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 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;
@@ -33,6 +34,7 @@ public class JgChangeRegistrationUnitDto  extends BaseDto {
     private String applyNo;
 
     @ApiModelProperty(value = "申请日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     @JsonSerialize(using = BizCustomDateSerializer.class)
     private Date applyDate;
 
@@ -49,6 +51,7 @@ public class JgChangeRegistrationUnitDto  extends BaseDto {
     private String receiveCompanyCode;
 
     @ApiModelProperty(value = "终审通过时间")
+    @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/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/JgChangeRegistrationUnit.java

@@ -2,6 +2,7 @@ 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;
@@ -40,6 +41,7 @@ public class JgChangeRegistrationUnit extends BaseEntity {
      * 申请日期
      */
 	@TableField("apply_date")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     @JsonSerialize(using = BizCustomDateSerializer.class)
     private Date applyDate;
 
@@ -71,6 +73,7 @@ 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/resources/mapper/JgChangeRegistrationNameMapper.xml

@@ -65,6 +65,6 @@
     </select>
 
 <delete id="deleteHistoryInfoById">
-    delete from tzs_jg_change_registration_name_eq where current_document_id = #{code}
+    delete from tzs_jg_registration_history where current_document_id = #{code}
     </delete>
 </mapper>