From f258c7c449fffe911d8d5e1846312fc9e605256b Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Fri, 18 Mar 2022 15:30:30 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=97=B6=EF=BC=8C=20?=
 =?UTF-8?q?=E6=8F=90=E9=86=92=E6=97=B6=E9=97=B4=E5=8F=AF=E4=BB=A5=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/entity/MemoAttrEntity.java       | 2 +-
 .../src/main/java/com/epmet/entity/MemoConcernEntity.java    | 5 +++++
 .../src/main/java/com/epmet/entity/MemoDifficultyEntity.java | 4 ++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/MemoAttrEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/MemoAttrEntity.java
index 8a9642b2cc..1345a64b99 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/MemoAttrEntity.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/MemoAttrEntity.java
@@ -31,7 +31,7 @@ public class MemoAttrEntity extends BaseEpmetEntity {
     /**
      * 提醒时间
      */
-	@TableField(value="REMIND_TIME",updateStrategy = FieldStrategy.IGNORED,jdbcType = JdbcType.DATE)
+	@TableField(value="REMIND_TIME",updateStrategy = FieldStrategy.IGNORED,jdbcType = JdbcType.TIMESTAMP)
 	private Date remindTime;
 
     /**
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/MemoConcernEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/MemoConcernEntity.java
index dce8dc6672..884231a5c1 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/MemoConcernEntity.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/MemoConcernEntity.java
@@ -1,9 +1,12 @@
 package com.epmet.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.apache.ibatis.type.JdbcType;
 
 import java.util.Date;
 
@@ -53,11 +56,13 @@ public class MemoConcernEntity extends BaseEpmetEntity {
     /**
      * 预计关怀时间
      */
+	@TableField(value="REMIND_TIME",updateStrategy = FieldStrategy.IGNORED,jdbcType = JdbcType.TIMESTAMP)
 	private Date scheduledTime;
 
     /**
      * 实际执行时间(预留字段)
      */
+	@TableField(value="REMIND_TIME",updateStrategy = FieldStrategy.IGNORED,jdbcType = JdbcType.TIMESTAMP)
 	private Date actualTime;
 
     /**
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/MemoDifficultyEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/MemoDifficultyEntity.java
index e73a444598..339ce5569e 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/MemoDifficultyEntity.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/MemoDifficultyEntity.java
@@ -1,9 +1,12 @@
 package com.epmet.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.apache.ibatis.type.JdbcType;
 
 import java.util.Date;
 
@@ -43,6 +46,7 @@ public class MemoDifficultyEntity extends BaseEpmetEntity {
     /**
      * 预计处理时间
      */
+	@TableField(value="REMIND_TIME",updateStrategy = FieldStrategy.IGNORED,jdbcType = JdbcType.TIMESTAMP)
 	private Date scheduledTime;
 
 }

From bd768e2535d2b4ed0f15fc188c7b838b4ceb2299 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Fri, 18 Mar 2022 15:33:25 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/MemoDifficultyServiceImpl.java  | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/MemoDifficultyServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/MemoDifficultyServiceImpl.java
index 6760d8b357..0a35d69ebf 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/MemoDifficultyServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/MemoDifficultyServiceImpl.java
@@ -126,19 +126,21 @@ public class MemoDifficultyServiceImpl extends BaseServiceImpl<MemoDifficultyDao
             memoAttachmentService.insertBatch(list);
         }
         //3.判断更新提醒记录表提醒时间
-        if (null != dto.getRemindTime()) {
-            MemoAttrDTO memoAttr = new MemoAttrDTO();
-            memoAttr.setId(dto.getId());
-            memoAttr.setRemindTime(dto.getRemindTime());
-            memoAttrService.update(memoAttr);
-        }
+        MemoAttrDTO memoAttr = new MemoAttrDTO();
+        memoAttr.setId(dto.getId());
+        memoAttr.setRemindTime(dto.getRemindTime());
+        memoAttrService.update(memoAttr);
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void delete(String[] ids) {
-        // 逻辑删除（@TableLogic 注解）
         baseDao.deleteBatchIds(Arrays.asList(ids));
+        memoAttrService.delete(ids);
+        for (String id : ids) {
+            //物理删除附件
+            memoAttachmentService.deleteByMemoId(id);
+        }
     }
 
     @Override