From d3bf339bd64d7b7efddc0afdd4beb1866b8b5a04 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期六, 21 九月 2024 00:47:55 +0800
Subject: [PATCH] 代码提交

---
 smartor/src/main/resources/mapper/smartor/SvyTaskMapper.xml |  260 ++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 180 insertions(+), 80 deletions(-)

diff --git a/smartor/src/main/resources/mapper/smartor/SvyTaskMapper.xml b/smartor/src/main/resources/mapper/smartor/SvyTaskMapper.xml
index e66185c..6d2da2b 100644
--- a/smartor/src/main/resources/mapper/smartor/SvyTaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SvyTaskMapper.xml
@@ -1,87 +1,155 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.smartor.mapper.SvyTaskMapper">
 
     <resultMap type="com.smartor.domain.SvyTask" id="SvyTaskResult">
-        <result property="taskid"    column="taskid"    />
-        <result property="svrtaskid"    column="svrtaskid"    />
-        <result property="taskname"    column="taskname"    />
-        <result property="templateid"    column="templateid"    />
-        <result property="templatename"    column="templatename"    />
-        <result property="labelinfo"    column="labelinfo"    />
-        <result property="state"    column="state"    />
-        <result property="count"    column="count"    />
-        <result property="executed"    column="executed"    />
-        <result property="unexecuted"    column="unexecuted"    />
-        <result property="fail"    column="fail"    />
-        <result property="patientid"    column="patientid"    />
-        <result property="patientname"    column="patientname"    />
-        <result property="addtime"    column="addtime"    />
-        <result property="checkuserid"    column="checkuserid"    />
-        <result property="checkusername"    column="checkusername"    />
-        <result property="checktime"    column="checktime"    />
-        <result property="type"    column="type"    />
-        <result property="typename"    column="typename"    />
-        <result property="usebqsms"    column="usebqsms"    />
-        <result property="usebhsms"    column="usebhsms"    />
-        <result property="usesendsms"    column="usesendsms"    />
-        <result property="deptcode"    column="deptcode"    />
-        <result property="delFlag"    column="del_flag"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="isupload"    column="isupload"    />
-        <result property="uploadTime"    column="upload_time"    />
-        <result property="orgid"    column="orgid"    />
-        <result property="pid"    column="pid"    />
-        <result property="guid"    column="guid"    />
-        <result property="preachform"    column="preachform"    />
-        <result property="isSend"    column="is_send"    />
-        <result property="sendState"    column="send_state"    />
-        <result property="param"    column="param"    />
+        <result property="taskid" column="taskid"/>
+        <result property="svrtaskid" column="svrtaskid"/>
+        <result property="taskName" column="task_name"/>
+        <result property="templateid" column="templateid"/>
+        <result property="templatename" column="templatename"/>
+        <result property="labelinfo" column="labelinfo"/>
+        <result property="state" column="state"/>
+        <result property="count" column="count"/>
+        <result property="executed" column="executed"/>
+        <result property="unexecuted" column="unexecuted"/>
+        <result property="fail" column="fail"/>
+        <result property="patientid" column="patientid"/>
+        <result property="patientname" column="patientname"/>
+        <result property="addtime" column="addtime"/>
+        <result property="checkuserid" column="checkuserid"/>
+        <result property="checkusername" column="checkusername"/>
+        <result property="checktime" column="checktime"/>
+        <result property="type" column="type"/>
+        <result property="typename" column="typename"/>
+        <result property="usebqsms" column="usebqsms"/>
+        <result property="usebhsms" column="usebhsms"/>
+        <result property="usesendsms" column="usesendsms"/>
+        <result property="deptcode" column="deptcode"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="isupload" column="isupload"/>
+        <result property="uploadTime" column="upload_time"/>
+        <result property="orgid" column="orgid"/>
+        <result property="pid" column="pid"/>
+        <result property="guid" column="guid"/>
+        <result property="preachform" column="preachform"/>
+        <result property="sendType" column="send_type"/>
+        <result property="sendState" column="send_state"/>
+        <result property="param" column="param"/>
+        <result property="textParam" column="text_param"/>
+        <result property="stopState" column="stop_state"/>
+        <result property="showDate" column="show_date"/>
+        <result property="showTimeMorn" column="show_time_morn"/>
+        <result property="showTimeNoon" column="show_time_noon"/>
+        <result property="showTimeNight" column="show_time_night"/>
+        <result property="sendTimeSlot" column="send_time_slot"/>
+        <result property="libtemplateid" column="libtemplateid"/>
+        <result property="libtemplatename" column="libtemplatename"/>
+        <result property="taskDesc" column="task_desc"/>
     </resultMap>
 
     <sql id="selectSvyTaskVo">
