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:
梁琦涛
2021-09-13 15:15:16 +08:00
parent ca01495f7e
commit b3c7992913
2 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyProjectServiceImpl.java
+9 -15
View File
@@ -101,16 +101,18 @@ public class PayPackCompanyProjectServiceImpl extends ServiceImpl<PayPackCompany
@Override
@Transactional
public void removePayPackCompanyProject(PayPackCompanyProject payPackCompanyProject) {
PayPackCompanyProject payPackCompanyProjectNew = payPackCompanyProjectService.getById(payPackCompanyProject.getId());
if(Objects.isNull(payPackCompanyProjectNew)){
LambdaQueryWrapper<PayPackCompanyProject> query = new LambdaQueryWrapper<>();
query.eq(PayPackCompanyProject::getProjectId,payPackCompanyProject.getId());
List<PayPackCompanyProject> listPayPackCompanyProject = payPackCompanyProjectService.list(query);
if(CollectionUtils.isEmpty(listPayPackCompanyProject)){
throw new JeroBootException("不存在打包项目！");
}
if(Objects.equals(payPackCompanyProjectNew.getCome(),PackCommon.COME1)){
if(Objects.equals(listPayPackCompanyProject.get(0).getCome(),PackCommon.COME1)){
throw new JeroBootException("此项目已在合同处创建关联，请先从合同处取消关联！");
}
// 更新项目状态
projectPackService.updateProjectStatus(payPackCompanyProjectNew.getProjectId(),String.valueOf(payPackCompanyProjectNew.getProjectType()),String.valueOf(PackCommon.PACKAGING0),payPackCompanyProject.getPackId());
payPackCompanyProjectService.removeById(payPackCompanyProject.getId());
projectPackService.updateProjectStatus(listPayPackCompanyProject.get(0).getProjectId(),String.valueOf(listPayPackCompanyProject.get(0).getProjectType()),String.valueOf(PackCommon.PACKAGING0),payPackCompanyProject.getPackId());
payPackCompanyProjectService.removeById(listPayPackCompanyProject.get(0).getId());
}
@Override
@@ -121,17 +123,9 @@ public class PayPackCompanyProjectServiceImpl extends ServiceImpl<PayPackCompany
if(StringUtils.isBlank(s1)){
throw new JeroBootException("id不能为空!");
}
PayPackCompanyProject payPackCompanyProjectNew = payPackCompanyProjectService.getById(s1);
if(Objects.isNull(payPackCompanyProjectNew)){
throw new JeroBootException("不存在打包项目！");
}
if(Objects.equals(payPackCompanyProjectNew.getCome(),PackCommon.COME1)){
throw new JeroBootException("此项目已在合同处创建关联，请先从合同处取消关联！");
}
// 更新项目状态
projectPackService.updateProjectStatus(payPackCompanyProjectNew.getProjectId(),String.valueOf(payPackCompanyProjectNew.getProjectType()),String.valueOf(PackCommon.PACKAGING0),payPackCompanyProject.getPackId());
payPackCompanyProject.setId(s1);
removePayPackCompanyProject(payPackCompanyProject);
}
payPackCompanyProjectService.removeByIds(Arrays.asList(payPackCompanyProject.getPackProjectIds()));
}
@Override
jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java
+1
View File
@@ -96,6 +96,7 @@ public class PayCommonProjectServiceImpl extends ServiceImpl<PayCommonProjectMap
if(Objects.equals(payCommonProject.getChargeWay(),PayProjectCommon.CHARGE_WAY2)){
payIncomeContract = payIncomeContractService.setPayIncomeContractAssociated(payCommonProject.getContractNum(),payCommonProject.getChargeCompanyId(),payCommonProject.getId());
}
// 关联了合同,判断合同是否打包，更新项目打包状态，添加打包
if(!Objects.isNull(payIncomeContract) && Objects.equals(payIncomeContract.getPack(),PayProjectCommon.PACKAGING1)){
LambdaUpdateWrapper<PayCommonProject> update = new LambdaUpdateWrapper<>();