From 8f903210610b4dc084a72d4ca9f3d8086e5972eb Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 24 三月 2026 15:35:54 +0800
Subject: [PATCH] feat:1.生产报工(销售订单不创建生产订单) 2.报工增加投入总量 3.报工不扣投入库存数量

---
 src/main/resources/mapper/projectManagement/InfoMapper.xml |   30 ++++++++++++++++++++++++++++++
 1 files changed, 30 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/mapper/projectManagement/InfoMapper.xml b/src/main/resources/mapper/projectManagement/InfoMapper.xml
index 26449ef..e101797 100644
--- a/src/main/resources/mapper/projectManagement/InfoMapper.xml
+++ b/src/main/resources/mapper/projectManagement/InfoMapper.xml
@@ -48,4 +48,34 @@
         department_name,order_date,order_amount,
         remark,attachment
     </sql>
+    <resultMap id="ListInfoVoMap" type="com.ruoyi.projectManagement.vo.ListInfoVo">
+
+        <result column="plan_stage"
+                property="planStage"
+                typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>
+
+    </resultMap>
+    <select id="searchListInfo" resultMap="ListInfoVoMap">
+        select t1.*, t2.name as project_management_plan_name,t3.title as projectManagementInfoParentName
+        from project_management_info as t1
+        left join project_management_plan as t2 on t1.project_management_plan_id = t2.id
+        left join project_management_info as t3 on t1.project_management_info_parent_id = t3.id
+        where t1.is_delete = 0
+        <if test="vo.noOrName != null and vo.noOrName != ''">
+            and ( t1.no like concat('%', #{vo.noOrName}, '%') OR t1.title like concat('%', #{vo.noOrName}, '%') )
+        </if>
+        <if test="vo.clientName != null and vo.clientName != ''">
+            and t1.client_name like concat('%', #{vo.clientName}, '%')
+        </if>
+        <if test="vo.salesmanName != null and vo.salesmanName != ''">
+            and t1.salesman_name like concat('%', #{vo.salesmanName}, '%')
+        </if>
+        <if test="vo.reviewStatus != null">
+            and t1.review_status = #{vo.reviewStatus.code}
+        </if>
+        <if test="vo.stage != null">
+            and t1.stage = #{vo.stage.code}
+        </if>
+        order by t1.create_time desc
+    </select>
 </mapper>

--
Gitblit v1.9.3