委托样品编号问题修改；

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

@@ -1121,7 +1121,8 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
                 sample.setEntrustId(entrust.getId()).setOrderBy(sampleIndex).setStatus(EntrustSampleStatusEnum.DRAFT).setProgress(EntrustSampleStatusEnum.DRAFT)
                         .setOrderBy(sampleIndex).setOkJudge(null).setJudgerId(null).setJudgeProgress(null).setJudger(null).setJudgeStatus(null).setJudgeCheckTime(null)
                         .setJudgeCheckerId(null).setAppearanceResult(null).setSurplusSampleLimit(null).setReceiver(null).setReceiverId(null).setReceiveTime(null)
-                        .setQualityRegistration(null).setUid(account.getUserId()).setCtime(new Date()).setLid(null).setLtime(null);
+                        .setQualityRegistration(null).setUid(account.getUserId()).setCtime(new Date()).setLid(null).setLtime(null)
+                        .setCode(null).setFirstCode(null).setSecondCode(null).setThirdCode(null);
                 entrustSampleList.add(sample);
                 sampleIndex += 10;
                 //
@@ -1564,15 +1565,24 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
             List<EntrustSample> sampleList = entrustSampleService.getByEntrustId(entrust.getId());
             RestAssert.fail(CollectionUtils.isEmpty(sampleList), String.format("委托编号为的【%s】样品为空！", entrust.getCode()));
             // 若存在任何一个样品的编号为空，那么需要自动生成其编号
-            if (sampleList.stream().anyMatch(t -> StringUtils.isBlank(t.getCode()))) {
-                for (EntrustSample sample : sampleList) {
+            for (EntrustSample sample : sampleList) {
+                if (StringUtils.isBlank(sample.getCode())) {
                     handleSampleCode(entrust, sample);
-                    if (StringUtils.isNotBlank(sample.getCode())) {
-                        RestAssert.fail(entrustSampleService.isRepeatSampleCode(sample), String.format("样品编号【%s】重复！", sample.getCode()));
-                    }
                 }
-                entrustSampleService.updateBatchById(sampleList);
+                RestAssert.fail(entrustSampleService.isRepeatSampleCode(sample), String.format("样品编号【%s】重复！", sample.getCode()));
             }
+            entrustSampleService.updateBatchById(sampleList);
+
+            // if (sampleList.stream().anyMatch(t -> StringUtils.isBlank(t.getCode()))) {
+            //     for (EntrustSample sample : sampleList) {
+            //         handleSampleCode(entrust, sample);
+            //         if (StringUtils.isNotBlank(sample.getCode())) {
+            //             RestAssert.fail(entrustSampleService.isRepeatSampleCode(sample), String.format("样品编号【%s】重复！", sample.getCode()));
+            //         }
+            //     }
+            //     entrustSampleService.updateBatchById(sampleList);
+            // }
+
             if ("是".equals(entrust.getSpecialAsk())) {
                 specialIds.add(entrust.getId());
             } else {

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

@@ -439,7 +439,7 @@ public class OriginalTemplateServiceImpl extends BaseServiceImpl<OriginalTemplat
 
                         if (StringUtils.isNotBlank(valueElse)) {
                             SoilItemCollectData soilItemCollectData = new SoilItemCollectData();
-                            soilItemCollectData.setTestValue(valueElse);
+                            soilItemCollectData.setTestValue(valueElse.trim());
                             soilItemCollectData.setSampleCode(sampleCode);
                             soilItemCollectData.setUnit(collectEntity.getUnit());
                             soilItemCollectData.setItemName(collectEntity.getItemName());
@@ -464,7 +464,7 @@ public class OriginalTemplateServiceImpl extends BaseServiceImpl<OriginalTemplat
                     }
                     SoilItemCollectData soilItemCollectData = new SoilItemCollectData();
                     soilItemCollectData.setItemName(itemName);
-                    soilItemCollectData.setTestValue(value);
+                    soilItemCollectData.setTestValue(value.trim());
                     soilItemCollectData.setSampleCode(sampleCode);
                     soilItemCollectData.setUnit(collectEntity.getUnit());
                     soilItemCollectData.setItemName(itemName);

src/main/resources/mapper/hmhj/EntrustSampleItemIndexMapper.xml

@@ -98,7 +98,7 @@
             max(s.sample_grading) "brand",
             max(i.tester) "tester",
             to_char(max(i.test_time),'YYYY-MM-DD HH24:MI:SS') "test_time",
-            max(r.report_checker) "report_checker",
+            max(CASE WHEN S.NAME = '原铝' then e.assignor else r.report_checker end) "report_checker",
             max(r.report_issuer) "report_issuer",
             max(r.quality_inspector) "quality_inspector",
             max(case when ii.name = '原铝Fe' then trim(ii.test_value) else null end) "fe",
@@ -114,6 +114,7 @@
             entrust_sample_item_index ii
         JOIN entrust_sample_item i  ON i.ID = ii.entrust_sample_item_id AND i.deleted = 0
         JOIN entrust_sample s       ON s.ID = i.entrust_sample_id       AND s.deleted = 0
+        JOIN entrust e              on e.ID = s.entrust_id              AND e.deleted = 0
         LEFT JOIN entrust_report r  ON r.entrust_id = s.entrust_id      AND r.deleted = 0
         WHERE  ii.deleted = 0
          -- AND s.NAME IN ('原铝', '铝成品')