From 6b1e77be08fb1cdd92987c065aa5f3f3bd32cf2c Mon Sep 17 00:00:00 2001
From: sunzheng <sunzheng.cn>
Date: Mon, 8 Jan 2024 16:01:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=B9=E6=8E=A5=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AF=E5=87=BA=E7=8E=B0=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/PayDraftingGroupController.java  | 17 ++++++++++-------
 .../jero/drafting/entity/PayDraftingGroup.java  |  5 +++++
 .../mapper/xml/PayDraftingGroupMapper.xml       | 14 +++++++++++---
 .../jero/drafting/vo/PayDraftingGroupVo.java    |  5 -----
 4 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupController.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupController.java
index 0ac6e1bf..ff1c9866 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupController.java
@@ -81,6 +81,9 @@ public class PayDraftingGroupController extends JeroController<PayDraftingGroup,
         if(!StringUtils.isBlank(payDraftingGroup.getDraftingGroupProject())){
             payDraftingGroup.setDraftingGroupProject(oConvertUtils.replaceAllPercent(payDraftingGroup.getDraftingGroupProject()));
         }
+        if(!StringUtils.isBlank(payDraftingGroup.getWorkingGroupName())){
+            payDraftingGroup.setWorkingGroupName(oConvertUtils.replaceAllPercent(payDraftingGroup.getWorkingGroupName()));
+        }
 
         IPage<PayDraftingGroupVo> pageList = payDraftingGroupService.queryPageList(page,payDraftingGroup);
         if (!Objects.isNull(pageList)) {
@@ -92,13 +95,6 @@ public class PayDraftingGroupController extends JeroController<PayDraftingGroup,
                     }else{
                         p.setCheckoutOperation(PayProjectCommon.CHECKOUT_OPERATION1);
                     }
-                    // 根据工作组id查询对应的工作组名称
-                    if (StringUtils.isNotBlank(p.getWorkingGroupId())) {
-                        PayWorkingGroup payWorkingGroup = payDraftingGroupService.getPayWorkingGroupNameById(p.getWorkingGroupId());
-                        if (!Objects.isNull(payWorkingGroup)) {
-                            p.setWorkingGroupName(payWorkingGroup.getWorkingGroupProject());
-                        }
-                    }
                 });
                 pageList.setRecords(listPayDraftingGroupVo);
             }
@@ -222,6 +218,13 @@ public class PayDraftingGroupController extends JeroController<PayDraftingGroup,
         if(Objects.isNull(payDraftingGroup)) {
             return Result.error("未找到对应数据");
         }
+        // 根据工作组id查询对应的工作组名称
+        if (StringUtils.isNotBlank(payDraftingGroup.getWorkingGroupId())) {
+            PayWorkingGroup payWorkingGroup = payDraftingGroupService.getPayWorkingGroupNameById(payDraftingGroup.getWorkingGroupId());
+            if (!Objects.isNull(payWorkingGroup)) {
+                payDraftingGroup.setWorkingGroupName(payWorkingGroup.getWorkingGroupProject());
+            }
+        }
         return Result.OK(payDraftingGroup);
     }
 
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/entity/PayDraftingGroup.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/entity/PayDraftingGroup.java
index 85a4c923..cb8c8fe4 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/entity/PayDraftingGroup.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/entity/PayDraftingGroup.java
@@ -52,6 +52,11 @@ public class PayDraftingGroup implements Serializable {
     @NotEmpty(message = "工作组id不能为空")
     @Size(max = 50,message = "工作组id长度不能大于50个字符")
     private String workingGroupId;
+
+    @ApiModelProperty(value = "工作组名称")
+    @TableField(exist = false)
+    private String workingGroupName;
+
     /**运行年份*/
     @Excel(name = "运行年份", width = 15)
     @ApiModelProperty(value = "运行年份")
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupMapper.xml
index 55667753..06e5fba3 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupMapper.xml
@@ -19,10 +19,12 @@
         pdg.update_by AS updateBy,
         pdg.update_time AS updateTime,
         su.realname AS principalNameA,
-        su1.realname AS principalNameB
+        su1.realname AS principalNameB,
+        pwg.working_group_project AS workingGroupName
         FROM pay_drafting_group pdg
         left join sys_user su on pdg.principal_id_a = su.id
         left join sys_user su1 on pdg.principal_id_b = su1.id
+        left join pay_working_group pwg on pwg.id = pdg.working_group_id
         <if test="(payDraftingGroup.companyContactName != null and payDraftingGroup.companyContactName != '')
         or (payDraftingGroup.companyName != null and payDraftingGroup.companyName != '')">
             left join pay_drafting_group_subitem pdgs on pdg.id = pdgs.drafting_group_id
@@ -33,10 +35,16 @@
                 AND drafting_group_project LIKE concat('%',concat(#{payDraftingGroup.draftingGroupProject},'%'))
             </if>
             <if test="payDraftingGroup.principalIdA != null and payDraftingGroup.principalIdA != ''">
-                AND principal_id_a = #{payDraftingGroup.principalIdA}
+                AND pdg.principal_id_a = #{payDraftingGroup.principalIdA}
             </if>
             <if test="payDraftingGroup.year != null and payDraftingGroup.year != ''">
-                AND year = #{payDraftingGroup.year}
+                AND pdg.year = #{payDraftingGroup.year}
+            </if>
+            <if test="payDraftingGroup.workingGroupId != null and payDraftingGroup.workingGroupId != ''">
+                AND working_group_id = #{payDraftingGroup.workingGroupId}
+            </if>
+            <if test="payDraftingGroup.workingGroupName != null and payDraftingGroup.workingGroupName != ''">
+                AND pwg.working_group_project  like concat('%', #{payDraftingGroup.workingGroupName}, '%')
             </if>
             <if test="payDraftingGroup.companyContactName != null and payDraftingGroup.companyContactName != ''">
                 and pdgsc.contacts_temporary_name like concat('%', #{payDraftingGroup.companyContactName}, '%')
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/vo/PayDraftingGroupVo.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/vo/PayDraftingGroupVo.java
index af998ed1..b90a6c15 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/vo/PayDraftingGroupVo.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/vo/PayDraftingGroupVo.java
@@ -21,9 +21,4 @@ public class PayDraftingGroupVo extends PayDraftingGroup {
      * 当前登录人是否可以操作(1为可操作，2为不可操作)
      */
     private Integer checkoutOperation;
-
-    /**
-     * 工作组名称
-     */
-    private String workingGroupName;
 }