update 年度制修订计划流程 完成时 推送计划到企标计划模块
This commit is contained in:
+42
-3
@@ -1,5 +1,5 @@
|
|||||||
package com.jero.modules.activiti.process.annualinit.service;
|
package com.jero.modules.activiti.process.annualinit.service;
|
||||||
import java.util.Date;
|
import com.google.common.collect.Lists;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
||||||
@@ -17,7 +17,6 @@ import com.jero.modules.activiti.process.annualinit.mapper.ProcessAnnualInitMapp
|
|||||||
import com.jero.modules.activiti.process.annualinit.vo.ProcessAnnualInitVO;
|
import com.jero.modules.activiti.process.annualinit.vo.ProcessAnnualInitVO;
|
||||||
import com.jero.modules.activiti.process.common.common.DraftCommon;
|
import com.jero.modules.activiti.process.common.common.DraftCommon;
|
||||||
import com.jero.modules.activiti.process.common.enums.ProcessType;
|
import com.jero.modules.activiti.process.common.enums.ProcessType;
|
||||||
import com.jero.modules.activiti.process.fb.common.ProcessDefinitionKey;
|
|
||||||
import com.jero.modules.activiti.process.fb.dto.BasicProcessInfoDTO;
|
import com.jero.modules.activiti.process.fb.dto.BasicProcessInfoDTO;
|
||||||
import com.jero.modules.activiti.process.fb.dto.BasicTaskInfoDTO;
|
import com.jero.modules.activiti.process.fb.dto.BasicTaskInfoDTO;
|
||||||
import com.jero.modules.activiti.process.fb.dto.ProcessDTO;
|
import com.jero.modules.activiti.process.fb.dto.ProcessDTO;
|
||||||
@@ -25,10 +24,13 @@ import com.jero.modules.activiti.process.fb.service.IProcessHandleService;
|
|||||||
import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO;
|
import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO;
|
||||||
import com.jero.modules.activiti.service.ProcessAllService;
|
import com.jero.modules.activiti.service.ProcessAllService;
|
||||||
import com.jero.modules.laws.common.util.CurrentUserUtil;
|
import com.jero.modules.laws.common.util.CurrentUserUtil;
|
||||||
|
import com.jero.modules.laws.enterprise.entity.ESPProjectStatus;
|
||||||
|
import com.jero.modules.laws.enterprise.entity.EnterpriseStandardPlan;
|
||||||
|
import com.jero.modules.laws.enterprise.enums.ESPlanStatusEnum;
|
||||||
|
import com.jero.modules.laws.enterprise.service.EnterpriseStandardPlanService;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.activiti.engine.TaskService;
|
import org.activiti.engine.TaskService;
|
||||||
import org.activiti.engine.task.Task;
|
import org.activiti.engine.task.Task;
|
||||||
import org.apache.poi.ss.formula.functions.T;
|
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
import javax.annotation.Resource;
|
import javax.annotation.Resource;
|
||||||
@@ -55,6 +57,8 @@ public class ProcessAnnualInitService extends ServiceImpl<ProcessAnnualInitMappe
|
|||||||
private TaskService taskService;
|
private TaskService taskService;
|
||||||
@Resource
|
@Resource
|
||||||
private ProcessAnnualInitLinkService annualInitLinkService;
|
private ProcessAnnualInitLinkService annualInitLinkService;
|
||||||
|
@Resource
|
||||||
|
private EnterpriseStandardPlanService esPlanService;
|
||||||
|
|
||||||
public void startProcess(ProcessInfoVO<ProcessAnnualInitVO> processInfoVO) {
|
public void startProcess(ProcessInfoVO<ProcessAnnualInitVO> processInfoVO) {
|
||||||
Map<String, Object> userInfoMap = processInfoVO.getUserInfoMap();
|
Map<String, Object> userInfoMap = processInfoVO.getUserInfoMap();
|
||||||
@@ -284,8 +288,43 @@ public class ProcessAnnualInitService extends ServiceImpl<ProcessAnnualInitMappe
|
|||||||
updateWrapper.set(ProcessAnnualInit::getAuthorizedPerson, userIdList);
|
updateWrapper.set(ProcessAnnualInit::getAuthorizedPerson, userIdList);
|
||||||
update(updateWrapper);
|
update(updateWrapper);
|
||||||
}
|
}
|
||||||
|
if (pass){
|
||||||
|
LambdaQueryWrapper<ProcessAnnualInitLink> myQuery = Wrappers.lambdaQuery(ProcessAnnualInitLink.class);
|
||||||
|
myQuery.eq(ProcessAnnualInitLink::getProcessId, annualInit);
|
||||||
|
List<ProcessAnnualInitLink> list = annualInitLinkService.list(myQuery);
|
||||||
|
List<EnterpriseStandardPlan> enterpriseStandardPlanList = convertToEnterpriseStandardPlanList(list);
|
||||||
|
esPlanService.saveBatch(enterpriseStandardPlanList);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private List<EnterpriseStandardPlan> convertToEnterpriseStandardPlanList(List<ProcessAnnualInitLink> list) {
|
||||||
|
List<EnterpriseStandardPlan> enterpriseStandardPlanlist=Lists.newArrayList();
|
||||||
|
for (ProcessAnnualInitLink processAnnualInitLink :list) {
|
||||||
|
enterpriseStandardPlanlist.add(convertFromProcessAnnualInitLink(processAnnualInitLink));
|
||||||
|
}
|
||||||
|
return enterpriseStandardPlanlist;
|
||||||
|
}
|
||||||
|
|
||||||
|
private EnterpriseStandardPlan convertFromProcessAnnualInitLink(ProcessAnnualInitLink processAnnualInitLink) {
|
||||||
|
EnterpriseStandardPlan enterpriseStandardPlan = new EnterpriseStandardPlan();
|
||||||
|
enterpriseStandardPlan.setRevisionType(processAnnualInitLink.getRevisionType());
|
||||||
|
//enterpriseStandardPlan.setProjectType();
|
||||||
|
enterpriseStandardPlan.setStandardId(processAnnualInitLink.getStandardId());
|
||||||
|
enterpriseStandardPlan.setStandardNumber(processAnnualInitLink.getStandardNumber());
|
||||||
|
enterpriseStandardPlan.setStandardName(processAnnualInitLink.getStandardName());
|
||||||
|
enterpriseStandardPlan.setMainDraftingUser(processAnnualInitLink.getMainDraftingUser());
|
||||||
|
enterpriseStandardPlan.setDepartId(processAnnualInitLink.getDepartId());
|
||||||
|
enterpriseStandardPlan.setProfessionalModule(processAnnualInitLink.getProfessionalModule());
|
||||||
|
enterpriseStandardPlan.setDraftCompleteDate(processAnnualInitLink.getDraftCompleteDate());
|
||||||
|
enterpriseStandardPlan.setPlanArchivingDate(processAnnualInitLink.getPlanArchivingDate());
|
||||||
|
enterpriseStandardPlan.setHaveEnglishVersion(processAnnualInitLink.getHaveEnglishVersion());
|
||||||
|
enterpriseStandardPlan.setCommittee(processAnnualInitLink.getCommittee());
|
||||||
|
enterpriseStandardPlan.setProjectStatus(ESPProjectStatus.NOT_STARTED.getValue());
|
||||||
|
enterpriseStandardPlan.setPlanStatus(ESPlanStatusEnum.ADD.getValue());
|
||||||
|
return enterpriseStandardPlan;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
public ProcessInfoVO<ProcessAnnualInitVO> getHandleData(String taskId) {
|
public ProcessInfoVO<ProcessAnnualInitVO> getHandleData(String taskId) {
|
||||||
ProcessInfoVO processInfoVO = processHandleService.queryProcessInfoVO(taskId);
|
ProcessInfoVO processInfoVO = processHandleService.queryProcessInfoVO(taskId);
|
||||||
String businessId = processInfoVO.getBusinessId();
|
String businessId = processInfoVO.getBusinessId();
|
||||||
|
|||||||
+43
@@ -0,0 +1,43 @@
|
|||||||
|
package com.jero.modules.laws.enterprise.enums;
|
||||||
|
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Getter;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author liJiaRao
|
||||||
|
* @date 2024-09-27 13:45
|
||||||
|
*/
|
||||||
|
@Getter
|
||||||
|
@AllArgsConstructor
|
||||||
|
public enum ESPlanStatusEnum {
|
||||||
|
/**
|
||||||
|
* 新增:新增计划入库
|
||||||
|
* 延期:初稿完成日期和计划归档日期延期
|
||||||
|
* 取消:计划取消
|
||||||
|
*/
|
||||||
|
ADD("新增", "1"),
|
||||||
|
DELAY("延期", "2"),
|
||||||
|
CANCEL("取消", "3"),
|
||||||
|
;
|
||||||
|
|
||||||
|
private String name;
|
||||||
|
private String value;
|
||||||
|
|
||||||
|
public static String getNameByValue(String value) {
|
||||||
|
for (ESPlanStatusEnum enumObject : values()) {
|
||||||
|
if (enumObject.getValue().equals(value)) {
|
||||||
|
return enumObject.getName();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static String getValueByName(String name) {
|
||||||
|
for (ESPlanStatusEnum enumObject : values()) {
|
||||||
|
if (enumObject.getName().equals(name)) {
|
||||||
|
return enumObject.getValue();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user