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/entity/JgMaintenanceContract.java

 package com.yeejoin.amos.boot.module.jg.api.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
@@ -224,7 +225,7 @@ public class JgMaintenanceContract extends BaseEntity {
     @TableField("next_execute_ids")
     private String nextExecuteIds;
 
-    @TableField("promoter")
+    @TableField(value = "promoter", updateStrategy = FieldStrategy.IGNORED)
     private String promoter;
 
     /**

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

+package com.yeejoin.amos.boot.module.jg.api.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 使用登记状态西悉尼
+ */
+@Getter
+@AllArgsConstructor
+public enum MaintenceStatusEnum {
+
+    SUBMIT("使用单位提交", "submit", "使用单位待提交", "维保单位受理已驳回", "使用单位撤回"),
+    RECEIVE("维保单位审核确认", "receive", "维保单位待受理", "监管单位受理已驳回", "维保单位受理撤回"),
+    PRELIMINARY("监管单位审核", "preliminary", "监管单位待受理", "", "");
+
+
+
+
+    private final String name;
+
+    private final String code;
+
+    private final String pass;
+
+    private final String reject;
+
+    private final String rollBack;
+
+
+
+    public static MaintenceStatusEnum getMessage(String name){
+        for (MaintenceStatusEnum constants : values()) {
+            if (constants.getName().equals(name)) {
+                return constants;
+            }
+        }
+        return null;
+    }
+}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgMaintenanceContractMapper.java

@@ -4,9 +4,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgMaintenanceContractDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintenanceContract;
+import com.yeejoin.amos.boot.module.jg.api.vo.EquipMessageVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * Mapper 接口
@@ -26,4 +28,5 @@ public interface JgMaintenanceContractMapper extends BaseMapper<JgMaintenanceCon
 
     void updatePromoter(@Param("id")Long id);
 
+    List<Map<String, Object>> selectEquipList(@Param("id")Long id);
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/vo/EquipExportVo.java

-package com.yeejoin.amos.boot.module.jg.api.vo;
-
-import com.alibaba.excel.annotation.ExcelProperty;
-import lombok.Data;
-
-@Data
-public class EquipExportVo {
-
-    @ExcelProperty(value = "管辖机构", index = 0)
-    String orgBranchName;
-
-    @ExcelProperty(value = "使用单位", index = 1)
-    String useUnitName;
-
-    @ExcelProperty(value = "设备种类", index = 2)
-    String equList;
-
-    @ExcelProperty(value = "设备类别", index = 3)
-    String equCategory;
-
-
-    @ExcelProperty(value = "使用登记证编号", index = 4)
-    String useOrgCode;
-
-
-    @ExcelProperty(value = "96333识别码", index = 5)
-    String code96333;
-
-
-    @ExcelProperty(value = "监管码", index = 6)
-    String supervisoryCode;
-
-
-    @ExcelProperty(value = "所属区域", index = 7)
-    String usePlace;
-
-
-    @ExcelProperty(value = "设备状态", index = 8)
-    String equState;
-
-
-
-
-}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/vo/EquipMessageVo.java

+package com.yeejoin.amos.boot.module.jg.api.vo;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+@Data
+public class EquipMessageVo {
+
+    String SEQUENCE_NBR;
+
+    String EQU_LIST;
+
+    String PRODUCE_UNIT_NAME;
+
+    String USE_INNER_CODE;
+
+    String FACTORY_NUM;
+
+    String ADDRESS;
+
+    String EQU_CATEGORY;
+
+}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/vo/JgMaintenanceContractVo.java

@@ -7,6 +7,7 @@ import lombok.Data;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 @Data
 public class JgMaintenanceContractVo {
@@ -145,4 +146,6 @@ public class JgMaintenanceContractVo {
 
     @ApiModelProperty("status")
     private String status;
+
+    private List<Map<String, Object>> equipmentLists;
 }

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

@@ -102,7 +102,7 @@
         SELECT
         sequence_nbr,
         apply_no,
-        apply_status,
+        status,
         apply_date,
         equ_type,
         use_unit_code,
@@ -168,4 +168,18 @@
         where is_delete = 0
           and sequence_nbr = #{sequenceNbr}
     </select>
+    <select id="selectEquipList" resultType="java.util.Map">
+        select jui.RECORD                                                             as SEQUENCE_NBR,
+               (SELECT name from tz_equipment_category where code = jri.EQU_LIST)     as EQU_LIST,
+               jfi.PRODUCE_UNIT_NAME,
+               jui.USE_INNER_CODE,
+               jfi.FACTORY_NUM,
+               jui.ADDRESS as ADDRESS,
+               (SELECT name from tz_equipment_category where code = jri.EQU_CATEGORY) as EQU_CATEGORY
+        from tzs_jg_maintenance_contract_eq mc
+                 LEFT JOIN idx_biz_jg_use_info jui on mc.equ_id = jui.RECORD
+                 LEFT JOIN idx_biz_jg_factory_info jfi on mc.equ_id = jfi.RECORD
+                 left JOIN idx_biz_jg_register_info jri on mc.equ_id = jri.RECORD
+        WHERE mc.equip_transfer_id = #{id}
+    </select>
 </mapper>