diff --git a/db/第二阶段.sql b/db/第二阶段.sql index ffe95a29..dc124687 100644 --- a/db/第二阶段.sql +++ b/db/第二阶段.sql @@ -155,22 +155,32 @@ alter table process_plan_change create table process_plan_change_link ( - id varchar(36) not null comment '主键id', - process_id varchar(36) comment '流程主表id', - revision_type varchar(50) comment '制修订类别', - plan_id varchar(36) comment '企标计划', - drafting_user varchar(50) comment '起草人', - depart_id varchar(50) comment '所在部门id', - draft_complete_date datetime comment '初稿完成日期变更后', - plan_archiving_date datetime comment '计划归档日期变更后', - change_reason varchar(500) comment '变更原因', - create_by varchar(36) comment '创建人', - create_time datetime comment '创建时间', - update_by varchar(36) comment '更新人', - update_time datetime comment '更新时间', - org_code varchar(64) comment '所属部门', - del_flag tinyint comment '删除状态(0-正常,1-删除)', - primary key (id) + id varchar(36) not null comment '主键id' + primary key, + process_id varchar(36) null comment '流程主表id', + revision_type varchar(50) null comment '制修订类别', + plan_id varchar(36) null comment '企标计划id', + standard_id varchar(50) null comment '标准id', + standard_number varchar(200) null comment '标准编号', + standard_name varchar(200) null comment '标准名称', + main_drafting_user varchar(50) null comment '起草人', + main_drafting_user_new varchar(50) null comment '新起草人', + depart_id varchar(50) null comment '所在部门id', + depart_id_new varchar(50) null comment '新所在部门id', + professional_module varchar(30) null comment '专业模块', + draft_complete_date datetime null comment '初稿完成日期', + plan_archiving_date datetime null comment '计划归档日期', + draft_complete_date_change datetime null comment '初稿完成日期变更后', + plan_archiving_date_change datetime null comment '计划归档日期变更后', + have_english_version varchar(50) null comment '是否有英文版', + committee varchar(500) null comment '所属技术委员会', + change_reason varchar(500) null comment '变更原因', + create_by varchar(36) null comment '创建人', + create_time datetime null comment '创建时间', + update_by varchar(36) null comment '更新人', + update_time datetime null comment '更新时间', + org_code varchar(64) null comment '所属部门', + del_flag tinyint null comment '删除状态(0-正常,1-删除)' ); alter table process_plan_change_link @@ -258,3 +268,25 @@ VALUES ('1836301659982864385', '1836301517254893569', '取消', '3', '', 3, 1, ' -- 企标状态增加 征求意见 -- INSERT INTO `sys_dict_item` (`id`, `dict_id`, `parent_id`, `item_text`, `en_name`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `stat_node`, `en_base`) VALUES ('1696811980113661954', '1696811542077329409', NULL, '征求意见', 'Seek For Opinions', '2', '征求意见', 2, 1, 'admin', '2023-08-30 17:07:56', NULL, NULL, 1, 1, NULL, '0', NULL, NULL); + +-- 企标计划变更-变更类型 +INSERT INTO sys_dict (id, dict_name, dict_code, description, del_flag, create_by, create_time, is_tag_dict, + is_read_only) +VALUES ('1843464136587796482', '企标计划变更-变更类型', 'espc_change_type', '新增，取消，延期，人员变更', 0, 'cheryrsm', '2024-10-08 09:31:14', + 0, 0); +INSERT INTO sys_dict_item (id, dict_id, item_text, en_name, item_value, description, sort_order, `status`, create_by, + create_time, is_tag_dict, is_read_only, del_flag) +VALUES ('1843464372399955969', '1843464136587796482', '新增', 'add', '1', '', 1, 1, 'cheryrsm', '2024-10-08 09:32:10', 0, + 0, 0); +INSERT INTO sys_dict_item (id, dict_id, item_text, en_name, item_value, description, sort_order, `status`, create_by, + create_time, is_tag_dict, is_read_only, del_flag) +VALUES ('1843464482533990401', '1843464136587796482', '取消', 'cancel', '2', '', 2, 1, 'cheryrsm', '2024-10-08 09:32:37', + 0, 0, 0); +INSERT INTO sys_dict_item (id, dict_id, item_text, en_name, item_value, description, sort_order, `status`, create_by, + create_time, is_tag_dict, is_read_only, del_flag) +VALUES ('1843464553690357761', '1843464136587796482', '延期', 'delay', '3', '', 3, 1, 'cheryrsm', '2024-10-08 09:32:54', + 0, 0, 0); +INSERT INTO sys_dict_item (id, dict_id, item_text, en_name, item_value, description, sort_order, `status`, create_by, + create_time, is_tag_dict, is_read_only, del_flag) +VALUES ('1843464714877460481', '1843464136587796482', '人员变更', 'Person change', '4', '', 4, 1, 'cheryrsm', + '2024-10-08 09:33:32', 0, 0, 0); \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/planchange/entity/ProcessPlanChange.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/planchange/entity/ProcessPlanChange.java index 69225316..67f24ef8 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/planchange/entity/ProcessPlanChange.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/planchange/entity/ProcessPlanChange.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.jero.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModelProperty; import com.fasterxml.jackson.annotation.JsonFormat; import org.jeecgframework.poi.excel.annotation.Excel; @@ -38,6 +39,7 @@ public class ProcessPlanChange implements Serializable { */ @ApiModelProperty(value = "变更类型") @Excel(name = "变更类型", width = 15) + @Dict(dicCode = "espc_change_type") private String changeType; /** * 部门经理 diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/planchange/entity/ProcessPlanChangeLink.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/planchange/entity/ProcessPlanChangeLink.java index 7561c785..df31938e 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/planchange/entity/ProcessPlanChangeLink.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/planchange/entity/ProcessPlanChangeLink.java @@ -2,10 +2,8 @@ package com.jero.modules.activiti.process.planchange.entity; import java.util.Date; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableLogic; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; +import com.jero.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModelProperty; import com.fasterxml.jackson.annotation.JsonFormat; import org.jeecgframework.poi.excel.annotation.Excel; @@ -51,39 +49,115 @@ public class ProcessPlanChangeLink implements Serializable { @ApiModelProperty(value = "企标计划") @Excel(name = "企标计划", width = 15) private String planId; + /** + * 标准id + */ + @ApiModelProperty(value = "标准id") + private String standardId; + /** + * 标准编号 + */ + @ApiModelProperty(value = "标准编号") + @Excel(name = "标准编号", width = 15) + private String standardNumber; + /** + * 标准名称 + */ + @ApiModelProperty(value = "标准名称") + @Excel(name = "标准名称", width = 15) + private String standardName; /** * 起草人 */ @ApiModelProperty(value = "起草人") - @Excel(name = "起草人", width = 15) - private String draftingUser; + @Excel(name = "起草人", width = 15, dictTable = "sys_user", dicText = "CONCAT(realname, '(', username, ')')", dicCode = "id") + @Dict(dictTable = "sys_user", dicText = "CONCAT(realname, '(', username, ')')", dicCode = "id") + private String mainDraftingUser; + /** + * 新起草人 + */ + @ApiModelProperty(value = "新起草人") + @Dict(dictTable = "sys_user", dicText = "CONCAT(realname, '(', username, ')')", dicCode = "id") + private String draftingUserNew; + /** + * 邮箱 + */ + @TableField(exist = false) + @ApiModelProperty(value = "邮箱") + private String email; + /** + * 新邮箱 + */ + @TableField(exist = false) + @ApiModelProperty(value = "新邮箱") + private String emailNew; /** * 所在部门id */ @ApiModelProperty(value = "所在部门id") - @Excel(name = "所在部门id", width = 15) + @Excel(name = "所在部门", width = 15, dictTable = "sys_depart", dicText = "depart_name", dicCode = "id") + @Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id") private String departId; /** - * 初稿完成日期变更后 + * 新所在部门id */ - @ApiModelProperty(value = "初稿完成日期变更后") - @Excel(name = "初稿完成日期变更后", width = 15, format = "yyyy-MM-dd") + @ApiModelProperty(value = "新所在部门id") + @Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id") + private String departIdNew; + /** + * 专业模块 + */ + @ApiModelProperty(value = "专业模块") + @Excel(name = "专业模块", width = 15, dicCode = "professional_module") + @Dict(dicCode = "professional_module") + private String professionalModule; + /** + * 初稿完成日期 + */ + @ApiModelProperty(value = "初稿完成日期") + @Excel(name = "初稿完成日期", width = 15, format = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd") private Date draftCompleteDate; /** - * 计划归档日期变更后 + * 初稿完成日期变更后 */ - @ApiModelProperty(value = "计划归档日期变更后") - @Excel(name = "计划归档日期变更后", width = 15, format = "yyyy-MM-dd") + @ApiModelProperty(value = "初稿完成日期变更后") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date draftCompleteDateChange; + /** + * 计划归档日期 + */ + @ApiModelProperty(value = "计划归档日期") + @Excel(name = "计划归档日期", width = 15, format = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd") private Date planArchivingDate; + /** + * 计划归档日期变更后 + */ + @ApiModelProperty(value = "计划归档日期变更后") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date planArchivingDateChange; + /** + * 是否有英文版 + */ + @ApiModelProperty(value = "是否有英文版") + @Excel(name = "是否有英文版", width = 15, dicCode = "yn") + @Dict(dicCode = "yn") + private String haveEnglishVersion; + /** + * 所属技术委员会 + */ + @ApiModelProperty(value = "所属技术委员会") + @Excel(name = "所属技术委员会", width = 15) + private String committee; /** * 变更原因 */ @ApiModelProperty(value = "变更原因") - @Excel(name = "变更原因", width = 15) private String changeReason; /** * 创建人 diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/planchange/service/ProcessPlanChangeLinkService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/planchange/service/ProcessPlanChangeLinkService.java index 4c0a06fc..8cd5eccb 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/planchange/service/ProcessPlanChangeLinkService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/planchange/service/ProcessPlanChangeLinkService.java @@ -1,7 +1,11 @@ package com.jero.modules.activiti.process.planchange.service; +import cn.hutool.core.collection.CollStreamUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.jero.common.system.api.ISysBaseAPI; import com.jero.common.system.query.QueryGenerator; +import com.jero.common.system.vo.DictModel; +import com.jero.common.util.PasswordUtil; import com.jero.modules.activiti.process.planchange.entity.ProcessPlanChangeLink; import com.jero.modules.activiti.process.planchange.mapper.ProcessPlanChangeLinkMapper; import org.springframework.stereotype.Service; @@ -15,6 +19,8 @@ import javax.servlet.http.HttpServletRequest; import lombok.extern.slf4j.Slf4j; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** * 企标计划变更流程关联标准(ProcessPlanChangeLink)表服务实现类 @@ -27,10 +33,23 @@ import java.util.List; public class ProcessPlanChangeLinkService extends ServiceImpl { @Resource private ProcessPlanChangeLinkMapper processPlanChangeLinkMapper; + @Resource + private ISysBaseAPI sysBaseAPI; public IPage pageList(Page page, ProcessPlanChangeLink processPlanChangeLink, HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(processPlanChangeLink, req.getParameterMap()); - return this.page(page, queryWrapper); + Page pageList = this.page(page, queryWrapper); + List records = pageList.getRecords(); + String userIds = records.stream().map(ProcessPlanChangeLink::getMainDraftingUser).collect(Collectors.joining(",")); + List dictModels = sysBaseAPI.translateDictFromTableByKeys("sys_user", "email", "id", userIds); + Map userMap = CollStreamUtil.toMap(dictModels, DictModel::getValue, DictModel::getText); + for (ProcessPlanChangeLink record : records) { + String mainDraftingUser = record.getMainDraftingUser(); + String email = userMap.get(mainDraftingUser); + record.setEmail(PasswordUtil.decrypt(email)); + } + + return pageList; } public void add(ProcessPlanChangeLink processPlanChangeLink) { diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/planchange/service/ProcessPlanChangeService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/planchange/service/ProcessPlanChangeService.java index 2875aee7..6dcb61c5 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/planchange/service/ProcessPlanChangeService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/planchange/service/ProcessPlanChangeService.java @@ -9,15 +9,14 @@ import com.jero.modules.activiti.common.ActivitiCommon; import com.jero.modules.activiti.entity.ProcessAll; import com.jero.modules.activiti.entity.ProcessApprovalRecord; import com.jero.modules.activiti.enums.ProcessTypeEnum; -import com.jero.modules.activiti.process.annualinit.common.ProcessAnnualInitCommon; 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; import com.jero.modules.activiti.process.fb.service.IProcessHandleService; import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO; +import com.jero.modules.activiti.process.planchange.common.PlanChangeCommon; import com.jero.modules.activiti.process.planchange.entity.ProcessPlanChange; import com.jero.modules.activiti.process.planchange.entity.ProcessPlanChangeLink; import com.jero.modules.activiti.process.planchange.mapper.ProcessPlanChangeMapper; @@ -31,14 +30,10 @@ import com.jero.modules.laws.enterprise.service.EnterpriseStandardPlanService; import org.activiti.engine.TaskService; import org.activiti.engine.task.Task; import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import org.apache.commons.lang3.StringUtils; import lombok.extern.slf4j.Slf4j; import java.util.*; @@ -99,7 +94,7 @@ public class ProcessPlanChangeService extends ServiceImpl variables = new HashMap<>(); variables.put(ActivitiCommon.PASS, pass); - variables.put(ProcessAnnualInitCommon.STANDARD_DEPART_HANDLER, planChange.getStandardDepartHandler()); + variables.put(PlanChangeCommon.STANDARD_DEPART_HANDLER, planChange.getStandardDepartHandler()); taskService.complete(processDTO.getTaskId(), variables); if (!Objects.equals(userId, originUserId)) { String departManager = planChange.getDepartManager(); @@ -255,7 +250,7 @@ public class ProcessPlanChangeService extends ServiceImpl variables = new HashMap<>(); variables.put(ActivitiCommon.PASS, pass); - variables.put(ProcessAnnualInitCommon.STANDARD_DEPART_MANAGER, planChange.getStandardDepartManager()); + variables.put(PlanChangeCommon.STANDARD_DEPART_MANAGER, planChange.getStandardDepartManager()); taskService.complete(processDTO.getTaskId(), variables); if (!Objects.equals(userId, originUserId)) { @@ -276,7 +271,7 @@ public class ProcessPlanChangeService extends ServiceImpl variables = new HashMap<>(); variables.put(ActivitiCommon.PASS, pass); - variables.put(ProcessAnnualInitCommon.SENIOR_MANAGER_LIST, Arrays.asList(planChange.getSeniorManager().split(","))); + variables.put(PlanChangeCommon.SENIOR_MANAGER_LIST, Arrays.asList(planChange.getSeniorManager().split(","))); taskService.complete(processDTO.getTaskId(), variables); if (!Objects.equals(userId, originUserId)) { @@ -297,7 +292,7 @@ public class ProcessPlanChangeService extends ServiceImpl variables = new HashMap<>(); variables.put(ActivitiCommon.PASS, pass); - variables.put(ProcessAnnualInitCommon.CHIEF_INSPECTOR_LIST, Arrays.asList(planChange.getChiefInspector().split(","))); + variables.put(PlanChangeCommon.CHIEF_INSPECTOR_LIST, Arrays.asList(planChange.getChiefInspector().split(","))); taskService.complete(processDTO.getTaskId(), variables); if (!Objects.equals(userId, originUserId)) { String departManager = planChange.getSeniorManager(); @@ -319,7 +314,7 @@ public class ProcessPlanChangeService extends ServiceImpl variables = new HashMap<>(); variables.put(ActivitiCommon.PASS, pass); - variables.put(ProcessAnnualInitCommon.AUTHORIZED_PERSON_LIST, Arrays.asList(planChange.getAuthorizedPerson().split(","))); + variables.put(PlanChangeCommon.AUTHORIZED_PERSON_LIST, Arrays.asList(planChange.getAuthorizedPerson().split(","))); taskService.complete(processDTO.getTaskId(), variables); if (!Objects.equals(userId, originUserId)) { String departManager = planChange.getChiefInspector(); @@ -355,33 +350,103 @@ public class ProcessPlanChangeService extends ServiceImpl myQuery = Wrappers.lambdaQuery(ProcessPlanChangeLink.class); myQuery.eq(ProcessPlanChangeLink::getProcessId, businessId); List list = planChangeLinkService.list(myQuery); - List enterpriseStandardPlanList = convertToEnterpriseStandardPlanList(list); - esPlanService.saveBatch(enterpriseStandardPlanList); + String changeType = planChange.getChangeType(); + switch (changeType){ + case PlanChangeCommon.ADD: + List addList = convertToAddList(list); + esPlanService.saveBatch(addList); + break; + case PlanChangeCommon.CANCEL: + List cancelList = convertToCancelList(list); + esPlanService.updateBatchById(cancelList); + break; + case PlanChangeCommon.DELAY: + List delayList = convertToDelayList(list); + esPlanService.updateBatchById(delayList); + break; + case PlanChangeCommon.PERSON_CHANGE: + List personChangeList = convertToPersonChangeList(list); + esPlanService.updateBatchById(personChangeList); + break; + default: + } + + } } - private List convertToEnterpriseStandardPlanList(List list) { - List enterpriseStandardPlanlist= Lists.newArrayList(); - for (ProcessPlanChangeLink ProcessPlanChangeLink :list) { - enterpriseStandardPlanlist.add(convertFromProcessAnnualInitLink(ProcessPlanChangeLink)); + private List convertToPersonChangeList(List list) { + List enterpriseStandardPlanlist=Lists.newArrayList(); + for (ProcessPlanChangeLink processPlanChangeLink :list) { + enterpriseStandardPlanlist.add(convertFromPersonChange(processPlanChangeLink)); + } + return enterpriseStandardPlanlist; + + } + + private EnterpriseStandardPlan convertFromPersonChange(ProcessPlanChangeLink processPlanChangeLink) { + EnterpriseStandardPlan enterpriseStandardPlan = new EnterpriseStandardPlan(); + enterpriseStandardPlan.setId(processPlanChangeLink.getPlanId()); + enterpriseStandardPlan.setMainDraftingUser(processPlanChangeLink.getMainDraftingUser()); + + return enterpriseStandardPlan; + } + + private List convertToDelayList(List list) { + List enterpriseStandardPlanlist=Lists.newArrayList(); + for (ProcessPlanChangeLink processPlanChangeLink :list) { + enterpriseStandardPlanlist.add(convertFromDelay(processPlanChangeLink)); } return enterpriseStandardPlanlist; } - private EnterpriseStandardPlan convertFromProcessAnnualInitLink(ProcessPlanChangeLink ProcessPlanChangeLink) { + private EnterpriseStandardPlan convertFromDelay(ProcessPlanChangeLink processPlanChangeLink) { EnterpriseStandardPlan enterpriseStandardPlan = new EnterpriseStandardPlan(); - enterpriseStandardPlan.setRevisionType(ProcessPlanChangeLink.getRevisionType()); - //enterpriseStandardPlan.setProjectType(); - //enterpriseStandardPlan.setStandardId(ProcessPlanChangeLink.getStandardId()); - //enterpriseStandardPlan.setStandardNumber(ProcessPlanChangeLink.getStandardNumber()); - //enterpriseStandardPlan.setStandardName(ProcessPlanChangeLink.getStandardName()); - //enterpriseStandardPlan.setMainDraftingUser(ProcessPlanChangeLink.getMainDraftingUser()); - enterpriseStandardPlan.setDepartId(ProcessPlanChangeLink.getDepartId()); - //enterpriseStandardPlan.setProfessionalModule(ProcessPlanChangeLink.getProfessionalModule()); - enterpriseStandardPlan.setDraftCompleteDate(ProcessPlanChangeLink.getDraftCompleteDate()); - enterpriseStandardPlan.setPlanArchivingDate(ProcessPlanChangeLink.getPlanArchivingDate()); - //enterpriseStandardPlan.setHaveEnglishVersion(ProcessPlanChangeLink.getHaveEnglishVersion()); - //enterpriseStandardPlan.setCommittee(ProcessPlanChangeLink.getCommittee()); + enterpriseStandardPlan.setId(processPlanChangeLink.getPlanId()); + enterpriseStandardPlan.setDraftCompleteDate(processPlanChangeLink.getDraftCompleteDate()); + enterpriseStandardPlan.setPlanArchivingDate(processPlanChangeLink.getPlanArchivingDate()); + enterpriseStandardPlan.setPlanStatus(ESPlanStatusEnum.DELAY.getValue()); + + return enterpriseStandardPlan; + } + + private List convertToCancelList(List list) { + List enterpriseStandardPlanlist=Lists.newArrayList(); + for (ProcessPlanChangeLink processPlanChangeLink :list) { + enterpriseStandardPlanlist.add(convertFromCancel(processPlanChangeLink)); + } + return enterpriseStandardPlanlist; + } + + private EnterpriseStandardPlan convertFromCancel(ProcessPlanChangeLink processPlanChangeLink) { + EnterpriseStandardPlan enterpriseStandardPlan = new EnterpriseStandardPlan(); + enterpriseStandardPlan.setId(processPlanChangeLink.getPlanId()); + enterpriseStandardPlan.setPlanStatus(ESPlanStatusEnum.CANCEL.getValue()); + + return enterpriseStandardPlan; + } + + private List convertToAddList(List list) { + List enterpriseStandardPlanlist= Lists.newArrayList(); + for (ProcessPlanChangeLink ProcessPlanChangeLink :list) { + enterpriseStandardPlanlist.add(convertFromAdd(ProcessPlanChangeLink)); + } + return enterpriseStandardPlanlist; + } + + private EnterpriseStandardPlan convertFromAdd(ProcessPlanChangeLink processPlanChangeLink) { + EnterpriseStandardPlan enterpriseStandardPlan = new EnterpriseStandardPlan(); + enterpriseStandardPlan.setRevisionType(processPlanChangeLink.getRevisionType()); + enterpriseStandardPlan.setStandardId(processPlanChangeLink.getStandardId()); + enterpriseStandardPlan.setStandardNumber(processPlanChangeLink.getStandardNumber()); + enterpriseStandardPlan.setStandardName(processPlanChangeLink.getStandardName()); + enterpriseStandardPlan.setMainDraftingUser(processPlanChangeLink.getMainDraftingUser()); + enterpriseStandardPlan.setDepartId(processPlanChangeLink.getDepartId()); + enterpriseStandardPlan.setProfessionalModule(processPlanChangeLink.getProfessionalModule()); + enterpriseStandardPlan.setDraftCompleteDate(processPlanChangeLink.getDraftCompleteDate()); + enterpriseStandardPlan.setPlanArchivingDate(processPlanChangeLink.getPlanArchivingDate()); + enterpriseStandardPlan.setHaveEnglishVersion(processPlanChangeLink.getHaveEnglishVersion()); + enterpriseStandardPlan.setCommittee(processPlanChangeLink.getCommittee()); enterpriseStandardPlan.setProjectStatus(ESPProjectStatus.NOT_STARTED.getValue()); enterpriseStandardPlan.setPlanStatus(ESPlanStatusEnum.ADD.getValue()); return enterpriseStandardPlan;