diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupResearchProjectController.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupResearchProjectController.java index 40b5b0a8..5998d472 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupResearchProjectController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupResearchProjectController.java @@ -80,6 +80,36 @@ public class PayDraftingGroupResearchProjectController extends JeroController enterpriseQueryPageList(PayDraftingGroupResearchProject payResearchProject, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize + ) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + if(StringUtils.isNotBlank(payResearchProject.getDraftingGroupId())){ + queryWrapper.eq("drafting_group_id",payResearchProject.getDraftingGroupId()); + }else { + return Result.error("起草组id为空!"); + } + if(StringUtils.isNotBlank(payResearchProject.getProjectName())){ + queryWrapper.like("project_name",payResearchProject.getProjectName()); + } + Page page = new Page<>(pageNo, pageSize); + IPage pageList = payDraftingGroupResearchProjectService.pageList(page,queryWrapper); + return Result.OK(pageList); + } + /** * 新增 * diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemController.java index c7f61c6f..d945191d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemController.java @@ -16,6 +16,7 @@ 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.common.DraftingConstant; import com.jero.drafting.entity.PayDraftingGroup; import com.jero.drafting.entity.PayDraftingGroupSubItem; import com.jero.drafting.entity.PayDraftingGroupSubItemContacts; @@ -167,6 +168,9 @@ public class PayDraftingGroupSubItemController extends JeroController list = pageList.getRecords(); + // 过滤数据,只要审核通过的数据 + list = list.stream().filter(item -> Objects.equals(item.getCheckResult(), DraftingConstant.CHECK_PASS)).collect(Collectors.toList()); + List listIds = list.stream().map(PayDraftingGroupSubItem::getDraftingGroupId).collect(Collectors.toList()); LambdaQueryWrapper queryPayDraftingGroup = new LambdaQueryWrapper<>(); queryPayDraftingGroup.in(PayDraftingGroup::getId,listIds); @@ -497,7 +501,7 @@ public class PayDraftingGroupSubItemController extends JeroController query(PayDraftingGroupSubItem payDraftingGroupSubItem, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @@ -518,7 +522,28 @@ public class PayDraftingGroupSubItemController extends JeroController page = new Page<>(pageNo, pageSize); IPage pageList = payDraftingGroupSubItemService.queryPageList(page, payDraftingGroupSubItem, paymentDate); - PayDraftingGroupSubItem item = pageList.getRecords().get(0); + List records = pageList.getRecords(); + if (CollectionUtils.isEmpty(records)) { + return Result.error("该成员不存在!"); + } + PayDraftingGroupSubItem item = records.get(0); return Result.OK(item); } + + /** + * 企业端-起草组成员添加(不带权限) + * + * @param payDraftingGroupSubItem 起草组成员 + * @return + */ + @ApiOperation(value = "企业端-起草组成员添加", notes = "企业端-起草组成员添加") + @PostMapping(value = "/addByQRCode") + public Result addByQRCode(@RequestBody PayDraftingGroupSubItem payDraftingGroupSubItem) { + StringBuilder msg = ValidUtil.validateAll(payDraftingGroupSubItem); + if (!StringUtils.isBlank(msg)) { + return Result.error(msg.toString()); + } + payDraftingGroupSubItemService.addPayDraftingGroupSubItem(payDraftingGroupSubItem); + return Result.OK("添加成功!"); + } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java index d4cbd7d0..624a1afb 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java @@ -178,10 +178,17 @@ public class PayDraftingGroupSubItemServiceImpl extends ServiceImpl listPayDraftingGroupSubItemContactsNew) { JSONObject json = new JSONObject(); json.put("type",ProjectCommon.PROJECT_TYPE7); - json.put("draftGroupId",payDraftingGroupSubItem.getDraftingGroupId()); - json.put("projectId",payDraftingGroupSubItem.getId()); + json.put("draftGroupId", payDraftingGroupSubItem.getDraftingGroupId()); + json.put("projectId", payDraftingGroupSubItem.getId()); json.put("path","/draftTeam/DraftTeamDetail"); //新建项目 给企业联系人发消息 if(!CollectionUtils.isEmpty(listPayDraftingGroupSubItemContactsNew)) { diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java index 11929740..34dc3e9b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java @@ -151,6 +151,55 @@ public class PayWorkingGroupSubItemController extends JeroController getItemById(PayWorkingGroupSubItem payWorkingGroupSubItem, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + @RequestParam(name = "paymentDate", required = false) String paymentDate) { + if (!StringUtils.isBlank(payWorkingGroupSubItem.getChargeCompanyTemporaryName()) && payWorkingGroupSubItem.getChargeCompanyTemporaryName().length() > 50) { + return Result.error("成员单位长度不能大于50个字符"); + } + if (StringUtils.isBlank(payWorkingGroupSubItem.getWorkingGroupId())) { + return Result.error("工作组id不能为空!"); + } + if(!StringUtils.isBlank(payWorkingGroupSubItem.getChargeCompanyTemporaryName())){ + payWorkingGroupSubItem.setChargeCompanyTemporaryName(oConvertUtils.replaceAllPercent(payWorkingGroupSubItem.getChargeCompanyTemporaryName())); + } + PayWorkingGroup payWorkingGroup = payWorkingGroupService.getById(payWorkingGroupSubItem.getWorkingGroupId()); + if(Objects.isNull(payWorkingGroup)){ + return Result.error("工作组不存在!"); + } + Page page = new Page<>(pageNo, pageSize); + IPage pageList = payWorkingGroupSubItemService.queryPageList(page, payWorkingGroupSubItem, paymentDate); + if(!CollectionUtils.isEmpty(pageList.getRecords())){ + List list = pageList.getRecords(); + list.forEach(p->{ + if(Objects.isNull(p.getReceivableAmount())){ + p.setReceivableAmount(new BigDecimal("0.00")); + } + if(Objects.isNull(p.getPaidAmount())){ + p.setPaidAmount(new BigDecimal("0.00")); + } + }); + } + List records = pageList.getRecords(); + if (CollectionUtils.isEmpty(records)){ + return Result.error("该成员不存在"); + } + PayWorkingGroupSubItem item = records.get(0); + return Result.OK(item); + } + /** * 分页列表查询 * diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml index 51e2ac37..379dd6f4 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml @@ -78,6 +78,9 @@ AND pwgs.estimated_arrival_date <= #{payWorkingGroupSubItem.estimatedArrivalEndDate} + + and pwgs.id = #{payWorkingGroupSubItem.id} + GROUP BY pwgs.id ORDER BY pwgs.create_time desc