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

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

@@ -67,12 +67,16 @@ public class AddMaterialTaskDto implements Serializable {
     */
     @ApiModelProperty("延迟提交")
     private Integer timeDelay;
-
+    /**
+     * 状态 1=未开始 2=进行中 3=结束
+     */
+    @ApiModelProperty("状态 1=未开始 2=进行中 3=结束")
+    private Integer status;
     /**
     * materialTaskAssign
     */
-//    @ApiModelProperty("materialTaskAssign子表")
-//    private List<AddMaterialTaskAssignDto> materialTaskAssignList;
+    @ApiModelProperty("materialTaskAssign子表")
+    private List<AddMaterialTaskAssignDto> materialTaskAssignList;
     /**
     * materialTaskAppendix
     */

src/main/java/com/xjrsoft/module/material/entity/MaterialTask.java

@@ -78,6 +78,11 @@ public class MaterialTask implements Serializable {
     */
     @ApiModelProperty("材料提交任务类型(material_type)")
     private Long materialTypeId;
+    /**
+     * 任务类型(可多选 xjr_dictionary_detail[material_category])
+     */
+    @ApiModelProperty("任务类型(可多选 xjr_dictionary_detail[material_category])")
+    private String materialCategory;
     /**
     * 任务名称
     */

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

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

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

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

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

@@ -2035,7 +2035,7 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
     }
 
     @Override
-    public Boolean checkAudited(Long taskId) {
+    public Boolean checkAudited(String taskId) {
         //根据taskid  获取任务信息
         Task task = taskService.createTaskQuery().taskId(String.valueOf(taskId)).singleResult();