From 5b207a55bdd10f1516031f629217daac069b64fd Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期五, 30 八月 2024 11:40:31 +0800
Subject: [PATCH] 添加免登录查询所有排班接口;
---
pms-parent/pms-global/src/main/resources/mapper/PrProductionProcessMapper.xml | 113 +++++++++++++++++++++++++++-----------------------------
1 files changed, 55 insertions(+), 58 deletions(-)
diff --git a/pms-parent/pms-global/src/main/resources/mapper/PrProductionProcessMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/PrProductionProcessMapper.xml
index a195aee..78e5bed 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/PrProductionProcessMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/PrProductionProcessMapper.xml
@@ -17,8 +17,25 @@
select="com.dy.pmsGlobal.daoPlt.PltProductMapper.selectProNameById" fetchType="eager" />
<association property="creatorName" column="creator" javaType="java.lang.Long"
select="com.dy.pmsGlobal.daoBa.BaUserMapper.selectNameByUserId" fetchType="eager" />
+ <association property="isQuote" column="id" javaType="java.lang.Boolean" fetchType="eager"
+ select="com.dy.pmsGlobal.daoPr.PrAssemblyPlanMapper.processIsQuote" />
+ <association property="planNames" column="id" javaType="java.lang.String" fetchType="eager"
+ select="com.dy.pmsGlobal.daoPr.PrAssemblyPlanMapper.selectPlanNamesByProcessId" />
<collection property="nodes" ofType="com.dy.pmsGlobal.pojoPr.PrProductionNode"
select="selectByProcess" fetchType="eager" column="id" />
+ </resultMap>
+
+ <resultMap id="ProcessResultMap" type="com.dy.pmsGlobal.pojoPr.PrProductionProcess">
+ <id property="id" column="id" jdbcType="BIGINT"/>
+ <result property="proId" column="pro_id" jdbcType="BIGINT"/>
+ <result property="name" column="name" jdbcType="VARCHAR"/>
+ <result property="creator" column="creator" jdbcType="VARCHAR"/>
+ <result property="dt" column="dt" jdbcType="TIMESTAMP"/>
+ <result property="disabled" column="disabled" jdbcType="TINYINT"/>
+ <result property="deleted" column="deleted" jdbcType="TINYINT"/>
+ <result property="remark" column="remark" jdbcType="VARCHAR"/>
+ <collection property="nodes" ofType="com.dy.pmsGlobal.pojoPr.PrProductionNode"
+ select="selectByProcess" fetchType="eager" column="id" />
</resultMap>
<sql id="Base_Column_List">
@@ -26,7 +43,6 @@
creator,dt,disabled,
deleted,remark
</sql>
-
<select id="selectProcessNameById" resultType="java.lang.String">
select name
@@ -38,12 +54,18 @@
from pr_production_node
where process_id = #{processId,jdbcType=BIGINT}
</select>
+ <select id="selectByProcessId" parameterType="java.lang.Long" resultMap="ProcessResultMap">
+ select
+ <include refid="Base_Column_List" />
+ from pr_production_process
+ where id = #{id,jdbcType=BIGINT}
+ </select>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from pr_production_process
- where id = #{id,jdbcType=BIGINT}
+ where id = #{id,jdbcType=BIGINT}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
@@ -56,22 +78,22 @@
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="proId != null">pro_id,</if>
- <if test="name != null">name,</if>
- <if test="creator != null">creator,</if>
- <if test="dt != null">dt,</if>
+ <if test="name != null and name !=''">name,</if>
+ <if test="creator != null and creator !=''">creator,</if>
+ <if test="dt != null and dt !=''">dt,</if>
<if test="disabled != null">disabled,</if>
<if test="deleted != null">deleted,</if>
- <if test="remark != null">remark,</if>
+ <if test="remark != null and remark !=''">remark,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id,jdbcType=BIGINT},</if>
<if test="proId != null">#{proId,jdbcType=BIGINT},</if>
- <if test="name != null">#{name,jdbcType=VARCHAR},</if>
- <if test="creator != null">#{creator,jdbcType=VARCHAR},</if>
- <if test="dt != null">#{dt,jdbcType=TIMESTAMP},</if>
+ <if test="name != null and name !=''">#{name,jdbcType=VARCHAR},</if>
+ <if test="creator != null and creator !=''">#{creator,jdbcType=VARCHAR},</if>
+ <if test="dt != null and dt !=''">#{dt,jdbcType=TIMESTAMP},</if>
<if test="disabled != null">#{disabled,jdbcType=TINYINT},</if>
<if test="deleted != null">#{deleted,jdbcType=TINYINT},</if>
- <if test="remark != null">#{remark,jdbcType=VARCHAR},</if>
+ <if test="remark != null and remark !=''">#{remark,jdbcType=VARCHAR},</if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoPr.PrProductionProcess">
@@ -80,13 +102,13 @@
<if test="proId != null">
pro_id = #{proId,jdbcType=BIGINT},
</if>
- <if test="name != null">
+ <if test="name != null and name !=''">
name = #{name,jdbcType=VARCHAR},
</if>
- <if test="creator != null">
+ <if test="creator != null and creator !=''">
creator = #{creator,jdbcType=VARCHAR},
</if>
- <if test="dt != null">
+ <if test="dt != null and dt !=''">
dt = #{dt,jdbcType=TIMESTAMP},
</if>
<if test="disabled != null">
@@ -95,7 +117,7 @@
<if test="deleted != null">
deleted = #{deleted,jdbcType=TINYINT},
</if>
- <if test="remark != null">
+ <if test="remark != null and remark !=''">
remark = #{remark,jdbcType=VARCHAR},
</if>
</set>
@@ -105,34 +127,16 @@
<select id="selectSome" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
- from pr_production_process
+ from pr_production_process t
<trim prefix="where" suffixOverrides="and">
- <!-- <if test="id != null">-->
- <!-- id = #{id,jdbcType=BIGINT} and-->
- <!-- </if>-->
<if test="proId != null">
pro_id = #{proId,jdbcType=BIGINT} and
</if>
-<!-- <if test="name != null">-->
+<!-- <if test="name != null and name !=''">-->
<!-- name = #{name,jdbcType=VARCHAR} and-->
<!-- </if>-->
- <!-- <if test="creator != null">-->
- <!-- creator = #{creator,jdbcType=VARCHAR} and-->
- <!-- </if>-->
- <!-- <if test="dt != null">-->
- <!-- dt = #{dt,jdbcType=TIMESTAMP} and-->
- <!-- </if>-->
- <!-- <if test="disabled != null">-->
- <!-- disabled = #{disabled,jdbcType=TINYINT} and-->
- <!-- </if>-->
- <!-- <if test="deleted != null">-->
- <!-- deleted = #{deleted,jdbcType=TINYINT} and-->
- <!-- </if>-->
- <!-- <if test="remark != null">-->
- <!-- remark = #{remark,jdbcType=VARCHAR} and-->
- <!-- </if>-->
</trim>
- order by id desc
+ order by t.id desc
<trim prefix="limit " >
<if test="start != null and count != null">
#{start}, #{count}
@@ -142,39 +146,32 @@
<select id="selectSomeCount" resultType="java.lang.Long">
select count(1)
- from pr_production_process
+ from pr_production_process t
<trim prefix="where" suffixOverrides="and">
-<!-- <if test="id != null">-->
-<!-- id = #{id,jdbcType=BIGINT} and-->
-<!-- </if>-->
<if test="proId != null">
pro_id = #{proId,jdbcType=BIGINT} and
</if>
-<!-- <if test="name != null">-->
-<!-- name = #{name,jdbcType=VARCHAR} and-->
-<!-- </if>-->
-<!-- <if test="creator != null">-->
-<!-- creator = #{creator,jdbcType=VARCHAR} and-->
-<!-- </if>-->
-<!-- <if test="dt != null">-->
-<!-- dt = #{dt,jdbcType=TIMESTAMP} and-->
-<!-- </if>-->
-<!-- <if test="disabled != null">-->
-<!-- disabled = #{disabled,jdbcType=TINYINT} and-->
-<!-- </if>-->
-<!-- <if test="deleted != null">-->
-<!-- deleted = #{deleted,jdbcType=TINYINT} and-->
-<!-- </if>-->
-<!-- <if test="remark != null">-->
-<!-- remark = #{remark,jdbcType=VARCHAR} and-->
-<!-- </if>-->
+ <!-- <if test="name != null and name !=''">-->
+ <!-- name = #{name,jdbcType=VARCHAR} and-->
+ <!-- </if>-->
</trim>
</select>
- <select id="queryAll" resultType="map">
+ <select id="queryAll" resultType="java.util.HashMap">
select
CAST(id AS CHAR) AS id,name
from pr_production_process
where deleted = 0
+ <trim prefix="and" suffixOverrides=",">
+ pro_id = #{proId,jdbcType=BIGINT}
+ </trim>
+ </select>
+ <select id="exists" resultType="java.lang.Boolean">
+ select count(1)
+ from pr_production_process
+ where name = #{name} and deleted = 0
+ <if test="id != null">
+ and id != #{id}
+ </if>
</select>
--
Gitblit v1.8.0