From 379af9bd87545e674a08316333a21e1fcaccf3a6 Mon Sep 17 00:00:00 2001
From: liuxm <liuxm_a@163.com>
Date: 星期二, 04 六月 2024 09:15:45 +0800
Subject: [PATCH] 安装运维生产计划;生产计划部分修改
---
pms-parent/pms-global/src/main/resources/mapper/PrDevOpsPlanMapper.xml | 119 +++++++++++++++++++----------------------------------------
1 files changed, 39 insertions(+), 80 deletions(-)
diff --git a/pms-parent/pms-global/src/main/resources/mapper/PrDevOpsPlanMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/PrDevOpsPlanMapper.xml
index 37e54d6..567af34 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/PrDevOpsPlanMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/PrDevOpsPlanMapper.xml
@@ -5,20 +5,22 @@
<mapper namespace="com.dy.pmsGlobal.daoPr.PrDevOpsPlanMapper">
<resultMap id="BaseResultMap" type="com.dy.pmsGlobal.pojoPr.PrDevOpsPlan">
- <id property="id" column="id" jdbcType="BIGINT"/>
- <result property="name" column="name" jdbcType="VARCHAR"/>
- <result property="num" column="num" jdbcType="INTEGER"/>
- <result property="status" column="status" jdbcType="TINYINT"/>
- <result property="creator" column="creator" jdbcType="VARCHAR"/>
- <result property="dt" column="dt" jdbcType="TIMESTAMP"/>
- <result property="startDate" column="start_date" jdbcType="VARCHAR"/>
- <result property="endDate" column="end_date" jdbcType="VARCHAR"/>
- <result property="deleted" column="deleted" jdbcType="TINYINT"/>
- <result property="content" column="content" jdbcType="VARCHAR"/>
+ <id property="id" column="id" jdbcType="BIGINT"/>
+ <result property="name" column="name" jdbcType="VARCHAR"/>
+<!-- <result property="num" column="num" jdbcType="INTEGER"/>-->
+ <result property="status" column="status" jdbcType="TINYINT"/>
+ <result property="creator" column="creator" jdbcType="VARCHAR"/>
+ <result property="dt" column="dt" jdbcType="TIMESTAMP"/>
+ <result property="startDate" column="start_date" jdbcType="VARCHAR"/>
+ <result property="endDate" column="end_date" jdbcType="VARCHAR"/>
+ <result property="deleted" column="deleted" jdbcType="TINYINT"/>
+ <result property="content" column="content" jdbcType="VARCHAR"/>
+ <association property="creatorName" column="creator" javaType="java.lang.Long"
+ select="com.dy.pmsGlobal.daoBa.BaUserMapper.selectNameByUserId" fetchType="eager" />
</resultMap>
<sql id="Base_Column_List">
- id,name,num,
+ id,name,
status,creator,dt,
start_date,end_date,deleted,
content
@@ -37,11 +39,10 @@
</delete>
<insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPr.PrDevOpsPlan" useGeneratedKeys="true">
insert into pr_dev_ops_plan
- ( id,name,num
- ,status,creator,dt
+ ( id,name,status,creator,dt
,start_date,end_date,deleted
,content)
- values (#{id,jdbcType=BIGINT},#{name,jdbcType=VARCHAR},#{num,jdbcType=INTEGER}
+ values (#{id,jdbcType=BIGINT},#{name,jdbcType=VARCHAR}
,#{status,jdbcType=TINYINT},#{creator,jdbcType=VARCHAR},#{dt,jdbcType=TIMESTAMP}
,#{startDate,jdbcType=VARCHAR},#{endDate,jdbcType=VARCHAR},#{deleted,jdbcType=TINYINT}
,#{content,jdbcType=VARCHAR})
@@ -51,7 +52,6 @@
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="name != null">name,</if>
- <if test="num != null">num,</if>
<if test="status != null">status,</if>
<if test="creator != null">creator,</if>
<if test="dt != null">dt,</if>
@@ -63,7 +63,6 @@
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id,jdbcType=BIGINT},</if>
<if test="name != null">#{name,jdbcType=VARCHAR},</if>
- <if test="num != null">#{num,jdbcType=INTEGER},</if>
<if test="status != null">#{status,jdbcType=TINYINT},</if>
<if test="creator != null">#{creator,jdbcType=VARCHAR},</if>
<if test="dt != null">#{dt,jdbcType=TIMESTAMP},</if>
@@ -78,9 +77,6 @@
<set>
<if test="name != null">
name = #{name,jdbcType=VARCHAR},
- </if>
- <if test="num != null">
- num = #{num,jdbcType=INTEGER},
</if>
<if test="status != null">
status = #{status,jdbcType=TINYINT},
@@ -110,7 +106,6 @@
update pr_dev_ops_plan
set
name = #{name,jdbcType=VARCHAR},
- num = #{num,jdbcType=INTEGER},
status = #{status,jdbcType=TINYINT},
creator = #{creator,jdbcType=VARCHAR},
dt = #{dt,jdbcType=TIMESTAMP},
@@ -126,36 +121,18 @@
<include refid="Base_Column_List" />
from pr_dev_ops_plan
<trim prefix="where" suffixOverrides="and">
- <if test="id != null">
- id = #{id,jdbcType=BIGINT} and
- </if>
- <if test="name != null">
- name = #{name,jdbcType=VARCHAR} and
- </if>
- <if test="num != null">
- num = #{num,jdbcType=INTEGER} and
- </if>
- <if test="status != null">
- status = #{status,jdbcType=TINYINT} and
- </if>
- <if test="creator != null">
- creator = #{creator,jdbcType=VARCHAR} and
- </if>
- <if test="dt != null">
- dt = #{dt,jdbcType=TIMESTAMP} and
- </if>
- <if test="startDate != null">
- start_date = #{startDate,jdbcType=VARCHAR} and
- </if>
- <if test="endDate != null">
- end_date = #{endDate,jdbcType=VARCHAR} and
- </if>
- <if test="deleted != null">
- deleted = #{deleted,jdbcType=TINYINT} and
- </if>
- <if test="content != null">
- content = #{content,jdbcType=VARCHAR} and
- </if>
+ <if test="name != null">
+ name = #{name,jdbcType=VARCHAR} and
+ </if>
+ <if test="status != null">
+ status = #{status,jdbcType=TINYINT} and
+ </if>
+ <if test="startDate != null and startDate != '' ">
+ start_date = #{startDate,jdbcType=VARCHAR} and
+ </if>
+ <if test="endDate != null and endDate != '' ">
+ end_date = #{endDate,jdbcType=VARCHAR} and
+ </if>
</trim>
order by id desc
<trim prefix="limit " >
@@ -169,36 +146,18 @@
select count(1)
from pr_dev_ops_plan
<trim prefix="where" suffixOverrides="and">
- <if test="id != null">
- id = #{id,jdbcType=BIGINT} and
- </if>
- <if test="name != null">
- name = #{name,jdbcType=VARCHAR} and
- </if>
- <if test="num != null">
- num = #{num,jdbcType=INTEGER} and
- </if>
- <if test="status != null">
- status = #{status,jdbcType=TINYINT} and
- </if>
- <if test="creator != null">
- creator = #{creator,jdbcType=VARCHAR} and
- </if>
- <if test="dt != null">
- dt = #{dt,jdbcType=TIMESTAMP} and
- </if>
- <if test="startDate != null">
- start_date = #{startDate,jdbcType=VARCHAR} and
- </if>
- <if test="endDate != null">
- end_date = #{endDate,jdbcType=VARCHAR} and
- </if>
- <if test="deleted != null">
- deleted = #{deleted,jdbcType=TINYINT} and
- </if>
- <if test="content != null">
- content = #{content,jdbcType=VARCHAR} and
- </if>
+ <if test="name != null">
+ name = #{name,jdbcType=VARCHAR} and
+ </if>
+ <if test="status != null">
+ status = #{status,jdbcType=TINYINT} and
+ </if>
+ <if test="startDate != null and startDate != '' ">
+ start_date = #{startDate,jdbcType=VARCHAR} and
+ </if>
+ <if test="endDate != null and endDate != '' ">
+ end_date = #{endDate,jdbcType=VARCHAR} and
+ </if>
</trim>
</select>
--
Gitblit v1.8.0