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 fa03d042..c7f61c6f 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 @@ -78,19 +78,7 @@ public class PayDraftingGroupSubItemController extends JeroController page = new Page<>(pageNo, pageSize); @@ -502,4 +490,35 @@ public class PayDraftingGroupSubItemController extends JeroController query(PayDraftingGroupSubItem payDraftingGroupSubItem, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + @RequestParam(name = "paymentDate", required = false) String paymentDate) { + if (!StringUtils.isBlank(payDraftingGroupSubItem.getChargeCompanyTemporaryName()) && payDraftingGroupSubItem.getChargeCompanyTemporaryName().length() > 50) { + return Result.error("成员单位长度不能大于50个字符"); + } + if (StringUtils.isBlank(payDraftingGroupSubItem.getDraftingGroupId())) { + return Result.error("起草组id不能为空!"); + } + if (StringUtils.isBlank(payDraftingGroupSubItem.getId())) { + return Result.error("起草组成员id不能为空!"); + } + PayDraftingGroup payDraftingGroup = payDraftingGroupService.getById(payDraftingGroupSubItem.getDraftingGroupId()); + if(Objects.isNull(payDraftingGroup)){ + return Result.error("起草组不存在!"); + } + Page page = new Page<>(pageNo, pageSize); + IPage pageList = payDraftingGroupSubItemService.queryPageList(page, payDraftingGroupSubItem, paymentDate); + PayDraftingGroupSubItem item = pageList.getRecords().get(0); + return Result.OK(item); + } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupSubItemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupSubItemMapper.xml index e96a25a5..bf073555 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupSubItemMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupSubItemMapper.xml @@ -34,6 +34,9 @@ AND pcm.company_name LIKE concat('%',concat(#{payDraftingGroupSubItem.chargeCompanyTemporaryName},'%')) + + AND pdgs.id = #{payDraftingGroupSubItem.id} + GROUP BY pdgs.id ORDER BY pdgs.create_time desc