update 保存草稿

laws-modules/src/main/java/com/jero/modules/activiti/process/common/entity/ProcessDraft.java

@@ -120,6 +120,12 @@ public class ProcessDraft implements Serializable {
     @ApiModelProperty(value = "草稿信息json字符串")
     private String infoJsonStr;
 
+    /**
+     * 保存来源
+     */
+    @ApiModelProperty(value="保存来源(1：待办 2：草稿)")
+    private String saveSource;
+
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
 }

laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbInfoController.java

@@ -88,6 +88,7 @@ public class ProcessFbInfoController {
                                   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
         LambdaQueryWrapper<ProcessDraft> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(ProcessDraft::getUserId, CurrentUserUtil.getId());
+        queryWrapper.eq(ProcessDraft::getSaveSource, 2);
         queryWrapper.eq(!Objects.isNull(processDraft.getPrcType()), ProcessDraft::getPrcType, processDraft.getPrcType());
         Page<ProcessDraft> page = new Page<>(pageNo, pageSize);
         IPage<ProcessDraft> sentList = processDraftService.page(page, queryWrapper);

laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java

@@ -67,6 +67,7 @@ public class ProcessHandleServiceImpl implements IProcessHandleService{
     private ProcessDraftService processDraftService; // 流程草稿表
 
     private static final String SAVE_BY_DRAFT = "2";
+    private static final String SAVE_BY_TASK = "1";
 
     /**
      * @Author: liao
@@ -353,9 +354,8 @@ public class ProcessHandleServiceImpl implements IProcessHandleService{
 
         // 删除自己的草稿
         deleteMyDraft(taskId, processInfoVO.getBusinessId(), basicProcessInfoDTO.getProcessType());
-        // 非发起节点不保存到草稿
+        // 保存来源(1：待办 2：草稿)
         BasicTaskInfoDTO basicTaskInfoDTO1 = processInfoVO.getBasicTaskInfoDTO();
-        if (StringUtils.isBlank(basicTaskInfoDTO1.getTaskId()) || SAVE_BY_DRAFT.equals(processInfoVO.getSaveSource())){
         ProcessDraft processDraft = new ProcessDraft();
         processDraft.setProjectId(processInfoVO.getBusinessId()); // 业务id
         processDraft.setProcessInstanceId(basicProcessInfoDTO.getProcessInstanceId()); // 流程实例id
@@ -368,10 +368,9 @@ public class ProcessHandleServiceImpl implements IProcessHandleService{
         processDraft.setHandleFile(handleFile); // 流程审批信息-附件
         processDraft.setUserId(CurrentUserUtil.getId()); // 用户id
         processDraft.setInfoJsonStr(processInfoVO.getInfoJsonStr());//草稿信息json字符串
-
+        processDraft.setSaveSource(StringUtils.isNotBlank(taskId) ? SAVE_BY_TASK : SAVE_BY_DRAFT);//保存来源(1：待办 2：草稿)
         processDraftService.save(processDraft);
     }
-    }
 
     @Override
     public ProcessInfoVO getDraftByDraftId(String draftId) {