Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/common/BizCustomDateSerializer.java

@@ -30,7 +30,7 @@ import java.util.Objects;
  */
 public class BizCustomDateSerializer extends JsonSerializer<Date> {
 
-    private List<String> customFields = Arrays.asList("acceptDate", "expiryDate","applicationDate","noticeDate","installStartDate","handleDate");
+    private List<String> customFields = Arrays.asList("acceptDate", "expiryDate","applicationDate","noticeDate","installStartDate","handleDate","auditPassDate","applyDate");
 
     public BizCustomDateSerializer()
     {

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

 package com.yeejoin.amos.boot.module.jg.api.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
@@ -52,6 +54,7 @@ public class JgChangeRegistrationNameDto extends BaseDto {
     private String createUserId;
 
     @ApiModelProperty(value = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date createDate;
 
     @ApiModelProperty(value = "创建人")
@@ -84,4 +87,16 @@ public class JgChangeRegistrationNameDto extends BaseDto {
     @ApiModelProperty(value = "任务发起人id")
     private String promoter;
 
+    /**
+     * 流程状态
+     */
+    @TableField("instance_status")
+    private String instanceStatus;
+
+    private List<String> roleIds;
+
+
+    // 区分监管和企业
+    private String type;
+
 }

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

 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.module.jg.api.common.BizCustomDateSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
@@ -31,6 +34,8 @@ public class JgChangeRegistrationUnitDto  extends BaseDto {
     private String applyNo;
 
     @ApiModelProperty(value = "申请日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonSerialize(using = BizCustomDateSerializer.class)
     private Date applyDate;
 
     @ApiModelProperty(value = "办理状态")
@@ -46,6 +51,8 @@ public class JgChangeRegistrationUnitDto  extends BaseDto {
     private String receiveCompanyCode;
 
     @ApiModelProperty(value = "终审通过时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonSerialize(using = BizCustomDateSerializer.class)
     private Date auditPassDate;
 
     @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/dto/JgInstallationNoticeDto.java

@@ -244,6 +244,7 @@ public class JgInstallationNoticeDto extends BaseDto {
     private String equAddress;
 
     @ApiModelProperty(value = "办理日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     @JsonSerialize(using = BizCustomDateSerializer.class)
     private Date handleDate;
 

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

@@ -136,4 +136,10 @@ public class JgChangeRegistrationName extends BaseEntity {
 	@TableField("promoter")
     private String promoter;
 
+    /**
+     * 流程状态
+     */
+    @TableField("instance_status")
+    private String instanceStatus;
+
 }

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

@@ -2,7 +2,10 @@ package com.yeejoin.amos.boot.module.jg.api.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import com.yeejoin.amos.boot.module.jg.api.common.BizCustomDateSerializer;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -38,6 +41,8 @@ public class JgChangeRegistrationUnit extends BaseEntity {
      * 申请日期
      */
 	@TableField("apply_date")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonSerialize(using = BizCustomDateSerializer.class)
     private Date applyDate;
 
     /**
@@ -68,6 +73,8 @@ public class JgChangeRegistrationUnit extends BaseEntity {
      * 终审通过时间
      */
 	@TableField("audit_pass_date")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonSerialize(using = BizCustomDateSerializer.class)
     private Date auditPassDate;
 
     /**

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

@@ -391,6 +391,7 @@ public class JgInstallationNotice extends BaseEntity {
     private String equAddress;
 
     @TableField("handle_date")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     @JsonSerialize(using = BizCustomDateSerializer.class)
     private Date handleDate;
 

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

@@ -49,6 +49,15 @@ public enum WorkFlowStatusEnum {
     CHANGE_REEXAMINE("三级受理", "changeReexamine", "三级待受理", "", ""),
 
     /**
+     * 更名变更登记流程
+     */
+    UNIT_RENAME_SUBMIT("使用单位提交", "unitRenameSubmit", "使用单位待提交", "一级受理已驳回", "使用单位已撤回"),
+    UNIT_RENAME_RECEIVE("一级受理", "unitRenameReceive", "一级待受理", "二级受理已驳回", "一级受理已撤回"),
+    UNIT_RENAME_PRELIMINARY("二级受理", "unitRenamePreliminary", "二级待受理", "三级受理已驳回", "二级受理已撤回"),
+    UNIT_RENAME_REEXAMINE("三级受理", "unitRenameReexamine", "三级待受理", "", ""),
+
+
+    /**
      * 移装变更登记流程
      */
     TRANSFER_SUBMIT("使用单位提交", "transferSubmit", "使用单位待提交", "一级受理已驳回", "使用单位已撤回"),
@@ -59,7 +68,7 @@ public enum WorkFlowStatusEnum {
     /**
      * 使用单位更登记流程
      */
-    UNITCHANGE_SUBMIT("使用单位提交", "unitChangeSubmit", "使用单位待提交", "一级受理已驳回", "使用单位提交已撤回"),
+    UNITCHANGE_SUBMIT("使用单位提交", "unitChangeSubmit", "使用单位待提交", "一级受理已驳回", "使用单位已撤回"),
     UNITCHANGE_RECEIVE("一级受理", "unitChangeReceive", "一级待受理", "二级受理已驳回", "一级受理已撤回"),
     UNITCHANGE_PRELIMINARY("二级受理", "unitChangePreliminary", "二级待受理", "三级受理已驳回", "二级受理已撤回"),
     UNITCHANGE_REEXAMINE("三级受理", "unitChangeReexamine", "三级待受理","","");

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

 package com.yeejoin.amos.boot.module.jg.api.mapper;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeRegistrationNameDto;
+import com.yeejoin.amos.boot.module.jg.api.dto.JgScrapCancelDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationName;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
@@ -16,4 +19,10 @@ import java.util.Map;
 public interface JgChangeRegistrationNameMapper extends BaseMapper<JgChangeRegistrationName> {
 
     List<Map<String, Object>> getEquipInfoByOrgCode(@Param("code") String code);
+
+    void deleteByChangeRegistrationId(@Param("changeRegistrationId") Long changeRegistrationId);
+
+    void deleteHistoryInfoById(@Param("code") String code);
+
+    Page<Map<String, Object>> getListPage(Page<Map<String, Object>> page, JgChangeRegistrationNameDto dto, List<String> roleIds, String orgCode);
 }

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

+package com.yeejoin.amos.boot.module.jg.api.service;
+
+
+/**
+ * 更名变更登记接口类
+ *
+ * @author system_generator
+ * @date 2023-12-25
+ */
+public interface IJgChangeRegistrationNameService {
+
+}

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

@@ -30,4 +30,6 @@ public interface IJgChangeRegistrationTransferService extends IService<JgChangeR
     void flowExecute(Long sequenceNbr, String instanceId, String operate, String comment, boolean update);
 
     void revocation(String instanceId);
+
+    void exportUseRegistrationCertificate(String sequenceNbr);
 }

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

@@ -28,4 +28,5 @@ public interface IJgTransferNoticeService extends IService<JgTransferNotice> {
     void saveNotice(String submitType, Map<String, JgTransferNoticeDto> model, ReginParams reginParams);
 
     String generateTransferNoticeReport(Long sequenceNbr);
+
 }

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

@@ -14,4 +14,57 @@
     WHERE
         USE_UNIT_CREDIT_CODE = #{code}
     </select>
+
+<delete id="deleteByChangeRegistrationId">
+    delete from tzs_jg_change_registration_name_eq where name_change_registration_id = #{changeRegistrationId}
+    </delete>
+
+<select id="getListPage" resultType="java.util.Map">
+    select ur.sequence_nbr as sequenceNbr,
+    ur.instance_id as instanceId,
+    ur.audit_status as auditStatus,
+    ur.apply_no as applyNo,
+    DATE_FORMAT(ur.rec_date,'%Y-%m-%d') as recDate,
+    DATE_FORMAT(ur.create_date,'%Y-%m-%d') as createDate,
+    DATE_FORMAT(ur.audit_pass_date,'%Y-%m-%d') as auditPassDate,
+    ur.receive_org_code as receiveOrgCode,
+    ur.receive_org_name as receiveOrgName,
+    ur.receive_company_code as receiveCompanyCode,
+    ur.use_unit_name as useUnitName,
+    ur.new_use_unit_name AS newUseUnitName,
+    ur.promoter,
+    ur.next_executor_ids as nextExecutorIds
+    from tzs_jg_change_registration_name ur
+    <where>
+        and  ur.is_delete = 0
+        <if test="dto.auditStatus != null and dto.auditStatus != ''">
+            and ur.audit_status = #{dto.auditStatus}
+        </if>
+        <if test="dto.applyNo != null and dto.applyNo != ''">
+            and ur.apply_no like concat('%',#{dto.applyNo},'%')
+        </if>
+        <if test="dto.createDate != null">
+            AND ur.create_date >= #{dto.createDate}
+        </if>
+        <if test="dto.receiveOrgCode != null and dto.receiveOrgCode != ''">
+            AND ur.receive_org_code = #{dto.receiveOrgCode}
+        </if>
+        <if test="roleIds != null and dto.type == 'supervision'">
+            <foreach collection='roleIds' item='role' open='and (' close=')' separator='or'>
+                ur.instance_status like concat('%',#{role},'%')
+            </foreach>
+        </if>
+        <if test="dto.type == 'supervision'">
+            AND ur.receive_org_code = #{orgCode}
+        </if>
+        <if test="dto.type == 'enterprise' ">
+            and ur.use_unit_code = #{orgCode}
+        </if>
+    </where>
+    order by ur.rec_date desc
+    </select>
+
+<delete id="deleteHistoryInfoById">
+    delete from tzs_jg_registration_history where current_document_id = #{code}
+    </delete>
 </mapper>

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

@@ -19,6 +19,7 @@
         crt.promoter,
         crt.rec_date as recDate,
         crt.instance_id as instanceId,
+        crt.use_registration_code as useRegistrationCode,
         use.USE_UNIT_NAME as useUnitName,
         (SELECT name from tz_equipment_category  where  code = jri.EQU_CATEGORY) as equCategory,
         jri.PRODUCT_NAME as productName,

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

@@ -10,11 +10,16 @@
         isn.use_unit_name AS useUnitName,
         isn.receive_org_name AS receiveOrgName,
         isn.new_use_unit_name AS newUseUnitName,
+        isn.equ_address AS equAddress,
+        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.apply_date AS applyDate,
         isn.status AS status,
         isn.instance_id AS instanceId,
         isn.promoter,
-        isn.next_execute_ids AS nextExecuteIds,
+        isn.next_executor_ids AS nextExecutorIds,
         isn.instance_status AS instanceStatus,
         isn.audit_pass_date AS auditPassDate,
         isn.equ_type AS equType
@@ -27,17 +32,20 @@
                     AND isn.apply_no LIKE CONCAT('%', #{param.applyNo}, '%')
                 </if>
                 <if test="param.receiveOrgCode != null and param.receiveOrgCode != ''">
-                    AND isn.receive_org_credit_code = #{param.receiveOrgCreditCode}
+                    AND isn.receive_org_code = #{param.receiveOrgCode}
                 </if>
                 <if test="param.useUnitName != null and param.useUnitName != ''">
-                    AND isn.use_unit_credit_code = #{param.useUnitName}
+                    AND isn.use_unit_code = #{param.useUnitName}
                 </if>
                 <if test="param.status != null and param.status != ''">
                     AND isn.status = #{param.status}
                 </if>
+                <if test="param.equCodeB != null and param.equCodeB != ''">
+                    AND isn.equ_code_b = #{param.equCodeB}
+                </if>
             </if>
             <if test="type == 'supervision'">
-                AND isn.receive_org_credit_code = #{orgCode}
+                AND isn.receive_org_code = #{orgCode}
                 AND isn.instance_id  is not null
             </if>
             <if test="type == 'enterprise'">
@@ -50,22 +58,16 @@
             </if>
         </where>
         ORDER BY
-        isn.create_date DESC
+        isn.create_date,isn.apply_no DESC
     </select>
 
     <select id="queryEquipInformation" resultType="java.util.Map">
         select
             isn.sequence_nbr AS sequenceNbr,
             isn.apply_no AS applyNo,
-            isn.use_unit_name AS useUnitName,
-            isn.use_unit_credit_code AS useUnitName,
-            isn.new_use_unit_credit_code AS useUnitName,
-            isn.new_use_unit_name AS useUnitName,
-            isn.receive_org_name AS receiveOrgName,
-            isn.receive_org_code AS receiveOrgCode,
             isn.change_certificate AS changeCertificate,
             isn.remark AS remark,
-            isn.equ_register_code AS equRegisterCode,
+            isn.use_regist_code AS equRegisterCode,
             ri.equ_list AS equList,
             ri.equ_category AS equCategory,
             ri.EQU_DEFINE AS equDefine,
@@ -99,7 +101,7 @@
             ei.address AS address
         FROM
             tzs_jg_change_registration_unit isn
-                LEFT JOIN tzs_jg_change_registration_unit_eq re ON re.equip_transfer_id = isn.sequence_nbr
+                LEFT JOIN tzs_jg_change_registration_unit_eq re ON re.unit_change_registration_id = isn.sequence_nbr
                 LEFT JOIN idx_biz_jg_register_info ri ON ri.record = re.equ_id
                 LEFT JOIN idx_biz_jg_design_info di ON di.record = re.equ_id
                 LEFT JOIN idx_biz_jg_factory_info fi ON fi.record = re.equ_id

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

@@ -133,9 +133,6 @@
             <if test="contractDto.useUnitName != '' and contractDto.useUnitName != null">
                 and use_unit_name like concat('%',#{contractDto.useUnitName},'%')
             </if>
-            <if test="contractDto.status != '' and contractDto.status != null">
-                and status not like concat('%',#{contractDto.status},'%')
-            </if>
             <if test="contractDto.useUnitCode != '' and contractDto.useUnitCode != null">
                 and use_unit_code = #{contractDto.useUnitCode}
             </if>

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

+package com.yeejoin.amos.boot.module.jg.biz.controller;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.boot.module.jg.api.dto.JgScrapCancelDto;
+import com.yeejoin.amos.boot.module.jg.api.enums.WorkFlowStatusEnum;
+import org.springframework.web.bind.annotation.RequestMapping;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+
+import java.util.*;
+
+import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgChangeRegistrationNameServiceImpl;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeRegistrationNameDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+/**
+ * 更名变更登记
+ *
+ * @author system_generator
+ * @date 2023-12-25
+ */
+@RestController
+@Api(tags = "更名变更登记Api")
+@RequestMapping(value = "/jg-change-registration-name")
+public class JgChangeRegistrationNameController extends BaseController {
+
+    @Autowired
+    JgChangeRegistrationNameServiceImpl jgChangeRegistrationNameService;
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/save")
+    @ApiOperation(httpMethod = "POST", value = "新增/新增并提交", notes = "新增/新增并提交")
+    public ResponseModel<Object> save(@RequestParam String submitType, @RequestBody Map<String, JSONObject> model) {
+        jgChangeRegistrationNameService.save(submitType, model);
+        return ResponseHelper.buildResponse("ok");
+    }
+
+    /**
+     * 根据sequenceNbr更新
+     *
+     * @param model 安装告知
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/updateInfo")
+    @ApiOperation(httpMethod = "POST", value = "编辑API", notes = "编辑API")
+    public ResponseModel<JgChangeRegistrationNameDto> updateInfo(@RequestParam String submitType,
+                                                                 @RequestBody Map<String, Object> model,
+                                                                 @RequestParam(value = "op", required = false) String op) {
+        JgChangeRegistrationNameDto dto = BeanUtil.mapToBean(((LinkedHashMap) model.get("jgRegistrationInfo")), JgChangeRegistrationNameDto.class, true);
+        if (Objects.isNull(dto)) {
+            throw new IllegalArgumentException("参数jgRegistrationInfo不能为空");
+        }
+        Object o = ((LinkedHashMap<?, ?>) model.get("jgRegistrationInfo")).get("changeCertificateList");
+        dto.setChangeCertificateList((List<Map<String, Object>>) o);
+        return ResponseHelper.buildResponse(jgChangeRegistrationNameService.updateInfo(submitType, dto, op));
+    }
+
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/deleteMessage")
+    @ApiOperation(httpMethod = "POST", value = "单个删除", notes = "单个删除")
+    public ResponseModel<Object> deleteMessage(@RequestParam("id") Long id) {
+        List<Long> ids = Collections.singletonList(id);
+        jgChangeRegistrationNameService.deleteBatch(ids);
+        return ResponseHelper.buildResponse("ok");
+    }
+
+    /**
+     * 撤回
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/withdraw")
+    @ApiOperation(httpMethod = "POST", value = "撤回", notes = "撤回")
+    public ResponseModel<Object> revocation(@RequestBody JSONObject map) {
+        jgChangeRegistrationNameService.revocation(String.valueOf(map.get("instanceId")));
+        return ResponseHelper.buildResponse("ok");
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/flowExecute")
+    @ApiOperation(httpMethod = "POST", value = "执行流程", notes = "执行流程")
+    public ResponseModel<Object> flowExecute(@RequestBody JSONObject map) {
+
+        LinkedHashMap model1 = (LinkedHashMap) map.get("model");
+        LinkedHashMap jgRegistrationInfoMap = (LinkedHashMap) model1.get("jgRegistrationInfo");
+        JgChangeRegistrationNameDto jgScrapCancelDto = JSON.parseObject(JSON.toJSONString(jgRegistrationInfoMap), JgChangeRegistrationNameDto.class);
+
+        jgChangeRegistrationNameService.flowExecute(Long.valueOf(String.valueOf(jgScrapCancelDto.getSequenceNbr())), jgScrapCancelDto.getInstanceId(), String.valueOf(map.get("operate")), String.valueOf(map.get("opinion")));
+        return ResponseHelper.buildResponse("ok");
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "POST", value = "列表全部数据查询", notes = "列表全部数据查询")
+    @PostMapping(value = "/getList")
+    public ResponseModel<Page<Map<String, Object>>> getList(@RequestBody JgChangeRegistrationNameDto dto,
+                                                            @RequestParam(value = "current") int current,
+                                                            @RequestParam(value = "size") int size) {
+        Page<Map<String, Object>> page = new Page<>(current, size);
+        return ResponseHelper.buildResponse(jgChangeRegistrationNameService.getList(dto, page, dto.getRoleIds()));
+    }
+
+
+    /**
+     * 根据sequenceNbr查询
+     *
+     * @param sequenceNbr 主键
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/details")
+    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个详情", notes = "根据sequenceNbr查询单个详情")
+    public ResponseModel<Map<String, Object>> selectOne(@RequestParam(required = false, value = "sequenceNbr") Long sequenceNbr) {
+        return ResponseHelper.buildResponse(jgChangeRegistrationNameService.queryBySequenceNbr(sequenceNbr));
+    }
+
+
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "列表筛选办理状态下拉", notes = "列表筛选办理状态下拉")
+    @GetMapping(value = "/getAuditStatusList")
+    public ResponseModel<List<Map<String, String>>> getAuditStatusList(@RequestParam(value = "code") String code) {
+        return ResponseHelper.buildResponse(WorkFlowStatusEnum.getInfoList(code));
+    }
+
+
+}

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

@@ -128,4 +128,12 @@ public class JgChangeRegistrationReformController extends BaseController {
 		map.put("useUnitName", selectedOrgInfo.getCompany().getCompanyName());
 		return ResponseHelper.buildResponse(map);
 	}
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET", value = "打印历史数据", notes = "打印历史数据")
+	@GetMapping(value = "/printHistoryData")
+	public ResponseModel<Map<String, Object>> printHistoryData(@RequestParam("currentDocumentId") String currentDocumentId,@RequestParam(value = "equipId",required = false) String equipId) {
+		return ResponseHelper.buildResponse(jgChangeRegistrationReformServiceImpl.getDetail(currentDocumentId,equipId));
+	}
+
 }

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

@@ -3,22 +3,21 @@ package com.yeejoin.amos.boot.module.jg.biz.controller;
 import com.alibaba.fastjson.JSONObject;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgChangeRegistrationTransferService;
-import io.swagger.annotations.ApiParam;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RestController;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-import java.util.List;
 import java.util.Map;
 
-import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgChangeRegistrationTransferServiceImpl;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 import org.springframework.beans.factory.annotation.Autowired;
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeRegistrationTransferDto;
@@ -145,4 +144,11 @@ public class JgChangeRegistrationTransferController extends BaseController {
 	    return ResponseHelper.buildResponse(jgChangeRegistrationTransferService.queryListForPage(page,params));
 	}
 
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/export")
+	@ApiOperation(httpMethod = "GET", value = "导出使用登记证", notes = "导出使用登记证")
+	public void exportImageZip(HttpServletResponse response, @RequestParam("sequenceNbr") String sequenceNbr){
+		jgChangeRegistrationTransferService.exportUseRegistrationCertificate(sequenceNbr);
+	}
+
 }

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

@@ -70,15 +70,13 @@ public class JgChangeRegistrationUnitController extends BaseController {
 	@PutMapping(value = "/update")
 	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新单位变更", notes = "根据sequenceNbr更新单位变更")
 	public ResponseModel<JgChangeRegistrationUnitDto> updateBySequenceNbrJgInstallationNotice(@RequestParam String submitType, @RequestBody Map<String, Object> model, @RequestParam(value = "op", required = false) String op) {
-		JgChangeRegistrationUnitDto installationInfo = BeanUtil.mapToBean(((LinkedHashMap) model.get("changeRegisInfo")), JgChangeRegistrationUnitDto.class, true);
-		if (Objects.isNull(installationInfo)) {
+		JgChangeRegistrationUnitDto jgChangeRegistrationUnitDto = BeanUtil.mapToBean(((LinkedHashMap) model.get("changeRegisInfo")), JgChangeRegistrationUnitDto.class, true);
+		if (Objects.isNull(jgChangeRegistrationUnitDto)) {
 			throw new IllegalArgumentException("参数installationInfo不能为空");
 		}
-//		Object o = ((LinkedHashMap<?, ?>) model.get("installationInfo")).get("proxyStatementAttachment");
-//		Object o1 = ((LinkedHashMap<?, ?>) model.get("installationInfo")).get("installContractAttachment");
-//		installationInfo.setProxyStatementAttachmentList((List<Map<String, Object>>) o);
-//		installationInfo.setInstallContractAttachmentList((List<Map<String, Object>>) o1);
-		return ResponseHelper.buildResponse(jgChangeRegistrationUnitServiceImpl.updateInstallationNotice(submitType,installationInfo, op));
+		Object o = ((LinkedHashMap<?, ?>) model.get("changeRegisInfo")).get("changeCertificateList");
+		jgChangeRegistrationUnitDto.setChangeCertificateList((List<Map<String, Object>>) o);
+		return ResponseHelper.buildResponse(jgChangeRegistrationUnitServiceImpl.updateInstallationNotice(submitType,jgChangeRegistrationUnitDto, op));
 	}
 
 	/**
@@ -163,7 +161,7 @@ public class JgChangeRegistrationUnitController extends BaseController {
 	@PostMapping(value = "/cancel")
 	@ApiOperation(httpMethod = "POST", value = "单位变更撤销", notes = "单位变更撤销")
 	public ResponseModel<JgChangeRegistrationUnitDto> cancel(@RequestBody Map<String, Object> model) {
-		JgChangeRegistrationUnitDto installationInfo = BeanUtil.mapToBean(((LinkedHashMap) model.get("installationInfo")), JgChangeRegistrationUnitDto.class, true);
+		JgChangeRegistrationUnitDto installationInfo = BeanUtil.mapToBean(((LinkedHashMap) model.get("changeRegisInfo")), JgChangeRegistrationUnitDto.class, true);
 		if (Objects.isNull(installationInfo)) {
 			throw new IllegalArgumentException("参数installationInfo不能为空");
 		}
@@ -181,9 +179,9 @@ public class JgChangeRegistrationUnitController extends BaseController {
 	@ApiOperation(httpMethod = "POST", value = "单位变更受理", notes = "单位变更受理")
 	public ResponseModel<JgChangeRegistrationUnitDto> accept(@RequestBody Map<String, Object> model, String op) {
 		// TODO 受理单位变更流程
-		LinkedHashMap model1 = (LinkedHashMap)model.get("model");
+		LinkedHashMap model1 = (LinkedHashMap)model.get("changeRegisInfo");
 		String opinion = (String)model.get("opinion");
-		LinkedHashMap installationInfo = (LinkedHashMap)model1.get("installationInfo");
+		LinkedHashMap installationInfo = (LinkedHashMap)model1.get("changeRegisInfo");
 		JgChangeRegistrationUnitDto jgInstallationNoticeDto = JSON.parseObject(JSON.toJSONString(installationInfo), JgChangeRegistrationUnitDto.class);
 		jgInstallationNoticeDto.setProcessAdvice(opinion);
 		jgChangeRegistrationUnitServiceImpl.accept(jgInstallationNoticeDto,op);

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

@@ -6,6 +6,8 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
+import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 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.JgMaintenanceContractVo;
@@ -15,6 +17,7 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
@@ -36,6 +39,9 @@ public class JgMaintenanceContractController extends BaseController {
     @Autowired
     JgMaintenanceContractServiceImpl jgMaintenanceContractServiceImpl;
 
+    @Autowired
+    RedisUtils redisUtils;
+
     /**
      * 新增(提交)
      *
@@ -170,6 +176,7 @@ public class JgMaintenanceContractController extends BaseController {
     @ApiOperation(httpMethod = "POST", value = "执行流程", notes = "执行流程")
     public ResponseModel<Object> flowExecute(@RequestBody JSONObject map) {
         jgMaintenanceContractServiceImpl.flowExecute(Long.valueOf(String.valueOf(map.get("sequenceNbr"))),String.valueOf(map.get("instanceId")), String.valueOf(map.get("operate")), String.valueOf(map.get("comment")), true);
+        ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         if (map.containsKey("formData") && !ObjectUtils.isEmpty(map.get("formData"))){
             JgMaintenanceContract dto = new JgMaintenanceContract();
             Map<String, Object> formData = (Map<String, Object>)map.get("formData");
@@ -188,6 +195,7 @@ public class JgMaintenanceContractController extends BaseController {
                 result.setMaintenanceManagerTwoId(maintenanceManagerTwoInfo[0]);
                 result.setMaintenanceManagerTwoName(maintenanceManagerTwoInfo[1]);
                 result.setMaintenanceManagerTwoPhone(dto.getMaintenanceManagerTwoPhone());
+                result.setPromoter(reginParams.getUserModel().getUserId());
             }
             jgMaintenanceContractServiceImpl.getBaseMapper().updateById(result);
         }

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

@@ -148,9 +148,16 @@ public class JgTransferNoticeController extends BaseController {
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(httpMethod = "GET", value = "移装造告知列表全部数据查询", notes = "移装造告知列表全部数据查询")
+    @ApiOperation(httpMethod = "GET", value = "移装告知列表全部数据查询", notes = "移装造告知列表全部数据查询")
     @GetMapping(value = "/generate-report")
     public ResponseModel<String> selectForList(@RequestParam("sequenceNbr") Long sequenceNbr) {
         return ResponseHelper.buildResponse(jgTransferNoticeService.generateTransferNoticeReport(sequenceNbr));
     }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "特种设备登记证导出", notes = "特种设备登记证导出")
+    @GetMapping(value = "/certificate/report")
+    public ResponseModel<String> generateCertificateReport() {
+        return ResponseHelper.buildResponse("");
+    }
 }

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

@@ -32,4 +32,6 @@ public interface ICommonService {
     Map<String,Object> getEnterpriseInfo(String sequenceNbr);
 
     List<Map<String,Object>> getEnterpriseEmployee(String unitCode);
+
+    String generateCertificateReport(Map<String, Object> map);
 }

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

@@ -2,14 +2,18 @@ package com.yeejoin.amos.boot.module.jg.biz.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.aspose.words.SaveFormat;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.boot.module.jg.api.dto.ByteArrayMultipartFile;
 import com.yeejoin.amos.boot.module.jg.api.mapper.CommonMapper;
 import com.yeejoin.amos.boot.module.jg.biz.service.ICommonService;
+import com.yeejoin.amos.boot.module.jg.biz.utils.ImageUtils;
+import com.yeejoin.amos.boot.module.jg.biz.utils.WordTemplateUtils;
 import com.yeejoin.amos.boot.module.jg.flc.api.fegin.PrivilegeFeginService;
 import com.yeejoin.amos.boot.module.ymt.api.entity.EquipmentCategory;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.EquipmentCategoryMapper;
@@ -18,13 +22,21 @@ import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.component.feign.utils.FeignUtil;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
+import com.yeejoin.amos.feign.systemctl.Systemctl;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+import org.springframework.util.Assert;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
+import org.springframework.web.multipart.MultipartFile;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.nio.file.Files;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -71,6 +83,20 @@ public class CommonServiceImpl implements ICommonService {
     @Autowired
     PrivilegeFeginService privilegeFeginService;
 
+    public static byte[] file2byte(File file) {
+        try {
+            FileInputStream in = new FileInputStream(file);
+            //当文件没有结束时，每次读取一个字节显示
+            byte[] data = new byte[in.available()];
+            in.read(data);
+            in.close();
+            return data;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
     @Override
     public List<EquipmentCategory> getEquipmentCategoryList(String code, String type) {
         List<EquipmentCategory> result = new ArrayList<>();
@@ -258,4 +284,81 @@ public class CommonServiceImpl implements ICommonService {
         }
         return result;
     }
+
+    @Override
+    public String generateCertificateReport(Map<String, Object> map) {
+        if (CollectionUtils.isEmpty(map)) {
+            throw new IllegalArgumentException("参数不能为空");
+        }
+        // 组装模板变量
+        map.put("useRegistrationCode", "20231225123"); // 编号
+        map.put("useUnitName", "西安市高科物业服务有限公司");  // 使用单位名称
+        map.put("fullAddress", "西安市曲江新区春临东街南湖意境1单元2号楼");  // 设备使用地点
+        map.put("equList", "电梯");  // 设备种类
+        map.put("equipDefine", "曳引驱动乘客电梯");  // 设备品种
+        map.put("equipCode", "");  // 设备代码
+        map.put("equipCategory", "曳引电梯");  // 设备类别
+        map.put("useInnerCode", "KY-9527");  // 单位内编号
+        map.put("factoryNum", "G60001");  // 产品编号
+        map.put("receiveOrgName", "西安市曲江新区质检院");  // 登记机关
+        map.put("giveOutYear", "2023");  // 发证日期-年
+        map.put("giveOutMonth", "12");  // 发证日期-月
+        map.put("giveOutDay", "26");  // 发证日期-日
+        // 生成二维码
+        String qrCode = ImageUtils.generateQRCode("YZGZ20231225001", 70, 65);
+        map.put("supervisoryCode", qrCode);  // 监管二维码
+
+        // word转pdf
+        File pdfFile;
+        try {
+            pdfFile = this.wordToPdf("equipment-registration-certificate-report.ftl", map);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+
+        // 上传pdf至文件服务器
+        String url = this.uploadFile(pdfFile);
+
+        // 删除临时文件
+        try {
+            Files.deleteIfExists(pdfFile.toPath());
+        } catch (IOException e) {
+            log.error("删除临时文件失败：{}", e);
+        }
+        return url;
+    }
+
+    /**
+     * word 转 pdf
+     *
+     * @param wordPath word文件路径
+     */
+    private File wordToPdf(String wordPath, Map<String, Object> placeholders) throws Exception {
+        Assert.hasText(wordPath, "word文件路径不能为空");
+
+        String tempFileName = "移装告知单_" + System.currentTimeMillis() + "_temp.pdf";
+
+        WordTemplateUtils instance = WordTemplateUtils.getInstance();
+
+        return instance.fillAndConvertDocFile(wordPath, tempFileName, placeholders, SaveFormat.PDF);
+    }
+
+    /**
+     * 上传文件至文件服务器
+     *
+     * @param file 文件
+     */
+    private String uploadFile(File file) {
+        Assert.notNull(file, "文件不能为空");
+
+        MultipartFile multipartFile = new ByteArrayMultipartFile("file", "file.pdf", "application/pdf", file2byte(file));
+        FeignClientResult<Map<String, String>> result = Systemctl.fileStorageClient.updateCommonFile(multipartFile);
+        String urlString = "";
+        if (result != null) {
+            for (String s : result.getResult().keySet()) {
+                urlString = s;
+            }
+        }
+        return urlString;
+    }
 }
\ No newline at end of file

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

@@ -213,23 +213,51 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
      */
     private Map<String, Object> getStringObjectMap(String record, String fieldType) {
         Map<String, Object> objMap = new HashMap<>();
+        String province="";
+        String city="";
+        String county="";
+        String street="";
+        String fullAddress="";
         //使用信息
         IdxBizJgUseInfo useInfo = idxBizJgUseInfoService.getOneData(record);
         if (!ValidationUtil.isEmpty(useInfo)) {
+
+            if(!ValidationUtil.isEmpty(useInfo.getProvince()) && !ValidationUtil.isEmpty(useInfo.getProvinceName())){
+                province = useInfo.getProvince()+"_"+useInfo.getProvinceName();
+                fullAddress += useInfo.getProvinceName();
+            }
+            if(!ValidationUtil.isEmpty(useInfo.getCity()) && !ValidationUtil.isEmpty(useInfo.getCityName())) {
+                city = useInfo.getCity() + "_" + useInfo.getCityName();
+                fullAddress += useInfo.getCityName();
+            }
+            if(!ValidationUtil.isEmpty(useInfo.getCounty()) && !ValidationUtil.isEmpty(useInfo.getCountyName())) {
+                county = useInfo.getCounty() + "_" + useInfo.getCountyName();
+                fullAddress += useInfo.getCountyName();
+            }
+            if(!ValidationUtil.isEmpty(useInfo.getFactoryUseSiteStreet()) && !ValidationUtil.isEmpty(useInfo.getStreetName())) {
+                street = useInfo.getFactoryUseSiteStreet() + "_" + useInfo.getStreetName();
+                fullAddress += useInfo.getStreetName();
+            }
+            if(!ValidationUtil.isEmpty(useInfo.getAddress())) {
+                fullAddress += useInfo.getAddress();
+            }
+
             Map<String, Object> useInfoMap = null;
             if(!ValidationUtil.isEmpty(fieldType)){
                 useInfoMap = Bean.BeantoMap(useInfo);
-                useInfoMap.put("province", useInfo.getProvince()+"_"+useInfo.getProvinceName());
-                useInfoMap.put("city", useInfo.getCity()+"_"+useInfo.getCityName());
-                useInfoMap.put("county", useInfo.getCounty()+"_"+useInfo.getCountyName());
-                useInfoMap.put("street", useInfo.getFactoryUseSiteStreet()+"_"+useInfo.getStreetName());
+                if(!ValidationUtil.isEmpty(province)){ useInfoMap.put("province", province); }
+                if(!ValidationUtil.isEmpty(city)) { useInfoMap.put("city", city); }
+                if(!ValidationUtil.isEmpty(county)) { useInfoMap.put("county", county); }
+                if(!ValidationUtil.isEmpty(street)) { useInfoMap.put("street", street); }
+                if(!ValidationUtil.isEmpty(fullAddress)) { useInfoMap.put("fullAddress", fullAddress); }
                 useInfoMap.put("useinfoSeq", useInfo.getSequenceNbr());
             }else {
                 useInfoMap = convertCamelToUnderscore(useInfo, null);
-                useInfoMap.put("PROVINCE", useInfo.getProvince()+"_"+useInfo.getProvinceName());
-                useInfoMap.put("CITY", useInfo.getCity()+"_"+useInfo.getCityName());
-                useInfoMap.put("COUNTY", useInfo.getCounty()+"_"+useInfo.getCountyName());
-                useInfoMap.put("STREET", useInfo.getFactoryUseSiteStreet()+"_"+useInfo.getStreetName());
+                if(!ValidationUtil.isEmpty(province)){ useInfoMap.put("PROVINCE", province); }
+                if(!ValidationUtil.isEmpty(city)) { useInfoMap.put("CITY", city); }
+                if(!ValidationUtil.isEmpty(county)) { useInfoMap.put("COUNTY", county); }
+                if(!ValidationUtil.isEmpty(street)) { useInfoMap.put("STREET", street); }
+                if(!ValidationUtil.isEmpty(fullAddress)){ useInfoMap.put("FULLADDRESS", fullAddress); }
                 useInfoMap.put("USEINFO_SEQ", useInfo.getSequenceNbr());
             }
             if(!useInfoMap.isEmpty()){

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

@@ -40,6 +40,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 改造变更登记服务实现类
@@ -81,7 +82,12 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
     private IdxBizJgRegisterInfoMapper idxBizJgRegisterInfoMapper;
     @Autowired
     private IdxBizJgOtherInfoMapper idxBizJgOtherInfoMapper;
-
+    //单位变更登记关系表mapper
+    @Autowired
+    private JgChangeRegistrationUnitEqMapper jgChangeRegistrationUnitEqMapper;
+    //更名变更登记关系表mapper
+    @Autowired
+    private JgChangeRegistrationNameEqMapper jgChangeRegistrationNameEqMapper;
 
     /**
      * 分页查询
@@ -188,7 +194,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             jgChangeRegistrationReformEq.setEquipTransferId(jgChangeRegistrationReform.getSequenceNbr().toString());
             jgChangeRegistrationReformEqMapper.insert(jgChangeRegistrationReformEq);
             //当前单据id
-            jgRegistrationHistory.setCurrentDocumentId(jgChangeRegistrationReform.getSequenceNbr().toString());
+            jgRegistrationHistory.setCurrentDocumentId(jgChangeRegistrationReform.getApplyNo());
             jgRegistrationHistoryMapper.insert(jgRegistrationHistory);
         }
 
@@ -281,7 +287,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             JgChangeRegistrationReformEq jgChangeRegistrationReformEq = jgChangeRegistrationReformEqMapper.selectOne(new QueryWrapper<JgChangeRegistrationReformEq>().eq("equip_transfer_id", jgChangeRegistrationReform.getSequenceNbr()));
             String newUseRegistrationCertificateNumber = getCode(jgChangeRegistrationReform.getSupervisoryCode());
             jgChangeRegistrationReform.setUseRegistrationCode(newUseRegistrationCertificateNumber);
-            updateTechparamsByEquIdAndCurrentDoucumentId(jgChangeRegistrationReformEq.getEquId(), jgChangeRegistrationReform.getSequenceNbr().toString(),newUseRegistrationCertificateNumber );
+            updateTechparamsByEquIdAndCurrentDoucumentId(jgChangeRegistrationReformEq.getEquId(), jgChangeRegistrationReform.getSequenceNbr().toString(),newUseRegistrationCertificateNumber,jgChangeRegistrationReform.getApplyNo() );
         }
         this.getBaseMapper().updateById(jgChangeRegistrationReform);
     }
@@ -422,16 +428,19 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
     }
 
     public void deleteBatch(List<Long> ids) {
+         List<JgChangeRegistrationReform> jgChangeRegistrationReformList = this.getBaseMapper().selectList(new QueryWrapper<JgChangeRegistrationReform>().in("sequence_nbr", ids));
+         List<String>  applyNos  =jgChangeRegistrationReformList.stream().map(JgChangeRegistrationReform::getApplyNo).collect(Collectors.toList());
         JgChangeRegistrationReform jgChangeRegistrationReform = new JgChangeRegistrationReform();
         jgChangeRegistrationReform.setIsDelete(true);
         LambdaQueryWrapper<JgChangeRegistrationReform> lambda = new QueryWrapper<JgChangeRegistrationReform>().lambda();
         lambda.in(JgChangeRegistrationReform::getSequenceNbr, ids);
-        this.update(jgChangeRegistrationReform, lambda);
+        this.getBaseMapper().delete(lambda);
         JgChangeRegistrationReformEq jgChangeRegistrationReformEq = new JgChangeRegistrationReformEq();
         jgChangeRegistrationReformEq.setIsDelete(true);
         LambdaQueryWrapper<JgChangeRegistrationReformEq> lambda1 = new QueryWrapper<JgChangeRegistrationReformEq>().lambda();
         lambda1.in(JgChangeRegistrationReformEq::getEquipTransferId, ids);
-        jgChangeRegistrationReformEqMapper.update(jgChangeRegistrationReformEq, lambda1);
+        jgChangeRegistrationReformEqMapper.delete(lambda1);
+        jgRegistrationHistoryMapper.delete(new QueryWrapper<JgRegistrationHistory>().in("current_document_id", applyNos));
     }
 
     public Map<String, Object> getDetail(String currentDocumentId, String equipId) {
@@ -454,7 +463,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         } else {
             JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryMapper.selectOne(new QueryWrapper<JgRegistrationHistory>()
                     .eq("equ_id", equipId)
-                    .eq("current_document_id", currentDocumentId)
+                    .eq("current_document_id", jgChangeRegistrationReform.getApplyNo())
                     .eq("registration_class", "改造登记"));
             originalData = JSONObject.parseObject(jgRegistrationHistory.getChangeData(), Map.class);
             originalData.remove("sequenceNbr");
@@ -474,6 +483,10 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         jgChangeRegistrationReformEqMapper.updateEquipIsVaildByEquipIdAndCurrentDocumentId(equipmentId, currentDocumentId);
         jgChangeRegistrationTransferEqMapper.updateEquipIsVaildByEquipIdAndCurrentDocumentId(equipmentId, currentDocumentId);
         jgUseRegistrationEqMapper.updateEquipIsVaildByEquipIdAndCurrentDocumentId(equipmentId, currentDocumentId);
+        //单位变更登记
+        jgChangeRegistrationUnitEqMapper.updateEquipIsVaildByEquipIdAndCurrentDocumentId(equipmentId, currentDocumentId);
+        //更名变更登记
+        jgChangeRegistrationNameEqMapper.updateEquipIsVaildByEquipIdAndCurrentDocumentId(equipmentId, currentDocumentId);
     }
 
     /**
@@ -482,12 +495,12 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
      * @param equipId
      * @param currentDocumentId
      */
-    public void updateTechparamsByEquIdAndCurrentDoucumentId(String equipId, String currentDocumentId, String newUseRegistrationCertificateNumber) {
+    public void updateTechparamsByEquIdAndCurrentDoucumentId(String equipId, String currentDocumentId, String newUseRegistrationCertificateNumber,String applyNo) {
 
         IdxBizJgTechParamsElevator idxBizJgTechParamsElevator = idxBizJgTechParamsElevatorMapper.selectOne(new QueryWrapper<IdxBizJgTechParamsElevator>().eq("RECORD", equipId));
         JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryMapper.selectOne(new QueryWrapper<JgRegistrationHistory>()
                 .eq("equ_id", equipId)
-                .eq("current_document_id", currentDocumentId)
+                .eq("current_document_id", applyNo)
                 .eq("registration_class", "改造登记"));
 
         if (!ObjectUtils.isEmpty(idxBizJgTechParamsElevator) && !ObjectUtils.isEmpty(jgRegistrationHistory)) {
@@ -500,7 +513,8 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             BeanUtil.copyProperties(idxBizJgTechParamsElevatorNew, idxBizJgTechParamsElevator, "sequenceNbr", "record");
             idxBizJgTechParamsElevatorMapper.updateById(idxBizJgTechParamsElevator);
             //将历史数据回填到历史记录表中
-            jgRegistrationHistory.setChangeData(historyData);
+            jgRegistrationHistory.setChangeData(newData);
+            jgRegistrationHistory.setOldData(historyData);
             jgRegistrationHistory.setStatus("history");
             jgRegistrationHistoryMapper.updateById(jgRegistrationHistory);
             makeEquipmentsInvalid(equipId, currentDocumentId);

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

@@ -94,12 +94,10 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
             //使用单位用"使用单位统一信用代码"匹配数据
             dto.setUseUnitCode(company.getCompanyCode());
             dto.setRoleIds(null);
-            dto.setStatus(null);
             contractList = maintenanceContractMapper.getContractList(page, dto);
         } else if (MaintenanceEnum.WEIBAO.getCode().equals(phase)) {
             //维保单位用"维保单位统一信用代码"匹配数据
             dto.setMaintenanceUnitCode(company.getCompanyCode());
-            dto.setStatus(dto.getStatus().contains(USE) ? USE : null);
             contractList = maintenanceContractMapper.getContractList(page, dto);
         } else if (MaintenanceEnum.JIANGUAN.getCode().equals(phase)) {
             //监管单位用"接收机构统一使用代码"匹配
@@ -365,7 +363,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
         BeanUtils.copyProperties(dto, contract);
         contract.setCreateDate(new Date());
         //获取维保备案编号
-        ResponseModel<List<String>> listResponseModel = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.AZGZ.getCode(), 1);
+        ResponseModel<List<String>> listResponseModel = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.WBBA.getCode(), 1);
         if (!ObjectUtils.isEmpty(listResponseModel) && listResponseModel.getStatus() != HttpStatus.OK.value()) {
             log.error("告知单获取失败");
             return false;
@@ -463,7 +461,6 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
             jgMaintenanceContract.setNextExecuteIds(role);
             jgMaintenanceContract.setPromoter(reginParams.getUserModel().getUserId());
             jgMaintenanceContract.setInstanceId(instanceId);
-            jgMaintenanceContract.setApplyDate(new Date());
             if (!ObjectUtils.isEmpty(jgMaintenanceContract.getInstanceStatus())) {
                 jgMaintenanceContract.setInstanceStatus(jgMaintenanceContract.getInstanceStatus() + "," + role);
             } else {
@@ -479,6 +476,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
             }
 
         }else {
+            jgMaintenanceContract.setApplyDate(new Date());
             jgMaintenanceContract.setStatus(taskCode);
         }
         this.getBaseMapper().updateById(jgMaintenanceContract);

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/entity/JyjcInspectionResult.java

@@ -119,11 +119,6 @@ public class JyjcInspectionResult extends BaseEntity {
 	@TableField("non_conformance")
     private String nonConformance;
 
-//    /**
-//     * 整改情况
-//     */
-//	@TableField("rectification")
-//    private String rectification;
 
     /**
      * 备注(无用预留)
@@ -180,4 +175,11 @@ public class JyjcInspectionResult extends BaseEntity {
      */
     @TableField("equ_define")
     private String equDefine;
+
+
+    /**
+     * 校验检验系统唯一流水号,排查问题，跟踪问题使用
+     */
+    @TableField("trace_id")
+    private String traceId;
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/model/JyjcInspectionResultModel.java

@@ -152,4 +152,9 @@ public class JyjcInspectionResultModel extends BaseModel {
 
     @ApiModelProperty(value = "监管码")
     private String supervisoryCode;
+
+    /**
+     * 校验检验系统唯一流水号,排查问题，跟踪问题使用
+     */
+    private String traceId;
 }