合并分支 'feature_dev_20221008_TODO' 到 'master'

Feature dev 20221008 todo 查看合并请求 laws-nio/laws-weilai!238
2022-11-04 18:05:02 +08:00
parent b25cff8964 18eb5b1710
commit 06ef963a48
2 changed files with 2 additions and 0 deletions
@@ -7,6 +7,7 @@ public enum TaskStatusEnum {

    NOT_DONE("待办","NotDone"), // 未完成
    HAVE_DONE("已办","haveDone"), // 已完成
+    HAVE_SENT("已发","haveSent"), // 已发
    SHOW_FLAG("展示数据","showData") // 展示数据
    ;

@@ -238,6 +238,7 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl<ProcessInfoEOMapper, P
 		params.put("flowTypeList",flowTypeList);
 		params.put("currentUserId",currentUser.getId());
 		params.put("queryType","issuedProcess");
+		params.put("taskStatus", TaskStatusEnum.HAVE_DONE.getValue());

 		IPage page = new Page(pageNo, pageSize);
 		IPage<ProcessInfoVO> result = this.baseMapper.queryProjectProcessPageList(page,params);