Merge branch 'develop_tzs_register' of…

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgChangeRegistrationReformMapper.xml

@@ -15,7 +15,7 @@
         ur.status,
         ur.receive_org_name as receiveOrgName,
         DATE_FORMAT(ur.reg_date,'%Y-%m-%d') as regDate,
-        DATE_FORMAT(ur.rec_date,'%Y-%m-%d') as recDate,
+        DATE_FORMAT(ur.audit_pass_date,'%Y-%m-%d') as auditPassDate,
         (SELECT name from tz_equipment_category  where  code = jri.EQU_CATEGORY) as equCategory,
         jri.PRODUCT_NAME as productName,
         jri.EQU_CODE as equCode,

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

@@ -274,6 +274,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             }
 
         } else {
+            jgChangeRegistrationReform.setAuditPassDate(new Date());
             jgChangeRegistrationReform.setAuditStatus(FlowStatusEnum.TO_BE_FINISHED.getName());
             jgChangeRegistrationReform.setStatus(FlowStatusEnum.TO_BE_FINISHED.getName());
             JgChangeRegistrationReformEq jgChangeRegistrationReformEq = jgChangeRegistrationReformEqMapper.selectOne(new QueryWrapper<JgChangeRegistrationReformEq>().eq("equip_transfer_id", jgChangeRegistrationReform.getSequenceNbr()));

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

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

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

@@ -119,11 +119,11 @@ public class JyjcInspectionResult extends BaseEntity {
 	@TableField("non_conformance")
     private String nonConformance;
 
-    /**
-     * 整改情况
-     */
-	@TableField("rectification")
-    private String rectification;
+//    /**
+//     * 整改情况
+//     */
+//	@TableField("rectification")
+//    private String rectification;
 
     /**
      * 备注(无用预留)

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

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

@@ -78,8 +78,8 @@ public class JyjcInspectionResultModel extends BaseModel {
     @ApiModelProperty(value = "不符合项")
     private String nonConformance;
 
-    @ApiModelProperty(value = "整改情况")
-    private String rectification;
+//    @ApiModelProperty(value = "整改情况")
+//    private String rectification;
 
     @ApiModelProperty(value = "备注(无用预留)")
     private String remark;

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/resources/mapper/JyjcInspectionResultMapper.xml

@@ -7,7 +7,7 @@
         select res.sequence_nbr, res.inspection_unit_code, res.application_no, res.application_unit_code,
         res.equip_unicode, res.result_status, res.license_number, res.result_no, res.inspector, res.inner_person_code,
         res.inspection_conclusion, res.inspection_date, res.next_inspection_date, res.inspection_start_date,
-        res.inspection_end_date, res.inspection_result_summary, res.non_conformance, res.rectification, res.remark,
+        res.inspection_end_date, res.inspection_result_summary, res.non_conformance, res.remark,
         res.rec_user_id, res.rec_date, res.biz_type,res.equ_category, res.inspection_type, res.inspection_type_name,
         res.application_date,use_unit_name, use_unit_credit_code, province_name, city_name, county_name, street_name, equ_code, use_inner_code, ibjri.equ_list,
          tec1.name equ_list_name, ibjri.equ_category , ibjoi.SUPERVISORY_CODE supervisoryCode

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<>();
+        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);