From 5b9b5fd8362799ed093e3f8a5e73d58d7fdc774a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E4=B8=89=E7=82=AE?= <15856818120@163.com> Date: Mon, 2 Feb 2026 09:19:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=B0=E8=B4=A6=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E7=A9=BF=E9=80=8F=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../aqgqj/business/backstage/entity/ProjectMaterialLedger.java | 2 ++ .../mappers/business/backstage/InventoryCountMapper.xml | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/bonus/aqgqj/business/backstage/entity/ProjectMaterialLedger.java b/src/main/java/com/bonus/aqgqj/business/backstage/entity/ProjectMaterialLedger.java index b0cc43b..8d40116 100644 --- a/src/main/java/com/bonus/aqgqj/business/backstage/entity/ProjectMaterialLedger.java +++ b/src/main/java/com/bonus/aqgqj/business/backstage/entity/ProjectMaterialLedger.java @@ -141,4 +141,6 @@ public class ProjectMaterialLedger { private Integer queryType; private String backTime; + + private String manager; } diff --git a/src/main/resources/mappers/business/backstage/InventoryCountMapper.xml b/src/main/resources/mappers/business/backstage/InventoryCountMapper.xml index 586ecf1..278db12 100644 --- a/src/main/resources/mappers/business/backstage/InventoryCountMapper.xml +++ b/src/main/resources/mappers/business/backstage/InventoryCountMapper.xml @@ -261,6 +261,7 @@ b.model_id AS modelId, LEFT(sba.back_time,10) as backTime, sba.`code` as planCode, + sba.manager as manager, b.num AS totalBack FROM st_back_details b @@ -273,7 +274,7 @@ WHERE p.ID = #{proId} AND b.model_id = #{modelId} - and sba.`status`='1' + AND (sba.`status` != '0' OR sba.`status` IS NULL) and sba.`code` LIKE CONCAT('%',#{planCode},'%')