From 22df26da1657f13a917c3c5110cc502f8bb8bc5a Mon Sep 17 00:00:00 2001 From: lijiarao Date: Fri, 27 Sep 2024 13:49:44 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E5=B9=B4=E5=BA=A6=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2=E8=AE=A1=E5=88=92=E6=B5=81=E7=A8=8B=20=E5=AE=8C?= =?UTF-8?q?=E6=88=90=E6=97=B6=20=E6=8E=A8=E9=80=81=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E5=88=B0=E4=BC=81=E6=A0=87=E8=AE=A1=E5=88=92=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/ProcessAnnualInitService.java | 45 +++++++++++++++++-- .../enterprise/enums/ESPlanStatusEnum.java | 43 ++++++++++++++++++ 2 files changed, 85 insertions(+), 3 deletions(-) create mode 100644 laws-modules/src/main/java/com/jero/modules/laws/enterprise/enums/ESPlanStatusEnum.java diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/service/ProcessAnnualInitService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/service/ProcessAnnualInitService.java index 1869f121..b39a7830 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/service/ProcessAnnualInitService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/service/ProcessAnnualInitService.java @@ -1,5 +1,5 @@ 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.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.common.common.DraftCommon; 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.BasicTaskInfoDTO; 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.service.ProcessAllService; 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 org.activiti.engine.TaskService; import org.activiti.engine.task.Task; -import org.apache.poi.ss.formula.functions.T; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -55,6 +57,8 @@ public class ProcessAnnualInitService extends ServiceImpl processInfoVO) { Map userInfoMap = processInfoVO.getUserInfoMap(); @@ -284,8 +288,43 @@ public class ProcessAnnualInitService extends ServiceImpl myQuery = Wrappers.lambdaQuery(ProcessAnnualInitLink.class); + myQuery.eq(ProcessAnnualInitLink::getProcessId, annualInit); + List list = annualInitLinkService.list(myQuery); + List enterpriseStandardPlanList = convertToEnterpriseStandardPlanList(list); + esPlanService.saveBatch(enterpriseStandardPlanList); + } } + private List convertToEnterpriseStandardPlanList(List list) { + List 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 getHandleData(String taskId) { ProcessInfoVO processInfoVO = processHandleService.queryProcessInfoVO(taskId); String businessId = processInfoVO.getBusinessId(); diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/enums/ESPlanStatusEnum.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/enums/ESPlanStatusEnum.java new file mode 100644 index 00000000..89f179f6 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/enums/ESPlanStatusEnum.java @@ -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; + } +}