27530 单位变更需求变更开发

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

@@ -117,6 +117,10 @@ public class JgChangeRegistrationUnitDto extends BaseDto {
     @ApiModelProperty(value = "告知设备列表")
     private List<Map<String, Object>> deviceList;
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "使用登记证列表")
+    private List<Map<String, Object>> registrationList;
+
     @ApiModelProperty(value = "设备类别")
     private String equType;
 
@@ -146,7 +150,7 @@ public class JgChangeRegistrationUnitDto extends BaseDto {
     @ApiModelProperty(value = "监管码")
     private String supervisoryCode;
 
-    @ApiModelProperty(value = "分类")
+    @ApiModelProperty(value = "设备种类")
     private String equList;
 
     @ApiModelProperty(value = "设备类别")
@@ -169,4 +173,16 @@ public class JgChangeRegistrationUnitDto extends BaseDto {
 
     @ApiModelProperty(value = "公司类型")
     private String companyType;
+
+    @ApiModelProperty(value = "经办人")
+    private String agent;
+
+    @ApiModelProperty(value = "经办人联系电话")
+    private String agentPhone;
+
+    @ApiModelProperty(value = "设备种类编码")
+    private String equListCode;
+
+    @ApiModelProperty(value = "接收机构公司的org_code")
+    private String receiveCompanyOrgCode;
 }

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

 package com.yeejoin.amos.boot.module.jg.api.dto;
 
+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;
 
 /**
@@ -15,11 +16,16 @@ import java.util.Date;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value="JgChangeRegistrationUnitEqDto", description="单位变更登记设备关系表")
-public class JgChangeRegistrationUnitEqDto  extends BaseDto {
+@ApiModel(value = "JgChangeRegistrationUnitEqDto", description = "单位变更登记设备关系表")
+public class JgChangeRegistrationUnitEqDto extends BaseDto {
+
+    private static final long serialVersionUID = 1L;
 
-   private static final long serialVersionUID = 1L;
+    @ApiModelProperty(value = "使用登记证")
+    private String registrationCertificate;
 
+    @ApiModelProperty(value = "设备信息json")
+    private String deviceInfo;
 
     @ApiModelProperty(value = "单位变更登记申请id")
     private String unitChangeRegistrationId;

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

@@ -29,7 +29,7 @@ public class JgUseRegistrationManageDto extends BaseDto {
     @ApiModelProperty(value = "使用登记证状态（已登记，已注销）")
     private String certificateStatus;
 
-    @ApiModelProperty(value = "接收机构")
+    @ApiModelProperty(value = "接收机构/登记机关")
     private String receiveOrgName;
 
     @ApiModelProperty(value = "办理日期")
@@ -68,7 +68,7 @@ public class JgUseRegistrationManageDto extends BaseDto {
     @ApiModelProperty(value = "创建时间")
     private String createDate;
 
-    @ApiModelProperty(value = "使用登记编号")
+    @ApiModelProperty(value = "使用登记证编号")
     private String useRegistrationCode;
 
     @ApiModelProperty(value = "使用单位统一信用代码")
@@ -77,7 +77,7 @@ public class JgUseRegistrationManageDto extends BaseDto {
     @ApiModelProperty(value = "接收机构公司代码")
     private String receiveCompanyCode;
 
-    @ApiModelProperty(value = "登记证书编号")
+    @ApiModelProperty(value = "登记证书编号/登记证书唯一码")
     private String certificateNo;
 
     @ApiModelProperty(value = "数据类型：监管/行政审批局，企业")

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

@@ -231,7 +231,7 @@ public class JgChangeRegistrationUnit extends BaseEntity {
     @TableField(exist = false)
     private String code96333;
 
-    @TableField(exist = false)
+    @TableField(value = "equ_list")
     private String equList;
 
     /**
@@ -266,4 +266,22 @@ public class JgChangeRegistrationUnit extends BaseEntity {
      */
     @TableField("receive_company_org_code")
     private String receiveCompanyOrgCode;
+
+    /**
+     * 经办人
+     */
+    @TableField("agent")
+    private String agent;
+
+    /**
+     * 经办人联系电话
+     */
+    @TableField("agent_phone")
+    private String agentPhone;
+
+    /**
+     * 设备种类编码
+     */
+    @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/JgChangeRegistrationUnitEq.java

@@ -23,6 +23,18 @@ public class JgChangeRegistrationUnitEq extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
     /**
+     * 使用登记证
+     */
+    @TableField("registration_certificate")
+    private String registrationCertificate;
+
+    /**
+     * 设备信息json
+     */
+    @TableField("device_info")
+    private String deviceInfo;
+
+    /**
      * 单位变更登记申请id
      */
 	@TableField("unit_change_registration_id")

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/service/IJgChangeRegistrationUnitService.java

@@ -63,6 +63,6 @@ public interface IJgChangeRegistrationUnitService {
      * @param model      数据
      * @param submitType 保存类型
      */
-    JgChangeRegistrationUnitDto saveNotice(String submitType, JSONObject model, ReginParams reginParams);
+    List<JgChangeRegistrationUnitDto> saveNotice(String submitType, JSONObject model, ReginParams reginParams);
 
 }

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

@@ -4,38 +4,9 @@
 
     <select id="queryForPage" resultType="com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationUnit">
         select
-        isn.sequence_nbr AS sequenceNbr,
-        isn.apply_no AS applyNo,
-        isn.apply_date AS applyDate,
-        isn.use_unit_name AS useUnitName,
-        isn.receive_org_name AS receiveOrgName,
-        isn.new_use_unit_name AS newUseUnitName,
-        isn.product_name_b AS productNameB,
-        isn.equ_code_b AS equCodeB,
-        isn.use_inner_code AS useInnerCode,
-        isn.use_regist_code AS useRegistCode,
-        isn.status AS status,
-        isn.instance_id AS instanceId,
-        isn.promoter,
-        isn.next_executor_ids AS nextExecutorIds,
-        isn.instance_status AS instanceStatus,
-        isn.audit_pass_date AS auditPassDate,
-        isn.equ_type AS equType,
-        isn.next_execute_user_ids as nextExecuteUserIds,
-        isn.next_task_id as nextTaskId,
-        isn.create_user_id as createUserId,
-        oi.SUPERVISORY_CODE AS supervisoryCode,
-        oi.CODE96333 as code96333,
-        ibjui."ADDRESS" as detailedAddress,
-        (SELECT name from tz_equipment_category ec WHERE ec.code = ri.EQU_LIST) AS equList,
-        (select name from tz_equipment_category ec WHERE ec.code = ri.EQU_DEFINE) AS equDefine,
-        concat(ibjui."PROVINCE_NAME", '', ibjui."CITY_NAME", '', ibjui."COUNTY_NAME", '', ibjui."STREET_NAME") AS equAddress
+        isn.*
         FROM
         tzs_jg_change_registration_unit isn
-        LEFT JOIN tzs_jg_change_registration_unit_eq re ON re.unit_change_registration_id = isn.sequence_nbr
-        LEFT JOIN idx_biz_jg_use_info ibjui ON ibjui.record = re.equ_id
-        LEFT JOIN idx_biz_jg_register_info ri ON ri.record = re.equ_id
-        LEFT JOIN idx_biz_jg_other_info oi ON  oi.RECORD = re.equ_id
         <where>
             isn.is_delete = false
             <if test="param != null ">
@@ -69,29 +40,6 @@
                 <if test="param.useRegistCode != null and param.useRegistCode != ''">
                     AND isn.use_regist_code like concat('%',#{param.useRegistCode},'%')
                 </if>
-                <if test="param.equList != null and param.equList != ''">
-                    AND ri.EQU_LIST = #{param.equList}
-                </if>
-                <if test="param.equCategory != null and param.equCategory != ''">
-                    AND ri.EQU_CATEGORY = #{param.equCategory}
-                </if>
-                <if test="param.equDefine != null and param.equDefine != ''">
-                    AND ri.EQU_DEFINE = #{param.equDefine}
-                </if>
-                <if test="param.code96333 != null and param.code96333 != ''">
-                    AND oi.CODE96333 like concat('%',#{param.code96333},'%')
-                </if>
-                <if test="param.supervisoryCode != null and param.supervisoryCode != ''">
-                    AND oi.SUPERVISORY_CODE like concat('%',#{param.supervisoryCode},'%')
-                </if>
-                <if test="param.equAddress != null and param.equAddress != ''">
-                    AND (
-                    ibjui."PROVINCE_NAME" LIKE CONCAT('%', #{param.equAddress}, '%')
-                    OR ibjui."CITY_NAME" LIKE CONCAT('%', #{param.equAddress}, '%')
-                    OR ibjui."COUNTY_NAME" LIKE CONCAT('%', #{param.equAddress}, '%')
-                    OR ibjui."STREET_NAME" LIKE CONCAT('%', #{param.equAddress}, '%')
-                    )
-                </if>
             </if>
             <if test="type == 'supervision'">
                 AND (isn.receive_org_code = #{orgCode} or isn.transfer_to_user_ids LIKE concat ( '%', #{currentUserId}, '%' ))
@@ -102,7 +50,7 @@
             </if>
             <if test="roleIds != null and type == 'supervision'">
                 <foreach collection='roleIds' item='role' open='and (' close=')' separator='or'>
-                    instance_status like concat('%',#{role},'%')
+                    isn.instance_status like concat('%',#{role},'%')
                 </foreach>
             </if>
         </where>
@@ -111,7 +59,6 @@
             isn.${sort.field} ${sort.sortType},
         </if>
         isn.create_date DESC,  isn.apply_no DESC
-
     </select>
 
     <select id="queryEquipInformation" resultType="java.util.Map">