待办中心开发。

This commit is contained in:
wangzhijiang
2022-10-18 15:15:50 +08:00
parent 1ebe37a132
commit b6aa2d857c
5 changed files with 30 additions and 4 deletions
@@ -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`;
@@ -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;
@@ -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;
@@ -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
@@ -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<ProcessInfoDetai
objectResult.setResult(processInfoDetailEOList);
objectResult.setSuccess(true);
return objectResult;
}else if(StringUtils.equals(operatorType, OperatorTypeEnum.UPDATE_PROCESS_INFO_DETAIL_BY_TASK_ID.getValue())){
String taskId = jsonObject.getString("taskId");
String taskStatus = jsonObject.getString("taskStatus");
LambdaUpdateWrapper<ProcessInfoDetailEO> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.set(ProcessInfoDetailEO::getStatus,taskStatus);
updateWrapper.eq(ProcessInfoDetailEO::getTaskId,taskId);
this.update(updateWrapper);
}
return new Result<>().success("调用成功!");
}