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},'%')