WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

待办中心-符合性流程开发。

Browse Source
This commit is contained in:
wangzhijiang
2022-10-19 11:21:15 +08:00
parent 730c3256bb
commit 8839414fba
7 changed files with 210 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java
+41 -2
View File
@@ -3,6 +3,7 @@ package com.jero.modules.project.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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.api.vo.Result;
import com.jero.common.constant.enums.CutEnum;
@@ -14,6 +15,7 @@ import com.jero.modules.project.entity.*;
import com.jero.modules.project.enums.JumpLinkEnum;
import com.jero.modules.project.enums.MsgTypeEnum;
import com.jero.modules.project.enums.SendMsgFlagEnum;
import com.jero.modules.project.enums.TaskStatusEnum;
import com.jero.modules.project.mapper.*;
import com.jero.modules.project.service.IFeedbackHistoryService;
import com.jero.modules.project.service.IProjectTaskInventoryDetailEOService;
@@ -21,6 +23,8 @@ import com.jero.modules.project.service.IProjectTaskInventoryFeedbackEOService;
import com.jero.modules.project.util.SendMessageUtils;
import com.jero.modules.system.entity.SysUser;
import com.jero.modules.system.service.ISysUserService;
import com.jero.modules.todoCenter.entity.ProcessInfoDetailEO;
import com.jero.modules.todoCenter.service.IProcessInfoDetailEOService;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.shiro.SecurityUtils;
@@ -61,6 +65,9 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl<Project
@Autowired
private IFeedbackHistoryService feedbackHistoryService;
@Autowired
private IProcessInfoDetailEOService processInfoDetailEOService;
@Value(value = "${jero.backUrl}")
private String backUrl;
@@ -106,6 +113,7 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl<Project
}else {
String id = UUID.randomUUID().toString().replace("-", "");
projectTaskInventoryDetail.setId(id);
projectTaskInventoryDetail.setTaskId(UUID.randomUUID().toString().replace("-", ""));
projectTaskInventoryDetailEOAddList.add(projectTaskInventoryDetail);
}
}
@@ -115,6 +123,7 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl<Project
List<String> createByList = new ArrayList<>();
List<ProjectTaskInventoryFeedbackEO> projectTaskInventoryFeedbackEOList = new ArrayList<>();
List<ProcessInfoDetailEO> processInfoDetailEOList = new ArrayList<>();
String serialNumber = projectTaskInventoryFeedbackEOService.createSerialNumber();
for (ProjectTaskInventoryDetailEO projectTaskInventoryDetailEO : projectTaskInventoryDetailEOAddList) {
@@ -138,6 +147,17 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl<Project
long number = Long.parseLong(serialNumber) + 1;
serialNumber = String.valueOf(number);
ProcessInfoDetailEO processInfoDetailEO = new ProcessInfoDetailEO();
processInfoDetailEO.setActiProcInstId(projectTaskInventoryDetailEO.getActiProcInstId());
processInfoDetailEO.setUserId(projectTaskInventoryDetailEO.getUserId());
processInfoDetailEO.setTaskDefinitionKey(projectTaskInventoryDetailEO.getTaskDefinitionKey());
processInfoDetailEO.setProjectLawsInventoryId(projectTaskInventoryDetailEO.getProjectTaskInventoryId());
processInfoDetailEO.setStatus(TaskStatusEnum.NOT_DONE.getValue());
processInfoDetailEO.setProcessInfoId(projectTaskInventoryDetailEO.getActiProcInstId());
processInfoDetailEO.setFlowType(projectTaskInventoryDetailEO.getFlowType());
processInfoDetailEO.setTaskId(projectTaskInventoryDetailEO.getTaskId());
processInfoDetailEOList.add(processInfoDetailEO);
}
}
@@ -156,6 +176,9 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl<Project
this.baseMapper.delete(deleteWrapper);
super.saveBatch(projectTaskInventoryDetailEOAddList);
this.processInfoDetailEOService.batchInsertDreUserTask(processInfoDetailEOList);
//获取没有发送过消息的用户
List<String> sendUserIdList = projectTaskInventoryDetailEOAddList.stream().filter(e -> {
boolean flag = true;
@@ -195,6 +218,15 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl<Project
Date now = new Date();
projectTaskInventoryDetailEO.setUpdateTime(now);
this.baseMapper.updateById(projectTaskInventoryDetailEO);
//如果是责任人 确认、取消确认操作。
if(StringUtils.equals(projectTaskInventoryDetailEO.getStatus(),TaskStatusEnum.HAVE_DONE.getValue())
|| StringUtils.equals(projectTaskInventoryDetailEO.getStatus(),TaskStatusEnum.NOT_DONE.getValue())){
ProjectTaskInventoryDetailEO taskInventoryDetailById = this.baseMapper.selectById(projectTaskInventoryDetailEO.getId());
LambdaUpdateWrapper<ProcessInfoDetailEO> processInfoDetailUpdateWrap= new LambdaUpdateWrapper();
processInfoDetailUpdateWrap.eq(ProcessInfoDetailEO::getTaskId,taskInventoryDetailById.getTaskId());
processInfoDetailUpdateWrap.set(ProcessInfoDetailEO::getStatus,projectTaskInventoryDetailEO.getStatus());
this.processInfoDetailEOService.update(processInfoDetailUpdateWrap);
}
}
/**
@@ -205,8 +237,9 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl<Project
*/
@Override
public void deleteById(String id) {
removeById(id);
QueryWrapper<ProjectTaskInventoryFeedbackEO> queryWrapper = new QueryWrapper<>();
ProjectTaskInventoryDetailEO projectTaskInventoryDetailEO = this.baseMapper.selectById(id);
removeById(id);
QueryWrapper<ProjectTaskInventoryFeedbackEO> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(ProjectTaskInventoryFeedbackEO::getProjectTaskInventoryId,id);
List<ProjectTaskInventoryFeedbackEO> list = this.projectTaskInventoryFeedbackEOService.list(queryWrapper);
if(CollectionUtils.isNotEmpty(list)){
@@ -216,6 +249,12 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl<Project
historyDeleteWrapper.lambda().in(FeedbackHistory::getFeedbackId,projectTaskInventoryFeedbackIdList);
this.feedbackHistoryService.remove(historyDeleteWrapper);
}
if(!Objects.isNull(projectTaskInventoryDetailEO)){
//删除待办中心待办数据
QueryWrapper<ProcessInfoDetailEO> processInfoDetailRemoveWrap = new QueryWrapper<>();
processInfoDetailRemoveWrap.lambda().eq(ProcessInfoDetailEO::getTaskId,projectTaskInventoryDetailEO.getTaskId());
this.processInfoDetailEOService.remove(processInfoDetailRemoveWrap);
}
}
/**
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/ProcessInfoEOMapper.java
+3 -2
View File
@@ -5,6 +5,7 @@ import java.util.Map;
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;
/**
* @Description: 流程信息表
@@ -14,7 +15,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
*/
public interface ProcessInfoEOMapper extends BaseMapper<ProcessInfoEO> {
IPage<ProcessInfoEO> queryPageList(IPage page,Map<String, Object> params);
IPage<ProcessInfoVO> queryPageList(IPage page, Map<String, Object> params);
IPage<ProcessInfoEO> queryProjectProcessTodoTaskListList(IPage page,Map<String, Object> params);
IPage<ProcessInfoVO> queryProjectProcessTodoTaskListList(IPage page,Map<String, Object> params);
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml
+14 -5
View File
@@ -62,7 +62,7 @@
</where>
</sql>
<select id="queryPageList" resultType="com.jero.modules.todoCenter.entity.ProcessInfoEO">
<select id="queryPageList" resultType="com.jero.modules.todoCenter.vo.ProcessInfoVO">
SELECT
pi.id,
pi.project_library_id,
@@ -80,7 +80,10 @@
(select detail.task_definition_key from process_info_detail detail where detail.process_info_id = pi.id and detail.user_id = #{params.currentUserId} limit 1) as task_definition_key,
pi.status,
pi.prc_num,
pi.prc_name
pi.prc_name,
plb.project_name_id,
plb.target_market,
plb.studio_engineer
FROM
process_info pi
left join project_library_base plb on plb.id = pi.project_library_id
@@ -91,7 +94,7 @@
<include refid="BaseQuerySql"/>
order by pi.create_time desc
</select>
<select id="queryProjectProcessTodoTaskListList" resultType="com.jero.modules.todoCenter.entity.ProcessInfoEO">
<select id="queryProjectProcessTodoTaskListList" resultType="com.jero.modules.todoCenter.vo.ProcessInfoVO">
select temp.* from (
SELECT
pi.id,
@@ -110,7 +113,10 @@
(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.prc_num,
pi.prc_name
pi.prc_name,
plb.project_name_id,
plb.target_market,
plb.studio_engineer
FROM
process_info pi
LEFT JOIN project_library_base plb ON plb.id = pi.project_library_id
@@ -151,7 +157,10 @@
'' as task_definition_key,
pi.STATUS,
pi.prc_num,
pi.prc_name
pi.prc_name,
plb.project_name_id,
plb.target_market,
plb.studio_engineer
FROM
process_info pi
LEFT JOIN project_library_base plb ON plb.id = pi.project_library_id
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/IProcessInfoDetailEOService.java
+6
View File
@@ -67,4 +67,10 @@ public interface IProcessInfoDetailEOService extends IService<ProcessInfoDetailE
* @return
*/
Result<?> processCall(JSONObject jsonObject);
/**
* 批量插入dre工程师的待办任务
* @param processInfoDetailEOList
*/
void batchInsertDreUserTask(List<ProcessInfoDetailEO> processInfoDetailEOList);
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoDetailEOServiceImpl.java
+14
View File
@@ -158,4 +158,18 @@ public class ProcessInfoDetailEOServiceImpl extends ServiceImpl<ProcessInfoDetai
}
return new Result<>().success("调用成功！");
}
@Override
public void batchInsertDreUserTask(List<ProcessInfoDetailEO> processInfoDetailEOList) {
processInfoDetailEOList.forEach(detail -> {
QueryWrapper<ProcessInfoDetailEO> removeWrap = new QueryWrapper<>();
removeWrap.lambda().eq(ProcessInfoDetailEO::getUserId,detail.getUserId());
removeWrap.lambda().eq(ProcessInfoDetailEO::getFlowType,detail.getFlowType());
removeWrap.lambda().eq(ProcessInfoDetailEO::getActiProcInstId,detail.getActiProcInstId());
removeWrap.lambda().eq(ProcessInfoDetailEO::getTaskDefinitionKey,detail.getTaskDefinitionKey());
this.remove(removeWrap);
});
this.saveBatch(processInfoDetailEOList);
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java
+31 -5
View File
@@ -7,9 +7,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.api.vo.Result;
import com.jero.common.exception.JeroBootException;
import com.jero.common.system.vo.LoginUser;
import com.jero.modules.project.entity.ProjectTaskInventoryDetailEO;
import com.jero.modules.project.enums.OperatorTypeEnum;
import com.jero.modules.project.enums.RequestSourceEnum;
import com.jero.modules.project.enums.TaskStatusEnum;
import com.jero.modules.project.service.IProjectTaskInventoryDetailEOService;
import com.jero.modules.system.entity.SysUser;
import com.jero.modules.system.service.ISysUserService;
import com.jero.modules.todoCenter.entity.ProcessInfoDetailEO;
@@ -18,6 +20,7 @@ import com.jero.modules.todoCenter.enums.TodoCenterStatusEnum;
import com.jero.modules.todoCenter.mapper.ProcessInfoEOMapper;
import com.jero.modules.todoCenter.service.IProcessInfoDetailEOService;
import com.jero.modules.todoCenter.service.IProcessInfoEOService;
import com.jero.modules.todoCenter.vo.ProcessInfoVO;
import com.jero.modules.wkflow.enums.FlowTypeEnum;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
@@ -43,6 +46,8 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl<ProcessInfoEOMapper, P
private IProcessInfoDetailEOService processInfoDetailEOService;
@Autowired
private ISysUserService sysUserService;
@Autowired
private IProjectTaskInventoryDetailEOService projectTaskInventoryDetailEOService;
/**
* 保存
@@ -160,7 +165,7 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl<ProcessInfoEOMapper, P
params.put("qdqrFlowTypeValue",FlowTypeEnum.QDQR.getValue());
IPage page = new Page(pageNo, pageSize);
IPage<ProcessInfoEO> result = this.baseMapper.queryProjectProcessTodoTaskListList(page,params);
IPage<ProcessInfoVO> result = this.baseMapper.queryProjectProcessTodoTaskListList(page,params);
this.disposeData(result.getRecords(),cut);
return result;
}
@@ -180,7 +185,7 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl<ProcessInfoEOMapper, P
params.put("currentUserId",currentUser.getId());
IPage page = new Page(pageNo, pageSize);
IPage<ProcessInfoEO> result = this.baseMapper.queryPageList(page,params);
IPage<ProcessInfoVO> result = this.baseMapper.queryPageList(page,params);
this.disposeData(result.getRecords(),cut);
return result;
}
@@ -200,7 +205,7 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl<ProcessInfoEOMapper, P
params.put("currentUserId",currentUser.getId());
IPage page = new Page(pageNo, pageSize);
IPage<ProcessInfoEO> result = this.baseMapper.queryPageList(page,params);
IPage<ProcessInfoVO> result = this.baseMapper.queryPageList(page,params);
this.disposeData(result.getRecords(),cut);
return result;
}
@@ -213,9 +218,9 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl<ProcessInfoEOMapper, P
flowTypeList.add(FlowTypeEnum.PREHOMOQRLC.getValue());
}
public void disposeData(List<ProcessInfoEO> datas,String cut){
public void disposeData(List<ProcessInfoVO> datas, String cut){
if(CollectionUtils.isNotEmpty(datas)){
List<String> processInfoIdList = datas.stream().map(ProcessInfoEO::getId).distinct().collect(Collectors.toList());
List<String> processInfoIdList = datas.stream().map(ProcessInfoVO::getId).distinct().collect(Collectors.toList());
QueryWrapper<ProcessInfoDetailEO> processInfoDetailQueryWrap = new QueryWrapper<>();
processInfoDetailQueryWrap.lambda().in(ProcessInfoDetailEO::getProcessInfoId,processInfoIdList);
@@ -270,6 +275,15 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl<ProcessInfoEOMapper, P
}
});
List<String> taskIdList = datas.stream().map(ProcessInfoVO::getTaskId).distinct().collect(Collectors.toList());
List<ProjectTaskInventoryDetailEO> taskInventoryDetailList = new ArrayList<>();
if(CollectionUtils.isNotEmpty(taskIdList)){
QueryWrapper<ProjectTaskInventoryDetailEO> taskInventoryDetailQueryWrap = new QueryWrapper<>();
taskInventoryDetailQueryWrap.lambda().in(ProjectTaskInventoryDetailEO::getTaskId,taskIdList);
taskInventoryDetailList = this.projectTaskInventoryDetailEOService.list(taskInventoryDetailQueryWrap);
}
List<ProjectTaskInventoryDetailEO> finalTaskInventoryDetailList = taskInventoryDetailList;
List<SysUser> sysUserList = this.sysUserService.querySysUserListByIdList(userIdList);
datas.forEach(data -> {
@@ -306,6 +320,18 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl<ProcessInfoEOMapper, P
}
}
data.setProjectName(data.getProjectName() + "-" + data.getYearName());
//设置任务清单明细表id
if(CollectionUtils.isNotEmpty(finalTaskInventoryDetailList)){
String primaryKeyId = finalTaskInventoryDetailList.stream().filter(taskInventoryDetail -> {
boolean flag = false;
if (StringUtils.equals(data.getTaskId(), taskInventoryDetail.getTaskId())) {
flag = true;
}
return flag;
}).map(ProjectTaskInventoryDetailEO::getId).collect(Collectors.joining(","));
data.setPrimaryKeyId(primaryKeyId);
}
});
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/vo/ProcessInfoVO.java
+101
View File
@@ -0,0 +1,101 @@
package com.jero.modules.todoCenter.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
/**
* 流程信息表VO类
*/
@Data
public class ProcessInfoVO implements Serializable {
private static final long serialVersionUID = 1L;
/**主键*/
private String id;
/**创建人*/
private String createBy;
/**创建日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private java.util.Date createTime;
/**更新人*/
private String updateBy;
/**更新日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private java.util.Date updateTime;
/**所属部门*/
private String sysOrgCode;
/**项目库id*/
private String projectLibraryId;
/**法规清单id*/
private String projectLawsInventoryId;
/**文档库id/标准id*/
private String bussDocumentLibraryId;
/**流程实例id*/
private String actiProcInstId;
/**流程类型*/
private String flowType;
/**截止日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
private java.util.Date endTime;
/**任务状态*/
private String status;
/**流程编号**/
private String prcNum;
/**流程名称*/
private String prcName;
/**流程类型展示字段*/
private String flowTypeShow;
/**任务状态展示字段*/
private String statusShow;
/**上一个操作人 用户id*/
private String lastAssignee;
private String lastAssigneeName;
/**当前操作人/代理人 用户id*/
private String assignee;
private String assigneeName;
/**标准编号*/
private String serialNumber;
/**标准标题*/
private String title;
/**项目名称*/
private String projectName;
/**年份*/
private String yearName;
/**待办id*/
private String taskId;
/**任务节点定义key*/
private String taskDefinitionKey;
/**项目名称id*/
private String projectNameId;
/**目标市场*/
private String targetMarket;
/**studio*/
private String studioEngineer;
/**任务清单明细表id，任务清单明细数据与待办中心明细表 是taskId一对一的关系**/
private String primaryKeyId;
}