改bug：删除计划时，记录操作人员姓名

src/main/java/com/wangxiaolu/promotion/controller/activityplanv2/PromPlanCoreController.java

@@ -167,7 +167,7 @@ public class PromPlanCoreController {
         if (isAuth) {
             employeeNo = "";
         }
-        promPlanCoreService.deletePlan(activityPlanVo.getPlanIds(), employeeNo);
+        promPlanCoreService.deletePlan(activityPlanVo.getPlanIds(), employeeNo,activityPlanVo.getEmployeeNo());
         return R.success();
     }
 

src/main/java/com/wangxiaolu/promotion/domain/activityplanv2/dao/ActivityPlanInfoDao.java

@@ -21,7 +21,7 @@ public interface ActivityPlanInfoDao {
 
     ActivityPlanInfoDto selectPlan(String storeCode, Date date);
 
-    void deleteByPlanIds(List<Long> planIds, String employeeNo);
+    void deleteByPlanIds(List<Long> planIds, String employeeNo,String operNo);
 
     void updateList(JSONArray table, Long recordId);
 

src/main/java/com/wangxiaolu/promotion/domain/activityplanv2/dao/impl/ActivityPlanInfoDaoImpl.java

@@ -115,7 +115,7 @@ public class ActivityPlanInfoDaoImpl implements ActivityPlanInfoDao {
     }
 
     @Override
-    public void deleteByPlanIds(List<Long> planIds, String employeeNo) {
+    public void deleteByPlanIds(List<Long> planIds, String employeeNo,String operNo) {
         // 判断ID中是否包含之前数据、非个人数据
         Integer count = activityPlanInfoMapper.selectNotDelCount(planIds,employeeNo);
         if (count > 0 ) {
@@ -131,7 +131,7 @@ public class ActivityPlanInfoDaoImpl implements ActivityPlanInfoDao {
                 throw new FlowException(RCode.ACTIVITY_PLAN_ID_NOT_DELETE.getCode(),String.format(RCode.ACTIVITY_PLAN_ID_NOT_DELETE.getMsg(),todayPlan.getId()));
             }
         }
-        activityPlanInfoMapper.updateIsDelete(planIds);
+        activityPlanInfoMapper.updateIsDelete(planIds,operNo);
     }
     private LambdaQueryWrapper<ActivityPlanInfoDo> buildWrapper(ActivityPlanInfoWrapper wrapper) {
         LambdaQueryWrapper<ActivityPlanInfoDo> qw = new LambdaQueryWrapper<>();

src/main/java/com/wangxiaolu/promotion/domain/activityplanv2/mapper/ActivityPlanInfoMapper.java

@@ -26,7 +26,7 @@ public interface ActivityPlanInfoMapper extends BaseMapper<ActivityPlanInfoDo> {
 
     ActivityPlanInfoDo selectPlan(String storeCode, Date date);
 
-    void updateIsDelete(List<Long> planIds);
+    void updateIsDelete(@Param("planIds") List<Long> planIds,@Param("employeeNo") String employeeNo);
 
     Integer selectNotDelCount(@Param("planIds") List<Long> planIds,@Param("employeeNo") String employeeNo);
 

src/main/java/com/wangxiaolu/promotion/service/activityplanv2/PromPlanCoreService.java

@@ -18,7 +18,7 @@ public interface PromPlanCoreService {
 
     void selfPlanAf(String planUuid);
 
-    void deletePlan(List<Long> planIds,String employeeNo);
+    void deletePlan(List<Long> planIds,String employeeNo,String operNo);
 
     Map<String, Object> authPlanUp(ActivityPlanVo activityPlanVo, String filePath) throws DataException;
 

src/main/java/com/wangxiaolu/promotion/service/activityplanv2/impl/PromPlanCoreServiceImpl.java

@@ -739,7 +739,7 @@ public class PromPlanCoreServiceImpl implements PromPlanCoreService {
     }
 
     @Override
-    public void deletePlan(List<Long> planIds,String employeeNo) {
-        activityPlanInfoDao.deleteByPlanIds(planIds, employeeNo);
+    public void deletePlan(List<Long> planIds,String employeeNo,String operNo) {
+        activityPlanInfoDao.deleteByPlanIds(planIds, employeeNo,operNo);
     }
 }

src/main/resources/mapper/activityplanv2/ActivityPlanInfoMapper.xml

@@ -99,7 +99,8 @@
 
     <update id="updateIsDelete" parameterType="java.util.List">
             update activity_plan_info
-            set is_delete = 0
+            set is_delete = 0,
+            modify_by = (select name from manage_employee_info mei where mei.employee_no = #{employeeNo})
             where id in
             <foreach collection="planIds" item="item" index="index" open="(" close=")" separator=",">
                 #{item}