liuc/biz_supplier_manage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/uat' into uat

Browse Source
This commit is contained in:
zhangqinbin
2022-05-06 09:26:17 +08:00
parent deb1848014 27d851f542
commit f0101699d3
4 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/chinaunicom/mall/ebtp/project/feign/entity/AnnoVO.java
View File

@ -48,4 +48,12 @@ public class AnnoVO implements Serializable {
private Integer status;
/**
* 是否包含公共服务平台: 0：不包含 1：包含
*/
@ApiModelProperty(value = "是否包含公共服务平台: 0：不包含 1：包含")
private Boolean hasCtpsp;
}

8
src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/entity/ProjectExceptionVO.java
View File

@ -1,5 +1,6 @@
package com.chinaunicom.mall.ebtp.project.projectexception.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.chinaunicom.mall.ebtp.common.base.entity.BasePageRequest;
import io.swagger.annotations.ApiModel;
@ -45,4 +46,11 @@ public class ProjectExceptionVO extends ProjectException implements Serializable
@ApiModelProperty(value = "异常信息ID")
private String sendMessageId;
/**
* 是否包含公共服务平台: 0：不包含 1：包含
*/
@ApiModelProperty(value = "是否包含公共服务平台: 0：不包含 1：包含")
@TableField(exist = false)
private Boolean hasCtpsp;
}

1
src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/service/impl/ProjectExceptionServiceImpl.java
View File

@ -596,6 +596,7 @@ public class ProjectExceptionServiceImpl extends BaseServiceImpl<ProjectExceptio
if(null != annoVOList && !annoVOList.isEmpty()){
vo.setSendMessageStatus(annoVOList.get(0).getStatus());
vo.setSendMessageId(annoVOList.get(0).getId());
vo.setHasCtpsp(annoVOList.get(0).getHasCtpsp());
}else{
vo.setSendMessageStatus(ProjectCommonUtil.SEND_MESSAGE_STATUS_0);
}

6
src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/entity/ProjectRecord.java
View File

@ -4,8 +4,6 @@ import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.chinaunicom.mall.ebtp.common.base.entity.BaseEntity;
import com.chinaunicom.mall.ebtp.common.config.CustomLocalDateTimeTypeHandler;
import com.chinaunicom.mall.ebtp.project.checkSpecialCharacters.CheckSc;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@ -16,7 +14,6 @@ import lombok.experimental.Accessors;
import org.hibernate.validator.constraints.Length;
import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.Pattern;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
@ -66,8 +63,7 @@ public class ProjectRecord extends BaseEntity implements Serializable {
* 招标项目名称
*/
@TableField(
fill = FieldFill.INSERT,
typeHandler = CustomLocalDateTimeTypeHandler.class
fill = FieldFill.INSERT
)
@ApiModelProperty(value = "招标项目名称")
private String projectName;