LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '元旦前上线版本' into branch2022-1-4

Browse Source
This commit is contained in:
fengchenchen
2022-01-06 16:00:38 +08:00
parent 5f0af7ef8b 38c8c857d4
commit b65a30c396
7 changed files with 60 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java
+12 -8
View File
@@ -1,24 +1,23 @@
package com.jero.project.entity;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.jero.common.aspect.annotation.Dict;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import com.jero.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.*;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
/**
* @Description: pay_common_project
@@ -246,4 +245,9 @@ public class PayCommonProject implements Serializable {
*/
@TableField(exist = false)
private String checkPaymentStatus;
/**
* 工作组 任务及目标
*/
@TableField(exist = false)
private String missionAndObjectives;
}
jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java
+9 -68
View File
@@ -237,6 +237,9 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
paySendContactsMessageDTO.setEmail(payContactsManagement.getEmail());
paySendContactsMessageDTO.setPhone(payContactsManagement.getPhone());
paySendContactsMessageDTO.setUserId(payWorkingGroup.getPrincipalIdA());
if(!CollectionUtils.isEmpty(listFile)){
paySendContactsMessageDTO.setListFile(listFile);
}
paySendContactsMessageDTO.setFlag(ProjectCommon.FLAG0);
// 项目的应收金额＞0 发送缴费通知
if(!Objects.isNull(payWorkingGroupSubItem.getReceivableAmount()) && payWorkingGroupSubItem.getReceivableAmount().compareTo(new BigDecimal("0")) > 0){
@@ -245,30 +248,6 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
paySendContactsMessageDTO.setJson(json);
contractCreateProjectSendMessageService.createProjectSendMessageToContactsService(paySendContactsMessageDTO);
}
if(!CollectionUtils.isEmpty(listFile)){
// 发送消息
SendMessageDTO sendMessageDTO = new SendMessageDTO();
if(!StringUtils.isBlank(payContactsManagement.getEmail())){
sendMessageDTO.setEmail(PasswordUtil.decrypt(payContactsManagement.getEmail()));
}
if(!StringUtils.isBlank(payContactsManagement.getPhone())){
sendMessageDTO.setToUser(PasswordUtil.decrypt(payContactsManagement.getPhone()));
sendMessageDTO.setPhone(PasswordUtil.decrypt(payContactsManagement.getPhone()));
}
HashMap<String,String> map = new HashMap<>();
map.put("projectName",payWorkingGroup.getWorkingGroupProject());
sendMessageDTO.setFromUser(sysUserInfo.getUsername());
sendMessageDTO.setTemplateCode(CompanyMessageEnums.MSG22.getCode());
sendMessageDTO.setTemplateParam(map);
sendMessageDTO.setBusType("C_OPEN_TYPE22");
sendMessageDTO.setListFile(listFile);
JSONObject jsonNew = new JSONObject();
jsonNew.put("id",payWorkingGroupSubItem.getId());
sendMessageDTO.setBusId(jsonNew.toJSONString());
sendMessageService.SendMessageService(sendMessageDTO);
}
}
// 新建项目 给企业联系人2发送消息
if(!StringUtils.isBlank(payWorkingGroupSubItem.getContactsIdTwo())){
@@ -280,6 +259,9 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
paySendContactsMessageDTO.setEmail(payContactsManagement.getEmail());
paySendContactsMessageDTO.setPhone(payContactsManagement.getPhone());
paySendContactsMessageDTO.setUserId(payWorkingGroup.getPrincipalIdA());
if(!CollectionUtils.isEmpty(listFile)){
paySendContactsMessageDTO.setListFile(listFile);
}
paySendContactsMessageDTO.setFlag(ProjectCommon.FLAG0);
// 项目的应收金额＞0 发送缴费通知
if(payWorkingGroupSubItem.getReceivableAmount().compareTo(new BigDecimal("0")) > 0){
@@ -288,28 +270,6 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
paySendContactsMessageDTO.setJson(json);
contractCreateProjectSendMessageService.createProjectSendMessageToContactsService(paySendContactsMessageDTO);
}
if(!CollectionUtils.isEmpty(listFile)){
// 发送消息
SendMessageDTO sendMessageDTO = new SendMessageDTO();
if(!StringUtils.isBlank(payContactsManagement.getEmail())){
sendMessageDTO.setEmail(PasswordUtil.decrypt(payContactsManagement.getEmail()));
}
if(!StringUtils.isBlank(payContactsManagement.getPhone())){
sendMessageDTO.setToUser(PasswordUtil.decrypt(payContactsManagement.getPhone()));
sendMessageDTO.setPhone(PasswordUtil.decrypt(payContactsManagement.getPhone()));
}
HashMap<String,String> map = new HashMap<>();
map.put("projectName",payWorkingGroup.getWorkingGroupProject());
sendMessageDTO.setFromUser(sysUserInfo.getUsername());
sendMessageDTO.setTemplateCode(CompanyMessageEnums.MSG22.getCode());
sendMessageDTO.setTemplateParam(map);
sendMessageDTO.setBusType("C_OPEN_TYPE22");
sendMessageDTO.setListFile(listFile);
JSONObject jsonNew = new JSONObject();
jsonNew.put("id",payWorkingGroupSubItem.getId());
sendMessageDTO.setBusId(jsonNew.toJSONString());
sendMessageService.SendMessageService(sendMessageDTO);
}
}
// 新建项目 给企业联系人3发送消息
if(!StringUtils.isBlank(payWorkingGroupSubItem.getContactsIdThree())){
@@ -321,6 +281,9 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
paySendContactsMessageDTO.setEmail(payContactsManagement.getEmail());
paySendContactsMessageDTO.setPhone(payContactsManagement.getPhone());
paySendContactsMessageDTO.setUserId(payWorkingGroup.getPrincipalIdA());
if(!CollectionUtils.isEmpty(listFile)){
paySendContactsMessageDTO.setListFile(listFile);
}
paySendContactsMessageDTO.setFlag(ProjectCommon.FLAG0);
// 项目的应收金额＞0 发送缴费通知
if(payWorkingGroupSubItem.getReceivableAmount().compareTo(new BigDecimal("0")) > 0){
@@ -329,28 +292,6 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
paySendContactsMessageDTO.setJson(json);
contractCreateProjectSendMessageService.createProjectSendMessageToContactsService(paySendContactsMessageDTO);
}
if(!CollectionUtils.isEmpty(listFile)){
// 发送消息
SendMessageDTO sendMessageDTO = new SendMessageDTO();
if(!StringUtils.isBlank(payContactsManagement.getEmail())){
sendMessageDTO.setEmail(PasswordUtil.decrypt(payContactsManagement.getEmail()));
}
if(!StringUtils.isBlank(payContactsManagement.getPhone())){
sendMessageDTO.setToUser(PasswordUtil.decrypt(payContactsManagement.getPhone()));
sendMessageDTO.setPhone(PasswordUtil.decrypt(payContactsManagement.getPhone()));
}
HashMap<String,String> map = new HashMap<>();
map.put("projectName",payWorkingGroup.getWorkingGroupProject());
sendMessageDTO.setFromUser(sysUserInfo.getUsername());
sendMessageDTO.setTemplateCode(CompanyMessageEnums.MSG22.getCode());
sendMessageDTO.setTemplateParam(map);
sendMessageDTO.setBusType("C_OPEN_TYPE22");
sendMessageDTO.setListFile(listFile);
JSONObject jsonNew = new JSONObject();
jsonNew.put("id",payWorkingGroupSubItem.getId());
sendMessageDTO.setBusId(jsonNew.toJSONString());
sendMessageService.SendMessageService(sendMessageDTO);
}
}
}