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/PrOrderMapper.xml | 30 +++++++++++++++++-------------
1 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/pms-parent/pms-global/src/main/resources/mapper/PrOrderMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/PrOrderMapper.xml
index 93c87e8..8fc48f4 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/PrOrderMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/PrOrderMapper.xml
@@ -15,11 +15,14 @@
<result property="status" column="status" jdbcType="TINYINT"/>
<result property="creator" column="creator" jdbcType="VARCHAR"/>
<result property="dt" column="dt" jdbcType="TIMESTAMP"/>
- <result property="deleted" column="deleted" jdbcType="TINYINT"/>
+ <result column="deleted" property="deleted" typeHandler="com.dy.common.mybatis.BooleanTypeHandler" />
<result property="remark" column="remark" jdbcType="VARCHAR"/>
</resultMap>
<resultMap id="BaseResultMap2" type="com.dy.pmsGlobal.pojoPr.PrOrder" extends="BaseResultMap">
<collection property="items" ofType="com.dy.pmsGlobal.pojoPr.PrOrderItem" fetchType="eager" select="com.dy.pmsGlobal.daoPr.PrOrderItemMapper.selectItems" column="id" />
+ </resultMap>
+ <resultMap id="BaseResultMap3" type="com.dy.pmsGlobal.pojoPr.PrOrder" extends="BaseResultMap">
+ <collection property="items" ofType="com.dy.pmsGlobal.pojoPr.PrOrderItem" fetchType="eager" select="com.dy.pmsGlobal.daoPr.PrOrderItemMapper.selectDistinctPro" column="id" />
</resultMap>
<sql id="Base_Column_List">
id,`name`,customer_name,project_name,
@@ -38,7 +41,7 @@
</select>
<select id="exists" resultType="java.lang.Boolean">
select count(1) from pr_order where name = #{name}
- <if test="id != null and id !=''">
+ <if test="id != null">
and id != #{id}
</if>
</select>
@@ -67,7 +70,7 @@
<if test="endDate != null and endDate != ''">
delivery_date <![CDATA[ < ]]> #{endDate,jdbcType=VARCHAR} and
</if>
- <if test="status != null and status != ''">
+ <if test="status != null">
status = #{status,jdbcType=TINYINT} and
</if>
</trim>
@@ -102,11 +105,12 @@
<if test="endDate != null and endDate != ''">
delivery_date <![CDATA[ < ]]> #{endDate,jdbcType=VARCHAR} and
</if>
- <if test="status != null and status != ''">
+ <if test="status != null">
status = #{status,jdbcType=TINYINT} and
</if>
</trim>
</select>
+ <!--涓嬫媺鑿滃崟璁㈠崟-->
<select id="selectAll" resultType="com.dy.pmsGlobal.pojoPr.PrOrder">
select
<include refid="Base_Column_List" />
@@ -131,7 +135,7 @@
<if test="endDate != null and endDate != ''">
delivery_date <![CDATA[ < ]]> #{endDate,jdbcType=VARCHAR} and
</if>
- <if test="status != null and status != ''">
+ <if test="status != null">
status = #{status,jdbcType=TINYINT} and
</if>
</trim>
@@ -148,31 +152,31 @@
<insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPr.PrOrder" useGeneratedKeys="true">
insert into pr_order
<trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="id != null and id !=''">id,</if>
+ <if test="id != null">id,</if>
<if test="name != null and name !=''">name,</if>
<if test="customerName!= null and customerName !=''">customer_name,</if>
<if test="projectName!= null and projectName !=''">project_name,</if>
<if test="director != null and director !=''">director,</if>
<if test="dMobile != null and dMobile !=''">d_mobile,</if>
<if test="deliveryDate!= null and deliveryDate !=''">delivery_date,</if>
- <if test="status != null and status !=''">status,</if>
+ <if test="status != null">status,</if>
<if test="creator != null and creator !=''">creator,</if>
<if test="dt != null and dt !=''">dt,</if>
- <if test="deleted != null and deleted !=''">deleted,</if>
+ <if test="deleted != null">deleted,</if>
<if test="remark != null and remark !=''">remark,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="id != null and id !=''">#{id,jdbcType=BIGINT},</if>
+ <if test="id != null">#{id,jdbcType=BIGINT},</if>
<if test="name != null and name !=''">#{name,jdbcType=VARCHAR},</if>
<if test="customerName!= null and customerName !=''">#{customerName,jdbcType=VARCHAR},</if>
<if test="projectName!= null and projectName !=''">#{projectName,jdbcType=VARCHAR},</if>
<if test="director != null and director !=''">#{director,jdbcType=VARCHAR},</if>
<if test="dMobile != null and dMobile !=''">#{dMobile,jdbcType=VARCHAR},</if>
<if test="deliveryDate!= null and deliveryDate !=''">#{deliveryDate,jdbcType=VARCHAR},</if>
- <if test="status != null and status !=''">#{status,jdbcType=TINYINT},</if>
+ <if test="status != null">#{status,jdbcType=TINYINT},</if>
<if test="creator != null and creator !=''">#{creator,jdbcType=VARCHAR},</if>
<if test="dt != null and dt !=''">#{dt,jdbcType=TIMESTAMP},</if>
- <if test="deleted != null and deleted !=''">#{deleted,jdbcType=TINYINT},</if>
+ <if test="deleted != null">#{deleted,jdbcType=TINYINT},</if>
<if test="remark != null and remark !=''">#{remark,jdbcType=VARCHAR},</if>
</trim>
</insert>
@@ -197,7 +201,7 @@
<if test="deliveryDate!= null and deliveryDate !=''">
delivery_date = #{deliveryDate,jdbcType=VARCHAR},
</if>
- <if test="status != null and status !=''">
+ <if test="status != null">
status = #{status,jdbcType=TINYINT},
</if>
<if test="creator != null and creator !=''">
@@ -206,7 +210,7 @@
<if test="dt != null and dt !=''">
dt = #{dt,jdbcType=TIMESTAMP},
</if>
- <if test="deleted != null and deleted !=''">
+ <if test="deleted != null">
deleted = #{deleted,jdbcType=TINYINT},
</if>
<if test="remark != null and remark !=''">
--
Gitblit v1.8.0