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

fix:企业端分标委

Browse Source
This commit is contained in:
zhangqinlin
2021-12-15 15:10:44 +08:00
parent 77e9151eb3
commit d35087dc0e
3 changed files with 84 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCouncilSubitemController.java
+1 -2
View File
@@ -110,7 +110,6 @@ public class PayCaseCouncilSubitemController extends JeroController<PayCaseCounc
* 企业端理事会成员表
*
*/
@RequiresPermissions("council:search")
@ApiOperation(value="企业端理事会成员表-搜索", notes="企业端理事会成员表-搜索",response = FindByName.class)
@GetMapping(value = "/findTwo")
public Result<?> findTwo(
@@ -153,7 +152,7 @@ public class PayCaseCouncilSubitemController extends JeroController<PayCaseCounc
public Result<?> add(@Valid @RequestBody PayCaseCouncilSubitem payCaseCouncilSubitem) {
PayCaseCouncilSubitem payCaseCouncilSubitem1 = new PayCaseCouncilSubitem();
BeanUtils.copyProperties(payCaseCouncilSubitem,payCaseCouncilSubitem1);
// 新增时校验重复ne
// 新增时校验重复
LambdaQueryWrapper<PayCaseCouncilSubitem> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(PayCaseCouncilSubitem::getContactsId, payCaseCouncilSubitem.getContactsId());
lambdaQueryWrapper.eq(PayCaseCouncilSubitem::getCouncilId, payCaseCouncilSubitem.getCouncilId());
jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDistributionRecordController.java
+1 -1
View File
@@ -293,7 +293,7 @@ public class PayWorkingGroupDistributionRecordController extends JeroController<
*/
@AutoLog(value = "资料分发-批量分发")
@RequiresPermissions("fileMaintenance:batchDistribute")
@ApiOperation(value="资料分发-分发", notes="资料分发-批量分发")
@ApiOperation(value="资料分发-批量分发", notes="资料分发-批量分发")
@PostMapping(value = "/addBatch")
public Result<?> addBatch(@RequestBody PayWorkingGroupDistributionRecord payWorkingGroupDistributionRecord) {
payWorkingGroupDistributionRecordService.addBatch(payWorkingGroupDistributionRecord);
jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java
+82 -1
View File
@@ -18,8 +18,12 @@ import com.jero.company.entity.PayContactsManagement;
import com.jero.company.service.IPayContactsManagementService;
import com.jero.data.entity.PayCaseCommittee;
import com.jero.data.entity.PayCaseCommitteeSubitem;
import com.jero.data.entity.PayCaseCouncil;
import com.jero.data.entity.PayCaseCouncilSubitem;
import com.jero.data.service.IPayCaseCommitteeService;
import com.jero.data.service.IPayCaseCommitteeSubitemService;
import com.jero.data.service.IPayCaseCouncilService;
import com.jero.data.service.IPayCaseCouncilSubitemService;
import com.jero.modules.oss.entity.OSSFile;
import com.jero.modules.oss.service.IOSSFileService;
import com.jero.project.common.PayProjectCommon;
@@ -34,6 +38,7 @@ import com.jero.temporary.service.IPayContactsManagementTemporaryService;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.env.Environment;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -78,6 +83,10 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl<Pa
private PayWorkingGroupDistributionRecordMapper payWorkingGroupDistributionRecordMapper;
@Resource
private RolePermissionService rolePermissionService;
@Autowired
private IPayCaseCouncilSubitemService payCaseCouncilSubitemService;
@Autowired
private IPayCaseCouncilService payCaseCouncilService;
@Override
@Transactional
@@ -161,6 +170,37 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl<Pa
throw new JeroBootException("分标委不存在!");
}
msg = payCaseCommittee.getName();
}else if(payWorkingGroupDistributionRecord.getProjectType() == PayProjectCommon.PROJECT_TYPE_FILE3){
LambdaQueryWrapper<PayContactsManagement> queryPayContactsManagement = new LambdaQueryWrapper<>();
queryPayContactsManagement.in(PayContactsManagement::getId, Arrays.asList(payWorkingGroupDistributionRecord.getContactsIds().split(",")));
List<PayContactsManagement> listContacts = payContactsManagementService.list(queryPayContactsManagement);
if(!CollectionUtils.isEmpty(listContacts)){
String str = JSON.toJSONString(listContacts);
list = JSONArray.parseArray(str,PayContactsManagementTemporary.class);
}
// 查询分标委成员
LambdaQueryWrapper<PayCaseCouncilSubitem> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(PayCaseCouncilSubitem::getCouncilId,payWorkingGroupDistributionRecord.getProjectId());
queryWrapper.in(PayCaseCouncilSubitem::getContactsId,Arrays.asList(s));
List<PayCaseCouncilSubitem> payCaseCouncilSubitems = payCaseCouncilSubitemService.list(queryWrapper);
if(!CollectionUtils.isEmpty(payCaseCouncilSubitems)){
payCaseCouncilSubitems.forEach(p->{
PayWorkingGroupDistributionRecord payWorkingGroupDistributionRecordNew = new PayWorkingGroupDistributionRecord();
payWorkingGroupDistributionRecordNew.setDataId(payWorkingGroupDistributionRecord.getDataId());
payWorkingGroupDistributionRecordNew.setProjectId(payWorkingGroupDistributionRecord.getProjectId());
payWorkingGroupDistributionRecordNew.setProjectType(payWorkingGroupDistributionRecord.getProjectType());
payWorkingGroupDistributionRecordNew.setFileId(byId.getId());
payWorkingGroupDistributionRecordNew.setSubId(p.getId());
payWorkingGroupDistributionRecordNew.setContactsId(p.getContactsId());
payWorkingGroupDistributionRecordNew.setContactsName(p.getContactsName());
listPayWorkingGroupDistributionRecord.add(payWorkingGroupDistributionRecordNew);
});
}
PayCaseCouncil payCaseCouncil = payCaseCouncilService.getById(payWorkingGroupDistributionRecord.getProjectId());
if(Objects.isNull(payCaseCouncil)){
throw new JeroBootException("理事会不存在!");
}
msg = payCaseCouncil.getName();
}else{
throw new JeroBootException("项目状态不正确！");
}
@@ -306,7 +346,48 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl<Pa
throw new JeroBootException("分标委不存在!");
}
msg = payCaseCommittee.getName();
}else{
}else if(payWorkingGroupDistributionRecord.getProjectType() == PayProjectCommon.PROJECT_TYPE_FILE3){
// 查询理事会成员
LambdaQueryWrapper<PayCaseCouncilSubitem> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(PayCaseCouncilSubitem::getCouncilId,payWorkingGroupDistributionRecord.getProjectId());
lambdaQueryWrapper.in(PayCaseCouncilSubitem::getContactsId,Arrays.asList(s));
List<PayCaseCouncilSubitem> listPayCaseCouncilSubitem = payCaseCouncilSubitemService.list(lambdaQueryWrapper);
listPayWorkingGroupDataFile.forEach(p->{
OSSFile byId = iossFileService.getById(p.getFileId());
if(Objects.isNull(byId)){
throw new JeroBootException("没有找到文件!");
}
// 文件路径
String url = byId.getUrl();
listFile.add(path + url);
// 查询工作组成员
if(!CollectionUtils.isEmpty(listPayCaseCouncilSubitem)){
listPayCaseCouncilSubitem.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.getContactsId());
payWorkingGroupDistributionRecordNew.setContactsName(p1.getContactsName());
listPayWorkingGroupDistributionRecord.add(payWorkingGroupDistributionRecordNew);
});
}
});
LambdaQueryWrapper<PayContactsManagement> queryPayContactsManagement = new LambdaQueryWrapper<>();
queryPayContactsManagement.in(PayContactsManagement::getId, Arrays.asList(s));
List<PayContactsManagement> listContacts = payContactsManagementService.list(queryPayContactsManagement);
if(!CollectionUtils.isEmpty(listContacts)){
String str = JSON.toJSONString(listContacts);
list = JSONArray.parseArray(str,PayContactsManagementTemporary.class);
}
PayCaseCouncil payCaseCouncil = payCaseCouncilService.getById(payWorkingGroupDistributionRecord.getProjectId());
if(Objects.isNull(payCaseCouncil)){
throw new JeroBootException("理事会不存在!");
}
msg = payCaseCouncil.getName();
}else {
throw new JeroBootException("项目状态不正确！");
}
payWorkingGroupDistributionRecordService.saveBatch(listPayWorkingGroupDistributionRecord);