zcloud_gbs
/
zcloud_gbs_basic_info_gwj
12
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: zcloud_gbs:10d89e71260966add06d76b6ba5fbe862e65bab5
Branches Tags
zcloud_gbs:main
..
compare: zcloud_gbs:c464ff173bd64108d7dc9af00e0dd7e877f294c8
Branches Tags
zcloud_gbs:main

No commits in common. "10d89e71260966add06d76b6ba5fbe862e65bab5" and "c464ff173bd64108d7dc9af00e0dd7e877f294c8" have entirely different histories.
10d89e7126 ... c464ff173b

7 changed files with 14 additions and 45 deletions
Show Stats Expand all files Collapse all files

5
.gitignore vendored
View File

@ -8,11 +8,9 @@ target/
.idea/jarRepositories.xml
.idea/compiler.xml
.idea/libraries/
.idea/
*.iws
*.iml
*.ipr
*.xml
### Eclipse ###
.apt_generated
@ -38,4 +36,5 @@ build/
### Mac OS ###
.DS_Store
/.idea/
/.idea/

2
.idea/easyCodeTableSettingEncode.xml
View File

File diff suppressed because one or more lines are too long

12
web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoAddCmd.java
View File

@ -11,7 +11,6 @@ import org.codehaus.jackson.annotate.JsonProperty;
import javax.validation.constraints.NotEmpty;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
/**
@ -47,12 +46,12 @@ public class CorpInfoAddCmd extends Command {
@ApiModelProperty(value = "所属区域", name = "companyArea", required = true)
private String companyArea;
@ApiModelProperty(value = "开始服务日期", name = "firstServeDate", required = true)
private LocalDate firstServeDate;
private String firstServeDate;
@ApiModelProperty(value = "规模", name = "scale", required = true)
private String scale;
@ApiModelProperty(value = "成立时间", name = "createDate", required = true)
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate createDate;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createDate;
@ApiModelProperty(value = "企业状态", name = "corpState", required = true)
private String corpState;
@ApiModelProperty(value = "企业状态编码", name = "corpStateCode", required = true)
@ -143,11 +142,6 @@ 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)

10
web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoUpdateCmd.java
View File

@ -10,7 +10,6 @@ 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;
/**
@ -49,11 +48,11 @@ public class CorpInfoUpdateCmd extends Command {
@ApiModelProperty(value = "所属区域", name = "companyArea", required = true)
private String companyArea;
@ApiModelProperty(value = "开始服务日期", name = "firstServeDate", required = true)
private LocalDate firstServeDate;
private String firstServeDate;
@ApiModelProperty(value = "规模", name = "scale", required = true)
private String scale;
@ApiModelProperty(value = "成立时间", name = "createDate", required = true)
private LocalDate createDate;
private LocalDateTime createDate;
@ApiModelProperty(value = "企业状态", name = "corpState", required = true)
private String corpState;
@ApiModelProperty(value = "企业状态编码", name = "corpStateCode", required = true)
@ -144,11 +143,6 @@ 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)

10
web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/CorpInfoCO.java
View File

@ -5,7 +5,6 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
@ -52,13 +51,13 @@ public class CorpInfoCO extends ClientObject {
private String companyArea;
//开始服务日期
@ApiModelProperty(value = "开始服务日期")
private LocalDate firstServeDate;
private String firstServeDate;
//规模
@ApiModelProperty(value = "规模")
private String scale;
//成立时间
@ApiModelProperty(value = "成立时间")
private LocalDate createDate;
private LocalDateTime createDate;
//企业状态
@ApiModelProperty(value = "企业状态")
private String corpState;
@ -191,11 +190,6 @@ 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;

9
web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpInfoE.java
View File

@ -6,7 +6,6 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;
@ -43,11 +42,11 @@ public class CorpInfoE extends BaseE {
//所属区域
private String companyArea;
//开始服务日期
private LocalDate firstServeDate;
private String firstServeDate;
//规模
private String scale;
//成立时间
private LocalDate createDate;
private LocalDateTime createDate;
//企业状态
private String corpState;
//企业状态编码
@ -136,10 +135,6 @@ 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:否

11
web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/CorpInfoDO.java
View File

@ -9,7 +9,6 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
/**
@ -58,13 +57,13 @@ public class CorpInfoDO extends BaseDO {
private String companyArea;
//开始服务日期
@ApiModelProperty(value = "开始服务日期")
private LocalDate firstServeDate;
private String firstServeDate;
//规模
@ApiModelProperty(value = "规模")
private String scale;
//成立时间
@ApiModelProperty(value = "成立时间")
private LocalDate createDate;
private LocalDateTime createDate;
//企业状态
@ApiModelProperty(value = "企业状态")
private String corpState;
@ -197,12 +196,6 @@ 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;