优化流程委托报告处理流程；

src/main/java/com/patzn/cloud/service/lims/hmhj/common/EntrustFlowUtils.java

@@ -102,6 +102,7 @@ public class EntrustFlowUtils {
                 statusEnum = EntrustStatusEnum.OUT_INPUT;
                 break;
             case 14:
+            case 15:
                 statusEnum = EntrustStatusEnum.QUALITY_CHECK;
                 break;
         }

src/main/java/com/patzn/cloud/service/lims/hmhj/controller/EntrustController.java

@@ -486,7 +486,7 @@ public class EntrustController extends ServiceController {
     public RestResult<Page<EntrustVO>> getPageTaskTestData(EntrustVO entrust) {
         entrust.setItemStatus(EntrustSampleItemStatusEnum.TEST);
         // 过滤当前人为检测人的委托数据 - 节点数据不为空，且为检测时，只查询当前人信息
-        if(StringUtils.isNotBlank(entrust.getSource()) && EntrustFlowEnum.TEST.getName().equalsIgnoreCase(entrust.getSource())) {
+        if (StringUtils.isNotBlank(entrust.getSource()) && EntrustFlowEnum.TEST.getName().equalsIgnoreCase(entrust.getSource())) {
             entrust.setTesterId(getAccount().getUserId());
         }
         // 获取当前用户分组
@@ -851,14 +851,14 @@ public class EntrustController extends ServiceController {
     @ApiOperation("导出检测委托书")
     @GetMapping("/export")
     public RestResult<Boolean> exportEntrust(@RequestParam("ids") List<Long> ids) {
-        return success(entrustService.exportEntrust(ids,response));
+        return success(entrustService.exportEntrust(ids, response));
     }
 
     /* 打印检测委托书完成后的ajax调用，先使用未登录方式 */
     @ApiOperation("修改检测委托书打印状态")
     @Login(action = Action.Skip)
     @PostMapping("/update_print_status")
-    public RestResult<Boolean> updatePrintStatus(@RequestParam("ids") List<Long> ids,@RequestParam("userId") Long userId) {
-        return success(entrustService.updatePrintStatus(ids,userId));
+    public RestResult<Boolean> updatePrintStatus(@RequestParam("ids") List<Long> ids, @RequestParam("userId") Long userId) {
+        return success(entrustService.updatePrintStatus(ids, userId));
     }
 }

src/main/java/com/patzn/cloud/service/lims/hmhj/controller/EntrustReportController.java

@@ -173,11 +173,6 @@ public class EntrustReportController extends ServiceController {
     }
 
 
-
-
-
-
-
     @ApiOperation("报告台账待签发分页列表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),

src/main/java/com/patzn/cloud/service/lims/hmhj/service/IEntrustSampleService.java

@@ -97,4 +97,8 @@ public interface IEntrustSampleService extends IBaseService<EntrustSample> {
     boolean updateSampleCodeByIds(List<Long> sampleIdsList, int level);
 
     List<EntrustSampleVO> selectVOLists(EntrustSampleVO entrustSampleVO);
+
+    boolean isRequireJudgeGrading(Long entrustId);
+
+    boolean updateJudgeStatus(Long entrustId,Integer judgeStatus);
 }

src/main/java/com/patzn/cloud/service/lims/hmhj/service/IEntrustService.java

@@ -98,4 +98,5 @@ public interface IEntrustService extends IBaseService<Entrust> {
     Boolean updatePrintStatus(List<Long> ids,Long userId);
 
     Boolean saveOutEntrust(EntrustDTO dto, Account account);
+
 }

src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/EntrustReportServiceImpl.java

@@ -226,6 +226,10 @@ public class EntrustReportServiceImpl extends BaseServiceImpl<EntrustReportMappe
             // 若提交至 -> 质量判定,那么需要更改委托状态
             if (toFlowStatus == EntrustFlowEnum.QUALITY_JUDGE) {
                 entrust.setStatus(EntrustStatusEnum.QUALITY_CHECK);
+                // 若不需要质量判定，直接进入电子档案流程
+                if (!entrustSampleService.isRequireJudgeGrading(entrust.getId())) {
+                    entrustSampleService.updateJudgeStatus(entrust.getId(), 2);
+                }
                 entrustService.updateById(entrust);
                 // 更改样品编码显示形式，由三级变为一级
                 entrustSampleService.updateSampleCodeByEntrustId(entrust.getId(), 1);

src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/EntrustSampleServiceImpl.java

@@ -408,6 +408,10 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
         } else if (nextFlowStatus == EntrustFlowEnum.QUALITY_JUDGE) {
             sampleStatus = EntrustSampleStatusEnum.END;
             itemStatus = EntrustSampleItemStatusEnum.END;
+
+        } else if (nextFlowStatus == EntrustFlowEnum.ARCHIVES) {
+            sampleStatus = EntrustSampleStatusEnum.END;
+            itemStatus = EntrustSampleItemStatusEnum.END;
         }
 
         // 哪一级别
@@ -425,6 +429,9 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
 
         if (null != sampleStatus) {
             updateSample.setStatus(sampleStatus);
+            // 判定是否为质量判定
+            // 若为质量判定，判断需要判级
+            boolean isRequireJudgeGrading = isRequireJudgeGrading(entrust.getId());
             for (EntrustSample sample : sampleList) {
                 String firstCode = sample.getFirstCode(),
                         secondCode = sample.getSecondCode(),
@@ -437,6 +444,10 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
                 }
                 sample.setCode(sampleCode);
                 sample.setStatus(sampleStatus).setProgress(sampleStatus);
+                // 不需要判级，直接跳入电子档案或者下一节点为质量判定
+                if ((!isRequireJudgeGrading && nextFlowStatus == EntrustFlowEnum.QUALITY_JUDGE) ||  nextFlowStatus == EntrustFlowEnum.ARCHIVES){
+                    sample.setJudgeProgress(2).setJudgeStatus(2);
+                }
             }
             // update(updateSample, Condition.create().eq("entrust_id", entrust.getId()));
             // 批量更新样品编号和状态
@@ -1737,4 +1748,22 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
         return baseMapper.selectVOList(RowBounds.DEFAULT, entrustSampleVO);
     }
 
+    @Override
+    public boolean isRequireJudgeGrading(Long entrustId) {
+        RestAssert.fail(null == entrustId, "判断是否需要判级时，委托编号不能为空");
+        List<EntrustSample> sampleList = getByEntrustId(entrustId);
+        if (CollectionUtils.isEmpty(sampleList)) {
+            return false;
+        }
+        return sampleList.stream().filter(t -> null != t.getProductStandardId()).count() > 0;
+    }
+
+    @Override
+    public boolean updateJudgeStatus(Long entrustId, Integer judgeStatus) {
+        RestAssert.fail(null == entrustId, "更新判定结果时委托ID为空");
+        RestAssert.fail(null == judgeStatus, "更新判定结果时判定结果为空");
+        EntrustSample entrustSample = new EntrustSample();
+        entrustSample.setJudgeStatus(judgeStatus).setJudgeProgress(judgeStatus);
+        return update(entrustSample, Condition.create().eq("entrust_id", entrustId));
+    }
 }
\ No newline at end of file

src/test/java/resources/db_sql/hmhj/v147/20210718新增台账字段.sql

+--添加炭块外观检测台账字段：生块装炉数--
+--添加炭块外观检测台账字段：生块装炉数--
+ALTER TABLE "public"."carbon_appearance_check_ledger"
+    ADD COLUMN "raw_block_charge_num" int4;
+
+COMMENT ON COLUMN "public"."carbon_appearance_check_ledger"."raw_block_charge_num" IS '生块装炉数';
\ No newline at end of file