土工平台修改

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

@@ -660,6 +660,11 @@ public class SoilExperimentController extends ServiceController  {
     }
 
 
+
+
+
+
+
     @ApiOperation(value = "填写开土制备记录", notes = "填写开土制备记录")
     @PostMapping("/save_excel_open_soil_record")
     public RestResult<SoilOpenSoilRecord> saveExcelOpenSoilRecord(@RequestParam("entrustId")Long entrustId, @RequestParam("templateId") Long templateId) {
@@ -675,6 +680,13 @@ public class SoilExperimentController extends ServiceController  {
     }
 
 
+    @ApiOperation(value = "高级实验报告生成", notes = "高级实验报告生成")
+    @PostMapping("/senior_test_report")
+    public RestResult<SoilExpReport> seniorTestReport(@RequestParam("id")Long id) {
+        return success(soilExperimentService.seniorTestReport(id,getAccount()));
+    }
+
+
 
 
 

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

@@ -103,4 +103,6 @@ public interface ISoilExperimentService extends IBaseService<SoilExperiment> {
     boolean uploadGdsFile(MultipartFile file);
 
     boolean uploadDynamicsCollect(MultipartHttpServletRequest httpServletRequest, Long entrustId, Account account);
+
+    SoilExpReport seniorTestReport(Long id, Account account);
 }

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

@@ -169,6 +169,10 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
 
 
     @Autowired
+    private ISoilExpRelOriginalRecordService soilExpRelOriginalRecordService;
+
+
+    @Autowired
     private SysOrgClient sysOrgClient;
 
     @Override
@@ -2491,6 +2495,58 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
     }
 
 
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public SoilExpReport seniorTestReport(Long id, Account account) {
+        RestAssert.fail(null == id ,"请选择高级试验！");
+        List<SoilExpRelOriginalRecord> relOriginalRecordList =  soilExpRelOriginalRecordService.list(Condition.create().eq("exp_id",id).last(" LIMIT 1 "));
+        RestAssert.fail(CollectionUtils.isEmpty(relOriginalRecordList),"原始记录暂未生成！");
+        SoilExpRelOriginalRecord originalRecord=relOriginalRecordList.get(0);
+        SoilOriginalRecord record =  soilOriginalRecordService.getById(originalRecord.getRecordId());
+        InputStream io = ossClient.download(record.getObjectKey());
+        if (null == io){
+            logger.error("----------------------2");
+            RestAssert.fail("模板不存在");
+        }
+
+        logger.error(" InputStream io 存在");
+        SoilExpReport objectKey=null;
+        XSSFWorkbook xssfWorkbook= null;
+        try {
+            xssfWorkbook=   new XSSFWorkbook(io);
+        }catch (Exception e){
+            logger.error("获取开土制备记录模板错误"+e.getMessage());
+            e.printStackTrace();
+        }
+
+        FileOutputStream os = null;
+        File file = null;
+        String generated="试验项目报告";
+        SoilEntrust entrust = soilEntrustService.getById(record.getEntrustId());
+        SoilExperiment experiment =   getById(id);
+        try {
+            file = File.createTempFile(generated, ".xlsx");
+            os = new FileOutputStream(file);
+            xssfWorkbook.write(os);
+            os.flush();
+            objectKey= soilExpReportService.uploadExpReportGenerate(new Long[]{id},null,entrust,experiment.getName(), account, "报告生成", file);
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            try {
+                os.close();
+                xssfWorkbook.close();
+                io.close();
+                FileUtils.deleteFiles(file);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+
+        }
+        return objectKey;
+    }
+
+
     public boolean parseTxt(MultipartFile smbFile, CollectDataType request) {
         try {
             List<SoilExperimentCollectData> dataList=   CollectUtil.txt2String(smbFile.getInputStream());