需求修改
This commit is contained in:
@@ -7,6 +7,7 @@ import lombok.Data;
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDate;
|
||||
import java.time.format.DateTimeFormatter;
|
||||
import java.util.Date;
|
||||
|
||||
@Data
|
||||
public class InitiatingRequest {
|
||||
@@ -105,6 +106,10 @@ public class InitiatingRequest {
|
||||
|
||||
private String csfzName;
|
||||
|
||||
private Date signStartTime;
|
||||
|
||||
private Date signEndTime;
|
||||
|
||||
|
||||
public InitiatingDO toInitiatingDO() {
|
||||
InitiatingDO initiatingDO = new InitiatingDO();
|
||||
@@ -115,14 +120,14 @@ public class InitiatingRequest {
|
||||
initiatingDO.setTitle("加盟意向协议-" + this.signName + "-" + dateTime);
|
||||
initiatingDO.setApply_date(this.apply_date);
|
||||
initiatingDO.setJms_id_card(this.idCardNo);
|
||||
if (StringUtil.isNotBlank(this.businessLicenseAddress)){
|
||||
if (StringUtil.isNotBlank(this.businessLicenseAddress)) {
|
||||
initiatingDO.setJms_id_card_address(this.businessLicenseAddress);
|
||||
}else if (StringUtil.isNotBlank(this.idCardAddress)){
|
||||
} else if (StringUtil.isNotBlank(this.idCardAddress)) {
|
||||
initiatingDO.setJms_id_card_address(this.idCardAddress);
|
||||
}
|
||||
if (StringUtil.isNotBlank(this.businessLicenseCode)){
|
||||
if (StringUtil.isNotBlank(this.businessLicenseCode)) {
|
||||
initiatingDO.setJms_id_card(this.businessLicenseCode);
|
||||
}else if (StringUtil.isNotBlank(this.idCardNo)){
|
||||
} else if (StringUtil.isNotBlank(this.idCardNo)) {
|
||||
initiatingDO.setJms_id_card(this.idCardNo);
|
||||
}
|
||||
initiatingDO.setJms_name(this.signName);
|
||||
@@ -133,12 +138,12 @@ public class InitiatingRequest {
|
||||
initiatingDO.setAnnex1(this.annex1);
|
||||
initiatingDO.setAnnex2(this.annex2);
|
||||
initiatingDO.setAnnex3(this.annex3);
|
||||
initiatingDO.setQy_year(this.qy_year);
|
||||
initiatingDO.setQy_month(this.qy_month);
|
||||
initiatingDO.setQy_day(this.qy_day);
|
||||
initiatingDO.setJy_year(this.jy_year);
|
||||
initiatingDO.setJy_month(this.jy_month);
|
||||
initiatingDO.setJy_day(this.jy_day);
|
||||
initiatingDO.setQy_year(this.signStartTime.getYear());
|
||||
initiatingDO.setQy_month(this.signStartTime.getMonth());
|
||||
initiatingDO.setQy_day(this.signStartTime.getDay());
|
||||
initiatingDO.setJy_year(this.signEndTime.getYear());
|
||||
initiatingDO.setJy_month(this.signEndTime.getMonth());
|
||||
initiatingDO.setJy_day(this.signEndTime.getDay());
|
||||
initiatingDO.setYxjzz(this.yxjzz);
|
||||
initiatingDO.setXyqx_month(this.xyqx_month);
|
||||
initiatingDO.setJmf(this.jmf);
|
||||
|
||||
@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import javax.validation.constraints.NotBlank;
|
||||
import javax.validation.constraints.NotNull;
|
||||
import java.util.Date;
|
||||
|
||||
@Data
|
||||
@@ -15,8 +16,10 @@ public class TrainingExperienceDistributionRequest {
|
||||
@ApiModelProperty("用户信息表partnerId")
|
||||
private String partnerId;
|
||||
@ApiModelProperty("体验门店id")
|
||||
@NotNull(message = "门店id为空")
|
||||
private String storeId;
|
||||
@ApiModelProperty("门店名")
|
||||
@NotNull(message = "门店名为空")
|
||||
private String storeName;
|
||||
@ApiModelProperty("开始体验时间")
|
||||
private Date experienceStartTime;
|
||||
|
||||
Reference in New Issue
Block a user