-        select taskid, svrtaskid, taskname, templateid, templatename, labelinfo, state, count, executed, unexecuted, fail, patientid, patientname, addtime, checkuserid, checkusername, checktime, type, typename, usebqsms, usebhsms, usesendsms, deptcode, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time, orgid, pid, guid, preachform, is_send, send_state, param from svy_task
+        select taskid,
+               send_time_slot,
+               libtemplateid,
+               libtemplatename,
+               show_date,
+               task_desc,
+               show_time_morn,
+               show_time_noon,
+               show_time_night,
+               stop_state,
+               svrtaskid,
+               text_param,
+               task_name,
+               templateid,
+               templatename,
+               labelinfo,
+               state,
+               count,
+               executed,
+               unexecuted,
+               fail,
+               patientid,
+               patientname,
+               addtime,
+               checkuserid,
+               checkusername,
+               checktime,
+               type,
+               typename,
+               usebqsms,
+               usebhsms,
+               usesendsms,
+               deptcode,
+               del_flag,
+               update_by,
+               update_time,
+               create_by,
+               create_time,
+               isupload,
+               upload_time,
+               orgid,
+               pid,
+               guid,
+               preachform,
+               send_type,
+               send_state,
+               param
+        from svy_task
     </sql>
 
     <select id="selectSvyTaskList" parameterType="com.smartor.domain.SvyTask" resultMap="SvyTaskResult">
         <include refid="selectSvyTaskVo"/>
         <where>
