From 6242f3fd2880fd1139f14ebcbc849de6b7443270 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 27 Oct 2022 14:13:25 +0800 Subject: [PATCH] 2 --- .../IcGroupPeopleRegisterController.java | 10 ++++++-- .../service/IcGroupPeopleRegisterService.java | 2 +- .../IcGroupPeopleRegisterServiceImpl.java | 25 ++++++++++++++----- .../mapper/IcEmployeeRegisterDao.xml | 2 +- 4 files changed, 29 insertions(+), 10 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcGroupPeopleRegisterController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcGroupPeopleRegisterController.java index f618805920..01b394c759 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcGroupPeopleRegisterController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcGroupPeopleRegisterController.java @@ -69,9 +69,15 @@ public class IcGroupPeopleRegisterController { return new Result(); } + /** + * 受众群体管理删除 + * http://yapi.elinkservice.cn/project/102/interface/api/8250 + * @param ids + * @return + */ @PostMapping("delete") - public Result delete(@RequestBody List ids){ - icGroupPeopleRegisterService.delete(ids); + public Result delete(@LoginUser TokenDto tokenDto,@RequestBody List ids){ + icGroupPeopleRegisterService.delete(ids,tokenDto.getUserId()); return new Result(); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcGroupPeopleRegisterService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcGroupPeopleRegisterService.java index bf9da45602..9dcad3b267 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcGroupPeopleRegisterService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcGroupPeopleRegisterService.java @@ -75,7 +75,7 @@ public interface IcGroupPeopleRegisterService extends BaseService ids); + void delete(List ids,String operUserId); /** * @Description 受众群体列表 diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcGroupPeopleRegisterServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcGroupPeopleRegisterServiceImpl.java index abb40f2269..e0ca969f52 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcGroupPeopleRegisterServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcGroupPeopleRegisterServiceImpl.java @@ -1,18 +1,19 @@ 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; +import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.dao.IcGroupPeopleRegisterDao; import com.epmet.dto.IcGroupPeopleRegisterDTO; import com.epmet.dto.form.GroupPeopleRegisterListFormDTO; -import com.epmet.dto.result.EmployeeRegisterListResultDTO; import com.epmet.dto.result.GroupPeopleRegisterListResultDTO; import com.epmet.entity.IcGroupPeopleRegisterEntity; import com.epmet.service.IcGroupPeopleRegisterService; @@ -20,11 +21,10 @@ import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.Arrays; +import java.util.Date; import java.util.List; import java.util.Map; @@ -82,11 +82,24 @@ public class IcGroupPeopleRegisterServiceImpl extends BaseServiceImpl ids) { + public void delete(List ids,String operUserId) { if (CollectionUtils.isNotEmpty(ids)){ - baseDao.deleteBatchIds(ids); + LambdaUpdateWrapper updateWrapper=new LambdaUpdateWrapper<>(); + updateWrapper.in(IcGroupPeopleRegisterEntity::getId,ids) + .set(IcGroupPeopleRegisterEntity::getUpdatedBy,operUserId) + .set(IcGroupPeopleRegisterEntity::getUpdatedTime,new Date()) + .set(IcGroupPeopleRegisterEntity::getDelFlag, NumConstant.ONE_STR); + baseDao.update(null,updateWrapper); + // baseDao.deleteBatchIds(ids); } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml index 62e0750a54..fcb029f4e1 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml @@ -98,6 +98,6 @@ AND DATE_FORMAT(rd.LATEST_NAT_TIME,'%Y-%m-%d') #{natEndDate} - ORDER BY LATEST_NAT_TIME DESC + ORDER BY rd.LATEST_NAT_TIME DESC,rd.CREATED_TIME desc \ No newline at end of file