feat：监督模块支持批量审核

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/dto/WmSupervisionDto.java

@@ -7,8 +7,10 @@ import lombok.NoArgsConstructor;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.time.LocalDate;
+import java.util.Collection;
 import java.util.List;
 
 /**
@@ -111,6 +113,25 @@ public final class WmSupervisionDto {
 
     }
 
+    @Data
+    public static class OnTaskSupervisionBatch {
+
+        @NotEmpty(message = "监督ID必填")
+        private Collection<Long> supervisionIds;
+
+        /**
+         * 监督意见
+         */
+        @NotNull(message = "监督意见必填")
+        private Boolean supervision;
+
+        /**
+         * 备注
+         */
+        private String remarks;
+
+    }
+
     @Data
     public static class OnPkgSupervisionCheck {
 

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmSupervisionController.java

@@ -88,6 +88,16 @@ public class WmSupervisionController {
 
     }
 
+    @SysLog(value = "管理员批量进行服务任务监督")
+    @PostMapping(value = "/supervision/task/create/batch")
+    public R<Boolean> createTaskSupervisionBatch(@Validated @RequestBody WmSupervisionDto.OnTaskSupervisionBatch resource) {
+
+        return R.ok(supervisionManager.doTaskSupervisionBatch(resource, SecurityUtils.getUser()));
+
+    }
+
+
+
     // @SysLog(value = "服务任务监督的审核")
     // @PostMapping(value = "/supervision/task/res/check")
     // public R<Boolean> checkTaskSupervision(@Validated @RequestBody WmSupervisionDto.OnTaskSupervisionCheck resource) {

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

@@ -1551,6 +1551,17 @@ public class WmSupervisionManager {
         return true;
     }
 
+    // 执行任务监察(批量）
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean doTaskSupervisionBatch(WmSupervisionDto.OnTaskSupervisionBatch resource, HnqzUser user) {
+
+        resource.getSupervisionIds().forEach(id -> {
+            taskSupervisionService.updateSupervision(id, resource.getRemarks(), !resource.getSupervision(), user);
+        });
+        return true;
+    }
+
+
     /**
      * 生成报告pdf
      *
@@ -1880,7 +1891,6 @@ public class WmSupervisionManager {
         return datas;
     }
 
-
 //     @Transactional(rollbackFor = Exception.class)
 //     public Boolean checkTaskSupervision(WmSupervisionDto.OnTaskSupervisionCheck resource, HnqzUser user) {
 //         Integer supervisionId = resource.getSupervisionId();

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmTaskContentServiceImpl.java

@@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.ImmutableList;
+import com.qunzhixinxi.hnqz.admin.api.constant.UpmsState;
 import com.qunzhixinxi.hnqz.admin.api.constant.UpmsType;
 import com.qunzhixinxi.hnqz.admin.api.dto.WmTaskDTO;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysUser;