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

update 年度数据锁定

Browse Source
This commit is contained in:
lijiarao
2024-07-27 18:05:34 +08:00
parent bf9793bc4d
commit 870771d863
3 changed files with 31 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
+3 -1
View File
@@ -83,6 +83,7 @@ import com.jero.project.service.IPayWorkingGroupSubItemService;
import com.jero.standards.memberinfo.service.IMemberInfoService;
import com.jero.statistics.entity.MeetingPackStatistics;
import com.jero.statistics.entity.MeetingPackStatisticsSearch;
import com.jero.temporary.entity.PayContactsManagementTemporary;
import com.jero.temporary.service.IPayCompanyManagementTemporaryService;
import com.jero.temporary.service.IPayContactsManagementTemporaryService;
import com.jero.util.ObjRecordUtil;
@@ -1762,7 +1763,8 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
for (PayMeetingSituation meetingSituation : pageList) {
String companyContactId = meetingSituation.getCompanyContactId();
PayContactsManagement contactsManagement = contactsManagementService.getById(companyContactId);
String companyContactTemporaryId = meetingSituation.getCompanyContactTemporaryId();
PayContactsManagementTemporary contactsManagement = contactsManagementTemporaryService.getByAllTable(companyContactId, companyContactTemporaryId);
meetingSituation.setCompanyContactName(contactsManagement.getName());
if (!MeetingCommon.INTERNATIONAL_MEETING.equals(meetingType1)){
meetingSituation.setPost(contactsManagement.getPost());
jero-boot-incoming-payment/src/main/java/com/jero/member/controller/TbMemberProjectSubitemController.java
+16 -2
View File
@@ -27,6 +27,10 @@ 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.jero.member.vo.*;
import com.jero.temporary.entity.PayCompanyManagementTemporary;
import com.jero.temporary.entity.PayContactsManagementTemporary;
import com.jero.temporary.service.IPayCompanyManagementTemporaryService;
import com.jero.temporary.service.IPayContactsManagementTemporaryService;
import lombok.extern.slf4j.Slf4j;
import com.jero.common.system.base.controller.JeroController;
import org.apache.commons.lang3.StringUtils;
@@ -60,6 +64,11 @@ public class TbMemberProjectSubitemController extends JeroController<TbMemberPro
private IPayCompanyManagementService payCompanyManagementService;
@Resource
private IPayContactsManagementService payContactsManagementService;
@Resource
private IPayCompanyManagementTemporaryService companyManagementTemporaryService;
@Resource
private IPayContactsManagementTemporaryService contactsManagementTemporaryService;
/**
* 分页列表查询
*/
@@ -298,17 +307,22 @@ public class TbMemberProjectSubitemController extends JeroController<TbMemberPro
}
for (TbMemberProjectSubitem memberProjectSubitem : exportList) {
String companyId = memberProjectSubitem.getCompanyId();
String companyTemporaryId = memberProjectSubitem.getCompanyTemporaryId();
String liaisonManId = memberProjectSubitem.getLiaisonManId();
String companyContactTemporaryId = memberProjectSubitem.getCompanyContactTemporaryId();
if (StringUtils.isNotBlank(companyId)) {
PayCompanyManagement payCompanyManagement = payCompanyManagementService.getById(companyId);
PayCompanyManagementTemporary payCompanyManagement = companyManagementTemporaryService.getByAllTable(companyId, companyTemporaryId);
if (!Objects.isNull(payCompanyManagement)) {
memberProjectSubitem.setDutyCode(payCompanyManagement.getDutyCode());
}
}
if (StringUtils.isNotBlank(liaisonManId)) {
PayContactsManagement payContactsManagement = payContactsManagementService.getById(liaisonManId);
PayContactsManagementTemporary payContactsManagement = contactsManagementTemporaryService.getByAllTable(liaisonManId, companyContactTemporaryId);
if (!Objects.isNull(payContactsManagement)) {
memberProjectSubitem.setEmail(payContactsManagement.getEmail());
memberProjectSubitem.setMobile(PasswordUtil.decrypt(payContactsManagement.getPhone()));
memberProjectSubitem.setContactAddress(payContactsManagement.getContactAddress());
memberProjectSubitem.setPostalCode(payContactsManagement.getPostalCode());
}
}
}
jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java
+12 -1
View File
@@ -131,10 +131,21 @@ public class TbMemberProjectSubitem implements Serializable {
private String email;
/**手机*/
//@Excel(name = "手机", width = 15,exportConvert = true)
@Excel(name = "手机", width = 15,exportConvert = true)
@ApiModelProperty(value = "手机")
private String mobile;
/**通讯地址*/
@Excel(name = "通讯地址", width = 15)
@ApiModelProperty(value = "通讯地址")
@TableField(exist = false)
private java.lang.String contactAddress;
/**邮政编码*/
@Excel(name = "邮政编码", width = 15)
@ApiModelProperty(value = "邮政编码")
@TableField(exist = false)
private java.lang.String postalCode;
/**会员状态*/
//@Excel(name = "会员状态", width = 15, dicCode = "member_status")
@ApiModelProperty(value = "会员状态")