报检 增加人员内部代码赋值

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/entity/JyjcInspectionApplication.java

@@ -113,6 +113,12 @@ public class JyjcInspectionApplication extends BaseEntity {
 	@TableField("application_unit_code")
     private String applicationUnitCode;
 
+	/**
+     * 内部人员代码
+     * */
+	@TableField("inner_person_code")
+    private String innerPersonCode;
+
     /**
      * 包含设备数量（冗余）
      */

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/model/JyjcInspectionApplicationModel.java

@@ -111,40 +111,43 @@ public class JyjcInspectionApplicationModel extends BaseModel {
     @ApiModelProperty(value = "操作类型 0 新增 2 编辑 1 暂存")
     private String workflowNode;
 
- @ApiModelProperty(value = "告知书")
- private List<Map<String,Object>> gzs;
- @ApiModelProperty(value = "产品质量证明书")
- private List<Map<String,Object>> cpzl;
- @ApiModelProperty(value = "施工自行检查报告")
- private List<Map<String,Object>> sgzxbg ;
- @ApiModelProperty(value = "施工合同或证明")
- private List<Map<String,Object>> sght;
- @ApiModelProperty(value = "施工方案/施工设计文件")
- private List<Map<String,Object>> sgfa;
- @ApiModelProperty(value = "施工单位许可证书")
- private List<Map<String,Object>> sgdwxk;
- @ApiModelProperty(value = "型式试验证书")
- private List<Map<String,Object>> xssy;
- @ApiModelProperty(value = "限速器和渐进式安全钳的调试证书")
- private List<Map<String,Object>> xsqts;
- @ApiModelProperty(value = "土建声明")
- private List<Map<String,Object>> tjsm;
- @ApiModelProperty(value = "质量保证手册和程序文件")
- private List<Map<String,Object>> zlbz;
- @ApiModelProperty(value = "施工作业文件")
- private List<Map<String,Object>> sgzy;
- @ApiModelProperty(value = "施工人员、质量保证体系责任人、专业技术人员身份证、技术工人的身份证及资质证书")
- private List<Map<String,Object>> sgry;
- @ApiModelProperty(value = "产品技术文件")
- private List<Map<String,Object>> cpjs;
- @ApiModelProperty(value = "施工设计文件")
- private List<Map<String,Object>> sgsj;
- @ApiModelProperty(value = "施工分包方目录")
- private List<Map<String,Object>> sgfb;
- @ApiModelProperty(value = "分包方评价资料")
- private List<Map<String,Object>> fbspj;
- @ApiModelProperty(value = "操作类型 0 新增 2 编辑 1 暂存")
- private List<Map<String,Object>> equip;
+    @ApiModelProperty(value = "内部人员代码")
+    private String innerPersonCode;
+
+    @ApiModelProperty(value = "告知书")
+    private List<Map<String, Object>> gzs;
+    @ApiModelProperty(value = "产品质量证明书")
+    private List<Map<String, Object>> cpzl;
+    @ApiModelProperty(value = "施工自行检查报告")
+    private List<Map<String, Object>> sgzxbg;
+    @ApiModelProperty(value = "施工合同或证明")
+    private List<Map<String, Object>> sght;
+    @ApiModelProperty(value = "施工方案/施工设计文件")
+    private List<Map<String, Object>> sgfa;
+    @ApiModelProperty(value = "施工单位许可证书")
+    private List<Map<String, Object>> sgdwxk;
+    @ApiModelProperty(value = "型式试验证书")
+    private List<Map<String, Object>> xssy;
+    @ApiModelProperty(value = "限速器和渐进式安全钳的调试证书")
+    private List<Map<String, Object>> xsqts;
+    @ApiModelProperty(value = "土建声明")
+    private List<Map<String, Object>> tjsm;
+    @ApiModelProperty(value = "质量保证手册和程序文件")
+    private List<Map<String, Object>> zlbz;
+    @ApiModelProperty(value = "施工作业文件")
+    private List<Map<String, Object>> sgzy;
+    @ApiModelProperty(value = "施工人员、质量保证体系责任人、专业技术人员身份证、技术工人的身份证及资质证书")
+    private List<Map<String, Object>> sgry;
+    @ApiModelProperty(value = "产品技术文件")
+    private List<Map<String, Object>> cpjs;
+    @ApiModelProperty(value = "施工设计文件")
+    private List<Map<String, Object>> sgsj;
+    @ApiModelProperty(value = "施工分包方目录")
+    private List<Map<String, Object>> sgfb;
+    @ApiModelProperty(value = "分包方评价资料")
+    private List<Map<String, Object>> fbspj;
+    @ApiModelProperty(value = "操作类型 0 新增 2 编辑 1 暂存")
+    private List<Map<String, Object>> equip;
 
     @ApiModelProperty("检验结果方式")
     private String resultType;

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

@@ -70,9 +70,14 @@ public class CommonController extends BaseController {
             return null;
         }
         List<String> phones = userPhones.stream().map(TzsUserInfo::getInnerPersonCode).collect(Collectors.toList());
-        String innerPersonCode = String.join(",", phones);
         Map<String,Object> map = new HashMap<>();
-        map.put("innerPersonCode",innerPersonCode);
+        if (CollectionUtils.isEmpty(phones)){
+            String innerPersonCode = String.join(",", phones);
+            map.put("innerPersonCode",innerPersonCode);
+        }else {
+            map.put("innerPersonCode","");
+        }
+
         return ResponseHelper.buildResponse(map);
     }
 

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

@@ -512,6 +512,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
         //逻辑变更为 通过后才对办理时间赋值
         if (status.equals(FlowStatusEnum.TO_BE_FINISHED.getCode())){
             entity.setAcceptDate(new Date());
+            entity.setInspectionUnitCode(params.getOrDefault("innerPersonCode","").toString());
         }
         this.updateById(entity);