From 62dac46bd2bc6e7b4717f2edeb936d8e93782451 Mon Sep 17 00:00:00 2001
From: sunzheng <sunzheng.cn>
Date: Thu, 11 Jan 2024 17:32:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=80=9A=E8=BF=87=E4=BA=8C?=
 =?UTF-8?q?=E7=BB=B4=E7=A0=81=E6=8A=A5=E5=90=8D=E8=B5=B7=E8=8D=89=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/PayDraftingGroupSubItemController.java  |  4 ++++
 .../impl/PayDraftingGroupSubItemServiceImpl.java       | 10 ++++++++++
 .../controller/PayWorkingGroupSubItemController.java   |  5 ++++-
 3 files changed, 18 insertions(+), 1 deletion(-)

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 d945191d..cd5af935 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
@@ -166,6 +166,10 @@ public class PayDraftingGroupSubItemController extends JeroController<PayDraftin
             pageList = payDraftingGroupSubItemService.queryCompanyPageListByCompanyManager(page, payDraftingGroupSubItem,listNeedInvoice,sysUser.getCompanyId());
         }
 
+        // 过滤数据，只要审核通过的数据
+        List<PayDraftingGroupSubItem> passList = pageList.getRecords().stream().filter(item -> Objects.equals(item.getCheckResult(), DraftingConstant.CHECK_PASS)).collect(Collectors.toList());
+        pageList.setRecords(passList);
+
         if(!CollectionUtils.isEmpty(pageList.getRecords())){
             List<PayDraftingGroupSubItem> list = pageList.getRecords();
             // 过滤数据，只要审核通过的数据
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 624a1afb..a04da740 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
@@ -714,6 +714,16 @@ public class PayDraftingGroupSubItemServiceImpl extends ServiceImpl<PayDraftingG
         updateWrapper.set(StringUtils.isNotBlank(checkRemark),PayDraftingGroupSubItem::getCheckRemark,checkRemark);
         updateWrapper.set(!Objects.isNull(checkResult),PayDraftingGroupSubItem::getCheckResult,checkResult);
         payDraftingGroupSubItemService.update(updateWrapper);
+        // 如果审核通过,发送消息
+        if(Objects.equals(checkVO.getCheckResult(),DraftingConstant.CHECK_PASS)) {
+            PayDraftingGroupSubItem draftingGroupSubItem = payDraftingGroupSubItemService.getById(payDraftingGroupSubItemId);
+            if (Objects.isNull(draftingGroupSubItem) || StringUtils.isBlank(draftingGroupSubItem.getDraftingGroupId())) {
+                 throw new JeroBootException("起草组不存在");
+            }
+            PayDraftingGroup payDraftingGroup = payDraftingGroupService.getById(draftingGroupSubItem.getDraftingGroupId());
+            List<PayDraftingGroupSubItemContacts> payDraftingGroupSubItemContactsList = draftingGroupSubItem.getPayDraftingGroupSubItemContactsList();
+            sendMessage(draftingGroupSubItem,payDraftingGroup,payDraftingGroupSubItemContactsList);
+        }
     }
 
     /**
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 34dc3e9b..19c37896 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
@@ -160,7 +160,7 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
 	  * @param paymentDate            日期
 	  * @return
 	  */
-	 @ApiOperation(value = "企业端-工作组成员-分页列表查询", notes = "企业端-工作组成员-分页列表查询")
+	 @ApiOperation(value = "企业端-工作组成员-查询某个工作组", notes = "企业端-工作组成员-查询某个工作组")
 	 @GetMapping(value = "/getItemById")
 	 public Result<?> getItemById(PayWorkingGroupSubItem payWorkingGroupSubItem,
 									@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@@ -172,6 +172,9 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
 		 if (StringUtils.isBlank(payWorkingGroupSubItem.getWorkingGroupId())) {
 			 return Result.error("工作组id不能为空！");
 		 }
+		 if (StringUtils.isBlank(payWorkingGroupSubItem.getId())) {
+			 return Result.error("工作组成员id不能为空！");
+		 }
 		 if(!StringUtils.isBlank(payWorkingGroupSubItem.getChargeCompanyTemporaryName())){
 			 payWorkingGroupSubItem.setChargeCompanyTemporaryName(oConvertUtils.replaceAllPercent(payWorkingGroupSubItem.getChargeCompanyTemporaryName()));
 		 }