From 4fbe2431794ce4842a4a7d1a7242d53db86182ef Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期三, 03 七月 2024 15:06:54 +0800
Subject: [PATCH] add quality and test items Api
---
pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkLastMapper.xml | 157 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 155 insertions(+), 2 deletions(-)
diff --git a/pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkLastMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkLastMapper.xml
index 03bcba8..1e9f4cf 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkLastMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkLastMapper.xml
@@ -21,6 +21,16 @@
select="com.dy.pmsGlobal.daoBa.BaUserMapper.selectNameByUserId" fetchType="eager" />
<association property="stationName" column="station_id" javaType="java.lang.Long"
select="com.dy.pmsGlobal.daoPlt.PltStationMapper.selectNameByStationId" fetchType="eager" />
+ <association property="planName" column="plan_id" javaType="java.lang.Long"
+ select="com.dy.pmsGlobal.daoPr.PrAssemblyPlanMapper.selectNameByPlanId" fetchType="eager" />
+ <association property="processName" column="process_id" javaType="java.lang.Long"
+ select="com.dy.pmsGlobal.daoPr.PrProductionProcessMapper.selectProcessNameById" fetchType="eager" />
+ <association property="nodeName" column="node_id" javaType="java.lang.Long"
+ select="com.dy.pmsGlobal.daoPr.PrProductionNodeMapper.selectNameByNodeId" fetchType="eager" />
+ <association property="lineName" column="line_id" javaType="java.lang.Long"
+ select="com.dy.pmsGlobal.daoPlt.PltProductionLineMapper.selectNameByLineId" fetchType="eager" />
+ <collection property="assistantsList" ofType="com.dy.pmsGlobal.pojoBa.BaUser"
+ select="com.dy.pmsGlobal.daoBa.BaUserMapper.selectByAssistants" fetchType="eager" column="assistants" />
</resultMap>
<sql id="Base_Column_List">
@@ -29,7 +39,20 @@
node_id,dt,status,
start_time,end_time,assistants
</sql>
-
+ <sql id="part_Column_List">
+ ${alias}.id,
+ ${alias}.user_id,
+ ${alias}.line_id,
+ ${alias}.station_id,
+ ${alias}.plan_id,
+ ${alias}.process_id,
+ ${alias}.node_id,
+ ${alias}.dt,
+ ${alias}.status,
+ ${alias}.start_time,
+ ${alias}.end_time,
+ ${alias}.assistants
+ </sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
@@ -90,7 +113,7 @@
<if test="startTime != null and startTime !=''">
and start_time = #{startTime,jdbcType=TIMESTAMP},
</if>
- <if test="endTime != null and userId !=''">
+ <if test="endTime != null and endTime !=''">
and end_time = #{endTime,jdbcType=TIMESTAMP},
</if>
<if test="assistants != null and assistants !=''">
@@ -99,6 +122,136 @@
</where>
order by id desc
</select>
+ <select id="selectSome" resultMap="BaseResultMap">
+ select
+ <include refid="part_Column_List" >
+ <property name="alias" value="l"/>
+ </include>
+ from sta_assembly_work_last l
+ left join ba_user u on l.user_id = u.id
+ left join plt_station s on l.station_id = s.id
+ left join pr_assembly_plan p on l.plan_id = p.id
+ left join pr_production_process pp on l.process_id = pp.id
+ left join pr_production_node n on l.node_id = n.id
+ left join plt_production_line ll on l.line_id = ll.id
+ <where>
+ <if test="userName != null and userName != ''">
+ and u.name like concat('%', #{userName}, '%')
+ </if>
+ <if test="stationName != null and stationName != '' ">
+ and s.name like concat('%', #{stationName}, '%')
+ </if>
+ <if test="planName != null and planName != '' ">
+ and p.name like concat('%', #{planName}, '%')
+ </if>
+ <if test="processName != null and processName != '' ">
+ and pp.name like concat('%', #{processName}, '%')
+ </if>
+ <if test="nodeName != null and nodeName != '' ">
+ and n.content like concat('%', #{nodeName}, '%')
+ </if>
+ <if test="lineName != null and lineName != '' ">
+ and ll.name like concat('%', #{lineName}, '%')
+ </if>
+ <if test="startTime != null and startTime !=''">
+ and l.start_time <![CDATA[ > ]]> #{startTime}
+ </if>
+ <if test="endTime != null and endTime !=''">
+ and l.start_time <![CDATA[ < ]]> #{endTime}
+ </if>
+ <if test="userId != null and userId !=''">
+ and l.user_id = #{userId,jdbcType=BIGINT}
+ </if>
+ <if test="lineId != null and lineId !=''">
+ and l.line_id = #{lineId,jdbcType=BIGINT}
+ </if>
+ <if test="stationId != null and stationId !=''">
+ and l.station_id = #{stationId,jdbcType=BIGINT}
+ </if>
+ <if test="planId != null and planId !=''">
+ and l.plan_id = #{planId,jdbcType=BIGINT}
+ </if>
+ <if test="processId != null and processId !=''">
+ and l.process_id = #{processId,jdbcType=BIGINT}
+ </if>
+ <if test="nodeId != null and nodeId !=''">
+ and l.node_id = #{nodeId,jdbcType=BIGINT}
+ </if>
+ <if test="status != null and status !=''">
+ and l.status = #{status,jdbcType=TINYINT}
+ </if>
+ <if test="assistants != null and assistants !=''">
+ and l.assistants = #{assistants,jdbcType=VARCHAR}
+ </if>
+ </where>
+ order by id desc
+ <trim prefix="limit " >
+ <if test="start != null and count != null">
+ #{start}, #{count}
+ </if>
+ </trim>
+ </select>
+
+ <select id="selectSomeCount" resultType="java.lang.Long">
+ select count(1)
+ from sta_assembly_work_last l
+ left join ba_user u on l.user_id = u.id
+ left join plt_station s on l.station_id = s.id
+ left join pr_assembly_plan p on l.plan_id = p.id
+ left join pr_production_process pp on l.process_id = pp.id
+ left join pr_production_node n on l.node_id = n.id
+ left join plt_production_line ll on l.line_id = ll.id
+ <where>
+ <if test="userName != null and userName != ''">
+ and u.name like concat('%', #{userName}, '%')
+ </if>
+ <if test="stationName != null and stationName != '' ">
+ and s.name like concat('%', #{stationName}, '%')
+ </if>
+ <if test="planName != null and planName != '' ">
+ and p.name like concat('%', #{planName}, '%')
+ </if>
+ <if test="processName != null and processName != '' ">
+ and pp.name like concat('%', #{processName}, '%')
+ </if>
+ <if test="nodeName != null and nodeName != '' ">
+ and n.content like concat('%', #{nodeName}, '%')
+ </if>
+ <if test="lineName != null and lineName != '' ">
+ and ll.name like concat('%', #{lineName}, '%')
+ </if>
+ <if test="startTime != null and startTime !=''">
+ and l.start_time <![CDATA[ > ]]> #{startTime,jdbcType=TIMESTAMP}
+ </if>
+ <if test="endTime != null and endTime !=''">
+ and l.start_time <![CDATA[ < ]]> #{endTime,jdbcType=TIMESTAMP}
+ </if>
+ <if test="userId != null and userId !=''">
+ and l.user_id = #{userId,jdbcType=BIGINT}
+ </if>
+ <if test="lineId != null and lineId !=''">
+ and l.line_id = #{lineId,jdbcType=BIGINT}
+ </if>
+ <if test="stationId != null and stationId !=''">
+ and l.station_id = #{stationId,jdbcType=BIGINT}
+ </if>
+ <if test="planId != null and planId !=''">
+ and l.plan_id = #{planId,jdbcType=BIGINT}
+ </if>
+ <if test="processId != null and processId !=''">
+ and l.process_id = #{processId,jdbcType=BIGINT}
+ </if>
+ <if test="nodeId != null and nodeId !=''">
+ and l.node_id = #{nodeId,jdbcType=BIGINT}
+ </if>
+ <if test="status != null and status !=''">
+ and l.status = #{status,jdbcType=TINYINT}
+ </if>
+ <if test="assistants != null and assistants !=''">
+ and l.assistants = #{assistants,jdbcType=VARCHAR}
+ </if>
+ </where>
+ </select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
delete from sta_assembly_work_last
--
Gitblit v1.8.0