feat(jyjc): 报检结果接收调整

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/result/processor/SingleEquipResultDataProcessor.java

@@ -18,7 +18,6 @@ import com.yeejoin.amos.boot.module.jyjc.biz.service.impl.JyjcInspectionResultAt
 import com.yeejoin.amos.boot.module.jyjc.biz.service.impl.JyjcInspectionResultServiceImpl;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgInspectionCylinderAttachment;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgInspectionDetectionInfo;
-import com.yeejoin.amos.boot.module.ymt.api.entity.TzsUserInfo;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgInspectionCylinderAttachmentMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgInspectionDetectionInfoMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.UseInfoMapper;
@@ -31,7 +30,6 @@ import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import java.util.Set;
-import java.util.stream.Collectors;
 
 @Component
 @RequiredArgsConstructor
@@ -151,8 +149,8 @@ public class SingleEquipResultDataProcessor implements SupportableResultDataProc
         info.setRecord(jyjcInspectionResult.getEquipUnicode());
         info.setInspectReport(this.getReport(jyjcInspectionResult));
         info.setInspectDate(jyjcInspectionResult.getInspectionDate());
-        info.setInspectStaff(getInspectUserName(jyjcInspectionResult));
         info.setInspectStaffCode(jyjcInspectionResult.getInspector());
+        info.setInspectStaff(commonService.getInspectUserName(jyjcInspectionResult.getInspector()));
         info.setInspectConclusion(jyjcInspectionResult.getInspectionConclusion());
         info.setProblemRemark(jyjcInspectionResult.getNonConformance());
         info.setNextInspectDate(jyjcInspectionResult.getNextInspectionDate());
@@ -167,9 +165,4 @@ public class SingleEquipResultDataProcessor implements SupportableResultDataProc
         JyjcInspectionResultAttachment jybgFile = inspectionResultService.getReportAttachment(jyjcInspectionResult.getSequenceNbr());
         return jybgFile.getAttachmentUrl();
     }
-
-    private String getInspectUserName(JyjcInspectionResult model) {
-        List<TzsUserInfo> userInfos = commonService.getUserInfosByUnitCode(model.getInspectionUnitCode());
-        return userInfos.stream().filter(u -> model.getInspector().contains(u.getSequenceNbr() + "")).map(TzsUserInfo::getName).collect(Collectors.joining(","));
-    }
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/CommonServiceImpl.java

@@ -421,13 +421,13 @@ public class CommonServiceImpl {
         info.setInspectOrgName(model.getInspectionUnitName());
         info.setInspectType(model.getInspectionType());
         info.setRecord(record);
+        info.setResultSeq(model.getSequenceNbr() + "");
         info.setInspectDate(model.getInspectionDate());
-        info.setInspectStaff(getInspectUserName(model));
         info.setInspectStaffCode(model.getInspector());
+        info.setInspectStaff(getInspectUserName(model.getInspector()));
         info.setInspectReport(jybgFile.getAttachmentUrl());
         info.setInspectConclusion(model.getInspectionConclusion());
-        // json字段暂时注释
-//        info.setProblemRemark(model.getNonConformance());
+        info.setProblemRemark(model.getNonConformance());
         info.setNextInspectDate(model.getNextInspectionDate());
         info.setSequenceCode(record);
         info.setInspectOrgCode(model.getInspectionUnitCode());
@@ -440,8 +440,8 @@ public class CommonServiceImpl {
         info.setInspectType(model.getInspectionType());
         info.setRecord(record);
         info.setInspectDate(model.getInspectionDate());
-        info.setInspectStaff(getInspectUserName(model));
         info.setInspectStaffCode(model.getInspector());
+        info.setInspectStaff(getInspectUserName(model.getInspector()));
         info.setInspectReport(jybgFile.getAttachmentUrl());
         info.setInspectConclusion(model.getInspectionConclusion());
         info.setResultSeq(model.getSequenceNbr() + "");
@@ -453,14 +453,20 @@ public class CommonServiceImpl {
         info.setRecDate(new Date());
     }
 
-    private String getInspectUserName(JyjcInspectionResult model) {
-        List<TzsUserInfo> userInfos = this.getUserInfosByUnitCode(model.getInspectionUnitCode());
-        return userInfos.stream().filter(u -> model.getInspector().contains(u.getSequenceNbr() + "")).map(TzsUserInfo::getName).collect(Collectors.joining(","));
+
+    public String getInspectUserName(String inspector) {
+        if(StringUtils.isNotBlank(inspector)) {
+            List<TzsUserInfo> userInfos = this.getUserInfosByIds(inspector);
+            return userInfos.stream().map(TzsUserInfo::getName).collect(Collectors.joining(","));
+        }
+        return "";
     }
 
-    private String getInspectUserName(JyjcInspectionResultModel model) {
-        List<TzsUserInfo> userInfos = this.getUserInfosByUnitCode(model.getInspectionUnitCode());
-        return userInfos.stream().filter(u -> model.getInspector().contains(u.getSequenceNbr() + "")).map(TzsUserInfo::getName).collect(Collectors.joining(","));
+    private List<TzsUserInfo> getUserInfosByIds(String inspector) {
+        LambdaQueryWrapper<TzsUserInfo> userInfoQueryWrapper = new LambdaQueryWrapper<>();
+        userInfoQueryWrapper.in(TzsUserInfo::getSequenceNbr, Arrays.asList(inspector.split(",")));
+        userInfoQueryWrapper.select(BaseEntity::getSequenceNbr, TzsUserInfo::getName);
+        return userInfoMapper.selectList(userInfoQueryWrapper);
     }
 
     /**