From ddc7285cbef043bae32cb26a11f84da0ce1f052e Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Fri, 19 Aug 2022 12:43:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BA=8B=E4=BB=B6=E6=97=B6?=
 =?UTF-8?q?=20=E6=9B=B4=E6=96=B0=E6=97=B6=E9=97=B4=20=E5=92=8C=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/IcUserDemandRecServiceImpl.java | 16 +++++++++++-----
 .../epmet/service/impl/ProjectServiceImpl.java   | 11 +++++++----
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java
index e4477dcf27..9ecec05fa1 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java
@@ -18,8 +18,8 @@
 package com.epmet.service.impl;
 
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.AppClientConstant;
 import com.epmet.commons.tools.constant.NumConstant;
@@ -39,6 +39,7 @@ import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
 import com.epmet.commons.tools.scan.param.TextScanParamDTO;
 import com.epmet.commons.tools.scan.param.TextTaskDTO;
 import com.epmet.commons.tools.scan.result.SyncScanResult;
+import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.Result;
@@ -114,6 +115,8 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
     private String textSyncScanMethod;
     @Autowired
     private GovProjectOpenFeignClient govProjectOpenFeignClient;
+    @Autowired
+    private LoginUserUtil loginUserUtil;
 
 
     @Override
@@ -522,10 +525,13 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
         if(StringUtils.isBlank(originId) || StringUtils.isBlank(origin)){
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"参数错误","参数错误");
         }
-        LambdaQueryWrapper<IcUserDemandRecEntity> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(IcUserDemandRecEntity::getOriginId,originId)
-                .eq(IcUserDemandRecEntity::getOrigin,origin);
-        return baseDao.delete(wrapper);
+        LambdaUpdateWrapper<IcUserDemandRecEntity> wrapper = new LambdaUpdateWrapper();
+        wrapper.eq(IcUserDemandRecEntity::getOriginId, originId)
+                .eq(IcUserDemandRecEntity::getOrigin,origin)
+                .set(IcUserDemandRecEntity::getUpdatedTime,new Date())
+                .set(IcUserDemandRecEntity::getCreatedBy,loginUserUtil.getLoginUserId())
+                .set(IcUserDemandRecEntity::getDelFlag,NumConstant.ONE_STR);
+        return baseDao.update(null, wrapper);
     }
 
     /**
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
index 9c77a99edd..9e679c824b 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
@@ -19,8 +19,8 @@ package com.epmet.service.impl;
 
 import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.rocketmq.messages.ProjectChangedMQMsg;
@@ -3565,10 +3565,13 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 
 	@Override
 	public Integer deleteByOriginId(String originId, String origin) {
-		LambdaQueryWrapper<ProjectEntity> wrapper = new LambdaQueryWrapper<>();
+		LambdaUpdateWrapper<ProjectEntity> wrapper = new LambdaUpdateWrapper();
 		wrapper.eq(ProjectEntity::getOriginId, originId)
-		.eq(ProjectEntity::getOrigin,origin);
-		return baseDao.delete(wrapper);
+				.eq(ProjectEntity::getOrigin,origin)
+				.set(ProjectEntity::getUpdatedTime,new Date())
+				.set(ProjectEntity::getCreatedBy,loginUserUtil.getLoginUserId())
+				.set(ProjectEntity::getDelFlag,NumConstant.ONE_STR);
+		return baseDao.update(null, wrapper);
 	}