分标委分发修改
This commit is contained in:
+9
-7
@@ -266,9 +266,11 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl<Pa
|
||||
}
|
||||
msg = payWorkingGroup.getWorkingGroupProject();
|
||||
}else if(payWorkingGroupDistributionRecord.getProjectType() == PayProjectCommon.PROJECT_TYPE_FILE2){
|
||||
LambdaQueryWrapper<PayWorkingGroupSubItem> queryPayWorkingGroupSubItem = new LambdaQueryWrapper<>();
|
||||
queryPayWorkingGroupSubItem.in(PayWorkingGroupSubItem::getContactsTemporaryIdOne,Arrays.asList(s));
|
||||
List<PayWorkingGroupSubItem> listPayWorkingGroupSubItem = payWorkingGroupSubItemService.list(queryPayWorkingGroupSubItem);
|
||||
// 查询分标委成员
|
||||
LambdaQueryWrapper<PayCaseCommitteeSubitem> queryPayCaseCommitteeSubitem = new LambdaQueryWrapper<>();
|
||||
queryPayCaseCommitteeSubitem.eq(PayCaseCommitteeSubitem::getCommitteeId,payWorkingGroupDistributionRecord.getProjectId());
|
||||
queryPayCaseCommitteeSubitem.in(PayCaseCommitteeSubitem::getContactsId,Arrays.asList(s));
|
||||
List<PayCaseCommitteeSubitem> listPayCaseCommitteeSubitem = payCaseCommitteeSubitemService.list(queryPayCaseCommitteeSubitem);
|
||||
listPayWorkingGroupDataFile.forEach(p->{
|
||||
OSSFile byId = iossFileService.getById(p.getFileId());
|
||||
if(Objects.isNull(byId)){
|
||||
@@ -278,16 +280,16 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl<Pa
|
||||
String url = byId.getUrl();
|
||||
listFile.add(path + url);
|
||||
// 查询工作组成员
|
||||
if(!CollectionUtils.isEmpty(listPayWorkingGroupSubItem)){
|
||||
listPayWorkingGroupSubItem.forEach(p1->{
|
||||
if(!CollectionUtils.isEmpty(listPayCaseCommitteeSubitem)){
|
||||
listPayCaseCommitteeSubitem.forEach(p1->{
|
||||
PayWorkingGroupDistributionRecord payWorkingGroupDistributionRecordNew = new PayWorkingGroupDistributionRecord();
|
||||
payWorkingGroupDistributionRecordNew.setDataId(p.getId());
|
||||
payWorkingGroupDistributionRecordNew.setProjectId(payWorkingGroupDistributionRecord.getProjectId());
|
||||
payWorkingGroupDistributionRecordNew.setProjectType(payWorkingGroupDistributionRecord.getProjectType());
|
||||
payWorkingGroupDistributionRecordNew.setFileId(byId.getId());
|
||||
payWorkingGroupDistributionRecordNew.setSubId(p1.getId());
|
||||
payWorkingGroupDistributionRecordNew.setContactsId(p1.getContactsIdOne());
|
||||
payWorkingGroupDistributionRecordNew.setContactsName(p1.getContactsTemporaryNameOne());
|
||||
payWorkingGroupDistributionRecordNew.setContactsId(p1.getContactsId());
|
||||
payWorkingGroupDistributionRecordNew.setContactsName(p1.getContactsName());
|
||||
listPayWorkingGroupDistributionRecord.add(payWorkingGroupDistributionRecordNew);
|
||||
});
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user