Browse Source

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

大数据与最优化研究所 1 year ago
parent
commit
ec8fab07d0

+ 4 - 4
src/main/java/com/xjrsoft/module/material/dto/AddMaterialTaskDto.java

@@ -32,10 +32,10 @@ public class AddMaterialTaskDto implements Serializable {
     @ApiModelProperty("材料提交任务类型(material_type)")
     private Long materialTypeId;
     /**
-    * 状态 1=未开始 2=进行中 3=结束
-    */
-    @ApiModelProperty("状态 1=未开始 2=进行中 3=结束")
-    private Integer status;
+     * 任务类型(可多选 xjr_dictionary_detail[material_category])
+     */
+    @ApiModelProperty("任务类型(可多选 xjr_dictionary_detail[material_category])")
+    private String materialCategory;
     /**
     * 要求完成日期
     */

+ 2 - 2
src/main/java/com/xjrsoft/module/workflow/controller/WorkflowExecuteController.java

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

+ 1 - 1
src/main/java/com/xjrsoft/module/workflow/service/IWorkflowExecuteService.java

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

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

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