修改报检问题

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/enums/DocumentEnum.java

@@ -13,7 +13,7 @@ public enum DocumentEnum {
 
     GZS("gzs", "告知书"),
     CPZL("cpzl", "产品质量证明书"),
-    SGZX("sgzx", "施工自行检查报告"),
+    SGZX("sgzxbg", "施工自行检查报告"),
     SGHT("sght", "施工合同或证明"),
     SGFA("sgfa", "施工方案/施工设计文件"),
     SGDWXK("sgdwxk", "施工单位许可证书"),
@@ -26,7 +26,22 @@ public enum DocumentEnum {
     SGSJ("sgsj", "施工设计文件"),
     SGFB("sgfb", "施工分包方目录"),
     FBSPJ("fbspj", "分包方评价资料"),
-    QT("qt", "其他附件");
+    QT("qtfj", "其他附件"),
+    CPZLHGZ("cpzlhg", "产品质量合格证"),
+    CPSJ("cpsj", "产品设计文件"),
+    ZZXK("zzxk", "制造许可证"),
+    ZJSY("zjsy", "安全保护装置的型式试验证书"),
+    DDHL("ddhl", "电动葫芦的型式试验证书"),
+    SYWH("sywh", "使用维护说明书"),
+    CLXS("clxs", "车辆行驶线路图"),
+    SYDJ("sydj", "使用登记证"),
+    SYCJY("sycjy", "上一次检验报告"),
+    FBHG("fbhg", "防爆合格证"),
+    NDZXJC("ndzxjc", "年度自行检查报告"),
+    AGGLRY("aqglry", "安全管理人员证"),
+    ZYRYZ("zyry", "作业人员证"),
+    WBHT("wbht", "维保合同"),
+    AZJY("azjy", "安装监检报告");
 
     private String code;
     private String name;

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

 package com.yeejoin.amos.boot.module.jyjc.api.model;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
 import org.typroject.tyboot.core.rdbms.model.BaseModel;
 
 import java.util.Date;
@@ -37,6 +39,7 @@ public class JyjcInspectionApplicationModel extends BaseModel {
     private String applicationNo;
 
     @ApiModelProperty(value = "申请日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date applicationDate;
 
     @ApiModelProperty(value = "检验检测类别")

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

@@ -19,7 +19,7 @@
         tzjia.application_date,
         tzjia.accept_date,
         tzjia.inspection_charge_phone,
-        tzjia.inspection_charge_person,
+        tbei2.use_contact as  inspectionChargePerson,
         tbei1.use_unit AS applicationUnitName,
         tbei.use_unit AS inspectionUnitName,
         tzjia.status,
@@ -29,6 +29,7 @@
         tz_jyjc_inspection_application AS tzjia
         LEFT JOIN tz_base_enterprise_info tbei ON tbei.use_code = tzjia.application_unit_code
         LEFT JOIN tz_base_enterprise_info tbei1 ON tbei1.use_code = tzjia.inspection_unit_code
+        LEFT JOIN tz_base_enterprise_info tbei2 ON tbei2.sequence_nbr = tzjia.inspection_charge_person
         LEFT JOIN cb_data_dictionary cdd ON cdd.code = tzjia.equip_classify
         LEFT JOIN cb_data_dictionary cdd1 ON cdd1.code = tzjia.inspection_classify
         LEFT JOIN cb_data_dictionary cdd2 ON cdd2.code = tzjia.status and cdd2.type = 'JYLCZT'

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/config/BizCustomDateSerializer.java

@@ -29,7 +29,7 @@ import java.util.Objects;
  */
 public class BizCustomDateSerializer extends StdSerializer<Date> {
 
-    private List<String> customFields = Arrays.asList("acceptDate", "expiryDate");
+    private List<String> customFields = Arrays.asList("acceptDate", "expiryDate","applicationDate");
 
     public BizCustomDateSerializer()
     {

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

@@ -124,7 +124,9 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
                 model.setResultType(jyjcOpeningApplication.getResultType());
             }
 
-            model.setApplicationNo(UUID.randomUUID().toString());
+            List<String> codes = createCodeService.createApplicationFormCode(ApplicationFormTypeEnum.JY.getCode(), 1);
+
+            model.setApplicationNo(codes.get(0));
             model.setApplicationDate(new Date());
             // region 获取下一个流程节点的数据
             Map<String, Object> nextNodeInfo = workflowHelper.getNextWorkflowNode(model.getProcessInstanceId());