Merge branch 'dev'

src/main/java/com/patzn/cloud/service/lims/common/CollectUtil.java

@@ -37,6 +37,7 @@ public class CollectUtil {
                 content = content.replace("凝 聚 力","凝聚力");
                 content = content.replace("灵 敏 度","灵敏度");
                 content = content.replace("粘 聚 力","凝聚力");
+                content = content.replace("粘聚力","凝聚力");
                 String[] dataArray = content.split(" ");
                 for (String handleS:dataArray) {
                      handleS=handleS.trim();

src/main/java/com/patzn/cloud/service/lims/soil/controller/SoilAppendixController.java

@@ -83,4 +83,12 @@ public class SoilAppendixController extends ServiceController {
 	public RestResult<Boolean> delete(@RequestParam("ids") List<Long> ids) {
         return success(soilAppendixService.removeByIds(ids));
 	}
+
+
+
+    @ApiOperation(value = "下载报告附录", notes = "下载报告附录")
+    @GetMapping("/download/{id}")
+    public void downloadFile(@PathVariable("id")Long id) {
+        soilAppendixService.downloadFile(id, response);
+    }
 }

src/main/java/com/patzn/cloud/service/lims/soil/controller/SoilExpReportController.java

@@ -190,4 +190,12 @@ public class SoilExpReportController extends ServiceController {
         return success(soilExpReportService.generateReport(entrustId,templateId,expReportIds));
     }
 
+
+
+    @ApiOperation(value = "下载项目报告", notes = "下载项目报告")
+    @GetMapping("/download/{id}")
+    public void downloadFile(@PathVariable("id")Long id) {
+        soilExpReportService.downloadFile(id, response);
+    }
+
 }

src/main/java/com/patzn/cloud/service/lims/soil/service/ISoilAppendixService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.plugins.Page;
 import com.patzn.cloud.commons.service.IBaseService;
 import com.patzn.cloud.service.soil.entity.SoilAppendix;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**
@@ -21,4 +22,6 @@ public interface ISoilAppendixService extends IBaseService<SoilAppendix> {
     int countByEntrustId(Long entrustId);
 
     SoilAppendix getByExpId(Long expId);
+
+    void downloadFile(Long id, HttpServletResponse response);
 }

src/main/java/com/patzn/cloud/service/lims/soil/service/ISoilExpReportService.java

@@ -8,6 +8,7 @@ import com.patzn.cloud.service.soil.entity.SoilExpReport;
 import com.patzn.cloud.service.soil.entity.SoilExpReportTemplate;
 import com.patzn.cloud.service.soil.entity.SoilReport;
 
+import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.util.List;
 
@@ -36,4 +37,6 @@ public interface ISoilExpReportService extends IBaseService<SoilExpReport> {
     boolean expReportCheckBack(Long[] ids, String remark, Account account);
 
     boolean expReportIssueBack(Long[] ids, String remark, Account account);
+
+    void downloadFile(Long id, HttpServletResponse response);
 }

src/main/java/com/patzn/cloud/service/lims/soil/service/impl/SoilAppendixServiceImpl.java

 package com.patzn.cloud.service.lims.soil.service.impl;
 
 import com.baomidou.mybatisplus.mapper.Condition;
+import com.patzn.cloud.commons.api.RestAssert;
+import com.patzn.cloud.oss.starter.OssClient;
 import com.patzn.cloud.service.lims.soil.mapper.SoilAppendixMapper;
 import com.patzn.cloud.service.lims.soil.service.ISoilAppendixService;
 import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
 import com.patzn.cloud.service.soil.entity.SoilAppendix;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**
@@ -21,6 +25,9 @@ import java.util.List;
 @Service
 public class SoilAppendixServiceImpl extends BaseServiceImpl<SoilAppendixMapper, SoilAppendix> implements ISoilAppendixService {
 
+    @Autowired
+    private OssClient ossClient;
+
     @Override
     public Page<SoilAppendix> page(Page<SoilAppendix> page, SoilAppendix soilAppendix) {
         Wrapper wrapper = new EntityWrapper<>(soilAppendix);
@@ -42,4 +49,13 @@ public class SoilAppendixServiceImpl extends BaseServiceImpl<SoilAppendixMapper,
     public SoilAppendix getByExpId(Long expId) {
         return super.getOne(Condition.create().eq("exp_id",expId).last("LIMIT 1"));
     }
+
+    @Override
+    public void downloadFile(Long id, HttpServletResponse response) {
+        SoilAppendix attachment = super.getById(id);
+        if (null == attachment) {
+            RestAssert.fail("抱歉！该附件不存在");
+        }
+        ossClient.download(attachment.getObjectKey(), attachment.getName() + ".xlsx", response);
+    }
 }

src/main/java/com/patzn/cloud/service/lims/soil/service/impl/SoilExpReportServiceImpl.java

@@ -3,7 +3,6 @@ package com.patzn.cloud.service.lims.soil.service.impl;
 import com.aspose.cells.Workbook;
 import com.baomidou.mybatisplus.mapper.Condition;
 import com.baomidou.mybatisplus.toolkit.CollectionUtils;
-import com.google.common.collect.Lists;
 import com.patzn.cloud.commons.api.RestAssert;
 import com.patzn.cloud.commons.controller.Account;
 import com.patzn.cloud.commons.controller.LoginHelper;
@@ -27,7 +26,6 @@ import com.patzn.cloud.service.soil.vo.SoilSampleVO;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.hssf.usermodel.*;
-import org.apache.poi.openxml4j.util.ZipSecureFile;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.poi.xssf.usermodel.*;
@@ -38,6 +36,7 @@ import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.servlet.http.HttpServletResponse;
 import java.io.*;
 import java.net.URL;
 import java.util.*;
@@ -605,6 +604,14 @@ public class SoilExpReportServiceImpl extends BaseServiceImpl<SoilExpReportMappe
         return soilReportService.updateBatchById(updateList);
     }
 
+    @Override
+    public void downloadFile(Long id, HttpServletResponse response) {
+        SoilExpReport attachment = super.getById(id);
+        if (null == attachment) {
+            RestAssert.fail("抱歉！该项目报告不存在");
+        }
+        ossClient.download(attachment.getObjectKey(), attachment.getExpName() + ".xlsx", response);
+    }
 
 
     public InputStream exportToExcelInputStream(XSSFWorkbook workbook)  {

src/main/resources/mapper/soil/SoilExperimentMapper.xml

@@ -424,7 +424,7 @@
 
 
     <select id="selectByEntrustId" resultType="com.patzn.cloud.service.soil.vo.SoilExperimentVO">
-            SELECT i.id,i.name,s.sample_code FROM soil_experiment  i
+            SELECT i.id,i.name,s.sample_code,s.site_no FROM soil_experiment  i
 
             JOIN soil_sample s ON i.sample_id = s.id
             JOIN soil_entrust e ON s.entrust_id = e.id