From 0e81ab70b417806e453589f44350afa4c5caadc8 Mon Sep 17 00:00:00 2001
From: fuqingji <51312040@qq.com>
Date: Thu, 28 Apr 2022 16:56:35 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=85=AC=E5=91=8A?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=85=AC=E5=85=B1=E6=9C=8D=E5=8A=A1=E5=B9=B3?=
 =?UTF-8?q?=E5=8F=B0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mall/ebtp/project/feign/entity/AnnoVO.java            | 8 ++++++++
 .../projectexception/entity/ProjectExceptionVO.java       | 8 ++++++++
 .../service/impl/ProjectExceptionServiceImpl.java         | 1 +
 3 files changed, 17 insertions(+)

diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/feign/entity/AnnoVO.java b/src/main/java/com/chinaunicom/mall/ebtp/project/feign/entity/AnnoVO.java
index f7200fa..3ba9f58 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/project/feign/entity/AnnoVO.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/project/feign/entity/AnnoVO.java
@@ -48,4 +48,12 @@ public class AnnoVO implements Serializable {
     private Integer status;
 
 
+    /**
+     * 是否包含公共服务平台: 0：不包含 1：包含
+     */
+    @ApiModelProperty(value = "是否包含公共服务平台: 0：不包含 1：包含")
+    private Boolean hasCtpsp;
+
+
+
 }
diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/entity/ProjectExceptionVO.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/entity/ProjectExceptionVO.java
index db61ebe..55957c4 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/entity/ProjectExceptionVO.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/entity/ProjectExceptionVO.java
@@ -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;
 }
diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/service/impl/ProjectExceptionServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/service/impl/ProjectExceptionServiceImpl.java
index e40fabc..8d1576a 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/service/impl/ProjectExceptionServiceImpl.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/service/impl/ProjectExceptionServiceImpl.java
@@ -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);
                 }

From 27d851f54201b2c50529c070aeef735990e1a9ba Mon Sep 17 00:00:00 2001
From: fuqingji <51312040@qq.com>
Date: Fri, 29 Apr 2022 09:08:41 +0800
Subject: [PATCH 2/2] 1

---
 .../ebtp/project/projectrecord/entity/ProjectRecord.java    | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/entity/ProjectRecord.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/entity/ProjectRecord.java
index 474d8b0..969aa11 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/entity/ProjectRecord.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/entity/ProjectRecord.java
@@ -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;