From cc2d9099482df84e7876dfcbada56dd33f31e3fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com> Date: Sun, 26 Sep 2021 17:27:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/mapper/ProjectDetailMapper.java | 12 ++ .../common/mapper/xml/ProjectDetailMapper.xml | 65 ++++++++++ ...ntractCreateProjectSendMessageService.java | 3 +- .../common/service/ProjectDetailService.java | 12 +- ...ctCreateProjectSendMessageServiceImpl.java | 49 ++++---- .../impl/ProjectDetailServiceImpl.java | 5 + .../service/impl/SendMessageServiceImpl.java | 1 - .../impl/PayIncomeContractServiceImpl.java | 112 +++++++++++------- .../impl/PayMeetingSituationServiceImpl.java | 2 +- ...PayPayMemberProjectSubitemServiceImpl.java | 2 +- .../PayPackCompanyProjectServiceImpl.java | 64 +++++----- ...kingGroupDistributionRecordController.java | 2 +- .../impl/PayCommonProjectServiceImpl.java | 2 +- .../PayWorkingGroupSubItemServiceImpl.java | 2 +- 14 files changed, 229 insertions(+), 104 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/mapper/ProjectDetailMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/mapper/ProjectDetailMapper.java index b47879c8..04e87357 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/mapper/ProjectDetailMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/mapper/ProjectDetailMapper.java @@ -1,6 +1,8 @@ package com.jero.common.mapper; import com.jero.project.entity.PayCommonProject; +import java.util.List; + public interface ProjectDetailMapper { /** * @Description 查询项目信息 @@ -11,4 +13,14 @@ public interface ProjectDetailMapper { * @Exception */ PayCommonProject queryProject(String projectId); + + /** + * @Description 查询项目列表信息 + * @Author lqt + * @Date 2021/9/14 + * @Param list 项目id集合 + * @Return + * @Exception + */ + List queryProjectList(List list); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/mapper/xml/ProjectDetailMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/common/mapper/xml/ProjectDetailMapper.xml index cd1af4c9..bf8e3738 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/mapper/xml/ProjectDetailMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/mapper/xml/ProjectDetailMapper.xml @@ -52,4 +52,69 @@ + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/ContractCreateProjectSendMessageService.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/ContractCreateProjectSendMessageService.java index 7bb86770..87168eb0 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/ContractCreateProjectSendMessageService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/ContractCreateProjectSendMessageService.java @@ -7,8 +7,9 @@ public interface ContractCreateProjectSendMessageService { * @Date 2021/9/24 * @Param projectName 项目名称 * @Param projectId 项目id + * @Param userId 用户id * @Return * @Exception */ - void ContractCreateProjectSendMessageService(String projectName,String projectId); + void ContractCreateProjectSendMessageService(String projectName,String projectId,String userId); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/ProjectDetailService.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/ProjectDetailService.java index 233f3166..cf372242 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/ProjectDetailService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/ProjectDetailService.java @@ -2,8 +2,10 @@ package com.jero.common.service; import com.jero.common.vo.ProjectDetailVO; import com.jero.common.vo.ProjectStatusVO; +import com.jero.project.entity.PayCommonProject; import java.math.BigDecimal; +import java.util.List; public interface ProjectDetailService { @@ -16,7 +18,15 @@ public interface ProjectDetailService { * @Exception */ ProjectDetailVO getProjectDetail(String projectId); - + /** + * @Description 查询项目列表信息 + * @Author lqt + * @Date 2021/9/14 + * @Param list 项目id集合 + * @Return + * @Exception + */ + List queryProjectList(List list); /** * @Description 获取变更应收金额之后的状态 * @Author lqt diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ContractCreateProjectSendMessageServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ContractCreateProjectSendMessageServiceImpl.java index 1440a657..4c46449b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ContractCreateProjectSendMessageServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ContractCreateProjectSendMessageServiceImpl.java @@ -20,6 +20,7 @@ import org.springframework.stereotype.Service; import java.util.Arrays; import java.util.HashMap; import java.util.List; +import java.util.Objects; @Service public class ContractCreateProjectSendMessageServiceImpl implements ContractCreateProjectSendMessageService { @@ -30,29 +31,31 @@ public class ContractCreateProjectSendMessageServiceImpl implements ContractCrea private SendMessageService sendMessageService; @Override - public void ContractCreateProjectSendMessageService(String projectName,String projectId) { - // 获取项目负责人，发送消息 - List list = sysUserService.getRolesUser(Arrays.asList(RoleCommon.XMFZR)); - if(!CollectionUtils.isEmpty(list)){ - LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - list.forEach(p->{ - // 发送消息 - SendMessageDTO sendMessageDTO = new SendMessageDTO(); - if(!StringUtils.isBlank(p.getEmail())){ - sendMessageDTO.setEmail(PasswordUtil.decrypt(p.getEmail())); - } - HashMap map = new HashMap<>(); - map.put("projectName",projectName); - sendMessageDTO.setFromUser(sysUser.getUsername()); - sendMessageDTO.setToUser(p.getUsername()); - sendMessageDTO.setTemplateCode(ManagementMessageEnums.MSG1.getCode()); - sendMessageDTO.setTemplateParam(map); - sendMessageDTO.setBusType("M_OPEN_TYPE1"); - JSONObject json = new JSONObject(); - json.put("id",projectId); - sendMessageDTO.setBusId(json.toJSONString()); - sendMessageService.SendMessageService(sendMessageDTO); - }); + public void ContractCreateProjectSendMessageService(String projectName,String projectId,String userId) { + if(StringUtils.isEmpty(userId)){ + return; } + SysUser sysUserDetail = sysUserService.getById(userId); + if(Objects.isNull(sysUserDetail)){ + return; + } + // 获取项目负责人，发送消息 + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + // 发送消息 + SendMessageDTO sendMessageDTO = new SendMessageDTO(); + if(!StringUtils.isBlank(sysUserDetail.getEmail())){ + sendMessageDTO.setEmail(PasswordUtil.decrypt(sysUserDetail.getEmail())); + } + HashMap map = new HashMap<>(); + map.put("projectName",projectName); + sendMessageDTO.setFromUser(sysUser.getUsername()); + sendMessageDTO.setToUser(sysUserDetail.getUsername()); + sendMessageDTO.setTemplateCode(ManagementMessageEnums.MSG1.getCode()); + sendMessageDTO.setTemplateParam(map); + sendMessageDTO.setBusType("M_OPEN_TYPE1"); + JSONObject json = new JSONObject(); + json.put("id",projectId); + sendMessageDTO.setBusId(json.toJSONString()); + sendMessageService.SendMessageService(sendMessageDTO); } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java index 647d9317..b5809ef1 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java @@ -195,6 +195,11 @@ public class ProjectDetailServiceImpl implements ProjectDetailService { return projectDetailVO; } + @Override + public List queryProjectList(List list) { + return projectDetailMapper.queryProjectList(list); + } + @Override public ProjectStatusVO getStatus(String projectId, BigDecimal receivableAmount,Integer needInvoice) { if(StringUtils.isBlank(projectId)){ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java index da4275c8..6f06f9ca 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java @@ -9,7 +9,6 @@ import com.jero.common.enums.MessageUrlEnums; import com.jero.common.exception.JeroBootException; import com.jero.common.service.SendMessageService; import com.jero.common.system.api.ISysBaseAPI; -import com.jero.common.util.SysAnnmentTypeEnum; import com.jero.common.util.oConvertUtils; import com.jero.modules.message.entity.SysMessageTemplate; import com.jero.modules.message.handle.impl.EmailSendMsgHandle; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java index 4e54e953..26a4485a 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java @@ -306,6 +306,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl{ String projectName = ""; + String principalId = ""; ProjectOutput projectOutput = new ProjectOutput(); StringBuilder msgPayIncomeContractAssociated = ValidUtil.validateAll(p); if(!StringUtils.isBlank(msgPayIncomeContractAssociated)){ @@ -348,6 +349,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl list = sysUserService.getRolesUser(Arrays.asList(RoleCommon.XMFZR)); - if(!CollectionUtils.isEmpty(list)){ - String finalProjectName = projectName; - list.forEach(item->{ - // 发送消息 - SendMessageDTO sendMessageDTO = new SendMessageDTO(); - if(!StringUtils.isBlank(item.getEmail())){ - sendMessageDTO.setEmail(PasswordUtil.decrypt(item.getEmail())); - } - HashMap map = new HashMap<>(); - map.put("projectName", finalProjectName); - sendMessageDTO.setFromUser(sysUser.getUsername()); - sendMessageDTO.setToUser(item.getUsername()); - sendMessageDTO.setTemplateCode(ManagementMessageEnums.MSG7.getCode()); - sendMessageDTO.setTemplateParam(map); - sendMessageDTO.setBusType("M_OPEN_TYPE7"); - JSONObject json = new JSONObject(); - json.put("id",p.getProjectId()); - sendMessageDTO.setBusId(json.toJSONString()); - sendMessageService.SendMessageService(sendMessageDTO); - }); + if(StringUtils.isEmpty(principalId)){ + return; } + SysUser sysUserData = sysUserService.getById(principalId); + if(Objects.isNull(sysUserData)){ + return; + } + // 发送消息 + SendMessageDTO sendMessageDTO = new SendMessageDTO(); + if(!StringUtils.isBlank(sysUserData.getEmail())){ + sendMessageDTO.setEmail(PasswordUtil.decrypt(sysUserData.getEmail())); + } + if(!StringUtils.isBlank(sysUserData.getPhone())){ + sendMessageDTO.setPhone(PasswordUtil.decrypt(sysUserData.getPhone())); + } + HashMap map = new HashMap<>(); + map.put("projectName", projectName); + sendMessageDTO.setFromUser(sysUser.getUsername()); + sendMessageDTO.setToUser(sysUserData.getUsername()); + sendMessageDTO.setTemplateCode(ManagementMessageEnums.MSG7.getCode()); + sendMessageDTO.setTemplateParam(map); + sendMessageDTO.setBusType("M_OPEN_TYPE7"); + JSONObject json = new JSONObject(); + json.put("id",p.getProjectId()); + sendMessageDTO.setBusId(json.toJSONString()); + sendMessageService.SendMessageService(sendMessageDTO); } }); } @@ -863,47 +872,64 @@ public class PayIncomeContractServiceImpl extends ServiceImpl list = sysUserService.getRolesUser(Arrays.asList(RoleCommon.CWRY)); + if(!CollectionUtils.isEmpty(list)){ + list.forEach(p->{ + // 发送消息 + SendMessageDTO sendMessageDTO = new SendMessageDTO(); + if(!StringUtils.isBlank(p.getEmail())){ + sendMessageDTO.setEmail(PasswordUtil.decrypt(p.getEmail())); + } + if(!StringUtils.isBlank(p.getPhone())){ + sendMessageDTO.setPhone(PasswordUtil.decrypt(p.getPhone())); + } + HashMap map = new HashMap<>(); + map.put("contractNum",payIncomeContractStatus.getContractNum()); + map.put("contractName",payIncomeContractStatus.getContractName()); + sendMessageDTO.setFromUser(sysUser.getUsername()); + sendMessageDTO.setToUser(p.getUsername()); + sendMessageDTO.setTemplateCode(ManagementMessageEnums.MSG3.getCode()); + sendMessageDTO.setTemplateParam(map); + sendMessageDTO.setBusType("M_OPEN_TYPE3"); + JSONObject json = new JSONObject(); + json.put("revenueId",payIncomeContractStatus.getId()); + json.put("contractNum",payIncomeContractStatus.getContractNum()); + sendMessageDTO.setBusId(json.toJSONString()); + sendMessageService.SendMessageService(sendMessageDTO); + }); + } } // 审核未通过 if(Objects.equals(payIncomeContractAudit.getContractStatus(),PayIncomeContractCommon.STATUS4)){ - code = ManagementMessageEnums.MSG4.getCode(); - type = "M_OPEN_TYPE4"; - role = RoleCommon.HTFZR; - } - // 获取项目负责人，发送消息 - List list = sysUserService.getRolesUser(Arrays.asList(role)); - if(!CollectionUtils.isEmpty(list)){ - String finalType = type; - String finalCode = code; - list.forEach(p->{ + SysUser sysUserData = sysUserService.getById(payIncomeContractStatus.getPrincipalId()); + if(!Objects.isNull(sysUserData)){ // 发送消息 SendMessageDTO sendMessageDTO = new SendMessageDTO(); - if(!StringUtils.isBlank(p.getEmail())){ - sendMessageDTO.setEmail(PasswordUtil.decrypt(p.getEmail())); + if(!StringUtils.isBlank(sysUserData.getEmail())){ + sendMessageDTO.setEmail(PasswordUtil.decrypt(sysUserData.getEmail())); + } + if(StringUtils.isEmpty(sysUserData.getPhone())){ + sendMessageDTO.setPhone(PasswordUtil.decrypt(sysUserData.getPhone())); } HashMap map = new HashMap<>(); map.put("contractNum",payIncomeContractStatus.getContractNum()); map.put("contractName",payIncomeContractStatus.getContractName()); sendMessageDTO.setFromUser(sysUser.getUsername()); - sendMessageDTO.setToUser(p.getUsername()); - sendMessageDTO.setTemplateCode(finalCode); + sendMessageDTO.setToUser(sysUserData.getUsername()); + sendMessageDTO.setTemplateCode(ManagementMessageEnums.MSG4.getCode()); sendMessageDTO.setTemplateParam(map); - sendMessageDTO.setBusType(finalType); + sendMessageDTO.setBusType("M_OPEN_TYPE4"); JSONObject json = new JSONObject(); json.put("revenueId",payIncomeContractStatus.getId()); json.put("contractNum",payIncomeContractStatus.getContractNum()); sendMessageDTO.setBusId(json.toJSONString()); sendMessageService.SendMessageService(sendMessageDTO); - }); + } } + } @Override diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java index b660c477..0b048f0a 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java @@ -126,7 +126,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl list = sysUserService.getRolesUser(Arrays.asList(RoleCommon.XMFZR)); - for (String s1 : s) { - if (StringUtils.isBlank(s1)) { - continue; - } - // 获取项目信息 - PayCommonProject payCommonProject = projectDetailMapper.queryProject(s1); - if(Objects.isNull(payCommonProject)){ - continue; - } - if(!CollectionUtils.isEmpty(list)){ - list.forEach(p->{ - // 发送消息 - SendMessageDTO sendMessageDTO = new SendMessageDTO(); - if(!StringUtils.isBlank(p.getEmail())){ - sendMessageDTO.setEmail(PasswordUtil.decrypt(p.getEmail())); - } - HashMap map = new HashMap<>(); - map.put("projectName",payCommonProject.getChargeProject()); - sendMessageDTO.setFromUser(sysUser.getUsername()); - sendMessageDTO.setToUser(p.getUsername()); - sendMessageDTO.setTemplateCode(ManagementMessageEnums.MSG6.getCode()); - sendMessageDTO.setTemplateParam(map); - sendMessageDTO.setBusType("M_OPEN_TYPE6"); - JSONObject json = new JSONObject(); - json.put("id",payCommonProject.getId()); - sendMessageDTO.setBusId(json.toJSONString()); - sendMessageService.SendMessageService(sendMessageDTO); - }); - } + + List list = projectDetailService.queryProjectList(Arrays.asList(s)); + if(!CollectionUtils.isEmpty(list)){ + list.forEach(p->{ + if(StringUtils.isEmpty(p.getPrincipalId())){ + return; + } + SysUser sysUserData = sysUserService.getById(p.getPrincipalId()); + if(Objects.isNull(sysUserData)){ + return; + } + // 发送消息 + SendMessageDTO sendMessageDTO = new SendMessageDTO(); + if(!StringUtils.isBlank(p.getEmail())){ + sendMessageDTO.setEmail(PasswordUtil.decrypt(p.getEmail())); + } + if(!StringUtils.isBlank(p.getPhone())){ + sendMessageDTO.setPhone(PasswordUtil.decrypt(p.getPhone())); + } + HashMap map = new HashMap<>(); + map.put("projectName",p.getChargeProject()); + sendMessageDTO.setFromUser(sysUser.getUsername()); + sendMessageDTO.setToUser(sysUserData.getUsername()); + sendMessageDTO.setTemplateCode(ManagementMessageEnums.MSG6.getCode()); + sendMessageDTO.setTemplateParam(map); + sendMessageDTO.setBusType("M_OPEN_TYPE6"); + JSONObject json = new JSONObject(); + json.put("id",p.getId()); + sendMessageDTO.setBusId(json.toJSONString()); + sendMessageService.SendMessageService(sendMessageDTO); + }); } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDistributionRecordController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDistributionRecordController.java index 83f58fda..df151b05 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDistributionRecordController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDistributionRecordController.java @@ -35,7 +35,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; /** - * @Description: 资料分发 + * @Description: 资料 * @Author: jeecg-boot * @Date: 2021-09-16 * @Version: V1.0 diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java index 8a126f42..f6443039 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java @@ -134,7 +134,7 @@ public class PayCommonProjectServiceImpl extends ServiceImpl