feat(gear-oa):为应付账款模块添加采购详情关联字段

在 GearPayable、GearPayableBo 和 GearPayableVo 中新增 detailId 字段,并在 GearPayableMapper.xml 中增加对应字段映射及关联查询逻辑。
同时更新了查询条件构造器以支持 detailId 的筛选。
此外,修正 GearRequirementsMapper.xml 中 projectId 映射为 orderId。
This commit is contained in:
2025-09-22 10:54:40 +08:00
parent c2cdb084b7
commit 81fa15bc90
6 changed files with 15 additions and 2 deletions

View File

@@ -68,4 +68,7 @@ public class GearPayable extends BaseEntity {
*/ */
private String remark; private String remark;
//采购详情id
private Long detailId;
} }

View File

@@ -72,5 +72,8 @@ public class GearPayableBo extends BaseEntity {
*/ */
private String remark; private String remark;
//采购详情id
private Long detailId;
} }

View File

@@ -88,4 +88,7 @@ public class GearPayableVo {
//供应商名称 //供应商名称
private String supplierName; private String supplierName;
//采购详情编码
private String detailCode;
} }

View File

@@ -67,6 +67,7 @@ public class GearPayableServiceImpl implements IGearPayableService {
lqw.eq("p.del_flag", 0); lqw.eq("p.del_flag", 0);
lqw.eq(bo.getSupplierId() != null, "p.supplier_id", bo.getSupplierId()); lqw.eq(bo.getSupplierId() != null, "p.supplier_id", bo.getSupplierId());
lqw.eq(bo.getOrderId() != null, "p.order_id", bo.getOrderId()); 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.getDueDate() != null, "p.due_date", bo.getDueDate());
lqw.eq(bo.getAmount() != null, "p.amount", bo.getAmount()); lqw.eq(bo.getAmount() != null, "p.amount", bo.getAmount());
lqw.eq(bo.getPaidAmount() != null, "p.paid_amount", bo.getPaidAmount()); lqw.eq(bo.getPaidAmount() != null, "p.paid_amount", bo.getPaidAmount());

View File

@@ -8,6 +8,7 @@
<result property="payableId" column="payable_id"/> <result property="payableId" column="payable_id"/>
<result property="supplierId" column="supplier_id"/> <result property="supplierId" column="supplier_id"/>
<result property="orderId" column="order_id"/> <result property="orderId" column="order_id"/>
<result property="detailId" column="detail_id"/>
<result property="dueDate" column="due_date"/> <result property="dueDate" column="due_date"/>
<result property="amount" column="amount"/> <result property="amount" column="amount"/>
<result property="paidAmount" column="paid_amount"/> <result property="paidAmount" column="paid_amount"/>
@@ -35,9 +36,11 @@
p.create_time, p.create_time,
p.create_by, p.create_by,
p.update_time, p.update_time,
p.update_by p.update_by,
d.detail_code as detailCode
from gear_payable p from gear_payable p
left join gear_supplier s on p.supplier_id = s.supplier_id and s.del_flag = 0 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} ${ew.customSqlSegment}
</select> </select>

View File

@@ -9,7 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="title" column="title"/> <result property="title" column="title"/>
<result property="requesterId" column="requester_id"/> <result property="requesterId" column="requester_id"/>
<result property="ownerId" column="owner_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="description" column="description"/>
<result property="deadline" column="deadline"/> <result property="deadline" column="deadline"/>
<result property="status" column="status"/> <result property="status" column="status"/>