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-14 20:19:09 +08:00
parent fa2636002d
commit 3a898aa001
8 changed files with 61 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java
+1 -14
View File
@@ -476,20 +476,7 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
PayIncomeContractDetailOutput payIncomeContractDetailOutput = JSONObject.parseObject(str,PayIncomeContractDetailOutput.class);
List<ProjectOutput> listProject = new ArrayList<>();
// 获取关联项目id
if(Objects.equals(payIncomeContract.getStatus(),PayIncomeContractCommon.STATUS6)){
LambdaQueryWrapper<PayIncomeContractAssociatedCancellation> queryPayIncomeContractAssociatedCancellation = new LambdaQueryWrapper();
queryPayIncomeContractAssociatedCancellation.eq(PayIncomeContractAssociatedCancellation::getContractId,payIncomeContract.getId());
List<PayIncomeContractAssociatedCancellation> listPayIncomeContractAssociatedCancellation = payIncomeContractAssociatedCancellationService.list(queryPayIncomeContractAssociatedCancellation);
if(!CollectionUtils.isEmpty(listPayIncomeContractAssociatedCancellation)){
List<ProjectOutput> finalListProject = listProject;
listPayIncomeContractAssociatedCancellation.forEach(p->{
String s = JSON.toJSONString(p);
ProjectOutput projectOutput = JSONObject.parseObject(s,ProjectOutput.class);
projectOutput.setId(p.getAssociatedId());
finalListProject.add(projectOutput);
});
}
}else{
if(!Objects.equals(payIncomeContract.getStatus(),PayIncomeContractCommon.STATUS6)){
listProject = payIncomeContractService.getAssociated(id);
}
jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml
+1 -1
View File
@@ -8,7 +8,7 @@
SELECT
pic.id,
pic.contract_num AS contractNum,
pic.contract_name AS contractName,
if(pic.status = 6,CONCAT(pic.contract_name,'已作废'),pic.contract_name) AS contractName,
pic.signed_company_id AS signedCompanyId,
pic.signed_company_temporary_id AS signedCompanyTemporaryId,
pic.signed_company_temporary_name AS signedCompanyTemporaryName,
jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java
+3 -21
View File
@@ -1030,27 +1030,9 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
payIncomeContractAssociatedCancellation.setId(null);
payIncomeContractAssociatedCancellation.setAssociatedId(p.getId());
list.add(payIncomeContractAssociatedCancellation);
if(Objects.equals(p.getProjectType(),PayIncomeContractCommon.PROJECT_TYPE1)){
LambdaUpdateWrapper<PayCommonProject> updatePayCommonProject = new LambdaUpdateWrapper<>();
updatePayCommonProject.eq(PayCommonProject::getId,p.getProjectId());
updatePayCommonProject.set(PayCommonProject::getContractNum,null);
payCommonProjectService.update(updatePayCommonProject);
}else if(Objects.equals(p.getProjectType(),PayIncomeContractCommon.PROJECT_TYPE2)){
LambdaUpdateWrapper<PayWorkingGroupSubItem> updatePayWorkingGroupSubItem = new LambdaUpdateWrapper<>();
updatePayWorkingGroupSubItem.eq(PayWorkingGroupSubItem::getId,p.getProjectId());
updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getContractNum,null);
payWorkingGroupSubItemService.update(updatePayWorkingGroupSubItem);
}else if(Objects.equals(p.getProjectType(),PayIncomeContractCommon.PROJECT_TYPE3)){
LambdaUpdateWrapper<PayMeetingSituation> updatePayMeetingSituation = new LambdaUpdateWrapper<>();
updatePayMeetingSituation.eq(PayMeetingSituation::getId,p.getProjectId());
updatePayMeetingSituation.set(PayMeetingSituation::getContractId,null);
payMeetingSituationService.update(updatePayMeetingSituation);
}else if(Objects.equals(p.getProjectType(),PayIncomeContractCommon.PROJECT_TYPE4)){
LambdaUpdateWrapper<PayMemberProjectSubitem> updatePayMemberProjectSubitem = new LambdaUpdateWrapper<>();
updatePayMemberProjectSubitem.eq(PayMemberProjectSubitem::getId,p.getProjectId());
updatePayMemberProjectSubitem.set(PayMemberProjectSubitem::getContractNo,null);
memberProjectSubitemService.update(updatePayMemberProjectSubitem);
}
PayIncomeContractAssociated payIncomeContractAssociated = new PayIncomeContractAssociated();
payIncomeContractAssociated.setId(p.getId());
cancelAssociated(payIncomeContractAssociated);
});
payIncomeContractAssociatedCancellationService.saveBatch(list);
}