diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index b14b0fb2a..351bc7440 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -1222,3 +1222,8 @@ CREATE TABLE `laws_weilai`.`process_info_detail` ( -- 待办中心 流程信息明细表 增加字段 2022-10-18 未同步生产环境 ALTER TABLE `laws_weilai`.`process_info_detail` ADD COLUMN `end_time` datetime NULL COMMENT '截止时间' AFTER `flow_type`; + +-- 待办中心 流程信息明细表 增加字段 2022-10-18 未同步生产环境 +ALTER TABLE `laws_weilai`.`process_info` + ADD COLUMN `prc_num` varchar(64) NULL COMMENT '流程编号' AFTER `status`, + ADD COLUMN `prc_name` varchar(255) NULL COMMENT '流程名称' AFTER `prc_num`; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java index b46414b02..731d28c0f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java @@ -41,6 +41,11 @@ public enum OperatorTypeEnum { ADD_LAWS_OPINION_GATHER("添加法规意见收集数据","addLawsOpinionGather"), UPDATE_LAWS_OPINION_GATHER_GATHER_RESULT("更新法规意见收集数据收集结果","updateLawsOpinionGatherGatherResult"), + + /** + * 流程信息明细表 + */ + UPDATE_PROCESS_INFO_DETAIL_BY_TASK_ID("根据taskId更新流程信息明细表","updateProcessInfoDetailByTaskId"), ; String name; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/entity/ProcessInfoEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/entity/ProcessInfoEO.java index ccabb9d6d..9c3de82f9 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/entity/ProcessInfoEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/entity/ProcessInfoEO.java @@ -94,6 +94,12 @@ public class ProcessInfoEO implements Serializable { @ApiModelProperty(value = "任务状态") private java.lang.String status; + @ApiModelProperty(value = "流程编号") + private String prcNum; + + @ApiModelProperty(value = "流程名称") + private String prcName; + /**流程类型展示字段*/ @TableField(exist = false) private String flowTypeShow; 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 a1f4e52dc..4db4fd1d9 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 @@ -104,7 +104,9 @@ pi.end_time, (select detail.task_id from process_info_detail detail where detail.process_info_id = pi.id and detail.user_id = #{params.currentUserId} and detail.`status` = 'NotDone' limit 1) as task_id, (select detail.task_definition_key from process_info_detail detail where detail.process_info_id = pi.id and detail.user_id = #{params.currentUserId} and detail.`status` = 'NotDone' limit 1) as task_definition_key, - pi.STATUS + pi.STATUS, + pi.prc_num, + pi.prc_name FROM process_info pi LEFT JOIN project_library_base plb ON plb.id = pi.project_library_id @@ -143,7 +145,9 @@ (select pid.end_time from process_info_detail pid where pid.process_info_id = pi.id and pid.STATUS = 'NotDone' order by pid.end_time asc limit 1) as end_time, '' as task_id, '' as task_definition_key, - pi.STATUS + pi.STATUS, + pi.prc_num, + pi.prc_name FROM process_info pi LEFT JOIN project_library_base plb ON plb.id = pi.project_library_id diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoDetailEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoDetailEOServiceImpl.java index 46869984f..f52d0a182 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoDetailEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoDetailEOServiceImpl.java @@ -3,10 +3,9 @@ package com.jero.modules.todoCenter.service.impl; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.jero.common.api.vo.Result; import com.jero.common.exception.JeroBootException; -import com.jero.modules.project.entity.ProjectTaskInventoryDetailEO; -import com.jero.modules.project.entity.ProjectTaskInventoryEO; import com.jero.modules.project.enums.OperatorTypeEnum; import com.jero.modules.project.enums.RequestSourceEnum; import com.jero.modules.todoCenter.entity.ProcessInfoDetailEO; @@ -148,6 +147,13 @@ public class ProcessInfoDetailEOServiceImpl extends ServiceImpl updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.set(ProcessInfoDetailEO::getStatus,taskStatus); + updateWrapper.eq(ProcessInfoDetailEO::getTaskId,taskId); + this.update(updateWrapper); } return new Result<>().success("调用成功!"); }