This commit is contained in:
baozhipeng
2021-09-10 14:15:28 +08:00
parent 44218fd769
commit 666d3ca1cd
3 changed files with 23 additions and 17 deletions
@@ -29,5 +29,5 @@ public interface IPayMailBillService extends IService<PayMailBill> {
* @param payMailBill
* @return
*/
Result<?> addPayBill(PayMailBill payMailBill,String projectId,Integer projectType);
Result<?> addPayBill(PayMailBill payMailBill,String projectIds,String projectTypes);
}
@@ -55,29 +55,35 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
* @param payMailBill
* @return
*/
public Result<?> addPayBill(PayMailBill payMailBill,String projectId,Integer projectType){
public Result<?> addPayBill(PayMailBill payMailBill,String projectIds,String projectTypes){
String[] projectIdArray = projectIds.split(",");
String[] projectTypeArray = projectTypes.split(",");
if(PayIncomeContractCommon.PROJECT_TYPE5.equals(String.valueOf(projectType))){
for (int i = 0; i < projectIdArray.length; i++) {
if(PayIncomeContractCommon.PROJECT_TYPE5.equals(String.valueOf(projectIdArray[i]))){
LambdaQueryWrapper<PayMailBillProject> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(PayMailBillProject::getProjectId, projectId);
wrapper.eq(PayMailBillProject::getProjectType, PayIncomeContractCommon.PROJECT_TYPE5);
List<PayMailBillProject> type5List = payMailBillProjectService.list(wrapper);
LambdaQueryWrapper<PayMailBillProject> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(PayMailBillProject::getProjectId, projectIdArray[i]);
wrapper.eq(PayMailBillProject::getProjectType, PayIncomeContractCommon.PROJECT_TYPE5);
List<PayMailBillProject> type5List = payMailBillProjectService.list(wrapper);
if(type5List!=null && type5List.size()>0){
return Result.error("标协会员项目,只能开票一次。");
if(type5List!=null && type5List.size()>0){
return Result.error("标协会员项目,只能开票一次。");
}
}
}
//新增票据邮寄表
payMailBillService.save(payMailBill);
//新增票据关联项目表
PayMailBillProject payMailBillProject = new PayMailBillProject();
payMailBillProject.setBillId(payMailBill.getId());
payMailBillProject.setProjectId(projectId);
payMailBillProject.setProjectType(projectType);
payMailBillProjectService.save(payMailBillProject);
for (int i = 0; i < projectTypeArray.length; i++) {
PayMailBillProject payMailBillProject = new PayMailBillProject();
payMailBillProject.setBillId(payMailBill.getId());
payMailBillProject.setProjectId(projectIdArray[i]);
payMailBillProject.setProjectType(Integer.valueOf(projectTypeArray[i]));
payMailBillProjectService.save(payMailBillProject);
}
return Result.OK("添加成功!");
}
}
@@ -99,8 +99,8 @@ public class PayPaymentRecordController extends JeroController<PayPaymentRecord,
*/
@ApiOperation(value="添加开票", notes="添加开票")
@PostMapping(value = "/addPayBill")
public Result<?> addPayBill(@RequestBody PayMailBill payMailBill,String projectId,Integer projectType) {
return payMailBillService.addPayBill(payMailBill, projectId, projectType);
public Result<?> addPayBill(@RequestBody PayMailBill payMailBill,String projectIds,String projectTypes) {
return payMailBillService.addPayBill(payMailBill, projectIds, projectTypes);
}
/**