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

消息修改

Browse Source
This commit is contained in:
liangqitao
2021-12-16 20:34:01 +08:00
parent 8d40a41c73
commit fac55b5e7f
6 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java
+11 -12
View File
@@ -1,13 +1,5 @@
package com.jero.company.controller;
import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -28,7 +20,6 @@ import com.jero.company.entity.PayContactsManagement;
import com.jero.company.service.IPayCompanyManagementService;
import com.jero.company.service.IPayContactsManagementService;
import com.jero.company.service.ProjectCountService;
import com.jero.company.vo.CompanyOrContactsCount;
import com.jero.meeting.entity.PayMeetingSituation;
import com.jero.meeting.service.IPayMeetingSituationService;
import com.jero.member.entity.PayMemberProjectSubitem;
@@ -39,6 +30,8 @@ import com.jero.project.entity.PayCommonProject;
import com.jero.project.entity.PayWorkingGroupSubItem;
import com.jero.project.service.IPayCommonProjectService;
import com.jero.project.service.IPayWorkingGroupSubItemService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
@@ -57,8 +50,14 @@ import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
/**
* @Description: 联系人管理
@@ -256,7 +255,7 @@ public class PayContactsManagementController extends JeroController<PayContactsM
// 调用会员项目接口
MemberInfo memberInfo = new MemberInfo();
memberInfo.setCompanyName(payCompanyManagement.getCompanyName());
memberInfo.setId(payContactsManagementOld.getMemberId());
memberInfo.setId(payCompanyManagement.getMemberId());
memberInfo.setLiaisonMan(payContactsManagement.getName());
memberInfo.setEmail(payContactsManagement.getEmail());
memberInfo.setMobile(payContactsManagement.getPhone());
jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayContactsManagementServiceImpl.java
+1 -3
View File
@@ -6,13 +6,11 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
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.api.vo.Result;
import com.jero.common.exception.JeroBootException;
import com.jero.common.system.api.ISysBaseAPI;
import com.jero.common.system.util.JwtUtil;
import com.jero.common.system.vo.LoginUser;
import com.jero.common.util.*;
import com.jero.company.common.PayCompanyManagementCommon;
import com.jero.company.common.PayContactsManagementCommon;
import com.jero.company.entity.MemberInfo;
import com.jero.company.entity.PayCompanyManagement;
@@ -141,7 +139,7 @@ public class PayContactsManagementServiceImpl extends ServiceImpl<PayContactsMan
// 调用会员项目接口
MemberInfo memberInfo = new MemberInfo();
memberInfo.setCompanyName(payCompanyManagement.getCompanyName());
memberInfo.setId(payContactsManagementOld.getMemberId());
memberInfo.setId(payCompanyManagement.getMemberId());
memberInfo.setLiaisonMan(payContactsManagement.getName());
memberInfo.setEmail(payContactsManagement.getEmail());
memberInfo.setMobile(payContactsManagement.getPhone());
jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeSubitemController.java
+2 -1
View File
@@ -278,7 +278,8 @@ public class PayCaseCommitteeSubitemController extends JeroController<PayCaseCom
JSONObject json = new JSONObject();
json.put("type","7");// 7为分标委项目
json.put("id",payCaseCommitteeSubitem.getId());
json.put("path","subBidCommittee/SubBidCommitteeDetailPage");
json.put("abbreviation",payCaseCommittee.getAbbreviation());
json.put("path","/subBidCommittee/SubBidCommitteeDetailPage");
paySendContactsMessageDTO.setJson(json);
contractCreateProjectSendMessageService.createProjectSendMessageToContactsService(paySendContactsMessageDTO);
}
jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCouncilSubitemController.java
+1 -1
View File
@@ -181,7 +181,7 @@ public class PayCaseCouncilSubitemController extends JeroController<PayCaseCounc
JSONObject json = new JSONObject();
json.put("type","8"); // 8为理事会项目
json.put("id",payCaseCouncilSubitem.getId());
json.put("path","subBidCommittee/SubBidCommitteeDetailPage");
json.put("path","/standardsAssociation/CouncilDetailPage");
paySendContactsMessageDTO.setJson(json);
contractCreateProjectSendMessageService.createProjectSendMessageToContactsService(paySendContactsMessageDTO);
}
jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java
+3 -2
View File
@@ -321,8 +321,9 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl<PayWorkingGroupMappe
listPayWorkingGroupSubItem.forEach(p->{
JSONObject json = new JSONObject();
json.put("type",ProjectCommon.PROJECT_TYPE2);
json.put("id",p.getId());
json.put("path","workTeam/WorkTeamDetail");
json.put("workingGroupId",p.getWorkingGroupId());
json.put("projectId",p.getId());
json.put("path","/workTeam/WorkTeamDetail");
// 新建项目 给企业联系人1发送消息
if (!StringUtils.isBlank(p.getContactsIdOne())) {
PayContactsManagement payContactsManagement = payContactsManagementService.getById(p.getContactsIdOne());
jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java
+3 -2
View File
@@ -193,8 +193,9 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
}
JSONObject json = new JSONObject();
json.put("type",ProjectCommon.PROJECT_TYPE2);
json.put("id",payWorkingGroupSubItem.getId());
json.put("path","workTeam/WorkTeamDetail");
json.put("workingGroupId",payWorkingGroupSubItem.getWorkingGroupId());
json.put("projectId",payWorkingGroupSubItem.getId());
json.put("path","/workTeam/WorkTeamDetail");
// 新建项目 给企业联系人1发送消息
if(!StringUtils.isBlank(payWorkingGroupSubItem.getContactsIdOne())){
PayContactsManagement payContactsManagement = payContactsManagementService.getById(payWorkingGroupSubItem.getContactsIdOne());