From d42ef9a0a88d249e5662a9fb9c2b0a54cfa471af Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期二, 12 十一月 2024 15:37:13 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/UgRtuTaskMapper.xml |   53 +++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 47 insertions(+), 6 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/UgRtuTaskMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/UgRtuTaskMapper.xml
index 50752e7..a8d38c4 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/UgRtuTaskMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/UgRtuTaskMapper.xml
@@ -9,17 +9,20 @@
     <result column="creator" jdbcType="VARCHAR" property="creator" />
     <result column="remark" jdbcType="VARCHAR" property="remark" />
     <result column="dt" jdbcType="TIMESTAMP" property="dt" />
+    <result column="is_execute" jdbcType="TINYINT" property="isExecute" />
     <result column="is_over" jdbcType="TINYINT" property="isOver" />
     <result column="deleted" jdbcType="TINYINT" property="deleted" />
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    id, program_id, creator, remark, dt, is_over, deleted
+    id, program_id, creator, remark, dt, is_execute, is_over, deleted
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
     <!--@mbg.generated-->
     select 
-    <include refid="Base_Column_List" />
+    <include refid="Base_Column_List" />,
+    (CASE WHEN is_execute = 1 THEN '鏄�' ELSE '鍚�' END) AS isExecuteStr,
+    (CASE WHEN is_over = 1 THEN '鏄�' ELSE '鍚�' END) AS isOverStr
     from ug_rtu_task
     where id = #{id,jdbcType=BIGINT}
   </select>
@@ -55,7 +58,9 @@
     select
     <include refid="Base_Column_List" >
       <property name="alias" value="bd"/>
-    </include>
+    </include>,
+    (CASE WHEN bd.is_execute = 1 THEN '鏄�' ELSE '鍚�' END) AS isExecuteStr,
+    (CASE WHEN bd.is_over = 1 THEN '鏄�' ELSE '鍚�' END) AS isOverStr
     from ug_rtu_task bd
     where bd.deleted != 1
     <trim prefix="and" suffixOverrides="and">
@@ -86,10 +91,11 @@
   <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoRm.UgRtuTask">
     <!--@mbg.generated-->
     insert into ug_rtu_task (id, program_id, creator, 
-      remark, dt, is_over, deleted
+      remark, dt, is_execute, is_over, deleted
       )
     values (#{id,jdbcType=BIGINT}, #{programId,jdbcType=BIGINT}, #{creator,jdbcType=VARCHAR}, 
-      #{remark,jdbcType=VARCHAR}, #{dt,jdbcType=TIMESTAMP}, #{isOver,jdbcType=TINYINT}, #{deleted,jdbcType=TINYINT}
+      #{remark,jdbcType=VARCHAR}, #{dt,jdbcType=TIMESTAMP}, #{isExecute,jdbcType=TINYINT},
+      #{isOver,jdbcType=TINYINT}, #{deleted,jdbcType=TINYINT}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoRm.UgRtuTask">
@@ -110,6 +116,9 @@
       </if>
       <if test="dt != null">
         dt,
+      </if>
+      <if test="isExecute != null">
+        is_execute,
       </if>
       <if test="isOver != null">
         is_over,
@@ -133,6 +142,9 @@
       </if>
       <if test="dt != null">
         #{dt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="isExecute != null">
+        #{isExecute,jdbcType=TINYINT},
       </if>
       <if test="isOver != null">
         #{isOver,jdbcType=TINYINT},
@@ -158,7 +170,10 @@
       <if test="dt != null">
         dt = #{dt,jdbcType=TIMESTAMP},
       </if>
-      <if test="isOver != null">
+      <if test="isExecute != null">
+        is_execute = #{isExecute,jdbcType=TINYINT},
+      </if>
+     <if test="isOver != null">
         is_over = #{isOver,jdbcType=TINYINT},
       </if>
       <if test="deleted != null">
@@ -174,8 +189,34 @@
       creator = #{creator,jdbcType=VARCHAR},
       remark = #{remark,jdbcType=VARCHAR},
       dt = #{dt,jdbcType=TIMESTAMP},
+      is_execute = #{isExecute,jdbcType=TINYINT},
       is_over = #{isOver,jdbcType=TINYINT},
       deleted = #{deleted,jdbcType=TINYINT}
     where id = #{id,jdbcType=BIGINT}
   </update>
+
+  <update id="executeById" parameterType="java.lang.Long">
+    update ug_rtu_task set is_execute = 1
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+
+  <update id="overById" parameterType="java.lang.Long">
+    update ug_rtu_task set is_over = 1
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+
+  <select id="isExecuteById" parameterType="java.lang.Long" resultType="java.lang.Integer">
+    select
+    is_execute
+    from ug_rtu_task
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+
+  <select id="isOverById" parameterType="java.lang.Long" resultType="java.lang.Integer">
+    select
+    is_over
+    from ug_rtu_task
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0