-            <if test="svrtaskid != null "> and svrtaskid = #{svrtaskid}</if>
-            <if test="taskname != null  and taskname != ''"> and taskname like concat('%', #{taskname}, '%')</if>
-            <if test="templateid != null  and templateid != ''"> and templateid = #{templateid}</if>
-            <if test="templatename != null  and templatename != ''"> and templatename like concat('%', #{templatename}, '%')</if>
-            <if test="labelinfo != null  and labelinfo != ''"> and labelinfo = #{labelinfo}</if>
-            <if test="state != null "> and state = #{state}</if>
-            <if test="count != null "> and count = #{count}</if>
-            <if test="executed != null "> and executed = #{executed}</if>
-            <if test="unexecuted != null "> and unexecuted = #{unexecuted}</if>
-            <if test="fail != null "> and fail = #{fail}</if>
-            <if test="patientid != null  and patientid != ''"> and patientid = #{patientid}</if>
-            <if test="patientname != null  and patientname != ''"> and patientname like concat('%', #{patientname}, '%')</if>
-            <if test="addtime != null "> and addtime = #{addtime}</if>
-            <if test="checkuserid != null  and checkuserid != ''"> and checkuserid = #{checkuserid}</if>
-            <if test="checkusername != null  and checkusername != ''"> and checkusername like concat('%', #{checkusername}, '%')</if>
-            <if test="checktime != null "> and checktime = #{checktime}</if>
-            <if test="type != null  and type != ''"> and type = #{type}</if>
-            <if test="typename != null  and typename != ''"> and typename like concat('%', #{typename}, '%')</if>
-            <if test="usebqsms != null "> and usebqsms = #{usebqsms}</if>
-            <if test="usebhsms != null "> and usebhsms = #{usebhsms}</if>
-            <if test="usesendsms != null "> and usesendsms = #{usesendsms}</if>
-            <if test="deptcode != null  and deptcode != ''"> and deptcode = #{deptcode}</if>
-            <if test="isupload != null "> and isupload = #{isupload}</if>
-            <if test="uploadTime != null "> and upload_time = #{uploadTime}</if>
-            <if test="orgid != null  and orgid != ''"> and orgid = #{orgid}</if>
-            <if test="pid != null "> and pid = #{pid}</if>
-            <if test="guid != null  and guid != ''"> and guid = #{guid}</if>
-            <if test="preachform != null  and preachform != ''"> and preachform = #{preachform}</if>
-            <if test="isSend != null "> and is_send = #{isSend}</if>
-            <if test="sendState != null  and sendState != ''"> and send_state = #{sendState}</if>
-            <if test="param != null  and param != ''"> and param = #{param}</if>
+            <if test="svrtaskid != null ">and svrtaskid = #{svrtaskid}</if>
+            <if test="taskName != null  and taskName != ''">and task_name like concat('%', #{taskName}, '%')</if>
+            <if test="templateid != null  and templateid != ''">and templateid = #{templateid}</if>
+            <if test="templatename != null  and templatename != ''">and templatename like concat('%', #{templatename},
+                '%')
+            </if>
+            <if test="labelinfo != null  and labelinfo != ''">and labelinfo = #{labelinfo}</if>
+            <if test="state != null ">and state = #{state}</if>
+            <if test="count != null ">and count = #{count}</if>
+            <if test="executed != null ">and executed = #{executed}</if>
+            <if test="unexecuted != null ">and unexecuted = #{unexecuted}</if>
+            <if test="fail != null ">and fail = #{fail}</if>
+            <if test="patientid != null  and patientid != ''">and patientid = #{patientid}</if>
+            <if test="patientname != null  and patientname != ''">and patientname like concat('%', #{patientname},
+                '%')
+            </if>
+            <if test="addtime != null ">and addtime = #{addtime}</if>
+            <if test="checkuserid != null  and checkuserid != ''">and checkuserid = #{checkuserid}</if>
+            <if test="checkusername != null  and checkusername != ''">and checkusername like concat('%',
+                #{checkusername}, '%')
+            </if>
+            <if test="checktime != null ">and checktime = #{checktime}</if>
+            <if test="type != null  and type != ''">and type = #{type}</if>
+            <if test="typename != null  and typename != ''">and typename like concat('%', #{typename}, '%')</if>
+            <if test="usebqsms != null ">and usebqsms = #{usebqsms}</if>
+            <if test="usebhsms != null ">and usebhsms = #{usebhsms}</if>
+            <if test="usesendsms != null ">and usesendsms = #{usesendsms}</if>
+            <if test="deptcode != null  and deptcode != ''">and deptcode = #{deptcode}</if>
+            <if test="isupload != null ">and isupload = #{isupload}</if>
+            <if test="uploadTime != null ">and upload_time = #{uploadTime}</if>
+            <if test="orgid != null  and orgid != ''">and orgid = #{orgid}</if>
+            <if test="pid != null ">and pid = #{pid}</if>
+            <if test="guid != null  and guid != ''">and guid = #{guid}</if>
+            <if test="preachform != null  and preachform != ''">and preachform = #{preachform}</if>
+            <if test="sendType != null ">and send_type = #{sendType}</if>
+            <if test="sendState != null  and sendState != ''">and send_state = #{sendState}</if>
+            <if test="param != null  and param != ''">and param = #{param}</if>
+            <if test="sendTimeSlot != null  and sendTimeSlot != ''">and send_time_slot like concat('%', #{sendTimeSlot},
+                '%')
+            </if>
+            <if test="libtemplateid != null ">and libtemplateid = #{libtemplateid}</if>
+            <if test="libtemplatename != null  and libtemplatename != ''">and libtemplatename = #{libtemplatename}</if>
         </where>
     </select>
 
@@ -94,7 +162,7 @@
         insert into svy_task
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="svrtaskid != null">svrtaskid,</if>
-            <if test="taskname != null">taskname,</if>
+            <if test="taskName != null">task_name,</if>
             <if test="templateid != null">templateid,</if>
             <if test="templatename != null">templatename,</if>
             <if test="labelinfo != null">labelinfo,</if>
@@ -126,13 +194,23 @@
             <if test="pid != null">pid,</if>
             <if test="guid != null">guid,</if>
             <if test="preachform != null">preachform,</if>
-            <if test="isSend != null">is_send,</if>
+            <if test="sendType != null">send_type,</if>
             <if test="sendState != null">send_state,</if>
             <if test="param != null">param,</if>
-         </trim>
+            <if test="textParam != null">text_param,</if>
+            <if test="sendTimeSlot != null  and sendTimeSlot != ''">send_time_slot,</if>
+            <if test="stopState != null">stop_state,</if>
+            <if test="showDate != null and showDate != ''">show_date,</if>
+            <if test="showTimeNight != null and showTimeNight != ''">show_time_night,</if>
+            <if test="showTimeNoon != null and showTimeNoon != ''">show_time_noon,</if>
+            <if test="showTimeMorn != null and showTimeMorn != ''">show_time_morn,</if>
+            <if test="libtemplateid != null ">libtemplateid,</if>
+            <if test="libtemplatename != null  and libtemplatename != ''">libtemplatename,</if>
+            <if test="taskDesc != null  and taskDesc != ''">task_desc,</if>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="svrtaskid != null">#{svrtaskid},</if>
-            <if test="taskname != null">#{taskname},</if>
+            <if test="taskName != null">#{taskName},</if>
             <if test="templateid != null">#{templateid},</if>
             <if test="templatename != null">#{templatename},</if>
             <if test="labelinfo != null">#{labelinfo},</if>
@@ -164,17 +242,27 @@
             <if test="pid != null">#{pid},</if>
             <if test="guid != null">#{guid},</if>
             <if test="preachform != null">#{preachform},</if>
-            <if test="isSend != null">#{isSend},</if>
+            <if test="sendType != null">#{sendType},</if>
             <if test="sendState != null">#{sendState},</if>
             <if test="param != null">#{param},</if>
-         </trim>
+            <if test="textParam != null">#{textParam},</if>
+            <if test="sendTimeSlot != null  and sendTimeSlot != ''">#{sendTimeSlot},</if>
+            <if test="stopState != null">#{stopState},</if>
+            <if test="showDate != null and showDate != ''">#{showDate},</if>
+            <if test="showTimeNight != null and showTimeNight != ''">#{showTimeNight},</if>
+            <if test="showTimeNoon != null and showTimeNoon != ''">#{showTimeNoon},</if>
+            <if test="showTimeMorn != null and showTimeMorn != ''">#{showTimeMorn},</if>
+            <if test="libtemplateid != null ">#{libtemplateid},</if>
+            <if test="libtemplatename != null  and libtemplatename != ''">#{libtemplatename},</if>
+            <if test="taskDesc != null  and taskDesc != ''">#{taskDesc},</if>
+        </trim>
     </insert>
 
     <update id="updateSvyTask" parameterType="com.smartor.domain.SvyTask">
         update svy_task
         <trim prefix="SET" suffixOverrides=",">
             <if test="svrtaskid != null">svrtaskid = #{svrtaskid},</if>
-            <if test="taskname != null">taskname = #{taskname},</if>
+            <if test="taskName != null">task_name = #{taskName},</if>
             <if test="templateid != null">templateid = #{templateid},</if>
             <if test="templatename != null">templatename = #{templatename},</if>
             <if test="labelinfo != null">labelinfo = #{labelinfo},</if>
@@ -206,15 +294,27 @@
             <if test="pid != null">pid = #{pid},</if>
             <if test="guid != null">guid = #{guid},</if>
             <if test="preachform != null">preachform = #{preachform},</if>
-            <if test="isSend != null">is_send = #{isSend},</if>
+            <if test="sendType != null">send_type = #{sendType},</if>
             <if test="sendState != null">send_state = #{sendState},</if>
             <if test="param != null">param = #{param},</if>
+            <if test="textParam != null">text_param = #{textParam},</if>
+            <if test="sendTimeSlot != null  and sendTimeSlot != ''">send_time_slot=#{sendTimeSlot},</if>
+            <if test="stopState != null ">stop_state=#{stopState},</if>
+            <if test="showDate != null and showDate != ''">show_date=#{showDate},</if>
+            <if test="showTimeNight != null and showTimeNight != ''">show_time_night=#{showTimeNight},</if>
+            <if test="showTimeNoon != null and showTimeNoon != ''">show_time_noon=#{showTimeNoon},</if>
+            <if test="showTimeMorn != null and showTimeMorn != ''">show_time_morn=#{showTimeMorn},</if>
+            <if test="libtemplateid != null ">libtemplateid = #{libtemplateid},</if>
+            <if test="libtemplatename != null  and libtemplatename != ''">libtemplatename = #{libtemplatename},</if>
+            <if test="taskDesc != null  and taskDesc != ''">task_desc=#{taskDesc},</if>
         </trim>
         where taskid = #{taskid}
     </update>
 
     <delete id="deleteSvyTaskByTaskid" parameterType="Long">
-        delete from svy_task where taskid = #{taskid}
+        delete
+        from svy_task
+        where taskid = #{taskid}
     </delete>
 
     <delete id="deleteSvyTaskByTaskids" parameterType="String">

--
Gitblit v1.9.3