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

fix:80828

Browse Source
This commit is contained in:
梁琦涛
2024-01-15 17:30:42 +08:00
parent fc56a9a562
commit 5e451afc66
1 changed files with 37 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java
+37 -3
View File
@@ -25,6 +25,8 @@ import com.jero.contract.entity.PayIncomeContract;
import com.jero.contract.entity.PayIncomeContractAssociated;
import com.jero.contract.service.IPayIncomeContractAssociatedService;
import com.jero.contract.service.IPayIncomeContractService;
import com.jero.drafting.entity.PayDraftingGroupSubItemContacts;
import com.jero.drafting.service.IPayDraftingGroupSubItemContactsService;
import com.jero.mail.entity.PayMailBill;
import com.jero.mail.entity.PayMailBillProject;
import com.jero.mail.service.IPayMailBillProjectService;
@@ -102,6 +104,8 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
private RolePermissionService rolePermissionService;
@Resource
private IPayWorkingGroupSubItemContactsService payWorkingGroupSubItemContactsService;
@Resource
private IPayDraftingGroupSubItemContactsService payDraftingGroupSubItemContactsService;
/**
* 分页列表查询
*
@@ -461,9 +465,7 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
}
}
// 工作组项目资料
// 起草组项目资料
if(Objects.equals(String.valueOf(payCommonProject.getProjectType()), ProjectCommon.PROJECT_TYPE2)
|| Objects.equals(String.valueOf(payCommonProject.getProjectType()), ProjectCommon.PROJECT_TYPE7)){
if(Objects.equals(String.valueOf(payCommonProject.getProjectType()), ProjectCommon.PROJECT_TYPE2)){
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
LambdaQueryWrapper<PayWorkingGroupDistributionRecord> queryPayWorkingGroupDistributionRecord = new LambdaQueryWrapper<>();
queryPayWorkingGroupDistributionRecord.eq(PayWorkingGroupDistributionRecord::getSubId,id);
@@ -494,6 +496,38 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
}
// 起草组项目资料
if(Objects.equals(String.valueOf(payCommonProject.getProjectType()), ProjectCommon.PROJECT_TYPE7)){
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
LambdaQueryWrapper<PayWorkingGroupDistributionRecord> queryPayWorkingGroupDistributionRecord = new LambdaQueryWrapper<>();
queryPayWorkingGroupDistributionRecord.eq(PayWorkingGroupDistributionRecord::getSubId,id);
queryPayWorkingGroupDistributionRecord.eq(PayWorkingGroupDistributionRecord::getContactsId,sysUser.getId());
queryPayWorkingGroupDistributionRecord.groupBy(PayWorkingGroupDistributionRecord::getFileId);
List<PayWorkingGroupDistributionRecord> listPayWorkingGroupDistributionRecord = payWorkingGroupDistributionRecordService.list(queryPayWorkingGroupDistributionRecord);
if(!CollectionUtils.isEmpty(listPayWorkingGroupDistributionRecord)){
StringBuilder sb = new StringBuilder();
listPayWorkingGroupDistributionRecord.forEach(p->{
sb.append(p.getFileId());
if(listPayWorkingGroupDistributionRecord.indexOf(p) != (listPayWorkingGroupDistributionRecord.size() - 1)){
sb.append(",");
}
});
payCommonProject.setFiles(sb.toString());
}
LambdaQueryWrapper<PayDraftingGroupSubItemContacts> queryPayDraftingGroupSubItemContacts = new LambdaQueryWrapper<>();
queryPayDraftingGroupSubItemContacts.eq(PayDraftingGroupSubItemContacts::getDraftingGroupId,id);
List<PayDraftingGroupSubItemContacts> pwg = payDraftingGroupSubItemContactsService.list(queryPayDraftingGroupSubItemContacts);
if(!CollectionUtils.isEmpty(pwg)){
pwg.sort(Comparator.comparing(PayDraftingGroupSubItemContacts::getOrderNum));
payCommonProject.setContactsTemporaryId(pwg.get(0).getContactsTemporaryId());
payCommonProject.setContactsTemporaryName(pwg.get(0).getContactsTemporaryName());
}else{
payCommonProject.setContactsTemporaryId("");
payCommonProject.setContactsTemporaryName("");
}
}
String strProject = JSON.toJSONString(payCommonProject);
payCompanyCommonProject = JSONObject.parseObject(strProject,PayCompanyCommonProject.class);
if(Objects.isNull(payCompanyCommonProject.getPaidAmount())){