/check-audited 判断该任务节点是否已经审核

src/main/java/com/xjrsoft/module/material/controller/MaterialTaskController.java

@@ -166,8 +166,7 @@ public class MaterialTaskController {
     @ApiOperation(value = "新增材料提交任务")
     @SaCheckPermission("materialtask:add")
     public RT<Long> add(@Valid @RequestBody AddMaterialTaskDto dto) {
-        MaterialTask materialTask = BeanUtil.toBean(dto, MaterialTask.class);
-        return RT.ok(materialTaskService.add(materialTask));
+        return RT.ok(materialTaskService.add(dto));
     }
 
     @PutMapping

src/main/java/com/xjrsoft/module/material/dto/AddMaterialTaskDto.java

@@ -75,8 +75,18 @@ public class AddMaterialTaskDto implements Serializable {
     /**
     * materialTaskAssign
     */
-    @ApiModelProperty("materialTaskAssign子表")
-    private List<AddMaterialTaskAssignDto> materialTaskAssignList;
+//    @ApiModelProperty("materialTaskAssign子表")
+//    private List<AddMaterialTaskAssignDto> materialTaskAssignList;
+    /**
+     * 用户列表
+     */
+    @ApiModelProperty("用户列表")
+    private List<MaterialAssignUserDto> userList;
+    /**
+     * 发送消息状态 0=未不发 1=已发送
+     */
+    @ApiModelProperty("发送消息状态 0=未不发 1=已发送")
+    private Integer sendMessageStatus;
     /**
     * materialTaskAppendix
     */

src/main/java/com/xjrsoft/module/material/service/IMaterialTaskService.java

@@ -1,6 +1,7 @@
 package com.xjrsoft.module.material.service;
 
 import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.material.dto.AddMaterialTaskDto;
 import com.xjrsoft.module.material.dto.MaterialTaskAssignAppendixDto;
 import com.xjrsoft.module.material.entity.MaterialTask;
 
@@ -17,10 +18,10 @@ public interface IMaterialTaskService extends MPJBaseService<MaterialTask> {
     /**
     * 新增
     *
-    * @param materialTask
+    * @param dto
     * @return
     */
-    Long add(MaterialTask materialTask);
+    Long add(AddMaterialTaskDto dto);
 
     /**
     * 更新

src/main/java/com/xjrsoft/module/material/service/impl/MaterialTaskServiceImpl.java

@@ -1,8 +1,11 @@
 package com.xjrsoft.module.material.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.xjrsoft.module.material.dto.AddMaterialTaskAppendixDto;
+import com.xjrsoft.module.material.dto.AddMaterialTaskDto;
+import com.xjrsoft.module.material.dto.MaterialAssignUserDto;
 import com.xjrsoft.module.material.dto.MaterialTaskAssignAppendixDto;
 import com.xjrsoft.module.material.entity.MaterialTask;
 import com.xjrsoft.module.material.entity.MaterialTaskAppendix;
@@ -36,19 +39,38 @@ public class MaterialTaskServiceImpl extends MPJBaseServiceImpl<MaterialTaskMapp
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Long add(MaterialTask materialTask) {
-        materialTaskMaterialTaskMapper.insert(materialTask);
-        if (materialTask.getMaterialTaskAssignList() != null && materialTask.getMaterialTaskAssignList().size() > 0) {
-            for (MaterialTaskAssign materialTaskAssign : materialTask.getMaterialTaskAssignList()) {
-                materialTaskAssign.setMaterialTaskId(materialTask.getId());
-                materialTaskMaterialTaskAssignMapper.insert(materialTaskAssign);
-            }
+    public Long add(AddMaterialTaskDto dto) {
+        MaterialTask materialTask = BeanUtil.toBean(dto, MaterialTask.class);
+        materialTask.setStatus(2);
+        if(dto.getUserList() == null && !dto.getUserList().isEmpty()){
+            materialTask.setSubmitedPerson(dto.getUserList().size());
         }
-        for (MaterialTaskAppendix materialTaskAppendix : materialTask.getMaterialTaskAppendixList()) {
-            materialTaskAppendix.setMaterialTaskId(materialTask.getId());
-            materialTaskMaterialTaskAppendixMapper.insert(materialTaskAppendix);
+        materialTaskMaterialTaskMapper.insert(materialTask);
+
+        for (MaterialAssignUserDto materialAssignUserDto : dto.getUserList()){
+            materialTaskMaterialTaskAssignMapper.insert(new MaterialTaskAssign(){{
+                setMaterialTaskId(materialTask.getId());
+                setUserId(materialAssignUserDto.getUserId());
+                setUserType(materialAssignUserDto.getUserType());
+                setUserNumber(materialAssignUserDto.getUserNumber());
+                setStatus(1);
+                setExecutiveStatus(1);
+                setSendMessage(dto.getSendMessageStatus());
+            }});
         }
 
+//        materialTaskMaterialTaskMapper.insert(materialTask);
+//        if (materialTask.getMaterialTaskAssignList() != null && materialTask.getMaterialTaskAssignList().size() > 0) {
+//            for (MaterialTaskAssign materialTaskAssign : materialTask.getMaterialTaskAssignList()) {
+//                materialTaskAssign.setMaterialTaskId(materialTask.getId());
+//                materialTaskMaterialTaskAssignMapper.insert(materialTaskAssign);
+//            }
+//        }
+//        for (MaterialTaskAppendix materialTaskAppendix : materialTask.getMaterialTaskAppendixList()) {
+//            materialTaskAppendix.setMaterialTaskId(materialTask.getId());
+//            materialTaskMaterialTaskAppendixMapper.insert(materialTaskAppendix);
+//        }
+
         return materialTask.getId();
     }
 

src/main/java/com/xjrsoft/module/workflow/controller/WorkflowExecuteController.java

@@ -133,9 +133,9 @@ public class WorkflowExecuteController {
         return R.ok(workflowExecuteService.newApprove(dto));
     }
 
-    @PostMapping("/check-audited")
+    @GetMapping("/check-audited")
     @ApiOperation(value = "检查是否已经审核")
-    public R checkAudited(@Valid @RequestBody String taskId) {
+    public R checkAudited(@RequestParam String taskId) {
         return R.ok(workflowExecuteService.checkAudited(taskId));
     }