土工平台修改

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

@@ -102,7 +102,7 @@ public class SoilOriginalTemplateController extends ServiceController implements
 
     @Override
     @Login(action = Action.Skip)
-    @ApiOperation(value = "编辑证书模板", notes = "编辑证书模板")
+    @ApiOperation(value = "编辑项目报告模板", notes = "编辑证书模板")
     @PostMapping("/edit_exp_report_template_{someParam}")
     public RestResult<Boolean> editExpReportTemplate(@PathVariable("someParam") String someParam, @RequestBody OssFileResult obsFileResult) {
         return success(soilOriginalTemplateService.editExpReportTemplate(someParam, obsFileResult));
@@ -112,7 +112,7 @@ public class SoilOriginalTemplateController extends ServiceController implements
 
     @Override
     @Login(action = Action.Skip)
-    @ApiOperation(value = "编辑证书模板", notes = "编辑证书模板")
+    @ApiOperation(value = "编辑原始记录", notes = "编辑证书模板")
     @PostMapping("/edit_report_{someParam}")
     public RestResult<Boolean> editReport(@PathVariable("someParam") String someParam, @RequestBody OssFileResult obsFileResult) {
         return success(soilOriginalTemplateService.editReport(someParam, obsFileResult));
@@ -121,6 +121,24 @@ public class SoilOriginalTemplateController extends ServiceController implements
 
     @Override
     @Login(action = Action.Skip)
+    @ApiOperation(value = "编辑汇总报告", notes = "编辑证书模板")
+    @PostMapping("/edit_summary_report_{someParam}")
+    public RestResult<Boolean> editSummaryReportTemplate(String someParam, OssFileResult obsFileResult) {
+        return success(soilOriginalTemplateService.editSummaryReportTemplate(someParam, obsFileResult));
+    }
+
+
+    @Override
+    @Login(action = Action.Skip)
+    @ApiOperation(value = "编辑原始记录", notes = "编辑证书模板")
+    @PostMapping("/edit_exp_report_{someParam}")
+    public RestResult<Boolean> editExpReport(String someParam, OssFileResult obsFileResult) {
+        return success(soilOriginalTemplateService.editExpReport(someParam, obsFileResult));
+    }
+
+
+    @Override
+    @Login(action = Action.Skip)
     @ApiOperation(value = "在线编辑保存报告信息", notes = "在线编辑保存报告信息")
     @PostMapping("/get_key_by_businessid{someParam}")
     public RestResult<String> getKeyByBusinessId(String businessId) {

src/main/java/com/patzn/cloud/service/lims/soil/mapper/SoilAloneSampleMapper.java

@@ -21,5 +21,5 @@ public interface SoilAloneSampleMapper extends BatchMapper<SoilAloneSample> {
 
     List<SoilAloneSampleVO> selectVOList(RowBounds rowBounds, @Param("vo") SoilAloneSampleVO soilAloneSample);
 
-    List<SoilAloneSampleVO> selectVOSampleOfStorehouseList(RowBounds rowBounds, SoilAloneSampleVO soilAloneSample);
+    List<SoilAloneSampleVO> selectVOSampleOfStorehouseList(RowBounds rowBounds, @Param("vo")SoilAloneSampleVO soilAloneSample);
 }

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

@@ -32,4 +32,8 @@ public interface ISoilOriginalTemplateService extends IBaseService<SoilOriginalT
     boolean editReport(String someParam, OssFileResult obsFileResult);
 
     void downloadFile(Long id, HttpServletResponse response);
+
+    boolean editSummaryReportTemplate(String someParam, OssFileResult obsFileResult);
+
+    boolean editExpReport(String someParam, OssFileResult obsFileResult);
 }

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

@@ -158,6 +158,8 @@ public class SoilAloneSampleServiceImpl extends BaseServiceImpl<SoilAloneSampleM
 
     @Override
     public Page<SoilAloneSampleVO> pageVOSampleOfStorehouse(Page<SoilAloneSampleVO> page, SoilAloneSampleVO soilAloneSample) {
+        RestAssert.fail(StringUtils.isBlank(soilAloneSample.getStorehouse()),"请选择库房号");
+        RestAssert.fail(StringUtils.isBlank(soilAloneSample.getShelfCode()),"请选择架货号");
         return page.setRecords(baseMapper.selectVOSampleOfStorehouseList(page,soilAloneSample));
     }
 }

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

@@ -589,8 +589,10 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
             for (int i = 0; i < length; i++) {
                 SoilExperimentVO experimentVO =   voList.get(i);
                 List<SoilItemVO> itemVOList = sampleSoilItemVOMap.get(experimentVO.getSampleId());
-                for (SoilItemVO itemVO:itemVOList) {
-                    mapReplace.put("#{"+itemVO.getName()+"}",itemVO.getTestValue());
+                if (CollectionUtils.isNotEmpty(itemVOList)){
+                    for (SoilItemVO itemVO:itemVOList) {
+                        mapReplace.put("#{"+itemVO.getName()+"}",itemVO.getTestValue());
+                    }
                 }
                 if (!mapReplace.containsKey("#{含水率}")){
                     mapReplace.put("#{含水率}","");

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

@@ -60,6 +60,13 @@ public class SoilOriginalTemplateServiceImpl extends BaseServiceImpl<SoilOrigina
     private ISoilItemService soilItemService;
 
     @Autowired
+    private ISoilReportService soilReportService;
+
+
+    @Autowired
+    private ISoilExpReportService soilExpReportService;
+
+    @Autowired
     private ISoilOriginalTemplateService soilOriginalTemplateService;
 
     @Autowired
@@ -493,4 +500,51 @@ public class SoilOriginalTemplateServiceImpl extends BaseServiceImpl<SoilOrigina
         }
         ossClient.download(attachment.getObjectKey(), attachment.getName() + "." + attachment.getType(), response);
     }
+
+    @Override
+    public boolean editSummaryReportTemplate(String someParam, OssFileResult obsFileResult) {
+        RestAssert.fail(StringUtils.isBlank(someParam),"业务ID不能为空");
+        RestAssert.fail(null==obsFileResult,"OssFileResult不能为空");
+        RestAssert.fail(StringUtils.isBlank(obsFileResult.getObjectKey()),"ObjectKey不能为空");
+        RestAssert.fail(StringUtils.isBlank(obsFileResult.getVersionId()),"VersionId不能为空");
+        RestAssert.fail(StringUtils.isBlank(obsFileResult.getType()),"Type不能为空");
+        RestAssert.fail(StringUtils.isBlank(someParam) || 4 != someParam.split("&").length, "参数传递有误");
+        String[] arr = someParam.split("&");
+        Long businessId = Long.parseLong(arr[0]);
+        SoilReport report = soilReportService.getById(businessId);
+        if (null == report){
+            RestAssert.fail("数据有误");
+        }
+        SoilReport originalRecord = new SoilReport();
+        originalRecord.setId(businessId);
+        originalRecord.setObjectKey(obsFileResult.getObjectKey());
+        soilReportService.updateById(originalRecord);
+
+        return true;
+    }
+
+
+    @Override
+    public boolean editExpReport(String someParam, OssFileResult obsFileResult) {
+        RestAssert.fail(StringUtils.isBlank(someParam),"业务ID不能为空");
+        RestAssert.fail(null==obsFileResult,"OssFileResult不能为空");
+        RestAssert.fail(StringUtils.isBlank(obsFileResult.getObjectKey()),"ObjectKey不能为空");
+        RestAssert.fail(StringUtils.isBlank(obsFileResult.getVersionId()),"VersionId不能为空");
+        RestAssert.fail(StringUtils.isBlank(obsFileResult.getType()),"Type不能为空");
+        RestAssert.fail(StringUtils.isBlank(someParam) || 4 != someParam.split("&").length, "参数传递有误");
+        String[] arr = someParam.split("&");
+        Long businessId = Long.parseLong(arr[0]);
+        SoilExpReport report = soilExpReportService.getById(businessId);
+        if (null == report){
+            RestAssert.fail("数据有误");
+        }
+        SoilExpReport originalRecord = new SoilExpReport();
+        originalRecord.setId(businessId);
+        originalRecord.setObjectKey(obsFileResult.getObjectKey());
+        soilExpReportService.updateById(originalRecord);
+
+        return true;
+    }
+
+
 }