update 保存草稿

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

@@ -120,12 +120,6 @@ 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,7 +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.isNull(ProcessDraft::getTaskId);
         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

@@ -66,9 +66,6 @@ public class ProcessHandleServiceImpl implements IProcessHandleService{
     @Resource
     private ProcessDraftService processDraftService; // 流程草稿表
 
-    private static final String SAVE_BY_DRAFT = "2";
-    private static final String SAVE_BY_TASK = "1";
-
     /**
      * @Author: liao
      * @Date: 2023/11/2 17:04
@@ -354,7 +351,7 @@ public class ProcessHandleServiceImpl implements IProcessHandleService{
 
         // 删除自己的草稿
         deleteMyDraft(taskId, processInfoVO.getBusinessId(), basicProcessInfoDTO.getProcessType());
-        // 保存来源(1：待办 2：草稿)
+        // 根据是否有taskId区分保存来源(待办、草稿)
         BasicTaskInfoDTO basicTaskInfoDTO1 = processInfoVO.getBasicTaskInfoDTO();
         ProcessDraft processDraft = new ProcessDraft();
         processDraft.setProjectId(processInfoVO.getBusinessId()); // 业务id
@@ -368,7 +365,6 @@ 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);
     }