From 99f2e6115232e0a803186ffe11a1f67e52a24c29 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 12 Oct 2022 11:42:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BA=8B=E4=BB=B6=EF=BC=88?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=AE=AE=E9=A2=98=E3=80=81=E8=AE=AE=E9=A2=98?= =?UTF-8?q?=E5=88=86=E7=B1=BB=E3=80=81=E8=AE=AE=E9=A2=98=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E3=80=81=E5=88=A0=E9=99=A4=E9=A1=B9=E7=9B=AE=E3=80=81=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=88=86=E7=B1=BB=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/form/DelIssueFormDTO.java | 25 +++++++++++++ .../epmet/feign/GovIssueOpenFeignClient.java | 9 +++++ .../GovIssueOpenFeignClientFallBack.java | 11 ++++++ .../com/epmet/controller/IssueController.java | 12 +++++++ .../epmet/service/IssueCategoryService.java | 2 ++ .../java/com/epmet/service/IssueService.java | 9 ++++- .../com/epmet/service/IssueTagsService.java | 3 ++ .../impl/IssueCategoryServiceImpl.java | 15 +++++--- .../epmet/service/impl/IssueServiceImpl.java | 36 +++++++++++++++++++ .../service/impl/IssueTagsServiceImpl.java | 11 ++++++ .../epmet/service/ProjectCategoryService.java | 10 ++++++ .../com/epmet/service/ProjectService.java | 3 +- .../service/impl/IcEventServiceImpl.java | 12 +++++-- .../impl/ProjectCategoryServiceImpl.java | 17 +++++++++ .../service/impl/ProjectServiceImpl.java | 32 ++++++++++++----- 15 files changed, 190 insertions(+), 17 deletions(-) create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/DelIssueFormDTO.java diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/DelIssueFormDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/DelIssueFormDTO.java new file mode 100644 index 0000000000..5bfd830570 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/DelIssueFormDTO.java @@ -0,0 +1,25 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.Valid; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import java.util.List; + +/** + * @Description + * @Author yzm + * @Date 2022/10/12 11:00 + */ +@Data +public class DelIssueFormDTO { + @NotBlank(message = "customerId不能为空") + private String customerId; + @NotBlank(message = "userId不能为空") + private String userId; + @Valid + @NotEmpty(message = "issueIds不能为空") + private List issueIds; +} + diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java index 58f010561f..097dbeba8c 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java @@ -423,4 +423,13 @@ public interface GovIssueOpenFeignClient { */ @PostMapping("/gov/issue/issueprocess/issueprocess") Result queryIssueProcess(@RequestBody IssueIdFormDTO formDTO); + + /** + * 删除事件时，事件转了议题，调用此方法，删除议题 + * 批量删除议题（议题如果转了项目，此方法不删除项目！） + * @param delIssueFormDTO + * @return 删除的议题中，转为了项目，返回议题id，上层再单独去删除项目 + */ + @PostMapping("/gov/issue/issue/deleteIssueInternal") + Result> deleteIssueInternal(@RequestBody DelIssueFormDTO delIssueFormDTO); } diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java index 590afb6b41..b76d3ce734 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java @@ -365,4 +365,15 @@ public class GovIssueOpenFeignClientFallBack implements GovIssueOpenFeignClient return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "queryIssueProcess", formDTO); } + /** + * 删除事件时，事件转了议题，调用此方法，删除议题 + * 批量删除议题（议题如果转了项目，此方法不删除项目！） + * + * @param delIssueFormDTO + * @return 删除的议题中，转为了项目，返回项目id，上层再单独去删除项目 + */ + @Override + public Result> deleteIssueInternal(DelIssueFormDTO delIssueFormDTO) { + return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "deleteIssueInternal", delIssueFormDTO); + } } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java index f9cc14f21b..efb1ede9f1 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java @@ -403,5 +403,17 @@ public class IssueController { ValidatorUtils.validateEntity(issueFormDTO, PublishIssueFormDTO.AddUserShowGroup.class); return new Result().ok(issueService.publishIssue(issueFormDTO)); } + + /** + * 删除事件时，事件转了议题，调用此方法，删除议题 + * 批量删除议题（议题如果转了项目，此方法不删除项目！） + * @param delIssueFormDTO + * @return 删除的议题中，转为了项目，返回项目id，上层再单独去删除项目 + */ + @PostMapping("deleteIssueInternal") + public Result> deleteIssueInternal(@RequestBody DelIssueFormDTO delIssueFormDTO){ + ValidatorUtils.validateEntity(delIssueFormDTO); + return new Result>().ok(issueService.deleteIssueInternal(delIssueFormDTO)); + } } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueCategoryService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueCategoryService.java index 5717b27db0..489470c850 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueCategoryService.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueCategoryService.java @@ -27,6 +27,7 @@ import com.epmet.dto.result.IssueCategoryTagListResultDTO; import com.epmet.dto.result.ProjectCategoryTagResultDTO; import com.epmet.entity.IssueCategoryEntity; +import java.util.Date; import java.util.List; import java.util.Map; @@ -132,4 +133,5 @@ public interface IssueCategoryService extends BaseService { **/ void saveCategory(IssueSaveCategoryFormDTO formDTO); + void delByIssueId(String issueId, String userId, Date delTime); } \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java index 6fb256e35e..4ccd839e72 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java @@ -13,7 +13,6 @@ import com.epmet.resi.group.dto.group.result.GroupClosedListResultDTO; import com.epmet.resi.group.dto.group.result.GroupShiftProjectListResultDTO; import com.epmet.resi.group.dto.group.result.GroupVotingListResultDTO; import com.epmet.resi.group.dto.topic.form.TopicInfoFormDTO; -import com.github.pagehelper.Page; import javax.servlet.http.HttpServletResponse; import java.io.IOException; @@ -419,4 +418,12 @@ public interface IssueService extends BaseService { * @return */ IssueDTO publishIssue(PublishIssueFormDTO issueFormDTO); + + /** + * 删除事件时，事件转了议题，调用此方法，删除议题 + * 批量删除议题（议题如果转了项目，此方法不删除项目！） + * @param delIssueFormDTO + * @return 删除的议题中，转为了项目，返回议题id，上层再单独去删除项目 + */ + List deleteIssueInternal(DelIssueFormDTO delIssueFormDTO); } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueTagsService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueTagsService.java index b7970e8793..a99f1a96c7 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueTagsService.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueTagsService.java @@ -26,6 +26,7 @@ import com.epmet.dto.form.IssueTagsSaveFormDTO; import com.epmet.dto.result.AddTagResultDTO; import com.epmet.entity.IssueTagsEntity; +import java.util.Date; import java.util.List; import java.util.Map; @@ -122,4 +123,6 @@ public interface IssueTagsService extends BaseService { * @date 2020/12/10 上午9:37 */ void issueTagSave(IssueTagsSaveFormDTO form, TokenDto tokenDto); + + void delByIssueId(String issueId, String userId, Date delTime); } \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueCategoryServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueCategoryServiceImpl.java index c86e5d926d..6953874ade 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueCategoryServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueCategoryServiceImpl.java @@ -18,6 +18,7 @@ package com.epmet.service.impl; 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.tools.constant.FieldConstant; @@ -44,10 +45,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; /** @@ -224,4 +222,13 @@ public class IssueCategoryServiceImpl extends BaseServiceImpl wrapper = new LambdaUpdateWrapper(); + wrapper.eq(IssueCategoryEntity::getIssueId, issueId) + .set(IssueCategoryEntity::getUpdatedTime, delTime) + .set(IssueCategoryEntity::getUpdatedBy, userId) + .set(IssueCategoryEntity::getDelFlag, NumConstant.ONE_STR); + baseDao.update(null, wrapper); + } } \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java index abfedfdb21..312f76cab2 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java @@ -5,6 +5,7 @@ import com.alibaba.excel.write.metadata.WriteSheet; import com.alibaba.fastjson.JSON; import com.alibaba.nacos.client.utils.StringUtils; 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.baomidou.mybatisplus.core.toolkit.IdWorker; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; @@ -2155,4 +2156,39 @@ public class IssueServiceImpl extends BaseServiceImpl imp issueDTO.setIssueId(issueEntity.getId()); return issueDTO; } + + /** + * 删除事件时，事件转了议题，调用此方法，删除议题 + * 批量删除议题（议题如果转了项目，此方法不删除项目！） + * 删除issue、issue_category、issue_tags + * @param delIssueFormDTO + * @return 删除的议题中，转为了项目，返回议题id，上层再单独去删除项目 + */ + @Transactional(rollbackFor = Exception.class) + @Override + public List deleteIssueInternal(DelIssueFormDTO delIssueFormDTO) { + List shiftProjectIssueIds = new ArrayList<>(); + Date nowTime = new Date(); + for (String issueId : delIssueFormDTO.getIssueIds()) { + IssueEntity issueEntity = baseDao.selectById(issueId); + if (null == issueEntity) { + continue; + } + // 删除议题主表 + LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper(); + wrapper.eq(IssueEntity::getId, issueId) + .set(IssueEntity::getUpdatedTime, nowTime) + .set(IssueEntity::getUpdatedBy, delIssueFormDTO.getUserId()) + .set(IssueEntity::getDelFlag, NumConstant.ONE_STR); + baseDao.update(null, wrapper); + // 删除议题分类关系表 + issueCategoryService.delByIssueId(issueId, delIssueFormDTO.getUserId(), nowTime); + // 删除议题标签关系表 + issueTagsService.delByIssueId(issueId, delIssueFormDTO.getUserId(), nowTime); + if ("shift_project".equals(issueEntity.getIssueStatus())) { + shiftProjectIssueIds.add(issueEntity.getId()); + } + } + return shiftProjectIssueIds; + } } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueTagsServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueTagsServiceImpl.java index 1d24217321..c1b7a5c69e 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueTagsServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueTagsServiceImpl.java @@ -18,6 +18,7 @@ package com.epmet.service.impl; 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.tools.constant.FieldConstant; @@ -49,6 +50,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import java.util.Arrays; +import java.util.Date; import java.util.List; import java.util.Map; @@ -244,4 +246,13 @@ public class IssueTagsServiceImpl extends BaseServiceImpl wrapper = new LambdaUpdateWrapper(); + wrapper.eq(IssueTagsEntity::getIssueId, issueId) + .set(IssueTagsEntity::getUpdatedTime, delTime) + .set(IssueTagsEntity::getUpdatedBy, userId) + .set(IssueTagsEntity::getDelFlag, NumConstant.ONE_STR); + baseDao.update(null, wrapper); + } } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectCategoryService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectCategoryService.java index 9ae8a7fdee..4940a4fbb1 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectCategoryService.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectCategoryService.java @@ -26,6 +26,7 @@ import com.epmet.dto.form.ProjectSaveCategoryFormDTO; import com.epmet.dto.result.ProjectCategoryTagListResultDTO; import com.epmet.entity.ProjectCategoryEntity; +import java.util.Date; import java.util.List; import java.util.Map; import java.util.Set; @@ -136,4 +137,13 @@ public interface ProjectCategoryService extends BaseService> getProjectCategoryMap(List projectIds); + + /** + * 根据项目id,删除项目分类，记录删除人、删除时间 + * @param projectId + * @param userId + * @param delTime + * @return + */ + int delByProjectId(String projectId, String userId, Date delTime); } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java index 62c0040244..33a42bb28f 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java @@ -399,11 +399,10 @@ public interface ProjectService extends BaseService { PageData orgProjectList(OrgProjectListFormDTO formDTO); /** - * desc:根据来源id和类型 删除项目 （只删了主表） + * desc:根据来源id和类型 删除项目 （只删了主表、项目分类表） * @param originId * @param origin * @return */ Integer deleteByOriginId(String originId, String origin); - } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java index 715fafd992..abddc4c099 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java @@ -471,8 +471,16 @@ public class IcEventServiceImpl extends BaseServiceImpl effectRow = epmetHeartOpenFeignClient.deleteUserDemandByOriginId(entity.getId(), ProjectOriginEnum.IC_EVENT.getCode()); // log.info("delete userDemand result:{},eventId:{}", effectRow, id); } else if(NumConstant.THREE_STR.equals(entity.getOperationType())){ - // 删除议题 - // todo + DelIssueFormDTO delIssueFormDTO = new DelIssueFormDTO(); + delIssueFormDTO.setCustomerId(delIssueFormDTO.getCustomerId()); + delIssueFormDTO.setUserId(loginUserUtil.getLoginUserId()); + delIssueFormDTO.setIssueIds(Arrays.asList(entity.getOperationId())); + // 删除议题, 议题转了项目的，再单独去删除项目 + Result> delIssueRes = govIssueOpenFeignClient.deleteIssueInternal(delIssueFormDTO); + if(delIssueRes.success()&&!CollectionUtils.isEmpty(delIssueRes.getData())){ + // 议题被转了项目，需要删除项目 + SpringContextUtils.getBean(ProjectService.class).deleteByOriginId(delIssueRes.getData().get(0), ProjectOriginEnum.ISSUE.getCode()); + } } LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper(); wrapper.eq(IcEventEntity::getId,id).set(IcEventEntity::getUpdatedTime,new Date()) diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectCategoryServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectCategoryServiceImpl.java index 91d609d8e2..4caf803355 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectCategoryServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectCategoryServiceImpl.java @@ -19,6 +19,7 @@ package com.epmet.service.impl; 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.tools.constant.FieldConstant; @@ -244,4 +245,20 @@ public class ProjectCategoryServiceImpl extends BaseServiceImpl wrapper = new LambdaUpdateWrapper(); + wrapper.eq(ProjectCategoryEntity::getProjectId, projectId) + .set(ProjectCategoryEntity::getUpdatedTime,delTime) + .set(ProjectCategoryEntity::getUpdatedBy,userId) + .set(ProjectCategoryEntity::getDelFlag,NumConstant.ONE_STR); + return baseDao.update(null, wrapper); + } } \ No newline at end of file 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 0da1d55bb8..80d682cdff 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,6 +19,7 @@ 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; @@ -3615,16 +3616,31 @@ public class ProjectServiceImpl extends BaseServiceImpl(list, pageInfo.getTotal()); } + /** + * 根据项目来源id, 删除项目主表，项目分类关系表 + * @param originId + * @param origin + * @return + */ + @Transactional(rollbackFor = Exception.class) @Override public Integer deleteByOriginId(String originId, String origin) { - LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper(); - wrapper.eq(ProjectEntity::getOriginId, originId) - .eq(ProjectEntity::getOrigin,origin) - .set(ProjectEntity::getUpdatedTime,new Date()) - .set(ProjectEntity::getUpdatedBy,loginUserUtil.getLoginUserId()) - .set(ProjectEntity::getDelFlag,NumConstant.ONE_STR); - return baseDao.update(null, wrapper); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper(); + queryWrapper.eq(ProjectEntity::getOriginId, originId) + .eq(ProjectEntity::getOrigin, origin); + ProjectEntity projectEntity = baseDao.selectOne(queryWrapper); + if (null != projectEntity) { + Date nowTime = new Date(); + LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper(); + wrapper.eq(ProjectEntity::getId, projectEntity.getId()) + .set(ProjectEntity::getUpdatedTime, nowTime) + .set(ProjectEntity::getUpdatedBy, loginUserUtil.getLoginUserId()) + .set(ProjectEntity::getDelFlag, NumConstant.ONE_STR); + baseDao.update(null, wrapper); + projectCategoryService.delByProjectId(projectEntity.getId(), loginUserUtil.getLoginUserId(), nowTime); + return 1; + } + return 0; } - }