Merge branch 'develop_tzs_register' of…

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgScrapCancelDto.java

 package com.yeejoin.amos.boot.module.jg.api.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -74,6 +75,9 @@ public class JgScrapCancelDto extends BaseDto {
     @ApiModelProperty(value = "告知设备列表")
     private List<Map<String, Object>> deviceList;
 
+    @ApiModelProperty(value = "设备ID")
+    private String SEQUENCE_NBR;
+
 
     @ApiModelProperty(value = "终审通过时间")
     private Date auditPassDate;
@@ -85,4 +89,15 @@ public class JgScrapCancelDto extends BaseDto {
     // 区分监管和企业
     private String type;
 
+    /**
+     * 使用单位编码
+     */
+    private String useUnitCode;
+
+
+    /**
+     * 使用单位名称
+     */
+    private String useUnitName;
+
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgScrapCancel.java

@@ -116,4 +116,18 @@ public class JgScrapCancel extends BaseEntity {
     @TableField(value = "promoter")
     private String promoter;
 
+    /**
+     * 使用单位编码
+     */
+    @TableField("use_unit_code")
+    private String useUnitCode;
+
+
+    /**
+     * 使用单位名称
+     */
+    @TableField(value = "use_unit_name")
+    private String useUnitName;
+
+
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/enums/CancelTypeEnum.java

@@ -26,7 +26,7 @@ public enum CancelTypeEnum {
     public static String getNameByType(String code) {
         String name = null;
         for (CancelTypeEnum enumOne : CancelTypeEnum.values()) {
-            if (enumOne.getCode() == code) {
+            if (enumOne.getCode().equals(code)) {
                 name = enumOne.getName();
                 break;
             }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/enums/CancelFlowStatusEnum.java → amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/enums/CancelWorkFlowStatusEnum.java

@@ -8,12 +8,14 @@ import lombok.Getter;
  */
 @Getter
 @AllArgsConstructor
-public enum CancelFlowStatusEnum {
+public enum CancelWorkFlowStatusEnum {
+
+    SUBMIT("使用单位提交", "submit", "使用单位待提交", "一级单位已驳回", "使用单位撤回"),
+    RECEIVE("一级受理", "receive", "一级单位待受理", "二级单位已驳回", "一级单位撤回"),
+    PRELIMINARY("二级受理", "preliminary", "二级单位待受理", "三级单位已驳回", "二级单位撤回"),
+    REEXAMINE("三级受理", "reexamine", "三级单位待受理", "", ""),
+    COMPLETE("已完成", "complete", "已完成", "", "");
 
-    SUBMIT("使用单位提交", "submit", "使用单位待提交"),
-    RECEIVE("一级受理", "receive", "一级待受理"),
-    PRELIMINARY("二级受理", "preliminary", "二级待受理"),
-    REEXAMINE("三级受理", "reexamine", "三级待受理");
 
 
 
@@ -23,14 +25,27 @@ public enum CancelFlowStatusEnum {
 
     private final String pass;
 
+    private final String reject;
+
+    private final String rollBack;
+
 
 
-    public static CancelFlowStatusEnum getMessage(String name){
-        for (CancelFlowStatusEnum constants : values()) {
+    public static CancelWorkFlowStatusEnum getMessage(String name){
+        for (CancelWorkFlowStatusEnum constants : values()) {
             if (constants.getName().equals(name)) {
                 return constants;
             }
         }
         return null;
     }
+
+    public static CancelWorkFlowStatusEnum getMessageByCode(String code){
+        for (CancelWorkFlowStatusEnum constants : values()) {
+            if (constants.getCode().equals(code)) {
+                return constants;
+            }
+        }
+        return null;
+    }
 }

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

@@ -12,7 +12,8 @@
         select ur.sequence_nbr as sequenceNbr,
         ur.instance_id as instanceId,
         ur.audit_status as auditStatus,
-        ur.rec_date as regDate,
+        ur.rec_date as recDate,
+        ur.create_date as createDate,
         ur.receive_org_code as receiveOrgCode,
         ur.receive_org_name as receiveOrgName,
         ur.receive_company_code as receiveCompanyCode,
@@ -26,12 +27,14 @@
         ifnull(ur.next_execute_ids,'') as nextExecuteIds,
         audit_pass_date as auditPassDate,
         use.USE_UNIT_CREDIT_CODE as useUnitCreditCode,
-        use.USE_UNIT_NAME as useUnitName,
+        ur.use_unit_name as useUnitName,
+        ur.use_unit_code as useUnitCode,
         (SELECT name from tz_equipment_category  where  code = jri.EQU_CATEGORY) as equCategory,
         jri.EQU_DEFINE as equDefine,
         jri.PRODUCT_NAME as productName,
         jri.EQU_CODE as equCode,
         use.USE_INNER_CODE as innerCode,
+        use.ADDRESS as address,
         concat(use.PROVINCE_NAME,'-',use.CITY_NAME,'-',use.COUNTY_NAME) as place,
         re.equ_id as equipId
         from tzs_jg_scrap_cancel ur