From ca0565e53494417b3779759f8d3898e07bfd5929 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 20 一月 2026 14:09:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'refs/remotes/origin/jtwy' into sqd-hb
---
src/main/resources/mapper/production/ProductionProductMainMapper.xml | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 48 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductionProductMainMapper.xml b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
new file mode 100644
index 0000000..3a0542c
--- /dev/null
+++ b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.production.mapper.ProductionProductMainMapper">
+
+ <resultMap id="basicMap" type="com.ruoyi.production.pojo.ProductionProductMain">
+ <id property="id" column="id"/>
+ <result property="productNo" column="product_no"/>
+ <result property="userId" column="user_id"/>
+ <result property="workOrderId" column="work_order_id"/>
+ <result property="tenantId" column="tenant_id"/>
+ <result property="createTime" column="create_time"/>
+ <result property="status" column="status"/>
+ </resultMap>
+
+ <select id="listPageProductionProductMainDto" resultType="com.ruoyi.production.dto.ProductionProductMainDto">
+ select ppm.*,
+ pwo.work_order_no as workOrderNo,
+ pwo.status as workOrderStatus,
+ u.nick_name as nickName
+ from
+ production_product_main ppm
+ left join product_work_order pwo on pwo.id = ppm.work_order_id
+ left join sys_user u on u.user_id = ppm.user_id
+ <where>
+ <if test="c.nickName != null and c.nickName != ''">
+ and u.nick_name like concat('%',#{c.nickName},'%')
+ </if>
+ <if test="c.workOrderNo != null and c.workOrderNo != ''">
+ and pwo.work_order_no like concat('%',#{c.workOrderNo},'%')
+ </if>
+ <if test="c.workOrderStatus != null and c.workOrderStatus != ''">
+ and pwo.status = #{c.workOrderStatus}
+ </if>
+ <if test="c.status != null and c.status != ''">
+ and ppm.status = #{c.status}
+ </if>
+ </where>
+ order by ppm.id
+ </select>
+
+ <delete id="deleteByWorkOrderIds" parameterType="java.util.List">
+ DELETE FROM production_product_main
+ WHERE work_order_id IN
+ <foreach collection="workOrderIds" item="id" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </delete>
+</mapper>
--
Gitblit v1.9.3