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

fix 修改企业联系人123没有处理干净，相关功能丢失的遗留bug

Browse Source
This commit is contained in:
lijiarao
2022-09-05 16:10:47 +08:00
parent 8938e0c083
commit ef6eabb5c7
7 changed files with 172 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java
+14 -29
View File
@@ -46,6 +46,8 @@ import com.jero.modules.system.service.ISysUserService;
import com.jero.project.entity.PayCommonProject;
import com.jero.project.entity.PayWorkingGroup;
import com.jero.project.entity.PayWorkingGroupSubItem;
import com.jero.project.entity.PayWorkingGroupSubItemContacts;
import com.jero.project.mapper.PayWorkingGroupSubItemContactsMapper;
import com.jero.project.service.IPayCommonProjectService;
import com.jero.project.service.IPayWorkingGroupService;
import com.jero.project.service.IPayWorkingGroupSubItemService;
@@ -110,7 +112,8 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
private ITbCertificatePaymentService tbCertificatePaymentService;
@Resource
private ISysUserService sysUserService;
@Resource
private PayWorkingGroupSubItemContactsMapper payWorkingGroupSubItemContactsMapper;
/**
* 分页列表查询
@@ -205,20 +208,11 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
if(Objects.isNull(payWorkingGroup)){
throw new JeroBootException("工作组不存在！");
}
PayContactsManagementTemporary payWorkingTemporaryOne = payContactsManagementTemporaryService.getById(payWorkingGroupSubItemOld.getContactsTemporaryIdOne());
if(!Objects.isNull(payWorkingTemporaryOne)){
listId.add(payWorkingTemporaryOne);
}
if(!org.apache.commons.lang3.StringUtils.isBlank(payWorkingGroupSubItemOld.getContactsTemporaryIdTwo())){
PayContactsManagementTemporary payWorkingTemporaryTwo = payContactsManagementTemporaryService.getById(payWorkingGroupSubItemOld.getContactsTemporaryIdTwo());
if(!Objects.isNull(payWorkingTemporaryTwo)){
listId.add(payWorkingTemporaryTwo);
}
}
if(!org.apache.commons.lang3.StringUtils.isBlank(payWorkingGroupSubItemOld.getContactsTemporaryIdThree())){
PayContactsManagementTemporary payWorkingTemporaryThree = payContactsManagementTemporaryService.getById(payWorkingGroupSubItemOld.getContactsTemporaryIdThree());
if(!Objects.isNull(payWorkingTemporaryThree)){
listId.add(payWorkingTemporaryThree);
List<PayWorkingGroupSubItemContacts> subItemContacts = payWorkingGroupSubItemContactsMapper.getSubItemContacts(one.getProjectId());
for (PayWorkingGroupSubItemContacts subItemContact : subItemContacts) {
PayContactsManagementTemporary payWorkingTemporary = payContactsManagementTemporaryService.getById(subItemContact.getContactsTemporaryId());
if(!Objects.isNull(payWorkingTemporary)){
listId.add(payWorkingTemporary);
}
}
project = payWorkingGroup.getWorkingGroupProject();
@@ -430,20 +424,11 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
if(Objects.isNull(payWorkingGroup)){
throw new JeroBootException("工作组不存在！");
}
PayContactsManagementTemporary payWorkingTemporaryOne = payContactsManagementTemporaryService.getById(payWorkingGroupSubItemOld.getContactsTemporaryIdOne());
if(!Objects.isNull(payWorkingTemporaryOne)){
listId.add(payWorkingTemporaryOne);
}
if(!org.apache.commons.lang3.StringUtils.isBlank(payWorkingGroupSubItemOld.getContactsTemporaryIdTwo())){
PayContactsManagementTemporary payWorkingTemporaryTwo = payContactsManagementTemporaryService.getById(payWorkingGroupSubItemOld.getContactsTemporaryIdTwo());
if(!Objects.isNull(payWorkingTemporaryTwo)){
listId.add(payWorkingTemporaryTwo);
}
}
if(!org.apache.commons.lang3.StringUtils.isBlank(payWorkingGroupSubItemOld.getContactsTemporaryIdThree())){
PayContactsManagementTemporary payWorkingTemporaryThree = payContactsManagementTemporaryService.getById(payWorkingGroupSubItemOld.getContactsTemporaryIdThree());
if(!Objects.isNull(payWorkingTemporaryThree)){
listId.add(payWorkingTemporaryThree);
List<PayWorkingGroupSubItemContacts> subItemContacts = payWorkingGroupSubItemContactsMapper.getSubItemContacts(one.getProjectId());
for (PayWorkingGroupSubItemContacts subItemContact : subItemContacts) {
PayContactsManagementTemporary payWorkingTemporary = payContactsManagementTemporaryService.getById(subItemContact.getContactsTemporaryId());
if(!Objects.isNull(payWorkingTemporary)){
listId.add(payWorkingTemporary);
}
}
project = payWorkingGroup.getWorkingGroupProject();