From e0e04f46b28d4867b04caf95259469ef80857646 Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Thu, 30 Nov 2023 20:09:56 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E6=B5=81=E7=A8=8B):=20=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/EsDeclareFlowServiceImpl.java | 9 +++ .../impl/EsInspectFlowServiceImpl.java | 12 ++++ .../EsInspectDelayApplyFlowServiceImpl.java | 12 ++++ .../impl/EsInspectPlanFlowServiceImpl.java | 13 +++++ .../impl/EsInspectRectifyFlowServiceImpl.java | 12 ++++ .../EsPermissionApplyFlowServiceImpl.java | 12 ++++ .../ProcessMeetingManageController.java | 17 ++++++ .../entity/ProcessMeetingManage.java | 13 +++++ .../service/IProcessMeetingManageService.java | 7 +++ .../impl/MeetingManageFlowServiceImpl.java | 12 ++++ .../impl/ProcessMeetingManageServiceImpl.java | 56 ++++++++++++++++++- 11 files changed, 174 insertions(+), 1 deletion(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/service/impl/EsDeclareFlowServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/service/impl/EsDeclareFlowServiceImpl.java index 4e17f17d..97b69eeb 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/service/impl/EsDeclareFlowServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/service/impl/EsDeclareFlowServiceImpl.java @@ -172,6 +172,12 @@ public class EsDeclareFlowServiceImpl implements IEsDeclareFlowService { if (StringUtils.isNotBlank(processApprovalRecord.getCommitText())){ processDraft.setHandleText(processApprovalRecord.getCommitText()); } + if (!Objects.isNull(processAll.getDueTime())){ + processDraft.setProcessDueDate(processAll.getDueTime()); + } + if (StringUtils.isNotBlank(processAll.getPrcMes())){ + processDraft.setProcessDescription(processAll.getPrcMes()); + } processDraft.setUserId(loginUser.getId()); // 删除旧草稿 processDraftService.remove(new LambdaQueryWrapper() @@ -179,6 +185,9 @@ public class EsDeclareFlowServiceImpl implements IEsDeclareFlowService { .eq(ProcessDraft::getUserId, loginUser.getId())); // 保存新草稿 processDraftService.save(processDraft); + + // 企标宣贯业务表 + processEsDeclareService.saveOrUpdate(esDeclareFlowVO.getProcessEsDeclare()); } private Map listToString(Map map) { diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlowServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlowServiceImpl.java index 178db536..19c797eb 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlowServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlowServiceImpl.java @@ -206,6 +206,12 @@ public class EsInspectFlowServiceImpl implements IEsInspectFlowService { if (StringUtils.isNotBlank(processApprovalRecord.getCommitText())){ processDraft.setHandleText(processApprovalRecord.getCommitText()); } + if (!Objects.isNull(processAll.getDueTime())){ + processDraft.setProcessDueDate(processAll.getDueTime()); + } + if (StringUtils.isNotBlank(processAll.getPrcMes())){ + processDraft.setProcessDescription(processAll.getPrcMes()); + } processDraft.setUserId(loginUser.getId()); // 删除旧草稿 processDraftService.remove(new LambdaQueryWrapper() @@ -246,6 +252,12 @@ public class EsInspectFlowServiceImpl implements IEsInspectFlowService { if (StringUtils.isNotBlank(processDraft.getHandleText())){ processApprovalRecord.setCommitText(processDraft.getHandleText()); } + if (!Objects.isNull(processDraft.getProcessDueDate())){ + processAll.setDueTime(processDraft.getProcessDueDate()); + } + if (StringUtils.isNotBlank(processDraft.getProcessDescription())){ + processAll.setPrcMes(processDraft.getProcessDescription()); + } }else { // 不存在草稿 processApprovalRecord = processApprovalRecordService.getOne(new LambdaQueryWrapper() diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/service/impl/EsInspectDelayApplyFlowServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/service/impl/EsInspectDelayApplyFlowServiceImpl.java index 4459a283..9e18372b 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/service/impl/EsInspectDelayApplyFlowServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/service/impl/EsInspectDelayApplyFlowServiceImpl.java @@ -161,6 +161,12 @@ public class EsInspectDelayApplyFlowServiceImpl implements IEsInspectDelayApplyF if (StringUtils.isNotBlank(processApprovalRecord.getCommitText())){ processDraft.setHandleText(processApprovalRecord.getCommitText()); } + if (!Objects.isNull(processAll.getDueTime())){ + processDraft.setProcessDueDate(processAll.getDueTime()); + } + if (StringUtils.isNotBlank(processAll.getPrcMes())){ + processDraft.setProcessDescription(processAll.getPrcMes()); + } processDraft.setUserId(loginUser.getId()); // 删除旧草稿 processDraftService.remove(new LambdaQueryWrapper() @@ -201,6 +207,12 @@ public class EsInspectDelayApplyFlowServiceImpl implements IEsInspectDelayApplyF if (StringUtils.isNotBlank(processDraft.getHandleText())){ processApprovalRecord.setCommitText(processDraft.getHandleText()); } + if (!Objects.isNull(processDraft.getProcessDueDate())){ + processAll.setDueTime(processDraft.getProcessDueDate()); + } + if (StringUtils.isNotBlank(processDraft.getProcessDescription())){ + processAll.setPrcMes(processDraft.getProcessDescription()); + } }else { // 不存在草稿 processApprovalRecord = processApprovalRecordService.getOne(new LambdaQueryWrapper() diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/EsInspectPlanFlowServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/EsInspectPlanFlowServiceImpl.java index c3ad9f0b..9346f33e 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/EsInspectPlanFlowServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/EsInspectPlanFlowServiceImpl.java @@ -159,6 +159,7 @@ public class EsInspectPlanFlowServiceImpl implements IEsInspectPlanFlowService { ProcessDraft processDraft = new ProcessDraft(); // 属性拷贝 BeanUtils.copyProperties(processAll, processDraft); + processDraft.setCreateBy(""); processDraft.setId(""); processDraft.setUpdateBy(""); Date date = new Date(); @@ -172,6 +173,12 @@ public class EsInspectPlanFlowServiceImpl implements IEsInspectPlanFlowService { if (StringUtils.isNotBlank(processApprovalRecord.getCommitText())){ processDraft.setHandleText(processApprovalRecord.getCommitText()); } + if (!Objects.isNull(processAll.getDueTime())){ + processDraft.setProcessDueDate(processAll.getDueTime()); + } + if (StringUtils.isNotBlank(processAll.getPrcMes())){ + processDraft.setProcessDescription(processAll.getPrcMes()); + } processDraft.setUserId(loginUser.getId()); // 删除旧草稿 processDraftService.remove(new LambdaQueryWrapper() @@ -224,6 +231,12 @@ public class EsInspectPlanFlowServiceImpl implements IEsInspectPlanFlowService { if (StringUtils.isNotBlank(processDraft.getHandleText())){ processApprovalRecord.setCommitText(processDraft.getHandleText()); } + if (!Objects.isNull(processDraft.getProcessDueDate())){ + processAll.setDueTime(processDraft.getProcessDueDate()); + } + if (StringUtils.isNotBlank(processDraft.getProcessDescription())){ + processAll.setPrcMes(processDraft.getProcessDescription()); + } }else { // 不存在草稿 processApprovalRecord = processApprovalRecordService.getOne(new LambdaQueryWrapper() diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/service/impl/EsInspectRectifyFlowServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/service/impl/EsInspectRectifyFlowServiceImpl.java index c2a1f866..234f11f6 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/service/impl/EsInspectRectifyFlowServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/service/impl/EsInspectRectifyFlowServiceImpl.java @@ -145,6 +145,12 @@ public class EsInspectRectifyFlowServiceImpl implements IEsInspectRectifyFlowSer if (StringUtils.isNotBlank(processApprovalRecord.getCommitText())){ processDraft.setHandleText(processApprovalRecord.getCommitText()); } + if (!Objects.isNull(processAll.getDueTime())){ + processDraft.setProcessDueDate(processAll.getDueTime()); + } + if (StringUtils.isNotBlank(processAll.getPrcMes())){ + processDraft.setProcessDescription(processAll.getPrcMes()); + } processDraft.setUserId(loginUser.getId()); // 删除旧草稿 processDraftService.remove(new LambdaQueryWrapper() @@ -189,6 +195,12 @@ public class EsInspectRectifyFlowServiceImpl implements IEsInspectRectifyFlowSer if (StringUtils.isNotBlank(processDraft.getHandleText())){ processApprovalRecord.setCommitText(processDraft.getHandleText()); } + if (!Objects.isNull(processDraft.getProcessDueDate())){ + processAll.setDueTime(processDraft.getProcessDueDate()); + } + if (StringUtils.isNotBlank(processDraft.getProcessDescription())){ + processAll.setPrcMes(processDraft.getProcessDescription()); + } }else { // 不存在草稿 processApprovalRecord = processApprovalRecordService.getOne(new LambdaQueryWrapper() diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/impl/EsPermissionApplyFlowServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/impl/EsPermissionApplyFlowServiceImpl.java index c92e1ffb..6c9b2460 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/impl/EsPermissionApplyFlowServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/impl/EsPermissionApplyFlowServiceImpl.java @@ -163,6 +163,12 @@ public class EsPermissionApplyFlowServiceImpl implements EsPermissionApplyFlowSe if (StringUtils.isNotBlank(processApprovalRecord.getCommitText())){ processDraft.setHandleText(processApprovalRecord.getCommitText()); } + if (!Objects.isNull(processAll.getDueTime())){ + processDraft.setProcessDueDate(processAll.getDueTime()); + } + if (StringUtils.isNotBlank(processAll.getPrcMes())){ + processDraft.setProcessDescription(processAll.getPrcMes()); + } processDraft.setUserId(loginUser.getId()); // 删除旧草稿 processDraftService.remove(new LambdaQueryWrapper() @@ -203,6 +209,12 @@ public class EsPermissionApplyFlowServiceImpl implements EsPermissionApplyFlowSe if (StringUtils.isNotBlank(processDraft.getHandleText())){ processApprovalRecord.setCommitText(processDraft.getHandleText()); } + if (!Objects.isNull(processDraft.getProcessDueDate())){ + processAll.setDueTime(processDraft.getProcessDueDate()); + } + if (StringUtils.isNotBlank(processDraft.getProcessDescription())){ + processAll.setPrcMes(processDraft.getProcessDescription()); + } }else { // 不存在草稿 processApprovalRecord = processApprovalRecordService.getOne(new LambdaQueryWrapper() diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/controller/ProcessMeetingManageController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/controller/ProcessMeetingManageController.java index e0b6d097..45daeea9 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/controller/ProcessMeetingManageController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/controller/ProcessMeetingManageController.java @@ -150,6 +150,23 @@ public class ProcessMeetingManageController extends JeroController queryByProjectId(String projectId) { + ProcessMeetingManage processMeetingManage = processMeetingManageService.queryByProjectId(projectId); + if(processMeetingManage==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(processMeetingManage); + } + /** * 导出excel * diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/entity/ProcessMeetingManage.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/entity/ProcessMeetingManage.java index b1980b90..5ec09594 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/entity/ProcessMeetingManage.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/entity/ProcessMeetingManage.java @@ -1,5 +1,6 @@ package com.jero.modules.activiti.process.meetingmanage.entity; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import com.jero.modules.laws.documenttool.entity.BaseEntity; @@ -42,10 +43,22 @@ public class ProcessMeetingManage extends BaseEntity { @Excel(name = "分标委id(标准化活动树结构一级id)", width = 15) @ApiModelProperty(value = "分标委id(标准化活动树结构一级id)") private java.lang.String standardizationFirstId; + /**分标委名称*/ + @ApiModelProperty(value = "分标委名称") + @TableField(exist = false) + private java.lang.String standardizationFirstName; /**工作组id(标准化活动树结构二级id)*/ @Excel(name = "工作组id(标准化活动树结构二级id)", width = 15) @ApiModelProperty(value = "工作组id(标准化活动树结构二级id)") private java.lang.String standardizationSecondId; + /**工作组名称*/ + @ApiModelProperty(value = "工作组名称") + @TableField(exist = false) + private java.lang.String standardizationSecondName; + /**相关资料*/ + @ApiModelProperty(value = "相关资料") + @TableField(exist = false) + private java.lang.String fileIds; /**标准编号*/ @Excel(name = "标准编号", width = 15) @ApiModelProperty(value = "标准编号") diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/service/IProcessMeetingManageService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/service/IProcessMeetingManageService.java index cb4869bb..4ea661b5 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/service/IProcessMeetingManageService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/service/IProcessMeetingManageService.java @@ -74,4 +74,11 @@ public interface IProcessMeetingManageService extends IService() @@ -217,6 +223,12 @@ public class MeetingManageFlowServiceImpl implements IMeetingManageFlowService { if (StringUtils.isNotBlank(processDraft.getHandleText())){ processApprovalRecord.setCommitText(processDraft.getHandleText()); } + if (!Objects.isNull(processDraft.getProcessDueDate())){ + processAll.setDueTime(processDraft.getProcessDueDate()); + } + if (StringUtils.isNotBlank(processDraft.getProcessDescription())){ + processAll.setPrcMes(processDraft.getProcessDescription()); + } }else { // 不存在草稿 processApprovalRecord = processApprovalRecordService.getOne(new LambdaQueryWrapper() diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/service/impl/ProcessMeetingManageServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/service/impl/ProcessMeetingManageServiceImpl.java index 5fb83b9e..11e8076b 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/service/impl/ProcessMeetingManageServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/service/impl/ProcessMeetingManageServiceImpl.java @@ -1,20 +1,31 @@ package com.jero.modules.activiti.process.meetingmanage.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.exception.JeroBootException; import com.jero.common.system.query.QueryGenerator; +import com.jero.common.system.vo.LoginUser; import com.jero.modules.activiti.process.meetingmanage.entity.ProcessMeetingManage; +import com.jero.modules.activiti.process.meetingmanage.entity.ProcessMeetingManagePersonnel; import com.jero.modules.activiti.process.meetingmanage.mapper.ProcessMeetingManageMapper; +import com.jero.modules.activiti.process.meetingmanage.service.IProcessMeetingManagePersonnelService; import com.jero.modules.activiti.process.meetingmanage.service.IProcessMeetingManageService; +import com.jero.modules.laws.standardization.entity.LawsStandardization; +import com.jero.modules.laws.standardization.service.ILawsStandardizationLiaisonService; +import com.jero.modules.laws.standardization.service.ILawsStandardizationService; +import org.apache.logging.log4j.util.Strings; +import org.apache.shiro.SecurityUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletRequest; import java.util.Date; import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; /** @@ -27,8 +38,19 @@ import java.util.List; @Transactional(rollbackFor = JeroBootException.class) public class ProcessMeetingManageServiceImpl extends ServiceImpl implements IProcessMeetingManageService { + private final IProcessMeetingManagePersonnelService processMeetingManagePersonnelService; + private final ILawsStandardizationService lawsStandardizationService; + private final ILawsStandardizationLiaisonService lawsStandardizationLiaisonService; - /** + public ProcessMeetingManageServiceImpl(IProcessMeetingManagePersonnelService processMeetingManagePersonnelService, + ILawsStandardizationService lawsStandardizationService, + ILawsStandardizationLiaisonService lawsStandardizationLiaisonService) { + this.processMeetingManagePersonnelService = processMeetingManagePersonnelService; + this.lawsStandardizationService = lawsStandardizationService; + this.lawsStandardizationLiaisonService = lawsStandardizationLiaisonService; + } + + /** * 分页查询 * * @param processMeetingManage @@ -116,4 +138,36 @@ public class ProcessMeetingManageServiceImpl extends ServiceImpl() + .eq(ProcessMeetingManage::getProjectId, projectId)); + // 翻译 + if (Strings.isNotBlank(processMeetingManage.getStandardizationFirstId())){ + LawsStandardization lawsStandardization = lawsStandardizationService.getById(processMeetingManage.getStandardizationFirstId()); + if (!Objects.isNull(processMeetingManage)){ + processMeetingManage.setStandardizationFirstName(lawsStandardization.getNum() + " " +lawsStandardization.getName()); + } + } + if (Strings.isNotBlank(processMeetingManage.getStandardizationSecondId())){ + LawsStandardization lawsStandardization = lawsStandardizationService.getById(processMeetingManage.getStandardizationSecondId()); + if (!Objects.isNull(processMeetingManage)){ + processMeetingManage.setStandardizationSecondName(lawsStandardization.getNum() + " " +lawsStandardization.getName()); + } + } + // 相关资料 + List processMeetingManagePersonnelList = processMeetingManagePersonnelService.list( + new LambdaQueryWrapper() + .eq(ProcessMeetingManagePersonnel::getProcessMeetingManageId, processMeetingManage.getId()) + .eq(ProcessMeetingManagePersonnel::getPersonnelId, sysUser.getId())); + + if (!processMeetingManagePersonnelList.isEmpty()){ + String fileIds = processMeetingManagePersonnelList.stream().map(ProcessMeetingManagePersonnel::getFileId).collect(Collectors.joining(",")); + processMeetingManage.setFileIds(fileIds); + } + return processMeetingManage; + } }