diff --git a/.gitignore b/.gitignore
index d1fd2c5..1777b31 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,9 +8,11 @@ target/
.idea/jarRepositories.xml
.idea/compiler.xml
.idea/libraries/
+.idea/
*.iws
*.iml
*.ipr
+*.xml
### Eclipse ###
.apt_generated
@@ -36,5 +38,4 @@ build/
### Mac OS ###
.DS_Store
-/.idea/
-/.idea/
+
diff --git a/.idea/easyCodeTableSettingEncode.xml b/.idea/easyCodeTableSettingEncode.xml
index 3a8a273..3ad62cb 100644
--- a/.idea/easyCodeTableSettingEncode.xml
+++ b/.idea/easyCodeTableSettingEncode.xml
@@ -8,7 +8,7 @@
-
+
diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoAddCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoAddCmd.java
index 69ed808..c7d4b78 100644
--- a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoAddCmd.java
+++ b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoAddCmd.java
@@ -11,6 +11,7 @@ import org.codehaus.jackson.annotate.JsonProperty;
import javax.validation.constraints.NotEmpty;
import java.math.BigDecimal;
+import java.time.LocalDate;
import java.time.LocalDateTime;
/**
@@ -46,12 +47,12 @@ public class CorpInfoAddCmd extends Command {
@ApiModelProperty(value = "所属区域", name = "companyArea", required = true)
private String companyArea;
@ApiModelProperty(value = "开始服务日期", name = "firstServeDate", required = true)
- private String firstServeDate;
+ private LocalDate firstServeDate;
@ApiModelProperty(value = "规模", name = "scale", required = true)
private String scale;
@ApiModelProperty(value = "成立时间", name = "createDate", required = true)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private LocalDateTime createDate;
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private LocalDate createDate;
@ApiModelProperty(value = "企业状态", name = "corpState", required = true)
private String corpState;
@ApiModelProperty(value = "企业状态编码", name = "corpStateCode", required = true)
@@ -142,6 +143,11 @@ public class CorpInfoAddCmd extends Command {
@ApiModelProperty(value = "四色图类型，1.平面四色图", name = "fourtype", required = true)
private String fourtype;
+ @ApiModelProperty(value = "营业执照开始时间", name = "licenseStart", required = true)
+ private LocalDate licenseStart;
+
+ @ApiModelProperty(value = "营业执照结束时间", name = "licenseEnd", required = true)
+ private LocalDate licenseEnd;
@ApiModelProperty(value = "有无职业卫生信息,1:是,2:否", name = "whetherHygiene", required = true)
private Integer whetherHygiene;
@ApiModelProperty(value = "有无重大危险源,1:是,2:否", name = "whetherHazards", required = true)
diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoUpdateCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoUpdateCmd.java
index 444a1a7..58f0aad 100644
--- a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoUpdateCmd.java
+++ b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoUpdateCmd.java
@@ -10,6 +10,7 @@ import lombok.NoArgsConstructor;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
+import java.time.LocalDate;
import java.time.LocalDateTime;
/**
@@ -48,11 +49,11 @@ public class CorpInfoUpdateCmd extends Command {
@ApiModelProperty(value = "所属区域", name = "companyArea", required = true)
private String companyArea;
@ApiModelProperty(value = "开始服务日期", name = "firstServeDate", required = true)
- private String firstServeDate;
+ private LocalDate firstServeDate;
@ApiModelProperty(value = "规模", name = "scale", required = true)
private String scale;
@ApiModelProperty(value = "成立时间", name = "createDate", required = true)
- private LocalDateTime createDate;
+ private LocalDate createDate;
@ApiModelProperty(value = "企业状态", name = "corpState", required = true)
private String corpState;
@ApiModelProperty(value = "企业状态编码", name = "corpStateCode", required = true)
@@ -143,6 +144,11 @@ public class CorpInfoUpdateCmd extends Command {
@ApiModelProperty(value = "四色图类型，1.平面四色图", name = "fourtype", required = true)
private String fourtype;
+ @ApiModelProperty(value = "营业执照开始时间", name = "licenseStart", required = true)
+ private LocalDate licenseStart;
+
+ @ApiModelProperty(value = "营业执照结束时间", name = "licenseEnd", required = true)
+ private LocalDate licenseEnd;
@ApiModelProperty(value = "有无职业卫生信息,1:是,2:否", name = "whetherHygiene", required = true)
private Integer whetherHygiene;
@ApiModelProperty(value = "有无重大危险源,1:是,2:否", name = "whetherHazards", required = true)
diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/CorpInfoCO.java b/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/CorpInfoCO.java
index 465dd65..f84a849 100644
--- a/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/CorpInfoCO.java
+++ b/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/CorpInfoCO.java
@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
+import java.time.LocalDate;
import java.time.LocalDateTime;
@@ -51,13 +52,13 @@ public class CorpInfoCO extends ClientObject {
private String companyArea;
//开始服务日期
@ApiModelProperty(value = "开始服务日期")
- private String firstServeDate;
+ private LocalDate firstServeDate;
//规模
@ApiModelProperty(value = "规模")
private String scale;
//成立时间
@ApiModelProperty(value = "成立时间")
- private LocalDateTime createDate;
+ private LocalDate createDate;
//企业状态
@ApiModelProperty(value = "企业状态")
private String corpState;
@@ -190,6 +191,11 @@ public class CorpInfoCO extends ClientObject {
//四色图类型，1.平面四色图
@ApiModelProperty(value = "四色图类型，1.平面四色图")
private String fourtype;
+ @ApiModelProperty(value = "营业执照开始时间")
+ private LocalDate licenseStart;
+ //营业执照结束时间
+ @ApiModelProperty(value = "营业执照结束时间")
+ private LocalDate licenseEnd;
//有无职业卫生信息,1:是,2:否
@ApiModelProperty(value = "有无职业卫生信息,1:是,2:否")
private Integer whetherHygiene;
diff --git a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpInfoE.java b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpInfoE.java
index 38961b8..bd43dac 100644
--- a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpInfoE.java
+++ b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpInfoE.java
@@ -6,6 +6,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
+import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;
@@ -42,11 +43,11 @@ public class CorpInfoE extends BaseE {
//所属区域
private String companyArea;
//开始服务日期
- private String firstServeDate;
+ private LocalDate firstServeDate;
//规模
private String scale;
//成立时间
- private LocalDateTime createDate;
+ private LocalDate createDate;
//企业状态
private String corpState;
//企业状态编码
@@ -135,6 +136,10 @@ public class CorpInfoE extends BaseE {
private String subordinationName;
//四色图类型，1.平面四色图
private String fourtype;
+ //营业执照开始时间
+ private LocalDate licenseStart;
+ //营业执照结束时间
+ private LocalDate licenseEnd;
//有无职业卫生信息,1:是,2:否
private Integer whetherHygiene;
//有无重大危险源,1:是,2:否
diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/CorpInfoDO.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/CorpInfoDO.java
index e299b09..fa45202 100644
--- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/CorpInfoDO.java
+++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/CorpInfoDO.java
@@ -9,6 +9,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
+import java.time.LocalDate;
import java.time.LocalDateTime;
/**
@@ -57,13 +58,13 @@ public class CorpInfoDO extends BaseDO {
private String companyArea;
//开始服务日期
@ApiModelProperty(value = "开始服务日期")
- private String firstServeDate;
+ private LocalDate firstServeDate;
//规模
@ApiModelProperty(value = "规模")
private String scale;
//成立时间
@ApiModelProperty(value = "成立时间")
- private LocalDateTime createDate;
+ private LocalDate createDate;
//企业状态
@ApiModelProperty(value = "企业状态")
private String corpState;
@@ -196,6 +197,12 @@ public class CorpInfoDO extends BaseDO {
//四色图类型，1.平面四色图
@ApiModelProperty(value = "四色图类型，1.平面四色图")
private String fourtype;
+ //营业执照开始时间
+ @ApiModelProperty(value = "营业执照开始时间")
+ private LocalDate licenseStart;
+ //营业执照结束时间
+ @ApiModelProperty(value = "营业执照结束时间")
+ private LocalDate licenseEnd;
//有无职业卫生信息,1:是,2:否
@ApiModelProperty(value = "有无职业卫生信息,1:是,2:否")
private Integer whetherHygiene;