土工平台修改

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

@@ -103,6 +103,22 @@ public class SoilExpReportController extends ServiceController {
 
 
 
+    @ApiOperation("试验项目报告复核")
+    @PostMapping("/exp_report_check_back")
+    public RestResult<Boolean> expReportCheckBack(@RequestParam("ids") Long [] ids,@RequestParam("remark") String remark) {
+        return success(soilExpReportService.expReportCheckBack(ids,remark,getAccount()));
+    }
+
+
+    @ApiOperation("试验项目报告签发退回")
+    @PostMapping("/exp_report_issue_back")
+    public RestResult<Boolean> expReportIssueBack(@RequestParam("ids") Long [] ids,@RequestParam("remark") String remark) {
+        return success(soilExpReportService.expReportIssueBack(ids,remark,getAccount()));
+    }
+
+
+
+
     @ApiOperation("报告编制分页列表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),

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

@@ -165,6 +165,15 @@ public class SoilOriginalTemplateController extends ServiceController implements
 
     @Override
     @Login(action = Action.Skip)
+    @ApiOperation(value = "编辑开土制备记录", notes = "编辑证书模板")
+    @PostMapping("/edit_open_soil_record_{someParam}")
+    public RestResult<Boolean> editOpenSoilRecord(String someParam, OssFileResult obsFileResult) {
+        return success(soilOriginalTemplateService.editOpenSoilRecord(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/service/ISoilExpReportService.java

@@ -32,4 +32,8 @@ public interface ISoilExpReportService extends IBaseService<SoilExpReport> {
     boolean expReportIssueSubmit(Long[] ids, Account account);
 
     boolean expReportCheckApprove(Long[] ids, Account account);
+
+    boolean expReportCheckBack(Long[] ids, String remark, Account account);
+
+    boolean expReportIssueBack(Long[] ids, String remark, Account account);
 }

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

@@ -36,4 +36,6 @@ public interface ISoilOriginalTemplateService extends IBaseService<SoilOriginalT
     boolean editSummaryReportTemplate(String someParam, OssFileResult obsFileResult);
 
     boolean editExpReport(String someParam, OssFileResult obsFileResult);
+
+    boolean editOpenSoilRecord(String someParam, OssFileResult obsFileResult);
 }

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

@@ -21,6 +21,7 @@ import com.patzn.cloud.service.lims.soil.service.*;
 import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
 import com.patzn.cloud.service.soil.entity.*;
 import com.patzn.cloud.service.soil.enums.SoilExpReportStatusEnum;
+import com.patzn.cloud.service.soil.enums.SoilReportStatusEnum;
 import com.patzn.cloud.service.soil.vo.SoilExperimentVO;
 import com.patzn.cloud.service.soil.vo.SoilSampleVO;
 import org.apache.commons.lang3.ArrayUtils;
@@ -61,7 +62,6 @@ public class SoilExpReportServiceImpl extends BaseServiceImpl<SoilExpReportMappe
     @Autowired
     private ISoilEntrustService soilEntrustService;
 
-
     @Autowired
     private ISoilSampleService soilSampleService;
 
@@ -565,6 +565,45 @@ public class SoilExpReportServiceImpl extends BaseServiceImpl<SoilExpReportMappe
 
     }
 
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public boolean expReportCheckBack(Long[] ids, String remark, Account account) {
+        RestAssert.fail(ArrayUtils.isEmpty(ids),"请选择要复核驳回的试验报告");
+        RestAssert.fail(StringUtils.isBlank(remark),"请填写驳回的原因");
+
+        List<SoilReport> expReportList = soilReportService.list(Condition.create().in("id",ids));
+        List<SoilReport> updateList = new ArrayList<>();
+        for (SoilReport soilExpReport:expReportList) {
+            SoilReport expReport = new SoilReport();
+            expReport.setStatus(SoilReportStatusEnum.DRAFT);
+            expReport.setProgress(SoilReportStatusEnum.DRAFT);
+            expReport.setId(soilExpReport.getId());
+            expReport.setRemark(soilExpReport.getRemark()+" "+remark);
+            updateList.add(expReport);
+        }
+        return soilReportService.updateBatchById(updateList);
+    }
+
+
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public boolean expReportIssueBack(Long[] ids, String remark, Account account) {
+        RestAssert.fail(ArrayUtils.isEmpty(ids),"请选择要驳回的试验报告");
+        RestAssert.fail(StringUtils.isBlank(remark),"请填写驳回的原因");
+
+        List<SoilReport> expReportList = soilReportService.list(Condition.create().in("id",ids));
+        List<SoilReport> updateList = new ArrayList<>();
+        for (SoilReport soilExpReport:expReportList) {
+            SoilReport expReport = new SoilReport();
+            expReport.setStatus(SoilReportStatusEnum.DRAFT);
+            expReport.setProgress(SoilReportStatusEnum.DRAFT);
+            expReport.setId(soilExpReport.getId());
+            expReport.setRemark(soilExpReport.getRemark()+" "+remark);
+            updateList.add(expReport);
+        }
+        return soilReportService.updateBatchById(updateList);
+    }
 
 
 

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

@@ -984,6 +984,7 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
                 }
 
                 mapReplace.put("#{sampleCode}",firstVO.getSampleCode());
+                mapReplace.put("#{sampleDepth}",firstVO.getSampleDepth());
                 HSSFWorkbookUtil.replaceModel(mapReplace,xssfWorkbook,xssfSheet);
 
                 int length = voList.size();

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

@@ -53,6 +53,7 @@ public class SoilOpenSoilRecordServiceImpl extends BaseServiceImpl<SoilOpenSoilR
             openSoilRecord.setObjectKey(ossFileResult.getObjectKey());
             openSoilRecord.setRemark(remark);
             openSoilRecord.setVersionId(ossFileResult.getVersionId());
+            openSoilRecord.setUname(account.getUserName());
             int count =  count(Condition.create().eq("entrust_id",entrustId));
             count = count+1;
             openSoilRecord.setVersion(count);

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

@@ -66,6 +66,10 @@ public class SoilOriginalTemplateServiceImpl extends BaseServiceImpl<SoilOrigina
     @Autowired
     private ISoilExpReportService soilExpReportService;
 
+
+    @Autowired
+    private ISoilOpenSoilRecordService soilOpenSoilRecordService;
+
     @Autowired
     private ISoilOriginalTemplateService soilOriginalTemplateService;
 
@@ -551,16 +555,18 @@ public class SoilOriginalTemplateServiceImpl extends BaseServiceImpl<SoilOrigina
                         break;
                     }
                 }
