2

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<String> ids){
+    public Result delete(@LoginUser TokenDto tokenDto,@RequestBody List<String> ids){
-        icGroupPeopleRegisterService.delete(ids);
+        icGroupPeopleRegisterService.delete(ids,tokenDto.getUserId());
         return new Result();
     }
 

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcGroupPeopleRegisterService.java

@@ -75,7 +75,7 @@ public interface IcGroupPeopleRegisterService extends BaseService<IcGroupPeopleR
      * @author generator
      * @date 2022-10-26
      */
-    void delete(List<String> ids);
+    void delete(List<String> ids,String operUserId);
 
     /**
      * @Description 受众群体列表

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<IcGroupPeo
         updateById(entity);
     }
 
+    /**
+     * 受众群体管理删除
+     * http://yapi.elinkservice.cn/project/102/interface/api/8250
+     * @param ids
+     * @param operUserId 当前操作人
+     * @return
+     */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void delete(List<String> ids) {
+    public void delete(List<String> ids,String operUserId) {
         if (CollectionUtils.isNotEmpty(ids)){
-            baseDao.deleteBatchIds(ids);
+            LambdaUpdateWrapper<IcGroupPeopleRegisterEntity> 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);
         }
     }
 

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEmployeeRegisterDao.xml

@@ -98,6 +98,6 @@
           <if test='null != natEndDate and natEndDate != "" '>
               AND DATE_FORMAT(rd.LATEST_NAT_TIME,'%Y-%m-%d') <![CDATA[<=]]> #{natEndDate}
           </if>
-        ORDER BY LATEST_NAT_TIME DESC
+        ORDER BY rd.LATEST_NAT_TIME DESC,rd.CREATED_TIME desc
     </select>
 </mapper>