Merge remote-tracking branch 'origin/develop_tzs_register_to_0715' into…

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.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import com.yeejoin.amos.boot.module.jg.api.common.BizCustomDateSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 import java.util.List;
@@ -25,9 +29,13 @@ public class JgScrapCancelDto extends BaseDto {
     private static final long serialVersionUID = 1L;
 
 
-    @ApiModelProperty(value = "注销类型（1报废注销，2移装注销）")
+    @ApiModelProperty(value = "注销类型code（1报废注销，2移装注销）")
     private String cancelType;
 
+    @ApiModelProperty(value = "注销类型每次")
+    private String cancelTypeDesc;
+
+
     @ApiModelProperty(value = "申请编号")
     private String applyNo;
 
@@ -47,6 +55,8 @@ public class JgScrapCancelDto extends BaseDto {
     private String createUserId;
 
     @ApiModelProperty(value = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonSerialize(using = BizCustomDateSerializer.class)
     private Date createDate;
 
     @ApiModelProperty(value = "流程状态")
@@ -109,14 +119,11 @@ public class JgScrapCancelDto extends BaseDto {
     @ApiModelProperty(value = "转办后执行人的Id逗号分割")
     private String transferToUserIds;
 
-    @ApiModelProperty("设备品种")
-    private String equDefine;
+    @ApiModelProperty(value = "设备种类code")
+    private String equListCode;
 
-    @ApiModelProperty(value = "设备种类")
-    private String equList;
-
-    @ApiModelProperty(value = "设备类别")
-    private String equCategory;
+    @ApiModelProperty(value = "设备种类name")
+    private String equListName;
 
     @ApiModelProperty(value = "设备代码")
     private String equCode;
@@ -127,16 +134,14 @@ public class JgScrapCancelDto extends BaseDto {
     @ApiModelProperty(value = "96333识别码")
     private String code96333;
 
-    @ApiModelProperty(value = "设备名称")
-    private String productName;
-
-    @ApiModelProperty(value = "设备地址")
-    private String fullAddress;
-
-    @ApiModelProperty (value = "其他附件")
+    @ApiModelProperty(value = "其他附件")
     private String otherAccessories;
 
     @ApiModelProperty(value = "申请日期，接收查询参数")
     private String applicationDate;
 
+
+    @ApiModelProperty(value = "使用登记证id，多个逗号分割")
+    private String registrationManageId;
+
 }

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

 package com.yeejoin.amos.boot.module.jg.api.dto;
 
-import com.alibaba.fastjson.JSONArray;
-import com.baomidou.mybatisplus.annotation.TableField;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import java.util.Date;
 
 /**
  * 报废注销设备关系表
@@ -17,7 +14,7 @@ import java.util.Date;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value="JgScrapCancelEqDto", description="报废注销设备关系表")
+@ApiModel(value = "JgScrapCancelEqDto", description = "报废注销设备关系表")
 public class JgScrapCancelEqDto extends BaseDto {
 
     private static final long serialVersionUID = 1L;
@@ -29,10 +26,10 @@ public class JgScrapCancelEqDto  extends BaseDto {
     @ApiModelProperty(value = "设备id")
     private String equId;
 
-    @ApiModelProperty(value = "使用登记id")
-    private String certificateSeq;
+    @ApiModelProperty(value = "使用登记证编号")
+    private String useRegistrationCode;
 
-    @ApiModelProperty(value = "设备信息")
-    private JSONArray equipInfo;
+    @ApiModelProperty(value = "设备代码")
+    private String equCode;
 
 }

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

@@ -155,25 +155,28 @@ public class JgScrapCancel extends BaseEntity {
     private String nextExecuteUserIds;
 
     /**
+     * 使用登记证id，多个逗号分割
+     */
+    @TableField("registration_manage_id")
+    private String registrationManageId;
+
+    /**
+     * 使用登记证编号，多个逗号分割（冗余前端检索使用）
+     */
+    @TableField("use_registration_code")
+    private String useRegistrationCode;
+
+    /**
      * 转办后执行人的Id逗号分割
      */
     @TableField("transfer_to_user_ids")
     private String transferToUserIds;
 
-    @TableField(exist = false)
-    private String equList;
-
-    @TableField(exist = false)
-    private String equListDesc;
-
-    @TableField(exist = false)
-    private String equCategoryDesc;
-
-    @TableField(exist = false)
-    private String productName;
-
-    @TableField(exist = false)
-    private String fullAddress;
+    /**
+     * 设备种类code
+     */
+    @TableField("equ_list_code")
+    private String equListCode;
 
     /**
      * 其他附件

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

 package com.yeejoin.amos.boot.module.jg.api.entity;
 
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import java.util.Date;
 
 /**
  * 报废注销设备关系表
@@ -38,15 +35,17 @@ public class JgScrapCancelEq extends BaseEntity {
 
 
     /**
-     * 使用登记id
+     * 使用登记证编号
      */
-    @TableField("certificate_seq")
-    private String certificateSeq;
+    @TableField("use_registration_code")
+    private String useRegistrationCode;
+
 
     /**
-     * 设备信息
+     * 设备代码
      */
-    @TableField("equip_info")
-    private String equipInfo;
+    @TableField("equ_code")
+    private String equCode;
+
 
 }

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

@@ -84,7 +84,7 @@ public class JgUseRegistration extends BaseEntity {
     private Date auditPassDate;
 
     /**
-     * 登记类别
+     * 登记类别（1：历史设备登记，0：other）
      */
 	@TableField("reg_type")
     private String regType;

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

@@ -20,7 +20,7 @@ import java.util.Map;
  */
 public interface JgScrapCancelMapper extends BaseMapper<JgScrapCancel> {
 
-    Page<Map<String, Object>> getListPage(@Param("page") Page<Map<String, Object>> page,
+    Page<JgScrapCancelDto> getListPage(@Param("page") Page<JgScrapCancelDto> page,
                                           @Param("sort") SortVo sortMap,
                                           @Param("dto") JgScrapCancelDto dto,
                                           @Param("roleIds") List<String> roleIds,

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

@@ -50,14 +50,20 @@ public interface JgUseRegistrationMapper extends BaseMapper<JgUseRegistration> {
 
     Map<String, Object> getMaintenanceDetail(@Param("id") String id);
 
+    Map<String, Object> getMaintenanceDetailByIdx(@Param("id") String id);
+
     Map<String, Object> getiInstallDetail(@Param("id") String id);
 
+    Map<String, Object> getiInstallDetailByIdx(@Param("id") String id);
+
     Map<String, Object> getUseRegistrationDetail(@Param("id") String id);
 
     Page<JSONObject> queryForUnitVesselEquipmentPage(@Param("page") Page<JSONObject> page, @Param("jsonObject") JSONObject jsonObject, @Param("records") Set<String> records);
 
     Page<JSONObject> queryForEquipUsedByVehiclePage(@Param("page") Page<JSONObject> page, @Param("jsonObject") JSONObject jsonObject);
 
+    Page<JSONObject> queryForEquipUsedByVehiclePageHistory(@Param("page") Page<JSONObject> page, @Param("jsonObject") JSONObject jsonObject);
+
     @MapKey("records")
     List<Map<String, Object>> queryForUnitVesselEquipment(@Param("records") List<String> records);
 

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

@@ -9,52 +9,36 @@
     </update>
 
 
-    <select id="getListPage" resultType="java.util.Map">
+    <select id="getListPage" resultType="com.yeejoin.amos.boot.module.jg.api.dto.JgScrapCancelDto">
         select
-        DISTINCT tjsc.sequence_nbr as sequenceNbr,
-        tjsc.instance_id as instanceId,
-        tjsc.create_user_id as createUserId,
-        tjsc.audit_status as auditStatus,
+            tjsc.sequence_nbr,
+            tjsc.instance_id,
+            tjsc.create_user_id,
+            tjsc.audit_status,
             DATE_FORMAT(tjsc.rec_date,'%Y-%m-%d') as recDate,
             DATE_FORMAT(tjsc.create_date,'%Y-%m-%d') as createDate,
-        tjsc.receive_org_code as receiveOrgCode,
-        tjsc.receive_org_name as receiveOrgName,
-        tjsc.receive_company_code as receiveCompanyCode,
-        tjsc.cancel_certificate as cancelCertificate,
-        tjsc.cancel_type as cancelType,
-        tjsc.apply_no as applyNo,
+            tjsc.receive_org_code,
+            tjsc.receive_org_name,
+            tjsc.receive_company_code,
+            tjsc.cancel_certificate,
+            tjsc.cancel_type,
+            tjsc.apply_no,
             tjsc.status,
             tjsc.remark,
-        tjsc.instance_status as instanceStatus,
+            tjsc.instance_status,
             tjsc.promoter,
-        tjsc.next_execute_user_ids as nextExecuteUserIds,
-        tjsc.supervisory_code as supervisoryCode,
-        tjsc.next_task_id as nextTaskId,
+            tjsc.next_execute_user_ids,
+            tjsc.supervisory_code,
+            tjsc.next_task_id,
             ifnull(tjsc.next_execute_ids,'') as nextExecuteIds,
             DATE_FORMAT(tjsc.audit_pass_date,'%Y-%m-%d') as auditPassDate,
-        use.USE_UNIT_CREDIT_CODE as useUnitCreditCode,
-        tjsc.use_unit_name as useUnitName,
-        tjsc.use_unit_code as useUnitCode,
-        jri.USE_ORG_CODE AS useRegistrationCode,
-        jri.PRODUCT_NAME as productName,
-        jri.EQU_CODE as equCode,
-        use.USE_INNER_CODE as innerCode,
-        use.ADDRESS as address,
-        oi.SUPERVISORY_CODE AS supervisoryCode,
-        oi.CODE96333 as code96333,
-        (SELECT name from tz_equipment_category WHERE code = jri.EQU_LIST) AS equList,
-        (SELECT name from tz_equipment_category where code = jri.EQU_CATEGORY) as equCategory,
-        (SELECT name from tz_equipment_category where code = jri.EQU_DEFINE) as equDefine,
-        CONCAT(use.PROVINCE_NAME,'', use.CITY_NAME, '', use.COUNTY_NAME, '', use.street_name) AS place,
-        use."ADDRESS" as detailedAddress,
-        re.equ_id as equipId
+            tjsc.use_unit_name,
+            tjsc.use_unit_code,
+            tjsc.use_registration_code,
+            tjsc.equ_list_code
         from tzs_jg_scrap_cancel tjsc
-        LEFT JOIN tzs_jg_scrap_cancel_eq re on tjsc.sequence_nbr = re.equip_transfer_id
-        LEFT JOIN idx_biz_jg_register_info jri on re.equ_id = jri.RECORD
-        LEFT JOIN idx_biz_jg_use_info use on re.equ_id = use.RECORD
-        LEFT JOIN idx_biz_jg_other_info oi ON  oi.RECORD = re.equ_id
         <where>
-            and tjsc.is_delete = 0
+            tjsc.is_delete = 0
             <if test="dto.auditStatus != null and dto.auditStatus != ''">
                 and tjsc.audit_status = #{dto.auditStatus}
             </if>
@@ -70,34 +54,12 @@
             <if test="dto.applicationDate != null and dto.applicationDate != ''">
                 and tjsc.create_date like concat('%',DATE_FORMAT(#{dto.applicationDate},'%Y-%m-%d'),'%')
             </if>
-            <if test="dto.equList != null and dto.equList != ''">
-                AND jri."EQU_LIST" = #{dto.equList}
-            </if>
-            <if test="dto.equCategory != null and dto.equCategory != ''">
-                AND jri."equ_category" = #{dto.equCategory}
-            </if>
-            <if test="dto.equDefine != null and dto.equDefine != ''">
-                AND jri."EQU_DEFINE" = #{dto.equDefine}
-            </if>
-            <if test="dto.equCode != null and dto.equCode != ''">
-                AND jri."EQU_CODE" like concat('%',#{dto.equCode},'%')
+            <if test="dto.equListCode != null and dto.equListCode != ''">
+                AND tjsc."equ_list_code" = #{dto.equListCode}
             </if>
+
             <if test="dto.useRegistrationCode != null and dto.useRegistrationCode != ''">
-                AND jri."USE_ORG_CODE" like concat('%',#{dto.useRegistrationCode},'%')
-            </if>
-            <if test="dto.code96333 != null and dto.code96333 != ''">
-                AND oi.CODE96333 like concat('%',#{dto.code96333},'%')
-            </if>
-            <if test="dto.supervisoryCode != null and dto.supervisoryCode != ''">
-                AND oi.SUPERVISORY_CODE like concat('%',#{dto.supervisoryCode},'%')
-            </if>
-            <if test="dto.fullAddress != null and dto.fullAddress != ''">
-                AND (
-                use."PROVINCE_NAME" LIKE CONCAT('%', #{dto.fullAddress}, '%')
-                OR use."CITY_NAME" LIKE CONCAT('%', #{dto.fullAddress}, '%')
-                OR use."COUNTY_NAME" LIKE CONCAT('%', #{dto.fullAddress}, '%')
-                OR use."STREET_NAME" LIKE CONCAT('%', #{dto.fullAddress}, '%')
-                )
+                AND tjsc."use_registration_code" like concat('%',#{dto.useRegistrationCode},'%')
             </if>
             <if test="roleIds != null and dto.type == 'supervision'">
                 <foreach collection='roleIds' item='role' open='and (' close=')' separator='or'>

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

@@ -310,6 +310,26 @@
         LIMIT 1
     </select>
 
+    <select id="getiInstallDetailByIdx" resultType="java.util.Map">
+        SELECT
+            ibjci."CONSTRUCTION_LEADER_NAME"                  as  installLeaderName ,
+            ibjci."CONSTRUCTION_LEADER_PHONE"                 as  installLeaderPhone ,
+            ibjci."USC_DATE"                                  as  installStartDate ,
+            ibjci."USC_UNIT_NAME"                             as  installPropertyUnitName ,
+            ibjci."PROXY_STATEMENT_ATTACHMENT"                as  installProxyStatementAttachment ,
+            ibjci."CONSTRUCTION_CONTRACT_ATTACHMENT"          as  installContractAttachment ,
+            ibjci."CONSTRUCTION_OTHER_ACCESSORIES"            as  insOtherAccessories,
+            ibjui."STREET_NAME"                               as installStreet,
+            ibjui."PROVINCE_NAME"                             as installProvince,
+            ibjui."CITY_NAME"                                 as installCity,
+            ibjui."COUNTY_NAME"                               as installCounty
+        FROM "idx_biz_jg_construction_info" AS ibjci
+        left join "idx_biz_jg_use_info" as ibjui on ibjui."RECORD" = ibjci."RECORD"
+        WHERE ibjci."RECORD" = #{id}
+        ORDER BY ibjci."rec_date" desc
+        LIMIT 1
+    </select>
+
     <select id="getUseRegistrationDetail" resultType="java.util.Map">
         SELECT tjur."status"           as UseRegistratStatus,
                tjur."sequence_nbr"     as UseRegistratSequenceNbr,
@@ -342,6 +362,23 @@
         ORDER BY tjmce."rec_date" desc
         LIMIT 1
     </select>
+
+    <select id="getMaintenanceDetailByIdx" resultType="java.util.Map">
+        SELECT ibjmri."ME_UNIT_NAME"         as maintenanceUnitName,
+               ibjui."USE_UNIT_NAME"         as maintenanceUseUnitName,
+--                ibjmri."ME_MASTER"      as maintenanceManagerName,
+--                ibjmri."ME_MASTER_PHONE"     as maintenanceManagerPhone,
+               ibjmri."ME_MASTER"  as maintenanceManagerOneName,
+               ibjmri."ME_MASTER_PHONE" as maintenanceManagerOnePhone,
+               ibjmri."ME_MASTER1"  as maintenanceManagerTwoName,
+               ibjmri."ME_MASTER1_PHONE" as maintenanceManagerTwoPhone,
+               ibjmri."REPAIR_INFORM"          as maintenanceContract
+        FROM "idx_biz_jg_maintenance_record_info" as ibjmri
+        left join "idx_biz_jg_use_info" as ibjui on ibjui."RECORD" = ibjmri."RECORD"
+        WHERE ibjmri."RECORD" = #{id}
+        ORDER BY ibjmri."rec_date" desc
+        LIMIT 1
+    </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,
@@ -405,7 +442,16 @@
         <include refid="page-list-pipeline"/>
         WHERE
         ri."EQU_CATEGORY" = '8300'
+        <if test="jsonObject.DATA_SOURCE != null and jsonObject.DATA_SOURCE != 'jg_his'">
             and ui."DATA_SOURCE" like 'jg%'
+            and ui."DATA_SOURCE" not like 'jg_his%'
+        </if>
+        <if test="jsonObject.DATA_SOURCE != null and jsonObject.DATA_SOURCE == 'jg_his'">
+            and ui."DATA_SOURCE" like 'jg_his%'
+        </if>
+        <if test="jsonObject.DATA_SOURCE == null or jsonObject.DATA_SOURCE == ''">
+            and ui."DATA_SOURCE" like 'jg%'
+        </if>
         -- 保证使用单位选择设备时（record为null） 能选择到本单位的设备 并且 监管单位在查看时（record 不为null）可以匹配到所有的设备
         <if test="jsonObject.useUnitCreditCode != null and jsonObject.useUnitCreditCode != '' and jsonObject.record == null">
             and ui."USE_UNIT_CREDIT_CODE" = #{jsonObject.useUnitCreditCode}
@@ -469,6 +515,16 @@
         ri."EQU_CATEGORY" = '2300'
         and ui."DATA_SOURCE" like 'jg%'
         and (ri.whether_vehicle_cylinder is null or ri.whether_vehicle_cylinder != 1)
+        <if test="jsonObject.DATA_SOURCE != null and jsonObject.DATA_SOURCE != 'jg_his'">
+            and ui."DATA_SOURCE" like 'jg%'
+            and ui."DATA_SOURCE" not like 'jg_his%'
+        </if>
+        <if test="jsonObject.DATA_SOURCE != null and jsonObject.DATA_SOURCE == 'jg_his'">
+            and ui."DATA_SOURCE" like 'jg_his%'
+        </if>
+        <if test="jsonObject.DATA_SOURCE == null or jsonObject.DATA_SOURCE == ''">
+            and ui."DATA_SOURCE" like 'jg%'
+        </if>
         -- 保证使用单位选择设备时（record为null） 能选择到本单位的设备 并且 监管单位在查看时（record 不为null）可以匹配到所有的设备
         <if test="jsonObject.useUnitCreditCode != null and jsonObject.useUnitCreditCode != '' and jsonObject.record == null">
             and ui."USE_UNIT_CREDIT_CODE" = #{jsonObject.useUnitCreditCode}
@@ -494,6 +550,47 @@
         WHERE
         ri."EQU_DEFINE" = '23T0'
         and ui."DATA_SOURCE" like 'jg%'
+        -- and ui."DATA_SOURCE" not like 'jg_his%'
+        and ri.whether_vehicle_cylinder = 1
+        -- 保证使用单位选择设备时（record为null） 能选择到本单位的设备 并且 监管单位在查看时（record 不为null）可以匹配到所有的设备
+        <if test="jsonObject.useUnitCreditCode != null and jsonObject.useUnitCreditCode != '' and jsonObject.record == null">
+            and ui."USE_UNIT_CREDIT_CODE" = #{jsonObject.useUnitCreditCode}
+        </if>
+        <if test="jsonObject.record != null and jsonObject.record != ''">
+            and ui."RECORD" = #{jsonObject.record}
+        </if>
+        <if test="jsonObject.record == null">
+            and not exists(SELECT 1 FROM tzs_jg_vehicle_information v, tzs_jg_vehicle_information_eq ve WHERE
+            v.sequence_nbr = ve.vehicle_id AND ve.equ_id = ui."RECORD" and v.status !='使用单位待提交' and v.status
+            !='一级受理已驳回' and v.status !='使用单位已撤回' and v.status !='已作废' )
+        </if>
+        ORDER BY ui.REC_DATE DESC
+    </select>
+    <select id="queryForEquipUsedByVehiclePageHistory" resultType="com.alibaba.fastjson.JSONObject">
+        <include refid="page-list-vessel"/>
+        WHERE
+        ri."EQU_DEFINE" = '23T0'
+        and ui."DATA_SOURCE" like 'jg_his%'
+        and ri.whether_vehicle_cylinder = 1
+        -- 保证使用单位选择设备时（record为null） 能选择到本单位的设备 并且 监管单位在查看时（record 不为null）可以匹配到所有的设备
+        <if test="jsonObject.useUnitCreditCode != null and jsonObject.useUnitCreditCode != '' and jsonObject.record == null">
+            and ui."USE_UNIT_CREDIT_CODE" = #{jsonObject.useUnitCreditCode}
+        </if>
+        <if test="jsonObject.record != null and jsonObject.record != ''">
+            and ui."RECORD" = #{jsonObject.record}
+        </if>
+        <if test="jsonObject.record == null">
+            and not exists(SELECT 1 FROM tzs_jg_vehicle_information v, tzs_jg_vehicle_information_eq ve WHERE
+            v.sequence_nbr = ve.vehicle_id AND ve.equ_id = ui."RECORD" and v.status !='使用单位待提交' and v.status
+            !='一级受理已驳回' and v.status !='使用单位已撤回' and v.status !='已作废' )
+        </if>
+        ORDER BY ui.REC_DATE DESC
+    </select>
+    <select id="queryForEquipUsedByVehiclePage" resultType="com.alibaba.fastjson.JSONObject">
+        <include refid="page-list-vessel"/>
+        WHERE
+        ri."EQU_DEFINE" = '23T0'
+        and ui."DATA_SOURCE" like 'jg%'
         and ri.whether_vehicle_cylinder = 1
         -- 保证使用单位选择设备时（record为null） 能选择到本单位的设备 并且 监管单位在查看时（record 不为null）可以匹配到所有的设备
         <if test="jsonObject.useUnitCreditCode != null and jsonObject.useUnitCreditCode != '' and jsonObject.record == null">
@@ -509,7 +606,6 @@
         </if>
         ORDER BY ui.REC_DATE DESC
     </select>
-
     <select id="queryForUnitVesselEquipment" resultType="java.util.Map">
         <include refid="page-list-vessel"/>
         WHERE ri."EQU_CATEGORY" = '2300' and ui."DATA_SOURCE" like 'jg%' and (ri.whether_vehicle_cylinder is null or ri.whether_vehicle_cylinder != 1)

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/IdxBizJqEquipmentRegisterController.java

@@ -110,7 +110,19 @@ public class IdxBizJqEquipmentRegisterController extends BaseController {
         JSONObject jsonObject = new JSONObject(map);
         return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.queryForEquipmentRegisterPage(jsonObject));
     }
-
+//    /**
+//     * 查询设备注册列表
+//     *
+//     * @param map
+//     * @return
+//     */
+//    @TycloudOperation(ApiLevel = UserType.AGENCY)
+//    @GetMapping(value = "/pageHistory")
+//    @ApiOperation(httpMethod = "GET", value = "设备注册信息分页查询", notes = "设备注册信息分页查询")
+//    public ResponseModel<Page<JSONObject>> queryForPageHistory(@RequestParam Map<String, Object> map) {
+//        JSONObject jsonObject = new JSONObject(map);
+//        return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.queryForEquipmentRegisterPageHistory(jsonObject));
+//    }
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/category/list")
     @ApiOperation(httpMethod = "GET", value = "查询不同单位类型可新增的设备种类列表", notes = "查询不同单位类型可新增的设备种类列表")
@@ -143,7 +155,13 @@ public class IdxBizJqEquipmentRegisterController extends BaseController {
         JSONObject jsonObject = new JSONObject(queryMap);
         return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.queryEquipCanUsedByVesselPage(jsonObject));
     }
-
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/equipCanUsedByVessel/pageHistory")
+    @ApiOperation(httpMethod = "GET", value = "查询车用气瓶可进行选择的设备列表", notes = "查询车用气瓶可进行选择的设备列表")
+    public ResponseModel<Page<JSONObject>> queryEquipCanUsedByVesselPageHistory(@RequestParam Map<String, Object> queryMap) {
+        JSONObject jsonObject = new JSONObject(queryMap);
+        return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.queryEquipCanUsedByVesselPageHistory(jsonObject));
+    }
     /**
      * 压力容器设备批量导入
      */

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgScrapCancelController.java

@@ -40,7 +40,7 @@ public class JgScrapCancelController extends BaseController {
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/save")
-    @ApiOperation(httpMethod = "POST", value = "新增/新增并提交", notes = "新增/新增并提交")
+    @ApiOperation(httpMethod = "POST", value = "暂存、工作台提交", notes = "暂存、工作台提交")
     public ResponseModel<Object> save(@RequestParam String submitType, @RequestBody Map<String, Object> model) {
         return ResponseHelper.buildResponse(jgScrapCancelService.save(submitType, model));
     }
@@ -52,7 +52,7 @@ public class JgScrapCancelController extends BaseController {
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/updateInfo")
-    @ApiOperation(httpMethod = "POST", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
+    @ApiOperation(httpMethod = "POST", value = "保存、保存并提交、提交", notes = "保存、保存并提交、提交")
     public ResponseModel<JgScrapCancelDto> updateInfo(@RequestParam String submitType,
                                                       @RequestBody Map<String, Object> model,
                                                       @RequestParam(value = "op", required = false) String op) {
@@ -77,7 +77,7 @@ public class JgScrapCancelController extends BaseController {
         jgScrapCancelInfo.remove("SEQUENCE_NBR");
         JgScrapCancelDto jgScrapCancelDto = JSON.parseObject(JSON.toJSONString(jgScrapCancelInfo), JgScrapCancelDto.class);
 
-        jgScrapCancelService.flowExecute(jgScrapCancelDto.getEquList(),
+        jgScrapCancelService.flowExecute(jgScrapCancelDto.getEquListCode(),
                 Long.valueOf(String.valueOf(jgScrapCancelDto.getSequenceNbr())),
                 jgScrapCancelDto.getInstanceId(),
                 String.valueOf(map.get("operate")),
@@ -106,13 +106,13 @@ public class JgScrapCancelController extends BaseController {
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(httpMethod = "POST", value = "列表全部数据查询", notes = "列表全部数据查询")
+    @ApiOperation(httpMethod = "POST", value = "分页查询", notes = "分页查询")
     @PostMapping(value = "/getList")
-    public ResponseModel<Page<Map<String, Object>>> getList(JgScrapCancelDto dto,
+    public ResponseModel<Page<JgScrapCancelDto>> getList(JgScrapCancelDto dto,
                                                             @RequestParam(value = "sort",required = false) String sort,
                                                             @RequestParam(value = "current") int current,
                                                             @RequestParam(value = "size") int size) {
-        Page<Map<String, Object>> page = new Page<>(current, size);
+        Page<JgScrapCancelDto> page = new Page<>(current, size);
         dto.setType(String.valueOf(iJgInstallationNoticeService.getCompanyType().get("companyLevel")));
         return ResponseHelper.buildResponse(jgScrapCancelService.getList(dto,sort, page, dto.getRoleIds()));
     }

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

@@ -25,6 +25,8 @@ public interface IIdxBizJgRegisterInfoService {
 
     Page<JSONObject> queryForEquipmentRegisterPage(JSONObject jsonObject);
 
+    Page<JSONObject> queryForEquipmentRegisterPageHistory(JSONObject jsonObject);
+
     Map<String, Object> getDetailByRecord(String record);
 
     Map<String, Object> getDetailFieldCamelCaseByRecord(String record);
@@ -35,6 +37,8 @@ public interface IIdxBizJgRegisterInfoService {
 
     Page<JSONObject> queryEquipCanUsedByVesselPage(JSONObject jsonObject);
 
+    Page<JSONObject> queryEquipCanUsedByVesselPageHistory(JSONObject jsonObject);
+
     Object importPressureVesselData(Map<String, Object> paramMap, MultipartFile multipartFile);
 
     Object importPressureData(MultipartFile multipartFile) throws Exception;

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

@@ -153,6 +153,9 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
     @Autowired
     JgUseRegistrationManageServiceImpl useRegistrationManageService;
 
+    @Autowired
+    private TzBaseEnterpriseInfoMapper tzBaseEnterpriseInfoMapper;
+
     /**
      * 根据sequenceNbr查询：1、查询单位变更信息，2、查询使用登记证列表
      *
@@ -1057,7 +1060,12 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                         registrationManage.setReceiveOrgName(registration.getReceiveOrgName());
                         registrationManage.setReceiveCompanyCode(registration.getReceiveOrgCode());
                         registrationManage.setAuditPassDate(registration.getAuditPassDate());
-//                            registrationManage.setUseUnitAddress();  todo 设备使用地址需要更新
+                        if (!ObjectUtils.isEmpty(registration.getNewUseUnitCreditCode())) {
+                            TzBaseEnterpriseInfo useCodeResult = tzBaseEnterpriseInfoMapper.selectOne(new QueryWrapper<TzBaseEnterpriseInfo>().eq("use_unit_code", registration.getNewUseUnitCreditCode()));
+                            if (useCodeResult != null) {
+                                registrationManage.setUseUnitAddress(useCodeResult.getAddress());
+                            }
+                        }
                     }
                     useRegistrationManageService.updateBatchById(list);
                 } else {

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

@@ -1069,26 +1069,10 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
                     BeanUtils.copyProperties(jgInstallationNotice, taskMessageDto);
                     taskMap.put("model", taskMessageDto);
                     TaskV2Model taskV2Model1 = commonService.updateTaskModel(taskMap);
-
-                    // 生成一条tzs_jg_certificate_change_record记录
-                    JgCertificateChangeRecord jgCertificateChangeRecord = new JgCertificateChangeRecord();
-                    jgCertificateChangeRecord.setApplyNo(jgInstallationNotice.getApplyNo());
-                    jgCertificateChangeRecord.setReceiveOrgName(jgInstallationNotice.getReceiveOrgName());
-                    jgCertificateChangeRecord.setAuditPassDate(new Date());
-                    jgCertificateChangeRecord.setRegType(BusinessTypeEnum.JG_INSTALLATION_NOTIFICATION.getName());
-                    jgCertificateChangeRecord.setRegDate(jgInstallationNotice.getInstallStartDate());
-                    jgCertificateChangeRecord.setChangeContent(this.buildRecordContent(jgInstallationNotice));//变更内容
-                    jgCertificateChangeRecord.setUseRegistrationCode(registrationCode);//使用登记编号
-                    jgCertificateChangeRecord.setReceiveCompanyCode(jgInstallationNotice.getReceiveCompanyOrgCode());//接收机构公司代码
-                    jgCertificateChangeRecord.setCertificateNo("");//登记证书唯一码
-                    jgCertificateChangeRecord.setUseUnitCreditCode(jgInstallationNotice.getUseUnitCreditCode());//使用单位统一信用代码
-                    jgCertificateChangeRecord.setUseUnitName(jgInstallationNotice.getUseUnitName());//使用单位名称
-                    jgCertificateChangeRecord.setEquCategory(idxBizJgRegisterInfo.getEquCategory());//设备类别编码
-                    jgCertificateChangeRecord.setCreateDate(new Date());
-                    jgCertificateChangeRecord.setRoutePath(taskV2Model1.getRoutePath());
-                    jgCertificateChangeRecord.setCreateUserId(jgInstallationNotice.getCreateUserId());
-                    jgCertificateChangeRecord.setSequenceNbr(sequence.nextId());
-                    certificateChangeRecordService.save(jgCertificateChangeRecord);
+                    // 生成证记录表主键
+                    long certChangeSeq = sequence.nextId();
+                    // 生成jg证书变更记录
+                    genJgCertificateChangeRecord(jgInstallationNotice,certChangeSeq, registrationCode, idxBizJgRegisterInfo, taskV2Model1);
                     // 查询设备制造信息
                     LambdaQueryWrapper<IdxBizJgFactoryInfo> factoryInfoWrapper = new LambdaQueryWrapper<>();
                     factoryInfoWrapper.eq(IdxBizJgFactoryInfo::getRecord, jgRelationEquip.getEquId());
@@ -1096,7 +1080,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
 
                     // 生成tzs_jg_certificate_change_record_eq记录
                     JgCertificateChangeRecordEq changeRecordEq = new JgCertificateChangeRecordEq();
-                    changeRecordEq.setChangeRecordId(jgCertificateChangeRecord.getSequenceNbr().toString());//登记证记录主键
+                    changeRecordEq.setChangeRecordId(String.valueOf(certChangeSeq));//登记证记录主键
                     changeRecordEq.setEquId(jgRelationEquip.getEquId());//设备主键
                     changeRecordEq.setProductCode(idxBizJgFactoryInfo.getFactoryNum());
                     certificateChangeRecordEqService.save(changeRecordEq);
@@ -1184,6 +1168,28 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         }
     }
 
+    public void genJgCertificateChangeRecord(JgInstallationNotice jgInstallationNotice,Long sequenceNbr, String registrationCode, IdxBizJgRegisterInfo idxBizJgRegisterInfo, TaskV2Model taskV2Model1) {
+        // 生成一条tzs_jg_certificate_change_record记录
+        JgCertificateChangeRecord jgCertificateChangeRecord = new JgCertificateChangeRecord();
+        jgCertificateChangeRecord.setApplyNo(jgInstallationNotice.getApplyNo());
+        jgCertificateChangeRecord.setReceiveOrgName(jgInstallationNotice.getReceiveOrgName());
+        jgCertificateChangeRecord.setAuditPassDate(new Date());
+        jgCertificateChangeRecord.setRegType(BusinessTypeEnum.JG_INSTALLATION_NOTIFICATION.getName());
+        jgCertificateChangeRecord.setRegDate(jgInstallationNotice.getInstallStartDate());
+        jgCertificateChangeRecord.setChangeContent(this.buildRecordContent(jgInstallationNotice));//变更内容
+        jgCertificateChangeRecord.setUseRegistrationCode(registrationCode);//使用登记编号
+        jgCertificateChangeRecord.setReceiveCompanyCode(jgInstallationNotice.getReceiveCompanyOrgCode());//接收机构公司代码
+        jgCertificateChangeRecord.setCertificateNo("");//登记证书唯一码
+        jgCertificateChangeRecord.setUseUnitCreditCode(jgInstallationNotice.getUseUnitCreditCode());//使用单位统一信用代码
+        jgCertificateChangeRecord.setUseUnitName(jgInstallationNotice.getUseUnitName());//使用单位名称
+        jgCertificateChangeRecord.setEquCategory(idxBizJgRegisterInfo.getEquCategory());//设备类别编码
+        jgCertificateChangeRecord.setCreateDate(new Date());
+        jgCertificateChangeRecord.setRoutePath(taskV2Model1.getRoutePath());
+        jgCertificateChangeRecord.setCreateUserId(jgInstallationNotice.getCreateUserId());
+        jgCertificateChangeRecord.setSequenceNbr(sequenceNbr);
+        certificateChangeRecordService.save(jgCertificateChangeRecord);
+    }
+
     private void createConstruction2Db(JgInstallationNotice jgInstallationNotice, JgInstallationNoticeEq jgRelationEquip) {
         IdxBizJgConstructionInfo idxBizJgConstructionInfo = new IdxBizJgConstructionInfo();
         idxBizJgConstructionInfo.setUscUnitCreditCode(jgInstallationNotice.getInstallUnitCreditCode());

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

@@ -270,7 +270,8 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
     public List<JSONObject> queryEquByCertificateSeqList(List<Long> sequenceNbrList) {
         List<JgUseRegistrationManage> jgUseRegistrationManageList = this.baseMapper.selectList(new LambdaQueryWrapper<JgUseRegistrationManage>()
                 .in(JgUseRegistrationManage::getSequenceNbr, sequenceNbrList)
-                .eq(JgUseRegistrationManage::getIsDelete, 0));
+                .eq(JgUseRegistrationManage::getIsDelete, 0)
+                .select(JgUseRegistrationManage::getUseRegistrationCode));
         if (ValidationUtil.isEmpty(jgUseRegistrationManageList)) {
             return new ArrayList<>();
         }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/json/superviseBusinessCategory.json

@@ -30,7 +30,8 @@
     {
       "name": "移装告知",
       "code": "GZ_YZ",
-      "image": "upload/tzs/common/image/移装告知.png"
+      "image": "upload/tzs/common/image/移装告知.png",
+      "disable": true
     }
   ],
   "DJGL": [
@@ -47,7 +48,8 @@
     {
       "name": "移装变更登记",
       "code": "DJ_YZ",
-      "image": "upload/tzs/common/image/移装变更登记.png"
+      "image": "upload/tzs/common/image/移装变更登记.png",
+      "disable": true
     },
     {
       "name": "单位变更登记",
@@ -78,12 +80,14 @@
     {
       "name": "设备启用",
       "code": "SB_QY",
-      "image": "upload/tzs/common/image/设备启用.png"
+      "image": "upload/tzs/common/image/设备启用.png",
+      "disable": true
     },
     {
       "name": "设备停用",
       "code": "SB_TY",
-      "image": "upload/tzs/common/image/设备停用.png"
+      "image": "upload/tzs/common/image/设备停用.png",
+      "disable": true
     },
     {
       "name": "注销",

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/json/urlInfo.json

@@ -236,37 +236,37 @@
   {
     "type": "113-1",
     "pageType": "draft",
-    "name": "移装注销",
+    "name": "注销",
     "url": "/mixuap?appId=1742358052905971713&id=1737357808040439809&roleIds={roleIds}&userId={userId}&pageType=edit"
   },
   {
     "type": "113-1",
     "pageType": "look",
-    "name": "移装注销",
+    "name": "注销",
     "url": "/mixuap?appId=1742358052905971713&id=1737357871097606146&roleIds={roleIds}&userId={userId}&pageType=look"
   },
   {
     "type": "113-1",
     "pageType": "edit",
-    "name": "移装注销",
+    "name": "注销",
     "url": "/mixuap?appId=1742358052905971713&id=1737357871097606146&roleIds={roleIds}&userId={userId}&pageType=edit"
   },
   {
     "type": "113-2",
     "pageType": "draft",
-    "name": "报废注销",
+    "name": "报废",
     "url": "/mixuap?appId=1742358052905971713&id=1737357808040439809&roleIds={roleIds}&userId={userId}&pageType=edit"
   },
   {
     "type": "113-2",
     "pageType": "look",
-    "name": "报废注销",
+    "name": "报废",
     "url": "/mixuap?appId=1742358052905971713&id=1737357871097606146&roleIds={roleIds}&userId={userId}&pageType=look"
   },
   {
     "type": "113-2",
     "pageType": "edit",
-    "name": "报废注销",
+    "name": "报废",
     "url": "/mixuap?appId=1742358052905971713&id=1737357871097606146&roleIds={roleIds}&userId={userId}&pageType=edit"
   },
   {

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/IdxBizJgConstructionInfo.java

@@ -54,13 +54,13 @@ public class IdxBizJgConstructionInfo extends TzsBaseEntity {
     private String uscUnitCreditCode;
 
     /**
-     *
+     * 施工单位名称
      */
 	@TableField("\"USC_UNIT_NAME\"")
     private String uscUnitName;
 
     /**
-     *
+     * 施工时间
      */
 	@TableField("\"USC_DATE\"")
     private Date uscDate;
@@ -94,5 +94,35 @@ public class IdxBizJgConstructionInfo extends TzsBaseEntity {
     @TableField(value = "\"INFORM_FILE_PATH\"")
     private String informFilePath;
 
+    /**
+     * 施工负责人
+     */
+    @TableField(value = "\"CONSTRUCTION_LEADER_NAME\"")
+    private String constructionLeaderName;
+
+    /**
+     * 施工负责人手机
+     */
+    @TableField(value = "\"CONSTRUCTION_LEADER_PHONE\"")
+    private String constructionLeaderPhone;
+
+    /**
+     * 施工委托书图片
+     */
+    @TableField(value = "\"PROXY_STATEMENT_ATTACHMENT\"")
+    private String proxyStatementAttachment;
+
+    /**
+     * 施工合同照片
+     */
+    @TableField(value = "\"CONSTRUCTION_CONTRACT_ATTACHMENT\"")
+    private String constructionContractAttachment;
+
+    /**
+     * 其他附件
+     */
+    @TableField(value = "\"CONSTRUCTION_OTHER_ACCESSORIES\"")
+    private String constructionOtherAccessories;
+
 
 }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/IdxBizJgMaintenanceRecordInfo.java

@@ -56,19 +56,19 @@ public class IdxBizJgMaintenanceRecordInfo extends TzsBaseEntity {
     private String meUnitName;
 
     /**
-     *
+     * 维保备案合同
      */
 	@TableField("\"REPAIR_INFORM\"")
     private String repairInform;
 
     /**
-     *
+     * 维保合同开始日期
      */
 	@TableField("\"INFORM_START\"")
     private Date informStart;
 
     /**
-     *
+     * 维保合同结束日期
      */
 	@TableField("\"INFORM_END\"")
     private Date informEnd;

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/enums/ApplicationFormTypeEnum.java

@@ -34,8 +34,7 @@ public enum ApplicationFormTypeEnum {
     ZXBF("ZXBF", "BF_ZX"),//电梯（设备）报废注销
     GMBG("GMBG", "DJ_GM"),//更名变更
     SBQY("SBQY", "SB_QY"),//设备启用
-    SBTY("SBTY", "SB_TY")//设备启用
-    ;
+    SBTY("SBTY", "SB_TY");//设备启用
 
     /**
      * 编号