From 0efc53eef6959735b90222611eb70db258c1ba8a Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 21 Dec 2023 11:52:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=EF=BC=8C?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=8A=B6=E6=80=81=E4=B8=BA=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E7=9A=84=E4=B8=8D=E5=8F=91=E6=8F=90=E9=86=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../job/CertificationInventoryJob.java | 23 +++++++- .../project/job/InventoryAffirmJob.java | 46 ++++++++++----- .../modules/project/job/TaskAffirmJob.java | 56 +++++++++++++++---- .../project/job/VerifyComplianceJob.java | 49 ++++++++++++---- .../project/job/designComplianceJob.java | 49 ++++++++++++---- 5 files changed, 173 insertions(+), 50 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/CertificationInventoryJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/CertificationInventoryJob.java index 0cb504a45..bc4ab6fab 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/CertificationInventoryJob.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/CertificationInventoryJob.java @@ -2,6 +2,8 @@ package com.jero.modules.project.job; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.jero.common.constant.enums.YesOrNoEnum; +import com.jero.common.system.vo.DictModel; import com.jero.common.util.DateUtils; import com.jero.modules.feishu.enums.TemplateInfoEnum2; import com.jero.modules.feishu.service.IFeishuService; @@ -12,6 +14,8 @@ import com.jero.modules.project.enums.CertificationInventoryFlowStatusEnum; import com.jero.modules.project.service.IProjectCertificationInventoryEOService; import com.jero.modules.project.service.IProjectLibraryBaseService; import com.jero.modules.system.entity.SysUser; +import com.jero.modules.system.enums.DicCodeEnum; +import com.jero.modules.system.service.ISysDictService; import com.jero.modules.system.service.ISysUserService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; @@ -23,7 +27,14 @@ import org.quartz.JobExecutionException; import org.springframework.beans.factory.annotation.Autowired; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Calendar; +import java.util.Date; +import java.util.GregorianCalendar; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; /** @@ -43,10 +54,13 @@ public class CertificationInventoryJob implements Job { private ISysUserService sysUserService; @Autowired private IFeishuService feishuService; - + @Autowired + private ISysDictService sysDictService; @Override public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException { log.info("认证清单，定时任务开启 ====================================================="); + List projectStatus = sysDictService.queryDictItemsByCode(DicCodeEnum.PROJECT_STATUS.getCode()); + projectStatus = projectStatus.stream().filter(e-> YesOrNoEnum.CANCEL.getName().equals(e.getText())).collect(Collectors.toList()); List flowStatusList = new ArrayList<>(); flowStatusList.add(CertificationInventoryFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()); @@ -71,6 +85,11 @@ public class CertificationInventoryJob implements Job { if(CollectionUtils.isNotEmpty(projectCertificationInventoryEOS)){ ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); + if(ObjectUtils.isNotEmpty(projectLibraryBase) && StringUtils.isNotBlank(projectLibraryBase.getProjectStatus()) + && projectLibraryBase.getProjectStatus().equals(projectStatus.get(0).getValue())){ + //项目状态为取消时，不发提醒 + projectLibraryBase = null; + } if(ObjectUtils.isNotEmpty(projectLibraryBase)){ if(StringUtils.isNotEmpty(projectLibraryBase.getCertificationEngineer())){ // 消息提醒 认证工程师 认证清单数据 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java index d77b9fa07..1e3ab47dc 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java @@ -1,29 +1,24 @@ package com.jero.modules.project.job; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.jero.common.constant.enums.MessageType2Enum; -import com.jero.common.constant.enums.MessageTypeEnum; -import com.jero.common.constant.enums.MsgColorEnum; +import com.jero.common.constant.enums.YesOrNoEnum; +import com.jero.common.system.vo.DictModel; import com.jero.common.util.DateUtils; -import com.jero.modules.document.entity.BussDocumentLibraryEO; import com.jero.modules.document.service.IBussDocumentLibraryEOService; import com.jero.modules.feishu.enums.TemplateInfoEnum2; import com.jero.modules.feishu.service.IFeishuService; -import com.jero.modules.feishu.vo.FeishuMsg2Vo; -import com.jero.modules.feishu.vo.FeishuMsgVo; -import com.jero.modules.project.entity.*; +import com.jero.modules.project.entity.ProjectLawsInventoryEO; +import com.jero.modules.project.entity.ProjectLibraryBase; import com.jero.modules.project.enums.ComplianceFlowStatusEnum; -import com.jero.modules.project.enums.InventoryAffirmStatusEnum; -import com.jero.modules.project.enums.JumpLinkEnum; -import com.jero.modules.project.enums.SendMsgFlagEnum; import com.jero.modules.project.mapper.ProjectLawsInventoryEOMapper; import com.jero.modules.project.mapper.ProjectLibraryBaseMapper; import com.jero.modules.project.mapper.ProjectNameInfoEOMapper; import com.jero.modules.project.mapper.ProjectYearNameInfoEOMapper; import com.jero.modules.project.service.IProjectLawsInventoryEOService; import com.jero.modules.project.service.IProjectLibraryBaseService; -import com.jero.modules.system.entity.SysUser; +import com.jero.modules.system.enums.DicCodeEnum; import com.jero.modules.system.enums.ProjectRoleEnum; +import com.jero.modules.system.service.ISysDictService; import com.jero.modules.system.service.ISysUserService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; @@ -35,9 +30,14 @@ import org.quartz.JobExecutionException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; -import java.io.IOException; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.Arrays; +import java.util.Calendar; +import java.util.Date; +import java.util.GregorianCalendar; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; /** @@ -75,6 +75,9 @@ public class InventoryAffirmJob implements Job { private IProjectLibraryBaseService projectLibraryBaseService; private static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + @Autowired + private ISysDictService sysDictService; + /** * 清单任务到达截止时间后，给用户发送消息 @@ -82,6 +85,8 @@ public class InventoryAffirmJob implements Job { @Override public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException { log.info("清单确认流程，定时任务开启 ====================================================="); + List projectStatus = sysDictService.queryDictItemsByCode(DicCodeEnum.PROJECT_STATUS.getCode()); + projectStatus = projectStatus.stream().filter(e-> YesOrNoEnum.CANCEL.getName().equals(e.getText())).collect(Collectors.toList()); // 获取法规清单 设计、验证符合性流程状态为 清单待校核的数据。 QueryWrapper queryWrapperInventory = new QueryWrapper<>(); queryWrapperInventory.and(queryWrapper -> { @@ -130,6 +135,11 @@ public class InventoryAffirmJob implements Job { params.put("serialNumbers",serialNumbers); ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); + if(ObjectUtils.isNotEmpty(projectLibraryBase) && StringUtils.isNotBlank(projectLibraryBase.getProjectStatus()) + && projectLibraryBase.getProjectStatus().equals(projectStatus.get(0).getValue())){ + //项目状态为取消时，不发提醒 + projectLibraryBase = null; + } if(ObjectUtils.isNotEmpty(projectLibraryBase)){ String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 @@ -162,6 +172,11 @@ public class InventoryAffirmJob implements Job { params.put("serialNumbers",serialNumbers); ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); + if(ObjectUtils.isNotEmpty(projectLibraryBase) && StringUtils.isNotBlank(projectLibraryBase.getProjectStatus()) + && projectLibraryBase.getProjectStatus().equals(projectStatus.get(0).getValue())){ + //项目状态为取消时，不发提醒 + projectLibraryBase = null; + } if(ObjectUtils.isNotEmpty(projectLibraryBase)){ String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 @@ -194,6 +209,11 @@ public class InventoryAffirmJob implements Job { params.put("serialNumbers",serialNumbers); ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); + if(ObjectUtils.isNotEmpty(projectLibraryBase) && StringUtils.isNotBlank(projectLibraryBase.getProjectStatus()) + && projectLibraryBase.getProjectStatus().equals(projectStatus.get(0).getValue())){ + //项目状态为取消时，不发提醒 + projectLibraryBase = null; + } if(ObjectUtils.isNotEmpty(projectLibraryBase)){ String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/TaskAffirmJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/TaskAffirmJob.java index 594ad8c17..47f5813c4 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/TaskAffirmJob.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/TaskAffirmJob.java @@ -1,22 +1,15 @@ package com.jero.modules.project.job; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.jero.common.constant.enums.MessageType2Enum; -import com.jero.common.constant.enums.MessageTypeEnum; -import com.jero.common.constant.enums.MsgColorEnum; +import com.jero.common.constant.enums.YesOrNoEnum; +import com.jero.common.system.vo.DictModel; import com.jero.common.util.DateUtils; -import com.jero.modules.document.entity.BussDocumentLibraryEO; import com.jero.modules.document.service.IBussDocumentLibraryEOService; import com.jero.modules.feishu.enums.TemplateInfoEnum2; import com.jero.modules.feishu.service.IFeishuService; -import com.jero.modules.feishu.vo.FeishuMsg2Vo; import com.jero.modules.project.entity.ProjectLawsInventoryEO; import com.jero.modules.project.entity.ProjectLibraryBase; -import com.jero.modules.project.entity.ProjectNameInfoEO; -import com.jero.modules.project.entity.ProjectYearNameInfoEO; import com.jero.modules.project.enums.ComplianceFlowStatusEnum; -import com.jero.modules.project.enums.InventoryAffirmStatusEnum; -import com.jero.modules.project.enums.JumpLinkEnum; import com.jero.modules.project.mapper.ProjectLawsInventoryEOMapper; import com.jero.modules.project.mapper.ProjectLibraryBaseMapper; import com.jero.modules.project.mapper.ProjectNameInfoEOMapper; @@ -24,6 +17,8 @@ import com.jero.modules.project.mapper.ProjectYearNameInfoEOMapper; import com.jero.modules.project.service.IProjectLawsInventoryEOService; import com.jero.modules.project.service.IProjectLibraryBaseService; import com.jero.modules.system.entity.SysUser; +import com.jero.modules.system.enums.DicCodeEnum; +import com.jero.modules.system.service.ISysDictService; import com.jero.modules.system.service.ISysUserService; import com.jero.modules.wkflow.enums.FlowTypeEnum; import lombok.extern.slf4j.Slf4j; @@ -36,9 +31,14 @@ import org.quartz.JobExecutionException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; -import java.io.IOException; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.Arrays; +import java.util.Calendar; +import java.util.Date; +import java.util.GregorianCalendar; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; @Slf4j @@ -74,6 +74,8 @@ public class TaskAffirmJob implements Job { private IProjectLibraryBaseService projectLibraryBaseService; private static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + @Autowired + private ISysDictService sysDictService; /** @@ -84,6 +86,8 @@ public class TaskAffirmJob implements Job { @Override public void execute(JobExecutionContext context) throws JobExecutionException { log.info("任务确认流程，定时任务开启 ====================================================="); + List projectStatus = sysDictService.queryDictItemsByCode(DicCodeEnum.PROJECT_STATUS.getCode()); + projectStatus = projectStatus.stream().filter(e-> YesOrNoEnum.CANCEL.getName().equals(e.getText())).collect(Collectors.toList()); QueryWrapper queryWrapperInventory = new QueryWrapper<>(); // 获取出 任务待确认 的数据（这个状态的数据任务在责任人上） @@ -137,6 +141,11 @@ public class TaskAffirmJob implements Job { params.put("flowTypeEn","Design Compliance Process"); ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); + if(ObjectUtils.isNotEmpty(projectLibraryBase) && StringUtils.isNotBlank(projectLibraryBase.getProjectStatus()) + && projectLibraryBase.getProjectStatus().equals(projectStatus.get(0).getValue())){ + //项目状态为取消时，不发提醒 + projectLibraryBase = null; + } if(ObjectUtils.isNotEmpty(projectLibraryBase)){ String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 @@ -178,6 +187,11 @@ public class TaskAffirmJob implements Job { params.put("flowTypeEn","Design Compliance Process"); ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); + if(ObjectUtils.isNotEmpty(projectLibraryBase) && StringUtils.isNotBlank(projectLibraryBase.getProjectStatus()) + && projectLibraryBase.getProjectStatus().equals(projectStatus.get(0).getValue())){ + //项目状态为取消时，不发提醒 + projectLibraryBase = null; + } if(ObjectUtils.isNotEmpty(projectLibraryBase)){ String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 @@ -219,6 +233,11 @@ public class TaskAffirmJob implements Job { params.put("flowTypeEn","Design Compliance Process"); ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); + if(ObjectUtils.isNotEmpty(projectLibraryBase) && StringUtils.isNotBlank(projectLibraryBase.getProjectStatus()) + && projectLibraryBase.getProjectStatus().equals(projectStatus.get(0).getValue())){ + //项目状态为取消时，不发提醒 + projectLibraryBase = null; + } if(ObjectUtils.isNotEmpty(projectLibraryBase)){ String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 @@ -275,6 +294,11 @@ public class TaskAffirmJob implements Job { params.put("flowTypeEn","Validation Compliance Process"); ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); + if(ObjectUtils.isNotEmpty(projectLibraryBase) && StringUtils.isNotBlank(projectLibraryBase.getProjectStatus()) + && projectLibraryBase.getProjectStatus().equals(projectStatus.get(0).getValue())){ + //项目状态为取消时，不发提醒 + projectLibraryBase = null; + } if(ObjectUtils.isNotEmpty(projectLibraryBase)){ String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 @@ -316,6 +340,11 @@ public class TaskAffirmJob implements Job { params.put("flowTypeEn","Validation Compliance Process"); ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); + if(ObjectUtils.isNotEmpty(projectLibraryBase) && StringUtils.isNotBlank(projectLibraryBase.getProjectStatus()) + && projectLibraryBase.getProjectStatus().equals(projectStatus.get(0).getValue())){ + //项目状态为取消时，不发提醒 + projectLibraryBase = null; + } if(ObjectUtils.isNotEmpty(projectLibraryBase)){ String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 @@ -357,6 +386,11 @@ public class TaskAffirmJob implements Job { params.put("flowTypeEn","Validation Compliance Process"); ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); + if(ObjectUtils.isNotEmpty(projectLibraryBase) && StringUtils.isNotBlank(projectLibraryBase.getProjectStatus()) + && projectLibraryBase.getProjectStatus().equals(projectStatus.get(0).getValue())){ + //项目状态为取消时，不发提醒 + projectLibraryBase = null; + } if(ObjectUtils.isNotEmpty(projectLibraryBase)){ String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/VerifyComplianceJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/VerifyComplianceJob.java index 868ced1ca..f5abab042 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/VerifyComplianceJob.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/VerifyComplianceJob.java @@ -1,21 +1,15 @@ package com.jero.modules.project.job; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.jero.common.constant.enums.MessageType2Enum; -import com.jero.common.constant.enums.MessageTypeEnum; -import com.jero.common.constant.enums.MsgColorEnum; +import com.jero.common.constant.enums.YesOrNoEnum; +import com.jero.common.system.vo.DictModel; import com.jero.common.util.DateUtils; -import com.jero.modules.document.entity.BussDocumentLibraryEO; import com.jero.modules.document.service.IBussDocumentLibraryEOService; import com.jero.modules.feishu.enums.TemplateInfoEnum2; import com.jero.modules.feishu.service.IFeishuService; -import com.jero.modules.feishu.vo.FeishuMsg2Vo; -import com.jero.modules.feishu.vo.FeishuMsgVo; -import com.jero.modules.project.entity.*; +import com.jero.modules.project.entity.ProjectLawsInventoryEO; +import com.jero.modules.project.entity.ProjectLibraryBase; import com.jero.modules.project.enums.ComplianceFlowStatusEnum; -import com.jero.modules.project.enums.DesignComplianceStatusEnum; -import com.jero.modules.project.enums.JumpLinkEnum; -import com.jero.modules.project.enums.SendMsgFlagEnum; import com.jero.modules.project.mapper.ProjectLawsInventoryEOMapper; import com.jero.modules.project.mapper.ProjectLibraryBaseMapper; import com.jero.modules.project.mapper.ProjectNameInfoEOMapper; @@ -24,6 +18,8 @@ import com.jero.modules.project.service.IProjectLawsInventoryEOService; import com.jero.modules.project.service.IProjectLibraryBaseService; import com.jero.modules.project.service.IProjectTaskInventoryEOService; import com.jero.modules.system.entity.SysUser; +import com.jero.modules.system.enums.DicCodeEnum; +import com.jero.modules.system.service.ISysDictService; import com.jero.modules.system.service.ISysUserService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; @@ -35,9 +31,14 @@ import org.quartz.JobExecutionException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; -import java.io.IOException; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.Arrays; +import java.util.Calendar; +import java.util.Date; +import java.util.GregorianCalendar; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; /** @@ -76,10 +77,14 @@ public class VerifyComplianceJob implements Job { @Autowired private IFeishuService feishuService; private static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + @Autowired + private ISysDictService sysDictService; @Override public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException { log.info("验证符合性流程，定时任务开启 ====================================================="); + List projectStatus = sysDictService.queryDictItemsByCode(DicCodeEnum.PROJECT_STATUS.getCode()); + projectStatus = projectStatus.stream().filter(e-> YesOrNoEnum.CANCEL.getName().equals(e.getText())).collect(Collectors.toList()); // 查询出 结果待提交的数据 QueryWrapper lawsInventoryEOQueryWrap = new QueryWrapper<>(); @@ -126,6 +131,11 @@ public class VerifyComplianceJob implements Job { params.put("serialNumbers",serialNumbers); ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); + if(ObjectUtils.isNotEmpty(projectLibraryBase) && StringUtils.isNotBlank(projectLibraryBase.getProjectStatus()) + && projectLibraryBase.getProjectStatus().equals(projectStatus.get(0).getValue())){ + //项目状态为取消时，不发提醒 + projectLibraryBase = null; + } if(ObjectUtils.isNotEmpty(projectLibraryBase)){ String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 @@ -166,6 +176,11 @@ public class VerifyComplianceJob implements Job { params.put("serialNumbers",serialNumbers); ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); + if(ObjectUtils.isNotEmpty(projectLibraryBase) && StringUtils.isNotBlank(projectLibraryBase.getProjectStatus()) + && projectLibraryBase.getProjectStatus().equals(projectStatus.get(0).getValue())){ + //项目状态为取消时，不发提醒 + projectLibraryBase = null; + } if(ObjectUtils.isNotEmpty(projectLibraryBase)){ String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 @@ -206,6 +221,11 @@ public class VerifyComplianceJob implements Job { params.put("serialNumbers",serialNumbers); ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); + if(ObjectUtils.isNotEmpty(projectLibraryBase) && StringUtils.isNotBlank(projectLibraryBase.getProjectStatus()) + && projectLibraryBase.getProjectStatus().equals(projectStatus.get(0).getValue())){ + //项目状态为取消时，不发提醒 + projectLibraryBase = null; + } if(ObjectUtils.isNotEmpty(projectLibraryBase)){ String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 @@ -245,6 +265,11 @@ public class VerifyComplianceJob implements Job { params.put("serialNumbers",serialNumbers); ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); + if(ObjectUtils.isNotEmpty(projectLibraryBase) && StringUtils.isNotBlank(projectLibraryBase.getProjectStatus()) + && projectLibraryBase.getProjectStatus().equals(projectStatus.get(0).getValue())){ + //项目状态为取消时，不发提醒 + projectLibraryBase = null; + } if(ObjectUtils.isNotEmpty(projectLibraryBase)){ String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/designComplianceJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/designComplianceJob.java index 348b92929..cf5c65652 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/designComplianceJob.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/designComplianceJob.java @@ -1,21 +1,15 @@ package com.jero.modules.project.job; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.jero.common.constant.enums.MessageType2Enum; -import com.jero.common.constant.enums.MessageTypeEnum; -import com.jero.common.constant.enums.MsgColorEnum; +import com.jero.common.constant.enums.YesOrNoEnum; +import com.jero.common.system.vo.DictModel; import com.jero.common.util.DateUtils; -import com.jero.modules.document.entity.BussDocumentLibraryEO; import com.jero.modules.document.service.IBussDocumentLibraryEOService; import com.jero.modules.feishu.enums.TemplateInfoEnum2; import com.jero.modules.feishu.service.IFeishuService; -import com.jero.modules.feishu.vo.FeishuMsg2Vo; -import com.jero.modules.feishu.vo.FeishuMsgVo; -import com.jero.modules.project.entity.*; +import com.jero.modules.project.entity.ProjectLawsInventoryEO; +import com.jero.modules.project.entity.ProjectLibraryBase; import com.jero.modules.project.enums.ComplianceFlowStatusEnum; -import com.jero.modules.project.enums.DesignComplianceStatusEnum; -import com.jero.modules.project.enums.JumpLinkEnum; -import com.jero.modules.project.enums.SendMsgFlagEnum; import com.jero.modules.project.mapper.ProjectLawsInventoryEOMapper; import com.jero.modules.project.mapper.ProjectLibraryBaseMapper; import com.jero.modules.project.mapper.ProjectNameInfoEOMapper; @@ -24,6 +18,8 @@ import com.jero.modules.project.service.IProjectLawsInventoryEOService; import com.jero.modules.project.service.IProjectLibraryBaseService; import com.jero.modules.project.service.IProjectTaskInventoryEOService; import com.jero.modules.system.entity.SysUser; +import com.jero.modules.system.enums.DicCodeEnum; +import com.jero.modules.system.service.ISysDictService; import com.jero.modules.system.service.ISysUserService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; @@ -35,9 +31,14 @@ import org.quartz.JobExecutionException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; -import java.io.IOException; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.Arrays; +import java.util.Calendar; +import java.util.Date; +import java.util.GregorianCalendar; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; /** @@ -72,6 +73,8 @@ public class designComplianceJob implements Job { private ISysUserService sysUserService; @Autowired private IFeishuService feishuService; + @Autowired + private ISysDictService sysDictService; @Autowired private IProjectLibraryBaseService projectLibraryBaseService; @@ -80,6 +83,8 @@ public class designComplianceJob implements Job { @Override public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException { log.info("设计符合性确认流程，定时任务开启 ====================================================="); + List projectStatus = sysDictService.queryDictItemsByCode(DicCodeEnum.PROJECT_STATUS.getCode()); + projectStatus = projectStatus.stream().filter(e-> YesOrNoEnum.CANCEL.getName().equals(e.getText())).collect(Collectors.toList()); // 查询出 结果待提交的数据 QueryWrapper lawsInventoryEOQueryWrap = new QueryWrapper<>(); @@ -126,6 +131,11 @@ public class designComplianceJob implements Job { params.put("serialNumbers",serialNumbers); ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); + if(ObjectUtils.isNotEmpty(projectLibraryBase) && StringUtils.isNotBlank(projectLibraryBase.getProjectStatus()) + && projectLibraryBase.getProjectStatus().equals(projectStatus.get(0).getValue())){ + //项目状态为取消时，不发提醒 + projectLibraryBase = null; + } if(ObjectUtils.isNotEmpty(projectLibraryBase)){ String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 @@ -166,6 +176,11 @@ public class designComplianceJob implements Job { params.put("serialNumbers",serialNumbers); ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); + if(ObjectUtils.isNotEmpty(projectLibraryBase) && StringUtils.isNotBlank(projectLibraryBase.getProjectStatus()) + && projectLibraryBase.getProjectStatus().equals(projectStatus.get(0).getValue())){ + //项目状态为取消时，不发提醒 + projectLibraryBase = null; + } if(ObjectUtils.isNotEmpty(projectLibraryBase)){ String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 @@ -206,6 +221,11 @@ public class designComplianceJob implements Job { params.put("serialNumbers",serialNumbers); ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); + if(ObjectUtils.isNotEmpty(projectLibraryBase) && StringUtils.isNotBlank(projectLibraryBase.getProjectStatus()) + && projectLibraryBase.getProjectStatus().equals(projectStatus.get(0).getValue())){ + //项目状态为取消时，不发提醒 + projectLibraryBase = null; + } if(ObjectUtils.isNotEmpty(projectLibraryBase)){ String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 @@ -245,6 +265,11 @@ public class designComplianceJob implements Job { params.put("serialNumbers",serialNumbers); ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId); + if(ObjectUtils.isNotEmpty(projectLibraryBase) && StringUtils.isNotBlank(projectLibraryBase.getProjectStatus()) + && projectLibraryBase.getProjectStatus().equals(projectStatus.get(0).getValue())){ + //项目状态为取消时，不发提醒 + projectLibraryBase = null; + } if(ObjectUtils.isNotEmpty(projectLibraryBase)){ String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文