feat：拒绝任务释放积分包标记

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/manager/TaskManager.java

@@ -342,10 +342,10 @@ public class TaskManager {
     Integer userId = user.getId();
     //    int userId = 1;
 
-    Set<Integer> collect = userAreaService.listUserDept((long) userId, AreaType.DISTRICT.getType())
-        .stream()
-        .map(Long::intValue)
-        .collect(Collectors.toSet());
+    Set<Integer> collect =
+        userAreaService.listUserDept((long) userId, AreaType.DISTRICT.getType()).stream()
+            .map(Long::intValue)
+            .collect(Collectors.toSet());
 
     // 指定查询企业
     if (vendorId != null) {
@@ -491,6 +491,25 @@ public class TaskManager {
               .set(WmScorePackageStatus::getUpdateUser, user.getId())
               .eq(WmScorePackageStatus::getPackageId, task.getScorePackageId()));
     }
+
+    // 拒绝的需要释放
+    if (!checkResult) {
+      // 更新包信息
+      scorePackageService.update(
+          Wrappers.<WmScorePackage>lambdaUpdate()
+              .set(WmScorePackage::getTaskAddFlag, AddTaskState.ENABLE.getState())
+              .set(WmScorePackage::getUpdateTime, now)
+              .set(WmScorePackage::getUpdateUser, user.getId())
+              .eq(WmScorePackage::getId, task.getScorePackageId()));
+
+      // 更新领取信息
+      scorePackageStatusService.update(
+          Wrappers.<WmScorePackageStatus>lambdaUpdate()
+              .set(WmScorePackageStatus::getTaskAddFlag, AddTaskState.ENABLE.getState())
+              .set(WmScorePackageStatus::getUpdateTime, now)
+              .set(WmScorePackageStatus::getUpdateUser, user.getId())
+              .eq(WmScorePackageStatus::getPackageId, task.getScorePackageId()));
+    }
   }
 
   private Map<String, Integer> calcTotalScoreAndCount(String scorePackageId) {
@@ -655,13 +674,13 @@ public class TaskManager {
     checkChainManager.doCheck(checkHis, user);
 
     // 最后一层审核通过
+    Integer userId = user.getId();
     if (checkResult && checkReq.getNodeId() == 6) {
 
       Map<String, WmScorePackage> id2EntityMap =
           scorePackage.stream()
               .collect(Collectors.toMap(WmScorePackage::getId, Function.identity()));
 
-      Integer userId = user.getId();
       pkgId2TasksMap.forEach(
           (k, v) -> {
             // 查询已提交的任务（除去审核不通过的任务）& 统计判断任务累计积分是否达到积分包的预设值
@@ -694,6 +713,30 @@ public class TaskManager {
                     .eq(WmScorePackageStatus::getPackageId, k));
           });
     }
+
+    // 拒绝的需要释放
+    if (!checkResult) {
+
+      pkgId2TasksMap.forEach(
+          (k, v) -> {
+
+            // 更新包信息
+            scorePackageService.update(
+                Wrappers.<WmScorePackage>lambdaUpdate()
+                    .set(WmScorePackage::getTaskAddFlag, AddTaskState.ENABLE.getState())
+                    .set(WmScorePackage::getUpdateTime, now)
+                    .set(WmScorePackage::getUpdateUser, userId)
+                    .eq(WmScorePackage::getId, k));
+
+            // 更新领取信息
+            scorePackageStatusService.update(
+                Wrappers.<WmScorePackageStatus>lambdaUpdate()
+                    .set(WmScorePackageStatus::getTaskAddFlag, AddTaskState.ENABLE.getState())
+                    .set(WmScorePackageStatus::getUpdateTime, now)
+                    .set(WmScorePackageStatus::getUpdateUser, userId)
+                    .eq(WmScorePackageStatus::getPackageId, k));
+          });
+    }
   }
 
   private void validateTaskDetails1(List<WmTask> tasks, List<String> targetIds) {
@@ -782,11 +825,11 @@ public class TaskManager {
 
     // 获取当前操作人的审核记录
     List<Integer> tIds = Collections.emptyList();
-//        listChecked(new Page<>(query.getCurrent(), query.getSize()), null);
+    //        listChecked(new Page<>(query.getCurrent(), query.getSize()), null);
 
-//    if (CollUtil.isEmpty(tIds)) {
-//      return checkPage;
-//    }
+    //    if (CollUtil.isEmpty(tIds)) {
+    //      return checkPage;
+    //    }
 
     // 获取vendor
     List<Integer> vendorList = getVendorList(query.getVendorId(), user);