From 81fa15bc907d8c581c5fc96b8921c3e67b372c38 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Mon, 22 Sep 2025 10:54:40 +0800
Subject: [PATCH] =?UTF-8?q?feat(gear-oa):=E4=B8=BA=E5=BA=94=E4=BB=98?=
 =?UTF-8?q?=E8=B4=A6=E6=AC=BE=E6=A8=A1=E5=9D=97=E6=B7=BB=E5=8A=A0=E9=87=87?=
 =?UTF-8?q?=E8=B4=AD=E8=AF=A6=E6=83=85=E5=85=B3=E8=81=94=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在 GearPayable、GearPayableBo 和 GearPayableVo 中新增 detailId 字段，并在 GearPayableMapper.xml 中增加对应字段映射及关联查询逻辑。
同时更新了查询条件构造器以支持 detailId 的筛选。
此外，修正 GearRequirementsMapper.xml 中 projectId 映射为 orderId。
---
 gear-oa/src/main/java/com/gear/oa/domain/GearPayable.java    | 3 +++
 .../src/main/java/com/gear/oa/domain/bo/GearPayableBo.java   | 3 +++
 .../src/main/java/com/gear/oa/domain/vo/GearPayableVo.java   | 3 +++
 .../com/gear/oa/service/impl/GearPayableServiceImpl.java     | 1 +
 gear-oa/src/main/resources/mapper/oa/GearPayableMapper.xml   | 5 ++++-
 .../src/main/resources/mapper/oa/GearRequirementsMapper.xml  | 2 +-
 6 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/gear-oa/src/main/java/com/gear/oa/domain/GearPayable.java b/gear-oa/src/main/java/com/gear/oa/domain/GearPayable.java
index bdb1d01..ff8e4ae 100644
--- a/gear-oa/src/main/java/com/gear/oa/domain/GearPayable.java
+++ b/gear-oa/src/main/java/com/gear/oa/domain/GearPayable.java
@@ -68,4 +68,7 @@ public class GearPayable extends BaseEntity {
      */
     private String remark;
 
+    //采购详情id
+    private Long detailId;
+
 }
diff --git a/gear-oa/src/main/java/com/gear/oa/domain/bo/GearPayableBo.java b/gear-oa/src/main/java/com/gear/oa/domain/bo/GearPayableBo.java
index 80c30a2..a567737 100644
--- a/gear-oa/src/main/java/com/gear/oa/domain/bo/GearPayableBo.java
+++ b/gear-oa/src/main/java/com/gear/oa/domain/bo/GearPayableBo.java
@@ -72,5 +72,8 @@ public class GearPayableBo extends BaseEntity {
      */
     private String remark;
 
+    //采购详情id
+    private Long detailId;
+
 
 }
diff --git a/gear-oa/src/main/java/com/gear/oa/domain/vo/GearPayableVo.java b/gear-oa/src/main/java/com/gear/oa/domain/vo/GearPayableVo.java
index 356a1f9..fd254b8 100644
--- a/gear-oa/src/main/java/com/gear/oa/domain/vo/GearPayableVo.java
+++ b/gear-oa/src/main/java/com/gear/oa/domain/vo/GearPayableVo.java
@@ -88,4 +88,7 @@ public class GearPayableVo {
     //供应商名称
     private String supplierName;
 
+    //采购详情编码
+    private String detailCode;
+
 }
diff --git a/gear-oa/src/main/java/com/gear/oa/service/impl/GearPayableServiceImpl.java b/gear-oa/src/main/java/com/gear/oa/service/impl/GearPayableServiceImpl.java
index c533cbd..6516fc9 100644
--- a/gear-oa/src/main/java/com/gear/oa/service/impl/GearPayableServiceImpl.java
+++ b/gear-oa/src/main/java/com/gear/oa/service/impl/GearPayableServiceImpl.java
@@ -67,6 +67,7 @@ public class GearPayableServiceImpl implements IGearPayableService {
         lqw.eq("p.del_flag", 0);
         lqw.eq(bo.getSupplierId() != null, "p.supplier_id", bo.getSupplierId());
         lqw.eq(bo.getOrderId() != null, "p.order_id", bo.getOrderId());
+        lqw.eq(bo.getDetailId()!= null, "p.detail_id", bo.getDetailId());
         lqw.eq(bo.getDueDate() != null, "p.due_date", bo.getDueDate());
         lqw.eq(bo.getAmount() != null, "p.amount", bo.getAmount());
         lqw.eq(bo.getPaidAmount() != null, "p.paid_amount", bo.getPaidAmount());
diff --git a/gear-oa/src/main/resources/mapper/oa/GearPayableMapper.xml b/gear-oa/src/main/resources/mapper/oa/GearPayableMapper.xml
index 246e6ca..d007dd3 100644
--- a/gear-oa/src/main/resources/mapper/oa/GearPayableMapper.xml
+++ b/gear-oa/src/main/resources/mapper/oa/GearPayableMapper.xml
@@ -8,6 +8,7 @@
         <result property="payableId" column="payable_id"/>
         <result property="supplierId" column="supplier_id"/>
         <result property="orderId" column="order_id"/>
+        <result property="detailId" column="detail_id"/>
         <result property="dueDate" column="due_date"/>
         <result property="amount" column="amount"/>
         <result property="paidAmount" column="paid_amount"/>
@@ -35,9 +36,11 @@
                p.create_time,
                p.create_by,
                p.update_time,
-               p.update_by
+               p.update_by,
+               d.detail_code as detailCode
         from gear_payable p
                  left join gear_supplier s on p.supplier_id = s.supplier_id and s.del_flag = 0
+                 left join gear_purchase_plan_detail d on p.detail_id = d.detail_id and d.del_flag = 0
             ${ew.customSqlSegment}
     </select>
 
diff --git a/gear-oa/src/main/resources/mapper/oa/GearRequirementsMapper.xml b/gear-oa/src/main/resources/mapper/oa/GearRequirementsMapper.xml
index 0222acb..76449f8 100644
--- a/gear-oa/src/main/resources/mapper/oa/GearRequirementsMapper.xml
+++ b/gear-oa/src/main/resources/mapper/oa/GearRequirementsMapper.xml
@@ -9,7 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="title" column="title"/>
         <result property="requesterId" column="requester_id"/>
         <result property="ownerId" column="owner_id"/>
-        <result property="projectId" column="project_id"/>
+        <result property="orderId" column="order_id"/>
         <result property="description" column="description"/>
         <result property="deadline" column="deadline"/>
         <result property="status" column="status"/>