ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(企标稽查流程): 临时提交

Browse Source
This commit is contained in:
yjz
2024-01-02 15:58:52 +08:00
parent e88e634467
commit 65202ee2db
4 changed files with 71 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlowServiceImpl.java
+21 -4
View File
@@ -142,6 +142,9 @@ public class EsInspectFlowServiceImpl implements IEsInspectFlowService {
new LambdaUpdateWrapper<ProcessApprovalRecord>()
.eq(ProcessApprovalRecord::getTaskId, task.getId()));
// 处理业务表数据
handleBusinessData(esInspectFlowVO);
// 新增流程实例节点关联用户表
processNodeLinkService.saveNodeUserLink(processInstance.getProcessDefinitionId(), processInstance.getId(), listToString(map));
@@ -150,11 +153,25 @@ public class EsInspectFlowServiceImpl implements IEsInspectFlowService {
// 更新企标稽查状态
updateLawsEnterpriseStandardStatus(processAll.getProjectId());
}
// 删除草稿
processDraftService.remove(new LambdaQueryWrapper<ProcessDraft>()
.eq(ProcessDraft::getProjectId, processAll.getProjectId())
.eq(ProcessDraft::getUserId, loginUser.getId()));
private void handleBusinessData(EsInspectFlowVO esInspectFlowVO) {
List<ProcessEsInspect> processEsInspectList = esInspectFlowVO.getProcessEsInspectList();
ProcessAll processAll = esInspectFlowVO.getProcessAll();
String projectId = processAll.getProjectId();
processEsInspectList.stream().map(v -> {
if (StringUtils.isBlank(v.getId())){
v.setId(String.valueOf(SnowflakeUtils.snowflake()));
}
v.setProjectId(projectId);
return v;
}).collect(Collectors.toList()).forEach(v -> log.info(v.toString()));
// 处理稽查内容
if (EsInspectCommon.PROCESS_NODE_1.equals(processAll.getNodeId())){
}
}
private void updateLawsEnterpriseStandardStatus(String projectId) {
laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/controller/ProcessEsInspectPlanOpinionController.java
-1
View File
@@ -46,7 +46,6 @@ public class ProcessEsInspectPlanOpinionController extends JeroController<Proces
* @param processEsInspectPlanOpinion
* @param pageNo
* @param pageSize
* @param req
* @return
*/
@AutoLog(value = "企标稽查计划业务_意见表-分页列表查询")
laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/entity/ProcessEsInspectPlan.java
+4
View File
@@ -97,6 +97,10 @@ public class ProcessEsInspectPlan extends BaseEntity {
@ApiModelProperty(value = "意见")
@TableField(exist = false)
private List<ProcessEsInspectPlanOpinion> processEsInspectPlanOpinionList;
/**意见*/
@ApiModelProperty(value = "意见")
@TableField(exist = false)
private ProcessEsInspectPlanOpinion processEsInspectPlanOpinion;
/**节点id*/
@ApiModelProperty(value = "节点id")
@TableField(exist = false)
laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/EsInspectPlanFlowServiceImpl.java
+46 -6
View File
@@ -17,7 +17,9 @@ import com.jero.modules.activiti.process.common.enums.ProcessType;
import com.jero.modules.activiti.process.common.service.ProcessDraftService;
import com.jero.modules.activiti.process.esinspectplan.common.EsInspectPlanCommon;
import com.jero.modules.activiti.process.esinspectplan.entity.ProcessEsInspectPlan;
import com.jero.modules.activiti.process.esinspectplan.entity.ProcessEsInspectPlanOpinion;
import com.jero.modules.activiti.process.esinspectplan.service.IEsInspectPlanFlowService;
import com.jero.modules.activiti.process.esinspectplan.service.IProcessEsInspectPlanOpinionService;
import com.jero.modules.activiti.process.esinspectplan.service.IProcessEsInspectPlanService;
import com.jero.modules.activiti.process.esinspectplan.vo.EsInspectPlanFlowVO;
import com.jero.modules.activiti.service.ProcessAllService;
@@ -67,6 +69,7 @@ public class EsInspectPlanFlowServiceImpl implements IEsInspectPlanFlowService {
private final SendMessageAPI sendMessageAPI;
private final EnterpriseStandardInspectService enterpriseStandardInspectService;
private final EnterpriseStandardInspectObjectService enterpriseStandardInspectObjectService;
private final IProcessEsInspectPlanOpinionService processEsInspectPlanOpinionService;
public EsInspectPlanFlowServiceImpl(ProcessAllService processAllService,
ProcessApprovalRecordService processApprovalRecordService,
ProcessDraftService processDraftService,
@@ -77,7 +80,8 @@ public class EsInspectPlanFlowServiceImpl implements IEsInspectPlanFlowService {
ProcessNodeLinkService processNodeLinkService,
SendMessageAPI sendMessageAPI,
EnterpriseStandardInspectService enterpriseStandardInspectService,
EnterpriseStandardInspectObjectService enterpriseStandardInspectObjectService) {
EnterpriseStandardInspectObjectService enterpriseStandardInspectObjectService,
IProcessEsInspectPlanOpinionService processEsInspectPlanOpinionService) {
this.processAllService = processAllService;
this.processApprovalRecordService = processApprovalRecordService;
this.processDraftService = processDraftService;
@@ -89,6 +93,7 @@ public class EsInspectPlanFlowServiceImpl implements IEsInspectPlanFlowService {
this.sendMessageAPI = sendMessageAPI;
this.enterpriseStandardInspectService = enterpriseStandardInspectService;
this.enterpriseStandardInspectObjectService = enterpriseStandardInspectObjectService;
this.processEsInspectPlanOpinionService = processEsInspectPlanOpinionService;
}
ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
@@ -136,16 +141,45 @@ public class EsInspectPlanFlowServiceImpl implements IEsInspectPlanFlowService {
new LambdaUpdateWrapper<ProcessApprovalRecord>()
.eq(ProcessApprovalRecord::getTaskId, task.getId()));
// 处理业务表数据
handleBusinessData(esInspectPlanFlowVO);
// 新增流程实例节点关联用户表
processNodeLinkService.saveNodeUserLink(processInstance.getProcessDefinitionId(), processInstance.getId(), listToString(map));
// 自动完成第一个节点
taskService.complete(task.getId());
}
private void handleBusinessData(EsInspectPlanFlowVO esInspectPlanFlowVO) {
List<ProcessEsInspectPlan> processEsInspectPlanList = esInspectPlanFlowVO.getProcessEsInspectPlanList();
ProcessAll processAll = esInspectPlanFlowVO.getProcessAll();
String projectId = processAll.getProjectId();
processEsInspectPlanList.stream().map(v -> {
if (StringUtils.isBlank(v.getId())){
v.setId(String.valueOf(SnowflakeUtils.snowflake()));
}
v.setProjectId(projectId);
return v;
}).collect(Collectors.toList()).forEach(v -> log.info(v.toString()));
processEsInspectPlanService.saveOrUpdateBatch(processEsInspectPlanList);
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
// 处理意见
if (EsInspectPlanCommon.PROCESS_NODE_2.equals(processAll.getNodeId())){
ArrayList<ProcessEsInspectPlanOpinion> processEsInspectPlanOpinions = new ArrayList<>();
for (ProcessEsInspectPlan processEsInspectPlan : processEsInspectPlanList) {
if (!Objects.isNull(processEsInspectPlan.getProcessEsInspectPlanOpinion())) {
ProcessEsInspectPlanOpinion processEsInspectPlanOpinion = processEsInspectPlan.getProcessEsInspectPlanOpinion();
processEsInspectPlanOpinion.setInspectPlanId(processEsInspectPlan.getId());
processEsInspectPlanOpinion.setCreateBy(sysUser.getUsername());
processEsInspectPlanOpinions.add(processEsInspectPlanOpinion);
}
}
// 保存意见
processEsInspectPlanOpinionService.saveOrUpdateBatch(processEsInspectPlanOpinions);
}
// 删除草稿
processDraftService.remove(new LambdaQueryWrapper<ProcessDraft>()
.eq(ProcessDraft::getProjectId, processAll.getProjectId())
.eq(ProcessDraft::getUserId, loginUser.getId()));
}
@@ -192,6 +226,10 @@ public class EsInspectPlanFlowServiceImpl implements IEsInspectPlanFlowService {
.eq(ProcessDraft::getUserId, loginUser.getId()));
// 保存新草稿
processDraftService.save(processDraft);
// 处理业务表数据
handleBusinessData(esInspectPlanFlowVO);
// 稽查联络人汇总节点保存会签信息
if (StringUtils.isNotBlank(processAll.getTaskId())){
Task task = taskService.createTaskQuery().taskId(processAll.getTaskId()).singleResult();
@@ -348,6 +386,8 @@ public class EsInspectPlanFlowServiceImpl implements IEsInspectPlanFlowService {
if (task != null) {
// 稽查联络人汇总节点保存会签信息
saveCountersign(esInspectPlanFlowVO, map);
// 处理业务表数据
handleBusinessData(esInspectPlanFlowVO);
// 完成任务
taskService.complete(task.getId(), map);
// 再次更新流程审批信息
@@ -387,7 +427,7 @@ public class EsInspectPlanFlowServiceImpl implements IEsInspectPlanFlowService {
sendMessageDTO.setToUserId(v.getLinkUserIds());
Map<String, String> sendMap = new HashMap<>();
ProcessAll process = processAllService.getByProcessInstanceId(processAll.getProcessInstanceId());
sendMap.put("prcNum", process.getId());
sendMap.put("prcNum", process.getPrcNum());
sendMap.put("prcName", process.getPrcName());
sendMessageDTO.setMap(sendMap);
sendMessageAPI.sendMessage(sendMessageDTO);