From 9569ab058ad88dd61541415ba0179e8fb6c6f6d3 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 06 一月 2026 20:18:19 +0800
Subject: [PATCH] 补偿修改

---
 smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml |   40 +++++++++++++++++++++++++++++++---------
 1 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index 82214bc..fe4f4ed 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -102,13 +102,17 @@
 
     <resultMap type="com.smartor.domain.ServiceSubtaskScriptCount" id="ServiceSubtaskScriptCountResult">
         <result property="scriptid" column="scriptid"/>
+        <result property="templateid" column="templateid"/>
+        <result property="scriptType" column="script_type"/>
         <result property="scriptContent" column="script_content"/>
+        <result property="subtaskType" column="subtask_type"/>
         <result property="completedQuantity" column="completed_quantity"/>
         <result property="allQuantity" column="all_quantity"/>
         <result property="completedPercentage" column="completed_percentage"/>
         <result property="optionText" column="option_text"/>
         <result property="chosenQuantity" column="chosen_quantity"/>
         <result property="chosenPercentage" column="chosen_percentage"/>
+        <result property="options" column="options"/>
     </resultMap>
 
     <sql id="selectServiceSubtaskVo">
@@ -380,7 +384,7 @@
             <if test="taskGuid != null">and task_guid = #{taskGuid}</if>
             <if test="isabnormal != null">and isabnormal = #{isabnormal}</if>
             <if test="isVisitAgain != null">and is_visit_again = #{isVisitAgain}</if>
-<!--            <if test="dateLimit != null and dateLimit = '1'"> and CURDATE() + 1 > long_send_time</if>-->
+            <!--            <if test="dateLimit != null and dateLimit = '1'"> and CURDATE() + 1 > long_send_time</if>-->
             <!-- <if test="visitTime != null">and visit_time = #{visitTime}</if> -->
             <!--<if test="visitDeptCode != null">and visit_dept_code = #{visitDeptCode}</if>
             <if test="visitDeptName != null">and visit_dept_name = #{visitDeptName}</if>-->
@@ -403,6 +407,19 @@
         <if test="sort != null  and sort==8">order by visit_time desc</if>
 
         <!-- order by update_time desc,id desc -->
+    </select>
+    <select id="getCompensateServiceSubtaskList" parameterType="com.smartor.domain.ServiceSubtaskVO"
+            resultMap="ServiceSubtaskResult">
+        <include refid="selectServiceSubtaskVo"/>
+        <where>
+            del_flag=0
+            <if test="visitTime != null">
+                AND date_format(visit_time,'%y%m%d') &lt;= date_format(#{visitTime},'%y%m%d')
+            </if>
+            <if test="sendstate != null ">and sendstate = #{sendstate}</if>
+
+        </where>
+
     </select>
 
     <select id="selectServiceSubtaskListByCreateTime" parameterType="com.smartor.domain.ServiceSubtaskVO"
@@ -1355,7 +1372,10 @@
             resultMap="ServiceSubtaskScriptCountResult">
         SELECT
         a.id as scriptid,
+        a.templateid as templateid,
+        a.script_type,
         a.script_content,
+        b.subtask_type,
         b.completed_quantity,
         b.all_quantity,
         ROUND(b.completed_quantity/b.all_quantity,2) as completed_percentage
@@ -1369,6 +1389,7 @@
         INNER JOIN(
         SELECT
         ssd.scriptid AS scriptid,
+        ss.type as subtask_type,
         SUM(CASE WHEN IFNULL(ssd.matchedtext,ssd.asrtext) IS NOT NULL
         AND IFNULL(ssd.matchedtext,ssd.asrtext) != '' THEN 1
         ELSE 0 END) AS completed_quantity,
@@ -1812,13 +1833,13 @@
     <!-- 浼樺寲鐨勭粺璁℃煡璇細鐩存帴鍦ㄦ暟鎹簱灞傚畬鎴愯仛鍚堣绠� -->
     <select id="countByCondition" parameterType="com.smartor.domain.ServiceSubtaskVO" resultType="map">
         SELECT
-            SUM(CASE WHEN sendstate = 4 THEN 1 ELSE 0 END) AS wzx,
-            SUM(CASE WHEN sendstate != 4 AND sendstate != 2 THEN 1 ELSE 0 END) AS ysf,
-            SUM(CASE WHEN sendstate = 5 THEN 1 ELSE 0 END) AS fssb,
-            SUM(CASE WHEN sendstate >= 3 OR sendstate = 1 THEN 1 ELSE 0 END) AS yfs,
-            SUM(CASE WHEN sendstate = 2 THEN 1 ELSE 0 END) AS dsf,
-            SUM(CASE WHEN sendstate = 1 THEN 1 ELSE 0 END) AS blq,
-            SUM(CASE WHEN excep IS NOT NULL AND excep != '0' THEN 1 ELSE 0 END) AS yc
+        SUM(CASE WHEN sendstate = 4 THEN 1 ELSE 0 END) AS wzx,
+        SUM(CASE WHEN sendstate != 4 AND sendstate != 2 THEN 1 ELSE 0 END) AS ysf,
+        SUM(CASE WHEN sendstate = 5 THEN 1 ELSE 0 END) AS fssb,
+        SUM(CASE WHEN sendstate >= 3 OR sendstate = 1 THEN 1 ELSE 0 END) AS yfs,
+        SUM(CASE WHEN sendstate = 2 THEN 1 ELSE 0 END) AS dsf,
+        SUM(CASE WHEN sendstate = 1 THEN 1 ELSE 0 END) AS blq,
+        SUM(CASE WHEN excep IS NOT NULL AND excep != '0' THEN 1 ELSE 0 END) AS yc
         FROM service_subtask
         <where>
             del_flag = 0
@@ -1943,7 +1964,8 @@
             <if test="deptOrDistrict == 1">
                 <if test="leavehospitaldistrictcodes != null and leavehospitaldistrictcodes.size() > 0">
                     AND leavehospitaldistrictcode IN
-                    <foreach collection="leavehospitaldistrictcodes" item="leavehospitaldistrictcode" open="(" separator="," close=")">
+                    <foreach collection="leavehospitaldistrictcodes" item="leavehospitaldistrictcode" open="("
+                             separator="," close=")">
                         #{leavehospitaldistrictcode}
                     </foreach>
                 </if>

--
Gitblit v1.9.3