删除计划做限制计划日期是今日则必需是10点之前，包含过去日期不可删除，非职能角色不可删除他人计划

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

@@ -72,7 +72,6 @@ public class PromPlanCoreController {
      */
     @PostMapping("/auth/upload")
     public R authPlan(@RequestBody ActivityPlanVo activityPlanVo) {
-//         判断当前账号是否是城市经理
         boolean isAuth = manageEmployeeQueryService.isAuth(activityPlanVo.getEmployeeNo());
         if (!isAuth) {
             throw new DataException(RCode.EMP_PRIVILEGE_ERROR);
@@ -148,7 +147,14 @@ public class PromPlanCoreController {
         if (Collections.isEmpty(activityPlanVo.getPlanIds())){
             throw new ParamException(RCode.NEED_PARAM_ERROR);
         }
-        promPlanCoreService.deletePlan(activityPlanVo.getPlanIds());
+
+        // 判断当前账号是否是职能角色
+        String employeeNo = activityPlanVo.getEmployeeNo();
+        boolean isAuth = manageEmployeeQueryService.isAuth(employeeNo);
+        if (isAuth) {
+            employeeNo = "";
+        }
+        promPlanCoreService.deletePlan(activityPlanVo.getPlanIds(), employeeNo);
         return R.success();
     }
 

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

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

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

@@ -19,7 +19,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalTime;
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
@@ -77,11 +76,15 @@ public class ActivityPlanInfoDaoImpl implements ActivityPlanInfoDao {
     }
 
     @Override
-    public void deleteByPlanIds(List<Long> planIds) {
-        // 判断ID中是否包含今日数据
-        Integer count = activityPlanInfoMapper.selectNotDelCount(planIds);
+    public void deleteByPlanIds(List<Long> planIds, String employeeNo) {
+        // 判断ID中是否包含之前数据、非个人数据
+        Integer count = activityPlanInfoMapper.selectNotDelCount(planIds,employeeNo);
+        if (count > 0 ) {
+            throw new DataException(RCode.ACTIVITY_PLAN_NOT_SELF_DELETE);
+        }
+        Integer countToday = activityPlanInfoMapper.selectTodayCount(planIds);
         // 今日数据存在时，判断当前时间是否在今日10点前
-        if (count > 0 && (LocalTime.now().getHour() >= 10)) {
+        if (countToday > 0 && (LocalTime.now().getHour() >= 10)) {
             throw new DataException(RCode.ACTIVITY_PLAN_NOT_DELETE);
         }
         activityPlanInfoMapper.updateIsDelete(planIds);

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

@@ -26,9 +26,12 @@ public interface ActivityPlanInfoMapper extends BaseMapper<ActivityPlanInfoDo> {
 
     void updateIsDelete(List<Long> planIds);
 
-    Integer selectNotDelCount(@Param("planIds") List<Long> planIds);
+    Integer selectNotDelCount(@Param("planIds") List<Long> planIds,@Param("employeeNo") String employeeNo);
 
     void updateOne(@Param("pDo") ActivityPlanInfoDo pDo,@Param("recordId") Long recordId);
+
+    Integer selectTodayCount(List<Long> planIds);
+
 }
 
 

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

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

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

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

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

@@ -107,6 +107,20 @@
     </update>
 
     <select id="selectNotDelCount" resultType="java.lang.Integer">
+        select count(*)
+        from activity_plan_info
+        where id in
+        <foreach collection="planIds" item="item" index="index" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+        and is_delete = 1
+        and date &lt; date_format(now(),'%Y-%m-%d')
+        <if test="employeeNo != null and employeeNo != ''">
+           or employee_no != #{employeeNo}
+        </if>
+    </select>
+
+    <select id="selectTodayCount" resultType="java.lang.Integer">
         select count(*)
         from activity_plan_info
         where  id in
@@ -114,7 +128,7 @@
             #{item}
           </foreach>
           and is_delete = 1
-          and date &lt;= now()
+          and date = date_format(now(),'%Y-%m-%d')
     </select>
 
     <update id="updateOne">