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/dto/JgChangeRegistrationUnitDto.java

+package com.yeejoin.amos.boot.module.jg.api.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+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;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 单位变更登记
+ *
+ * @author system_generator
+ * @date 2023-12-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="JgChangeRegistrationUnitDto", description="单位变更登记")
+public class JgChangeRegistrationUnitDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "变更类型（0转出，1转入）")
+    private String changeType;
+
+    @ApiModelProperty(value = "申请编号")
+    private String applyNo;
+
+    @ApiModelProperty(value = "申请日期")
+    private Date applyDate;
+
+    @ApiModelProperty(value = "办理状态")
+    private String auditStatus;
+
+    @ApiModelProperty(value = "登记机构")
+    private String receiveOrgName;
+
+    @ApiModelProperty(value = "登记机构代码")
+    private String receiveOrgCode;
+
+    @ApiModelProperty(value = "登记机构公司代码")
+    private String receiveCompanyCode;
+
+    @ApiModelProperty(value = "终审通过时间")
+    private Date auditPassDate;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+    @ApiModelProperty(value = "创建人ID")
+    private String createUserId;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createDate;
+
+    @ApiModelProperty(value = "创建人")
+    private String createUserName;
+
+    @ApiModelProperty(value = "原使用单位统一信用代码")
+    private String useUnitCreditCode;
+
+    @ApiModelProperty(value = "原使用单位名称")
+    private String useUnitName;
+
+    @ApiModelProperty(value = "新使用单位统一信用代码")
+    private String newUseUnitCreditCode;
+
+    @ApiModelProperty(value = "新使用单位名称")
+    private String newUseUnitName;
+
+    @ApiModelProperty(value = "变更证明（买卖合同或其他变更使用单位证明）")
+    private String changeCertificate;
+
+    @ApiModelProperty(value = "变更证明（买卖合同或其他变更使用单位证明）")
+    private List<Map<String, Object>> changeCertificateList;
+
+    @ApiModelProperty(value = "流程实例id")
+    private String instanceId;
+
+    @ApiModelProperty(value = "流程执行顺序标识")
+    private String executeSequence;
+
+    @ApiModelProperty(value = "下一执行节点ids")
+    private String nextExecutorIds;
+
+    @ApiModelProperty(value = "任务发起人id")
+    private String promoter;
+
+    @ApiModelProperty(value = "使用登记证书附件（转入审核通过后生成）")
+    private String useRegistrationCertificate;
+
+    @ApiModelProperty(value = "流程已执行记录角色id")
+    private String instanceStatus;
+
+    @ApiModelProperty(value = "当前节点流程名称")
+    private String status;
+
+    @ApiModelProperty(value = "流程建议")
+    private String processAdvice;
+
+   @TableField(exist = false)
+   @ApiModelProperty(value = "告知设备列表")
+   private List<Map<String, Object>> deviceList;
+
+  @ApiModelProperty(value = "设备类别")
+  private String equType;
+
+ private 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/dto/JgChangeRegistrationUnitEqDto.java

+package com.yeejoin.amos.boot.module.jg.api.dto;
+
+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;
+
+/**
+ * 单位变更登记设备关系表
+ *
+ * @author system_generator
+ * @date 2023-12-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="JgChangeRegistrationUnitEqDto", description="单位变更登记设备关系表")
+public class JgChangeRegistrationUnitEqDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "单位变更登记申请id")
+    private String unitChangeRegistrationId;
+
+    @ApiModelProperty(value = "设备id")
+    private String equId;
+
+    @ApiModelProperty(value = "使用登记证编号是否作废（1作废，0在用）")
+    private String isInvalid;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createDate;
+
+    @ApiModelProperty(value = "创建人id")
+    private String createUserId;
+
+    @ApiModelProperty(value = "创建人")
+    private String createUserName;
+
+}

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

@@ -34,6 +34,7 @@ public class JgTransferNoticeDto extends BaseDto {
 
     @ApiModelProperty(value = "告知日期")
     @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonSerialize(using = BizCustomDateSerializer.class)
     private Date noticeDate;
 
     @ApiModelProperty(value = "告知状态")
@@ -99,6 +100,7 @@ public class JgTransferNoticeDto extends BaseDto {
 
     @ApiModelProperty(value = "计划施工日期")
     @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonSerialize(using = BizCustomDateSerializer.class)
     private Date planDate;
 
     @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

+package com.yeejoin.amos.boot.module.jg.api.entity;
+
+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;
+
+/**
+ * 单位变更登记
+ *
+ * @author system_generator
+ * @date 2023-12-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("tzs_jg_change_registration_unit")
+public class JgChangeRegistrationUnit extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 变更类型（0转出，1转入）
+     */
+	@TableField("change_type")
+    private String changeType;
+
+    /**
+     * 申请编号
+     */
+	@TableField("apply_no")
+    private String applyNo;
+
+    /**
+     * 申请日期
+     */
+	@TableField("apply_date")
+    private Date applyDate;
+
+    /**
+     * 办理状态
+     */
+	@TableField("audit_status")
+    private String auditStatus;
+
+    /**
+     * 登记机构
+     */
+	@TableField("receive_org_name")
+    private String receiveOrgName;
+
+    /**
+     * 登记机构代码
+     */
+	@TableField("receive_org_code")
+    private String receiveOrgCode;
+
+    /**
+     * 登记机构公司代码
+     */
+	@TableField("receive_company_code")
+    private String receiveCompanyCode;
+
+    /**
+     * 终审通过时间
+     */
+	@TableField("audit_pass_date")
+    private Date auditPassDate;
+
+    /**
+     * 备注
+     */
+	@TableField("remark")
+    private String remark;
+
+    /**
+     * 创建人ID
+     */
+	@TableField("create_user_id")
+    private String createUserId;
+
+    /**
+     * 创建时间
+     */
+	@TableField("create_date")
+    private Date createDate;
+
+    /**
+     * 创建人
+     */
+	@TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 原使用单位统一信用代码
+     */
+	@TableField("use_unit_credit_code")
+    private String useUnitCreditCode;
+
+    /**
+     * 原使用单位名称
+     */
+	@TableField("use_unit_name")
+    private String useUnitName;
+
+    /**
+     * 新使用单位统一信用代码
+     */
+	@TableField("new_use_unit_credit_code")
+    private String newUseUnitCreditCode;
+
+    /**
+     * 新使用单位名称
+     */
+	@TableField("new_use_unit_name")
+    private String newUseUnitName;
+
+    /**
+     * 变更证明（买卖合同或其他变更使用单位证明）
+     */
+	@TableField("change_certificate")
+    private String changeCertificate;
+
+    /**
+     * 流程实例id
+     */
+	@TableField("instance_id")
+    private String instanceId;
+
+    /**
+     * 流程执行顺序标识
+     */
+	@TableField("execute_sequence")
+    private String executeSequence;
+
+    /**
+     * 下一执行节点ids
+     */
+	@TableField("next_executor_ids")
+    private String nextExecutorIds;
+
+    /**
+     * 任务发起人id
+     */
+	@TableField("promoter")
+    private String promoter;
+
+    /**
+     * 使用登记证书附件（转入审核通过后生成）
+     */
+	@TableField("use_registration_certificate")
+    private String useRegistrationCertificate;
+
+    /**
+     * 流程已执行记录角色id
+     */
+	@TableField("instance_status")
+    private String instanceStatus;
+
+    /**
+     * 当前节点流程名称
+     */
+	@TableField("status")
+    private String status;
+
+    /**
+     * 流程建议
+     */
+    @TableField(exist = false)
+    private String processAdvice;
+
+    /**
+     * 设备类别
+     */
+    @TableField("equ_type")
+    private String equType;
+
+
+
+
+}

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

