diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/YesOrNoEnum.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/YesOrNoEnum.java index 2b56f4dd2..d224e58a8 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/YesOrNoEnum.java +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/YesOrNoEnum.java @@ -7,7 +7,9 @@ package com.jero.common.constant.enums; */ public enum YesOrNoEnum { NO("否","NO","0"), - YES("是","YES","1"); + YES("是","YES","1"), + CANCEL("取消","",""), + ; String name; diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/DicCodeEnum.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/DicCodeEnum.java index f0f6d460a..b04c520eb 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/DicCodeEnum.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/DicCodeEnum.java @@ -9,6 +9,7 @@ public enum DicCodeEnum { PROBLEM_TYPE("问题类型","1697066042058821634","wen4_ti2_lei4_xing2"), PROBLEM_PRIORITY("问题优先级","1716030928484503553","wen4_ti2_you1_xian1_ji2"), CERTIFICATION_PROGRESS("认证清单-认证进度","1524311122804346881","certification_progress"), + PROJECT_STATUS("项目状态","78bda155fe380b3b3f17551e88c284c6","project_status"), ; String name; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/ProcessInfoEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/ProcessInfoEOMapper.java index f83950d1c..2ab22bd54 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/ProcessInfoEOMapper.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/ProcessInfoEOMapper.java @@ -1,12 +1,13 @@ package com.jero.modules.todoCenter.mapper; -import java.util.Map; - +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.modules.todoCenter.entity.ProcessInfoEO; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.jero.modules.todoCenter.vo.ProcessInfoVO; +import java.util.List; +import java.util.Map; + /** * @Description: 流程信息表 * @Author: jero-boot @@ -30,6 +31,9 @@ public interface ProcessInfoEOMapper extends BaseMapper { */ IPage queryProjectProcessTodoTaskListList(IPage page,Map params); + + List queryProjectProcessTodoTaskList(IPage page, Map params); + /** * 查询法规评估流程分页列表 * @param page diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml index 317cdd972..19d5c11b1 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml @@ -230,7 +230,8 @@ plb.studio_engineer, plb.project_version, plb.parent_id, - plb.platform + plb.platform, + plb.project_status FROM process_info pi LEFT JOIN project_library_base plb ON plb.id = pi.project_library_id @@ -325,7 +326,214 @@ plb.studio_engineer, plb.project_version, plb.parent_id, - plb.platform + plb.platform, + plb.project_status + FROM + process_info pi + LEFT JOIN project_library_base plb ON plb.id = pi.project_library_id + LEFT JOIN project_name_info pni ON pni.id = plb.project_name_id + LEFT JOIN project_year_name_info pyni ON pyni.id = plb.year_name_id + LEFT JOIN project_laws_inventory pli ON pi.project_laws_inventory_id = pli.id + WHERE + ( + pi.id IN ( + SELECT + pid.process_info_id + FROM + process_info_detail pid + where pid.user_id = #{params.currentUserId} and pid.status = #{params.taskStatus} + ) + ) + AND pi.flow_type IN + + #{item} + + )temp + + order by + temp.end_time IS NULL, + temp.end_time, + temp.project_name IS NULL, + temp.project_name, + standard_info IS NULL, + standard_info, + flow_type_show_order_by + ASC + +