-                XSSFRow sampleRow  = xssfSheet.getRow(sampleRowLocation);
 
-                String sampleCode = "";
-                if (null != sampleRow){
-                    XSSFCell xssfCell =   sampleRow.getCell(sampleColLocation);
-                    sampleCode = HSSFWorkbookUtil.getJavaValue(xssfCell).toString();
 
+                String sampleCode = "";
+                if (null!=sampleRowLocation){
+                    XSSFRow sampleRow  = xssfSheet.getRow(sampleRowLocation);
+                    if (null != sampleRow){
+                        if (null!=sampleColLocation){
+                            XSSFCell xssfCell =   sampleRow.getCell(sampleColLocation);
+                            sampleCode = HSSFWorkbookUtil.getJavaValue(xssfCell).toString();
+                        }
+                    }
                 }
-
-                if (StringUtils.isNotBlank(sampleCode)){
                     for (SoilOriginalTemplateConfig config:configList) {
                             if (null == config.getItemed()||0==config.getItemed()){
                                 continue;
@@ -569,10 +575,26 @@ public class SoilOriginalTemplateServiceImpl extends BaseServiceImpl<SoilOrigina
                             Integer row = config.getMergeRowNum();
                             Integer col = config.getColumnPlace();
 
+
+                            Integer sampleCodeRow = config.getMergeBegin();
+                            Integer sampleCodeCol = config.getMergeEnd();
+
                             if (null == row || null ==col ){
                                 continue;
                             }
 
+                            if (null != sampleCodeRow && null !=sampleCodeCol ){
+                                XSSFRow sampleCodeXSSFRow  = xssfSheet.getRow(sampleCodeRow);
+                                if (null != sampleCodeXSSFRow){
+                                    XSSFCell sampleCodeXSSFCell = sampleCodeXSSFRow.getCell(sampleCodeCol);
+                                    sampleCode = HSSFWorkbookUtil.getJavaValue(sampleCodeXSSFCell).toString();
+                                }
+                            }
+
+                            if (StringUtils.isBlank(sampleCode)){
+                                continue;
+                            }
+
                             XSSFRow valueRow  = xssfSheet.getRow(row);
                             if (null == valueRow){
                                 continue;
@@ -614,7 +636,6 @@ public class SoilOriginalTemplateServiceImpl extends BaseServiceImpl<SoilOrigina
                         }
 
                     }
-                }
 
             }
 
@@ -683,5 +704,27 @@ public class SoilOriginalTemplateServiceImpl extends BaseServiceImpl<SoilOrigina
         return true;
     }
 
+    @Override
+    public boolean editOpenSoilRecord(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]);
+        SoilOpenSoilRecord report = soilOpenSoilRecordService.getById(businessId);
+        if (null == report){
+            RestAssert.fail("数据有误");
+        }
+        SoilOpenSoilRecord originalRecord = new SoilOpenSoilRecord();
+        originalRecord.setId(businessId);
+        originalRecord.setObjectKey(obsFileResult.getObjectKey());
+        soilOpenSoilRecordService.updateById(originalRecord);
+
+        return true;
+    }
+
 
 }