+package com.yeejoin.amos.boot.module.jg.api.entity;
+
+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;
+
+/**
+ * 单位变更登记设备关系表
+ *
+ * @author system_generator
+ * @date 2023-12-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("tzs_jg_change_registration_unit_eq")
+public class JgChangeRegistrationUnitEq extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 单位变更登记申请id
+     */
+	@TableField("unit_change_registration_id")
+    private String unitChangeRegistrationId;
+
+    /**
+     * 设备id
+     */
+	@TableField("equ_id")
+    private String equId;
+
+    /**
+     * 使用登记证编号是否作废（1作废，0在用）
+     */
+	@TableField("is_invalid")
+    private String isInvalid;
+
+    /**
+     * 创建时间
+     */
+	@TableField("create_date")
+    private Date createDate;
+
+    /**
+     * 创建人id
+     */
+	@TableField("create_user_id")
+    private String createUserId;
+
+    /**
+     * 创建人
+     */
+	@TableField("create_user_name")
+    private String createUserName;
+
+}

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

@@ -38,8 +38,8 @@
             <if test="dto.equCategory != null and dto.equCategory != ''">
                 and jri.EQU_CATEGORY = #{dto.equCategory}
             </if>
-            <if test="dto.auditStatus != null and dto.auditStatus != ''">
-                and ur.audit_status = #{dto.auditStatus}
+            <if test="dto.status != null and dto.status != ''">
+                and ur.status = #{dto.status}
             </if>
             <if test="dto.equCode != null and dto.equCode != ''">
                 and jri.EQU_CODE like concat('%',#{dto.equCode},'%')

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

@@ -167,8 +167,12 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             // 业务管理设备信息保存
             JgUseRegistrationEq jgRelationEquip = new JgUseRegistrationEq();
             jgRelationEquip.setEquId(map.get("equipId").toString());
-            List<String> applicationFormCode = iCreateCodeService.createApplicationFormCode(ApplicationFormTypeEnum.SYDJ.getCode(), 1);
-            jgUseRegistration.setApplyNo(applicationFormCode.get(0));
+//            List<String> applicationFormCode = iCreateCodeServicevice.createApplicationFormCode(ApplicationFormTypeEnum.SYDJ.getCode(), 1);
+//            jgUseRegistration.setApplyNo(applicationFormCode.get(0));
+            ResponseModel<List<String>> listResponseModel = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.SYDJ.getCode(), 1);
+            if(!ObjectUtils.isEmpty(listResponseModel)){
+                jgUseRegistration.setApplyNo(listResponseModel.getResult().get(0));
+            }
             jgUseRegistration.setAuditStatus("待提交");
             jgUseRegistration.setStatus(WorkFlowStatusEnum.USE_SUBMIT.getPass());
             this.save(jgUseRegistration);
@@ -436,9 +440,6 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         if (!ObjectUtils.isEmpty(useDetail)){
             detail.putAll(useDetail);
         }
-        if (!ObjectUtils.isEmpty(detail)){
-            detail.putAll(detail);
-        }
         detail.put("proDuctPhoto", JSON.parse(String.valueOf(detail.get("proDuctPhoto"))));
         detail.put("factoryStandard", JSON.parse(String.valueOf(detail.get("factoryStandard"))));
         detail.put("productQualityYieldProve", JSON.parse(String.valueOf(detail.get("productQualityYieldProve"))));