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

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

@@ -21,17 +21,17 @@ public class AddMaterialTaskDto implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    /**
+     * 任务名称
+     */
+    @ApiModelProperty("任务名称")
+    private String name;
     /**
     * 材料提交任务类型(material_type)
     */
     @ApiModelProperty("材料提交任务类型(material_type)")
     private Long materialTypeId;
     /**
-    * 任务名称
-    */
-    @ApiModelProperty("任务名称")
-    private String name;
-    /**
     * 状态 1=未开始 2=进行中 3=结束
     */
     @ApiModelProperty("状态 1=未开始 2=进行中 3=结束")

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

@@ -108,8 +108,8 @@ public class MaterialTypeServiceImpl extends MPJBaseServiceImpl<MaterialTypeMapp
         queryWrapper
                 .orderByDesc(MaterialType::getId)
                 .select(MaterialType.class,x -> VoToColumnUtil.fieldsToColumns(MaterialTypePageVo.class).contains(x.getProperty()))
-                .like(dto.getName() != null && dto.getName().equals(""), MaterialType::getName, dto.getName())
-                .eq(dto.getMaterialCategory() != null && dto.getMaterialCategory().equals(""), MaterialType::getMaterialCategory, dto.getMaterialCategory());
+                .like(dto.getName() != null && !dto.getName().equals(""), MaterialType::getName, dto.getName())
+                .eq(dto.getMaterialCategory() != null && !dto.getMaterialCategory().equals(""), MaterialType::getMaterialCategory, dto.getMaterialCategory());
         IPage<MaterialType> page = this.page(ConventPage.getPage(dto), queryWrapper);
         PageOutput<MaterialTypePageVo> pageOutput = ConventPage.getPageOutput(page, MaterialTypePageVo.class);
 

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

@@ -133,6 +133,11 @@ public class WorkflowExecuteController {
         return R.ok(workflowExecuteService.newApprove(dto));
     }
 
+    @PostMapping("/check-audited")
+    @ApiOperation(value = "检查是否已经审核")
+    public R checkAudited(@Valid @RequestBody ApproveDto dto) {
+        return R.ok(workflowExecuteService.checkAudited(dto));
+    }
 
     @GetMapping("/approve/multi-info")
     @ApiOperation(value = "批量审批获取流程信息")

src/main/java/com/xjrsoft/module/workflow/service/IWorkflowExecuteService.java

@@ -114,6 +114,8 @@ public interface IWorkflowExecuteService {
      */
     List<LaunchAndApproveVo> newApprove(ApproveDto dto);
 
+    Boolean checkAudited(ApproveDto dto);
+
 
     List<ApproveMultiVo> approveMulti(ApproveMultiDto dto);
 

src/main/java/com/xjrsoft/module/workflow/service/impl/WorkflowExecuteServiceImpl.java

@@ -2034,6 +2034,17 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
         return result;
     }
 
+    @Override
+    public Boolean checkAudited(ApproveDto dto) {
+        //根据taskid  获取任务信息
+        Task task = taskService.createTaskQuery().taskId(dto.getTaskId()).singleResult();
+
+        if (task == null) {
+            return false;
+        }
+        return true;
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public List<ApproveMultiVo> approveMulti(ApproveMultiDto dto) {