同步修改合同检测值

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

@@ -137,7 +137,7 @@ public class ContractSampleController extends ServiceController {
     @PostMapping("/page_out_reg")
     public RestResult<Page<ContractSample>> getPageOutReg(ContractSample contractSample) {
         contractSample.setStatus(ContractSampleStatusEnum.OUT_DRIFT);
-        return success(contractSampleService.page(getPage(), contractSample));
+        return success(contractSampleService.pageOutReg(getPage(), contractSample));
     }
 
 

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

@@ -67,4 +67,6 @@ public interface IContractSampleService extends IBaseService<ContractSample> {
     boolean passToSecondJudgeCheck(ContractSampleVODTO dto, Account account);
 
     boolean addJudgementType(Long[] ids, String judgement, Account account);
+
+    Page<ContractSample> pageOutReg(Page<ContractSample> page, ContractSample contractSample);
 }

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

@@ -398,5 +398,23 @@ public class ContractSampleServiceImpl extends BaseServiceImpl<ContractSampleMap
         return false;
     }
 
+    @Override
+    public Page<ContractSample> pageOutReg(Page<ContractSample> page, ContractSample contractSample) {
+        String code = contractSample.getCode();
+        String materialName = contractSample.getMaterialName();
+        contractSample.setCode(null).setMaterialName(null);
+        Wrapper wrapper = new EntityWrapper<>(contractSample);
+
+        if (StringUtils.isNotBlank(code)) {
+            wrapper.like("code", code);
+        }
+        if (StringUtils.isNotBlank(materialName)) {
+            wrapper.like("material_name", materialName);
+        }
+        wrapper.orderBy("ctime", false);
+        wrapper.notExists("select 1 from entrust_sample s where s.deleted = 0  and s.contract_sample_id = contract_sample.id");
+        return this.page(page, wrapper);
+    }
+
 
 }

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

@@ -72,8 +72,10 @@ public class EntrustSampleItemServiceImpl extends BaseServiceImpl<EntrustSampleI
     private IEntrustRecordService entrustRecordService;
 
     @Autowired
-    private IEntrustSampleItemIndexService entrustSampleItemIndexService;
+    private IEntrustSampleItemService entrustSampleItemService;
 
+    @Autowired
+    private IEntrustSampleItemIndexService entrustSampleItemIndexService;
 
     @Autowired
     private IEntrustSampleItemRecordService entrustSampleItemRecordService;
@@ -124,6 +126,9 @@ public class EntrustSampleItemServiceImpl extends BaseServiceImpl<EntrustSampleI
     @Autowired
     private IQualificationService qualificationService;
 
+    @Autowired
+    private IContractSampleItemService contractSampleItemService;
+
     @Override
     public Page<EntrustSampleItem> page(Page<EntrustSampleItem> page, EntrustSampleItem entrustSampleItem) {
         String name = entrustSampleItem.getName();
@@ -132,7 +137,7 @@ public class EntrustSampleItemServiceImpl extends BaseServiceImpl<EntrustSampleI
         if (StringUtils.isNotBlank(name)) {
             wrapper.like("name", name);
         }
-        wrapper.orderBy("id",true);
+        wrapper.orderBy("id", true);
         return this.page(page, wrapper);
     }
 
@@ -149,7 +154,25 @@ public class EntrustSampleItemServiceImpl extends BaseServiceImpl<EntrustSampleI
             List<EntrustSampleItem> entrustSampleItemList = JSONArray.parseArray(itemJson, EntrustSampleItem.class);
             RestAssert.fail(CollectionUtils.isEmpty(entrustSampleItemList), "检测项目数据为空");
             RestAssert.fail(entrustSampleItemList.stream().filter(t -> null == t.getId()).count() > 0, "要修改检测值的编号为空");
-            return updateBatchById(entrustSampleItemList);
+            updateBatchById(entrustSampleItemList);
+            EntrustSampleItem sampleItem = entrustSampleItemList.get(0);
+            entrustSampleItemList = entrustSampleItemService.list(Condition.create().eq("entrust_sample_id", sampleItem.getEntrustSampleId()));
+            //
+            EntrustSample entrustSample = entrustSampleService.getById(sampleItem.getEntrustSampleId());
+            if (null != entrustSample && null != entrustSample.getContractSampleId()) {
+                List<ContractSampleItem> sampleItems = contractSampleItemService.list(Condition.create().eq("contract_sample_id", entrustSample.getContractSampleId()));
+                if (CollectionUtils.isNotEmpty(sampleItems)) {
+                    for (ContractSampleItem item : sampleItems) {
+                        Optional<EntrustSampleItem> itemOptional = entrustSampleItemList.stream().filter(t -> t.getName().equals(item.getName())).findFirst();
+                        if (itemOptional.isPresent()) {
+                            EntrustSampleItem data = itemOptional.get();
+                            item.setTestValue(data.getTestValue()).setAgreedValue(data.getAgreedValue()).setDecide(data.getDecide());
+                        }
+                    }
+                    contractSampleItemService.updateBatchById(sampleItems);
+                }
+            }
+            return true;
         } catch (Exception e) {
             //e.printStackTrace();
             logger.error(e.getMessage(), e.getCause());

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

@@ -171,6 +171,7 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
         RestAssert.fail(ArrayUtils.isEmpty(ids), "请选择要提交到验收结果录入的数据");
         if (submitJudgeCheck(ids, account)) {
             List<EntrustSample> sampleList = list(Condition.create().in("id", ids));
+
             List<Long> contractSampleIdList = new ArrayList<>();
             for (EntrustSample sample : sampleList) {
                 if (null != sample.getContractSampleId()) {
@@ -445,7 +446,7 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
                 sample.setCode(sampleCode);
                 sample.setStatus(sampleStatus).setProgress(sampleStatus);
                 // 不需要判级，直接跳入电子档案或者下一节点为质量判定
-                if ((!isRequireJudgeGrading && nextFlowStatus == EntrustFlowEnum.QUALITY_JUDGE) ||  nextFlowStatus == EntrustFlowEnum.ARCHIVES){
+                if ((!isRequireJudgeGrading && nextFlowStatus == EntrustFlowEnum.QUALITY_JUDGE) || nextFlowStatus == EntrustFlowEnum.ARCHIVES) {
                     sample.setJudgeProgress(2).setJudgeStatus(2);
                 }
             }
@@ -1456,6 +1457,14 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
         return super.update(sample, Condition.create().in("id", ids));
     }
 
+    private ContractSample getContractSampleBySampleId(Long sampleId) {
+        EntrustSample entrustSample = baseMapper.selectById(sampleId);
+        if (null == entrustSample || null == entrustSample.getContractSampleId()) {
+            return null;
+        }
+        return contractSampleService.getById(entrustSample.getContractSampleId());
+    }
+
     @Transactional(rollbackFor = Exception.class)
     @Override
     public boolean backJudgeCheck(Long[] ids, String remark, Account account) {