Commit 537be9fa authored by suhuiguang's avatar suhuiguang

1.漏提交字段

parent 7413883e
package com.yeejoin.amos.boot.module.tzs.api.dto; package com.yeejoin.amos.boot.module.tzs.api.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto; import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
...@@ -39,12 +40,15 @@ public class BaseUnitLicenceDto extends BaseDto { ...@@ -39,12 +40,15 @@ public class BaseUnitLicenceDto extends BaseDto {
@ApiModelProperty(value = "证书编号") @ApiModelProperty(value = "证书编号")
private String certNo; private String certNo;
@JsonFormat(pattern = "yyyy-MM-dd")
@ApiModelProperty(value = "有效期至") @ApiModelProperty(value = "有效期至")
private Date expiryDate; private Date expiryDate;
@ApiModelProperty(value = "发证日期") @ApiModelProperty(value = "发证日期")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date issueDate; private Date issueDate;
@JsonFormat(pattern = "yyyy-MM-dd")
@ApiModelProperty(value = "变更日期") @ApiModelProperty(value = "变更日期")
private Date changeDate; private Date changeDate;
......
...@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.tzs.api.entity; ...@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.tzs.api.entity;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity; import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
...@@ -62,28 +63,48 @@ public class BaseUnitLicence extends BaseEntity { ...@@ -62,28 +63,48 @@ public class BaseUnitLicence extends BaseEntity {
/** /**
* 有效期至 * 有效期至
*/ */
@JsonFormat(pattern = "yyyy-MM-dd")
@TableField("expiry_date") @TableField("expiry_date")
private Date expiryDate; private Date expiryDate;
/** /**
* 发证日期 * 发证日期
*/ */
@JsonFormat(pattern = "yyyy-MM-dd")
@TableField("issue_date") @TableField("issue_date")
private Date issueDate; private Date issueDate;
/** /**
* 变更日期 * 变更日期
*/ */
@JsonFormat(pattern = "yyyy-MM-dd")
@TableField("change_date") @TableField("change_date")
private Date changeDate; private Date changeDate;
/** /**
* 许可评审方式 * 许可方式/许可状态
*/ */
@TableField("apply_type") @TableField("apply_type")
private String applyType; private String applyType;
/** /**
* 许可方式/许可状态
*/
@TableField("apply_type_code")
private String applyTypeCode;
/**
* 许可评审方式
*/
private String appraisalType;
/**
* 许可评审方式code
*/
private String appraisalTypeCode;
/**
* 备注 * 备注
*/ */
@TableField("remark") @TableField("remark")
......
package com.yeejoin.amos.boot.module.tzs.flc.api.dto; package com.yeejoin.amos.boot.module.tzs.flc.api.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto; import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
...@@ -37,6 +38,7 @@ public class RegUnitIcDto extends BaseDto { ...@@ -37,6 +38,7 @@ public class RegUnitIcDto extends BaseDto {
private String registeredOrganCode; private String registeredOrganCode;
@ApiModelProperty(value = "核准时间") @ApiModelProperty(value = "核准时间")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date approvedDate; private Date approvedDate;
@ApiModelProperty(value = "经营状态:在业、吊销、注销、迁入、迁出、停业、清算") @ApiModelProperty(value = "经营状态:在业、吊销、注销、迁入、迁出、停业、清算")
......
...@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.tzs.flc.api.entity; ...@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.tzs.flc.api.entity;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity; import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
...@@ -56,6 +57,7 @@ public class RegUnitIc extends BaseEntity { ...@@ -56,6 +57,7 @@ public class RegUnitIc extends BaseEntity {
/** /**
* 核准时间 * 核准时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd")
@TableField("approved_date") @TableField("approved_date")
private Date approvedDate; private Date approvedDate;
......
...@@ -368,5 +368,50 @@ ...@@ -368,5 +368,50 @@
ALTER TABLE `tz_flc_reg_unit_info` add column `unit_code_type_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '证件类型名称'; ALTER TABLE `tz_flc_reg_unit_info` add column `unit_code_type_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '证件类型名称';
</sql> </sql>
</changeSet> </changeSet>
<changeSet author="suhuiguang" id="1660546840856-01">
<preConditions onFail="MARK_RAN">
<columnExists tableName="tz_flc_reg_unit_ic" columnName="approved_date"/>
</preConditions>
<comment>tz_flc_reg_unit_ic approved_date datetime->date 核准时间</comment>
<sql>
ALTER TABLE `tz_flc_reg_unit_ic` modify column `approved_date` date DEFAULT NULL COMMENT '核准时间';
</sql>
</changeSet>
<changeSet author="suhuiguang" id="1660546840856-02">
<preConditions onFail="MARK_RAN">
<columnExists tableName="tz_base_unit_licence" columnName="expiry_date"/>
</preConditions>
<comment>tz_base_unit_licence expiry_date datetime->date 有效期至</comment>
<sql>
ALTER TABLE `tz_base_unit_licence` modify column `expiry_date` date DEFAULT NULL COMMENT '有效期至';
</sql>
</changeSet>
<changeSet author="suhuiguang" id="1660546840856-03">
<preConditions onFail="MARK_RAN">
<columnExists tableName="tz_base_unit_licence" columnName="issue_date"/>
</preConditions>
<comment>tz_base_unit_licence issue_date datetime->date 发证日期</comment>
<sql>
ALTER TABLE `tz_base_unit_licence` modify column `issue_date` date DEFAULT NULL COMMENT '发证日期';
</sql>
</changeSet>
<changeSet author="suhuiguang" id="1660546840856-04">
<preConditions onFail="MARK_RAN">
<columnExists tableName="tz_base_unit_licence" columnName="change_date"/>
</preConditions>
<comment>tz_base_unit_licence change_date datetime->date 变更日期</comment>
<sql>
ALTER TABLE `tz_base_unit_licence` modify column `change_date` date DEFAULT NULL COMMENT '变更日期';
</sql>
</changeSet>
<changeSet author="suhuiguang" id="1660546840856-05">
<preConditions onFail="MARK_RAN">
<columnExists tableName="tz_base_unit_licence" columnName="apply_type"/>
</preConditions>
<comment>tz_base_unit_licence apply_type 注释修改</comment>
<sql>
ALTER TABLE `tz_base_unit_licence` modify column `apply_type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '许可方式/许可状态';
</sql>
</changeSet>
</databaseChangeLog> </databaseChangeLog>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment