修改

src/main/java/com/bonus/aqgqj/business/backstage/entity/ProjectMaterialLedger.java

@@ -99,4 +99,6 @@ public class ProjectMaterialLedger {
      */
     @Excel(name = "备注", width = 16)
     private String remark;
+
+    private String keyWord;
 }

src/main/resources/mappers/business/backstage/InventoryCountMapper.xml

@@ -5,45 +5,61 @@
 
     <select id="getProjectOutListGroupModel" resultType="com.bonus.aqgqj.business.backstage.entity.ProjectMaterialLedger">
         SELECT
-            p.ID AS proId, p.`NAME` AS proName,
-            o.model_id AS modelId,  -- 设备类型字段
-            o.type,o.`name`,o.model,o.unit,
-            SUM(o.cg_num) AS totalCg,
-            SUM(o.lk_num) AS totalLk,
-            SUM(o.need_num) AS needNum, -- 需求数量
-            SUM(o.cg_num + o.lk_num) as totalCk   -- 总出库数量
+        p.ID AS proId, p.`NAME` AS proName,
+        o.model_id AS modelId, -- 设备类型字段
+        o.type,o.`name`,o.model,o.unit,
+        SUM(o.cg_num) AS totalCg,
+        SUM(o.lk_num) AS totalLk,
+        SUM(o.need_num) AS needNum, -- 需求数量
+        SUM(o.cg_num + o.lk_num) as totalCk -- 总出库数量
         FROM
-            st_plan_out_details o
-                JOIN
-            st_plan_out spo ON o.out_id = spo.id  -- 关联出库表
-                JOIN
-            bm_project p ON spo.pro_id = p.ID  -- 关联工程表
-            <where>
-                <if test="proName != null and proName != ''">
-                    AND p.`NAME` LIKE CONCAT('%',#{proName},'%')
-                </if>
-            </where>
+        st_plan_out_details o
+        JOIN
+        st_plan_out spo ON o.out_id = spo.id -- 关联出库表
+        JOIN
+        bm_project p ON spo.pro_id = p.ID -- 关联工程表
+        where
+        1=1
+            <if test="keyWord != null and keyWord != ''">
+                AND(
+                o.type LIKE CONCAT('%',#{keyWord},'%') OR
+                o.`name` LIKE CONCAT('%',#{keyWord},'%') OR
+                o.model LIKE CONCAT('%',#{keyWord},'%') OR
+                p.`NAME` LIKE CONCAT('%',#{keyWord},'%')
+                    )
+            </if>
         GROUP BY
-            p.ID,
-            o.model_id
+        p.ID,
+        o.model_id
     </select>
 
     <select id="getProjectBackListGroupModel" resultType="com.bonus.aqgqj.business.backstage.entity.ProjectMaterialLedger">
         SELECT
             p.ID AS proId, p.`NAME` AS proName,
+        smt3.`name` as type,
+        smt2.`name` as `name`,
+        smt.`name` as model,
             b.model_id AS modelId,  -- 设备类型字段
             SUM(b.num) AS totalBack  -- 总退货数量
         FROM
             st_back_details b
+        LEFT JOIN st_ma_type smt on smt.id=b.model_id and smt.`level`='3'
+        LEFT JOIN st_ma_type smt2 on smt2.id=smt.parent_id
+        LEFT JOIN st_ma_type smt3 on smt3.id=smt2.parent_id
                 JOIN
             st_back_apply sba ON b.apply_id = sba.id  -- 关联退料申请表
                 JOIN
             bm_project p ON sba.project_id = p.ID  -- 关联工程表
-            <where>
-                <if test="proName != null and proName != ''">
-                    AND p.`NAME` LIKE CONCAT('%',#{proName},'%')
+            where
+            1=1
+                <if test="keyWord != null and keyWord != ''">
+                    AND(
+                    smt3.`name` LIKE CONCAT('%',#{keyWord},'%') OR
+                    smt2.`name` LIKE CONCAT('%',#{keyWord},'%') OR
+                    smt.`name` LIKE CONCAT('%',#{keyWord},'%') OR
+                    p.`NAME` LIKE CONCAT('%',#{keyWord},'%')
+                    )
                 </if>
-            </where>
         GROUP BY
             p.ID,
             b.model_id

src/main/resources/mappers/business/backstage/PlanApplyMapper.xml

@@ -160,6 +160,7 @@
                 AND (
                 INSTR(spa.code,#{keyWord}) > 0 OR
                 INSTR(spa.creator,#{keyWord}) > 0 OR
+                INSTR(spa.remark,#{keyWord}) > 0 OR
                 INSTR(tbp.name,#{keyWord}) > 0
                 )
             </if>
@@ -250,6 +251,7 @@
         mt.name AS title,
         mt.unit_name AS unitName,
         mt3.name AS type,
+        IFNULL(mt.storage_num,0) as storageNum,
         mt.remark,
         mt.level,
         mt2.name,

src/main/resources/mappers/business/backstage/PlanAuditMapper.xml

@@ -8,7 +8,7 @@
     </update>
 
     <!--需求计划审核列表-->
-    <select id="getPlanAuditList" resultType="com.bonus.aqgqj.business.backstage.entity.plan.PlanApplyVo">
+     <select id="getPlanAuditList" resultType="com.bonus.aqgqj.business.backstage.entity.plan.PlanApplyVo">
         SELECT spa.id,
         spa.code,
         tbp.name AS proName,