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

fix 87907 工作组项目-成员-锁定后成员信息的详情页--企业联系人信息应该不更新

Browse Source 
87910 所有会议-已封锁的详情页面参会人信息却更新了
87912 资料网员&年度会员维护-锁定后的详情页--企业联系人信息应该不更新
This commit is contained in:
lijiarao
2024-07-31 18:30:52 +08:00
parent 55ebacca4a
commit 1a7781f42c
8 changed files with 28 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java
+1 -1
View File
@@ -982,7 +982,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
}
payIncomeContract.setSignedContactsTemporaryId(contactsName.getId());
payIncomeContract.setSignedContactsTemporaryName(contactsName.getName());
payContactsManagementTemporaryService.removeById(payIncomeContractStatus.getSignedContactsTemporaryId());
// payContactsManagementTemporaryService.removeById(payIncomeContractStatus.getSignedContactsTemporaryId());
}else{
payIncomeContract.setSignedContactsId(payIncomeContractStatus.getSignedContactsId());
}
jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java
+4 -4
View File
@@ -275,10 +275,10 @@ public class PayDraftingGroupSubItemServiceImpl extends ServiceImpl<PayDraftingG
throw new JeroBootException("起草组成员不可操作！");
}
// 删除企业联系人临时数据
payCompanyManagementTemporaryService.removeById(payDraftingGroupSubItem.getChargeCompanyTemporaryId());
//payCompanyManagementTemporaryService.removeById(payDraftingGroupSubItem.getChargeCompanyTemporaryId());
List<PayDraftingGroupSubItemContacts> subItemContacts = payDraftingGroupSubItemContactsMapper.getSubItemContacts(id);
List<String> temporaryIds = subItemContacts.stream().map(PayDraftingGroupSubItemContacts::getContactsTemporaryId).collect(Collectors.toList());
payContactsManagementTemporaryService.removeByIds(temporaryIds);
// paycontactsManagementTemporaryService.removeByIds(temporaryIds);
}
/**
@@ -445,7 +445,7 @@ public class PayDraftingGroupSubItemServiceImpl extends ServiceImpl<PayDraftingG
}
payDraftingGroupSubItem.setChargeCompanyTemporaryId(chargeCompanyName.getId());
payDraftingGroupSubItem.setChargeCompanyTemporaryName(chargeCompanyName.getCompanyName());
payCompanyManagementTemporaryService.removeById(payDraftingGroupSubItemOld.getChargeCompanyTemporaryId());
//payCompanyManagementTemporaryService.removeById(payDraftingGroupSubItemOld.getChargeCompanyTemporaryId());
} else {
payDraftingGroupSubItem.setChargeCompanyId(payDraftingGroupSubItemOld.getChargeCompanyId());
}
@@ -455,7 +455,7 @@ public class PayDraftingGroupSubItemServiceImpl extends ServiceImpl<PayDraftingG
// 删除临时表历史记录
if (!CollectionUtils.isEmpty(payDraftingGroupSubItemOld.getPayDraftingGroupSubItemContactsList())) {
List<String> list = payDraftingGroupSubItemOld.getPayDraftingGroupSubItemContactsList().stream().map(PayDraftingGroupSubItemContacts::getContactsTemporaryId).collect(Collectors.toList());
payContactsManagementTemporaryService.removeByIds(list);
// paycontactsManagementTemporaryService.removeByIds(list);
}
// 删除联系人记录
LambdaUpdateWrapper<PayDraftingGroupSubItemContacts> updatePayDraftingGroupSubItemContacts = new LambdaUpdateWrapper<>();
jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectSubitemService.java
+9 -9
View File
@@ -323,7 +323,7 @@ public class IPayMemberProjectSubitemService extends ServiceImpl<PayMemberProjec
}
payMemberProjectSubitem.setCompanyTemporaryId(chargeCompanyName.getId());
payMemberProjectSubitem.setCompanyName(chargeCompanyName.getCompanyName());
companyManagementTemporaryService.removeById(payMemberProjectSubitemOld.getCompanyTemporaryId());
//companyManagementTemporaryService.removeById(payMemberProjectSubitemOld.getCompanyTemporaryId());
}
// 联系人id != 联系人模板id 变更
@@ -334,7 +334,7 @@ public class IPayMemberProjectSubitemService extends ServiceImpl<PayMemberProjec
}
payMemberProjectSubitem.setCompanyContactTemporaryId(companyContact.getId());
payMemberProjectSubitem.setCompanyContactName(companyContact.getName());
contactsManagementTemporaryService.removeById(payMemberProjectSubitemOld.getCompanyContactTemporaryId());
// contactsManagementTemporaryService.removeById(payMemberProjectSubitemOld.getCompanyContactTemporaryId());
// 邮寄联系人id != 邮寄联系人模板id 变更
if(!Objects.equals(payMemberProjectSubitem.getPostContactId(),payMemberProjectSubitemOld.getPostContactId())){
@@ -345,7 +345,7 @@ public class IPayMemberProjectSubitemService extends ServiceImpl<PayMemberProjec
}
payMemberProjectSubitem.setPostContactTemporaryId(postContact.getId());
payMemberProjectSubitem.setPostContactName(postContact.getName());
contactsManagementTemporaryService.removeById(payMemberProjectSubitemOld.getPostContactTemporaryId());
// contactsManagementTemporaryService.removeById(payMemberProjectSubitemOld.getPostContactTemporaryId());
}
//校验来款方式
@@ -374,13 +374,13 @@ public class IPayMemberProjectSubitemService extends ServiceImpl<PayMemberProjec
PayMemberProjectSubitem payMemberProjectSubitem = getById(id);
//删除临时表数据
String companyId = payMemberProjectSubitem.getCompanyTemporaryId();
companyManagementTemporaryService.removeById(companyId);
//companyManagementTemporaryService.removeById(companyId);
String companyContactId = payMemberProjectSubitem.getCompanyContactTemporaryId();
contactsManagementTemporaryService.removeById(companyContactId);
// contactsManagementTemporaryService.removeById(companyContactId);
String postContactId = payMemberProjectSubitem.getPostContactTemporaryId();
contactsManagementTemporaryService.removeById(postContactId);
// contactsManagementTemporaryService.removeById(postContactId);
}
/**
@@ -424,10 +424,10 @@ public class IPayMemberProjectSubitemService extends ServiceImpl<PayMemberProjec
// 如果已打报，同步删除打包关联
LambdaUpdateWrapper<PayPackCompanyProject> update = new LambdaUpdateWrapper<>();
update.eq(PayPackCompanyProject::getProjectId,payMemberProjectSubitem.getId());
payPackCompanyProjectService.remove(update);
//payPackCompanyProjectService.remove(update);
// 删除企业联系人临时数据
companyManagementTemporaryService.removeById(payMemberProjectSubitem.getCompanyTemporaryId());
contactsManagementTemporaryService.removeByIds(Arrays.asList(payMemberProjectSubitem.getCompanyContactTemporaryId(),payMemberProjectSubitem.getPostContactTemporaryId()));
//companyManagementTemporaryService.removeById(payMemberProjectSubitem.getCompanyTemporaryId());
// contactsManagementTemporaryService.removeByIds(Arrays.asList(payMemberProjectSubitem.getCompanyContactTemporaryId(),payMemberProjectSubitem.getPostContactTemporaryId()));
}
/**
jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyServiceImpl.java
+3 -3
View File
@@ -206,7 +206,7 @@ public class PayPackCompanyServiceImpl extends ServiceImpl<PayPackCompanyMapper,
}
payPackCompany.setCompanyTemporaryId(chargeCompanyName.getId());
payPackCompany.setCompanyTemporaryName(chargeCompanyName.getCompanyName());
payCompanyManagementTemporaryService.removeById(payPackCompanyOld.getCompanyTemporaryId());
//payCompanyManagementTemporaryService.removeById(payPackCompanyOld.getCompanyTemporaryId());
}else{
payPackCompany.setCompanyId(payPackCompanyOld.getCompanyId());
}
@@ -218,7 +218,7 @@ public class PayPackCompanyServiceImpl extends ServiceImpl<PayPackCompanyMapper,
}
payPackCompany.setCompanyContactTemporaryId(contactsName.getId());
payPackCompany.setCompanyContactTemporaryName(contactsName.getName());
payContactsManagementTemporaryService.removeById(payPackCompanyOld.getCompanyContactTemporaryId());
// payContactsManagementTemporaryService.removeById(payPackCompanyOld.getCompanyContactTemporaryId());
}else{
payPackCompany.setCompanyContactId(payPackCompanyOld.getCompanyContactId());
}
@@ -230,7 +230,7 @@ public class PayPackCompanyServiceImpl extends ServiceImpl<PayPackCompanyMapper,
}
payPackCompany.setPackContactTemporaryId(mailContactsName.getId());
payPackCompany.setPackContactTemporaryName(mailContactsName.getName());
payContactsManagementTemporaryService.removeById(payPackCompanyOld.getPackContactTemporaryId());
// payContactsManagementTemporaryService.removeById(payPackCompanyOld.getPackContactTemporaryId());
}else{
payPackCompany.setPackContactId(payPackCompanyOld.getPackContactId());
}
jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java
+5 -5
View File
@@ -371,8 +371,8 @@ public class PayCommonProjectServiceImpl extends ServiceImpl<PayCommonProjectMap
update.eq(PayPackCompanyProject::getProjectId,payCommonProject.getId());
payPackCompanyProjectService.remove(update);
// 删除企业联系人临时数据
payCompanyManagementTemporaryService.removeById(payCommonProject.getChargeCompanyTemporaryId());
payContactsManagementTemporaryService.removeByIds(Arrays.asList(payCommonProject.getContactsTemporaryId(),payCommonProject.getMailContactsTemporaryId()));
//payCompanyManagementTemporaryService.removeById(payCommonProject.getChargeCompanyTemporaryId());
// paycontactsManagementTemporaryService.removeByIds(Arrays.asList(payCommonProject.getContactsTemporaryId(),payCommonProject.getMailContactsTemporaryId()));
return sb;
}
@@ -436,7 +436,7 @@ public class PayCommonProjectServiceImpl extends ServiceImpl<PayCommonProjectMap
}
payCommonProject.setChargeCompanyTemporaryId(chargeCompanyName.getId());
payCommonProject.setChargeCompanyTemporaryName(chargeCompanyName.getCompanyName());
payCompanyManagementTemporaryService.removeById(payCommonProjectOld.getChargeCompanyTemporaryId());
//payCompanyManagementTemporaryService.removeById(payCommonProjectOld.getChargeCompanyTemporaryId());
}else{
payCommonProject.setChargeCompanyId(payCommonProjectOld.getChargeCompanyId());
}
@@ -451,7 +451,7 @@ public class PayCommonProjectServiceImpl extends ServiceImpl<PayCommonProjectMap
}
payCommonProject.setContactsTemporaryId(contactsName.getId());
payCommonProject.setContactsTemporaryName(contactsName.getName());
payContactsManagementTemporaryService.removeById(payCommonProjectOld.getContactsTemporaryId());
// payContactsManagementTemporaryService.removeById(payCommonProjectOld.getContactsTemporaryId());
}else{
payCommonProject.setContactsId(payCommonProjectOld.getContactsId());
}
@@ -465,7 +465,7 @@ public class PayCommonProjectServiceImpl extends ServiceImpl<PayCommonProjectMap
}
payCommonProject.setMailContactsTemporaryId(mailContactsName.getId());
payCommonProject.setMailContactsTemporaryName(mailContactsName.getName());
payContactsManagementTemporaryService.removeById(payCommonProjectOld.getMailContactsTemporaryId());
// payContactsManagementTemporaryService.removeById(payCommonProjectOld.getMailContactsTemporaryId());
}else{
payCommonProject.setMailContactsId(payCommonProjectOld.getMailContactsId());
}
jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java
+5 -5
View File
@@ -1406,10 +1406,10 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
update.eq(PayPackCompanyProject::getProjectId, payWorkingGroupSubItem.getId());
payPackCompanyProjectService.remove(update);
// 删除企业联系人临时数据
payCompanyManagementTemporaryService.removeById(payWorkingGroupSubItem.getChargeCompanyTemporaryId());
//payCompanyManagementTemporaryService.removeById(payWorkingGroupSubItem.getChargeCompanyTemporaryId());
List<PayWorkingGroupSubItemContacts> subItemContacts = payWorkingGroupSubItemContactsMapper.getSubItemContacts(id);
List<String> temporaryIds = subItemContacts.stream().map(PayWorkingGroupSubItemContacts::getContactsTemporaryId).collect(Collectors.toList());
payContactsManagementTemporaryService.removeByIds(temporaryIds);
// paycontactsManagementTemporaryService.removeByIds(temporaryIds);
}
/**
@@ -1466,7 +1466,7 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
}
payWorkingGroupSubItem.setChargeCompanyTemporaryId(chargeCompanyName.getId());
payWorkingGroupSubItem.setChargeCompanyTemporaryName(chargeCompanyName.getCompanyName());
payCompanyManagementTemporaryService.removeById(payWorkingGroupSubItemOld.getChargeCompanyTemporaryId());
//payCompanyManagementTemporaryService.removeById(payWorkingGroupSubItemOld.getChargeCompanyTemporaryId());
} else {
payWorkingGroupSubItem.setChargeCompanyId(payWorkingGroupSubItemOld.getChargeCompanyId());
}
@@ -1476,7 +1476,7 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
// 删除临时表历史记录
if (!CollectionUtils.isEmpty(payWorkingGroupSubItemOld.getPayWorkingGroupSubItemContactsList())) {
List<String> list = payWorkingGroupSubItemOld.getPayWorkingGroupSubItemContactsList().stream().map(PayWorkingGroupSubItemContacts::getContactsTemporaryId).collect(Collectors.toList());
payContactsManagementTemporaryService.removeByIds(list);
// paycontactsManagementTemporaryService.removeByIds(list);
}
// 删除联系人记录
LambdaUpdateWrapper<PayWorkingGroupSubItemContacts> updatePayWorkingGroupSubItemContacts = new LambdaUpdateWrapper<>();
@@ -1501,7 +1501,7 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
}
payWorkingGroupSubItem.setMailContactsTemporaryId(mailContactsName.getId());
payWorkingGroupSubItem.setMailContactsTemporaryName(mailContactsName.getName());
payContactsManagementTemporaryService.removeById(payWorkingGroupSubItemOld.getMailContactsTemporaryId());
// payContactsManagementTemporaryService.removeById(payWorkingGroupSubItemOld.getMailContactsTemporaryId());
} else {
payWorkingGroupSubItem.setMailContactsId(payWorkingGroupSubItemOld.getMailContactsId());
}
jero-boot-incoming-payment/src/main/java/com/jero/temporary/controller/PayCompanyManagementTemporaryController.java
+1 -25
View File
@@ -80,31 +80,7 @@ public class PayCompanyManagementTemporaryController extends JeroController<PayC
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@ApiOperation(value="pay_company_management_temporary-通过id删除", notes="pay_company_management_temporary-通过id删除")
// @DeleteMapping(value = "/delete")
public Result<?> delete(@RequestParam(name="id",required=true) String id) {
payCompanyManagementTemporaryService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@ApiOperation(value="pay_company_management_temporary-批量删除", notes="pay_company_management_temporary-批量删除")
// @DeleteMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
this.payCompanyManagementTemporaryService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
* 通过id查询
jero-boot-incoming-payment/src/main/java/com/jero/temporary/controller/PayContactsManagementTemporaryController.java
-26
View File
@@ -80,32 +80,6 @@ public class PayContactsManagementTemporaryController extends JeroController<Pay
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@ApiOperation(value="pay_contacts_management_temporary-通过id删除", notes="pay_contacts_management_temporary-通过id删除")
// @DeleteMapping(value = "/delete")
public Result<?> delete(@RequestParam(name="id",required=true) String id) {
payContactsManagementTemporaryService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@ApiOperation(value="pay_contacts_management_temporary-批量删除", notes="pay_contacts_management_temporary-批量删除")
// @DeleteMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
this.payContactsManagementTemporaryService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
* 通过id查询
*