1.冗余检验人员名称给设备同步使用

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/controller/JyjcInspectionResultController.java

@@ -85,7 +85,7 @@ public class JyjcInspectionResultController extends BaseController {
 
     /**
      * 列表全部数据查询
-     *
+     *getJyjcPersonByUnitCode
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)

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/JyjcInspectionResultServiceImpl.java

@@ -24,6 +24,7 @@ import com.yeejoin.amos.boot.module.jyjc.api.service.IJyjcInspectionResultServic
 import com.yeejoin.amos.boot.module.jyjc.biz.utils.JsonUtils;
 import com.yeejoin.amos.boot.module.ymt.api.entity.InspectionDetectionInfo;
 import com.yeejoin.amos.boot.module.ymt.api.entity.TzBaseEnterpriseInfo;
+import com.yeejoin.amos.boot.module.ymt.api.entity.TzsUserInfo;
 import com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentClassifityEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.*;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -89,6 +90,9 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR
     @Autowired
     TzBaseEnterpriseInfoMapper tzBaseEnterpriseInfoMapper;
 
+    @Autowired
+    CommonserviceImpl commonService;
+
     /**
      * 检验检测单位分页查询
      */
@@ -267,7 +271,8 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR
         info.setInspectType(model.getInspectionType());
         info.setRecord(model.getEquipUnicode());
         info.setInspectDate(model.getInspectionDate());
-        info.setInspectStaff(model.getInspector());
+        info.setInspectStaff(getInspectUserName(model));
+        info.setInspectStaffCode(model.getInspector());
         info.setInspectReport(jybgFile.getAttachmentUrl());
         info.setInspectConclusion(model.getInspectionConclusion());
         info.setProblemRemark(model.getNonConformance());
@@ -278,6 +283,11 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR
         info.setRecDate(new Date());
     }
 
+    private String getInspectUserName(JyjcInspectionResultModel model) {
+        List<TzsUserInfo> userInfos = commonService.getUserInfosByUnitCode(model.getInspectionUnitCode());
+        return userInfos.stream().filter(u->model.getInspector().contains(u.getSequenceNbr() + "")).map(TzsUserInfo::getName).collect(Collectors.joining(","));
+    }
+
     /**
      * 列表查询 示例
      */