From f0a09ee996ab2605869844d6a3d812709e2bf0fa Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 16 十月 2026 16:07:25 +0800
Subject: [PATCH] 任务模块、电话模块
---
ruoyi-task/src/main/resources/mapper/task/ServiceSubtaskMapper.xml | 76 +++++++++++++++++++-------------------
1 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/ruoyi-task/src/main/resources/mapper/task/ServiceSubtaskMapper.xml
similarity index 97%
rename from smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
rename to ruoyi-task/src/main/resources/mapper/task/ServiceSubtaskMapper.xml
index 9255317..f9d3a27 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/ruoyi-task/src/main/resources/mapper/task/ServiceSubtaskMapper.xml
@@ -2,9 +2,9 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.smartor.mapper.ServiceSubtaskMapper">
+<mapper namespace="com.ruoyi.task.mapper.ServiceSubtaskMapper">
- <resultMap type="com.smartor.domain.ServiceSubtask" id="ServiceSubtaskResult">
+ <resultMap type="com.ruoyi.task.domain.ServiceSubtask" id="ServiceSubtaskResult">
<result property="id" column="id"/>
<result property="sendname" column="sendname"/>
<result property="phone" column="phone"/>
@@ -102,7 +102,7 @@
<result property="campusid" column="campusid"/>
</resultMap>
- <resultMap type="com.smartor.domain.ServiceSubtaskCount" id="ServiceSubtaskResult2">
+ <resultMap type="com.ruoyi.task.domain.ServiceSubtaskCount" id="ServiceSubtaskResult2">
<result property="month" column="month"/>
<result property="serviceType" column="service_type"/>
<result property="subTaskId" column="subTaskId"/>
@@ -113,7 +113,7 @@
</resultMap>
- <resultMap type="com.smartor.domain.ServiceSubtaskScriptCount" id="ServiceSubtaskScriptCountResult">
+ <resultMap type="com.ruoyi.task.domain.ServiceSubtaskScriptCount" id="ServiceSubtaskScriptCountResult">
<result property="scriptid" column="scriptid"/>
<result property="templateid" column="templateid"/>
<result property="scriptType" column="script_type"/>
@@ -128,7 +128,7 @@
<result property="options" column="options"/>
</resultMap>
- <resultMap type="com.smartor.domain.ServiceSubtaskStatistic" id="ServiceSubtaskStatisticResult">
+ <resultMap type="com.ruoyi.task.domain.ServiceSubtaskStatistic" id="ServiceSubtaskStatisticResult">
<result property="taskName" column="task_name"/>
<result property="drcode" column="drcode"/>
<result property="drname" column="drname"/>
@@ -251,7 +251,7 @@
from service_subtask
</sql>
- <select id="selectServiceSubtaskBySendstate" parameterType="com.smartor.domain.entity.ServiceSubtaskEntity"
+ <select id="selectServiceSubtaskBySendstate" parameterType="com.ruoyi.task.domain.entity.ServiceSubtaskEntity"
resultMap="ServiceSubtaskResult">
<include refid="selectServiceSubtaskVo"/>
where 1=1
@@ -274,7 +274,7 @@
</if>
</select>
- <select id="queryServiceSubtaskList" parameterType="com.smartor.domain.entity.ServiceSubtaskEntity"
+ <select id="queryServiceSubtaskList" parameterType="com.ruoyi.task.domain.entity.ServiceSubtaskEntity"
resultMap="ServiceSubtaskResult">
<include refid="selectServiceSubtaskVo"/>
where 1=1
@@ -291,7 +291,7 @@
<if test="continueTimeNext != null ">and continue_time_next = #{continueTimeNext}</if>
</select>
- <select id="selectServiceSubtaskList" parameterType="com.smartor.domain.entity.ServiceSubtaskEntity"
+ <select id="selectServiceSubtaskList" parameterType="com.ruoyi.task.domain.entity.ServiceSubtaskEntity"
resultMap="ServiceSubtaskResult">
<include refid="selectServiceSubtaskVo"/>
where del_flag = 0
@@ -536,7 +536,7 @@
<if test="pageSize != null and pageNum != null">limit ${pageSize} OFFSET ${pageNum}</if>
</select>
- <select id="getCompensateServiceSubtaskList" parameterType="com.smartor.domain.entity.ServiceSubtaskEntity"
+ <select id="getCompensateServiceSubtaskList" parameterType="com.ruoyi.task.domain.entity.ServiceSubtaskEntity"
resultMap="ServiceSubtaskResult">
<include refid="selectServiceSubtaskVo"/>
where del_flag = 0
@@ -569,7 +569,7 @@
<if test="continueTimeNext != null ">and continue_time_next = #{continueTimeNext}</if>
</select>
- <select id="selectServiceSubtaskListByCreateTime" parameterType="com.smartor.domain.entity.ServiceSubtaskEntity"
+ <select id="selectServiceSubtaskListByCreateTime" parameterType="com.ruoyi.task.domain.entity.ServiceSubtaskEntity"
resultMap="ServiceSubtaskResult">
<include refid="selectServiceSubtaskVo"/>
where del_flag = 0
@@ -598,7 +598,7 @@
</select>
- <select id="selectServiceSubtaskListAgain" parameterType="com.smartor.domain.entity.ServiceSubtaskEntity"
+ <select id="selectServiceSubtaskListAgain" parameterType="com.ruoyi.task.domain.entity.ServiceSubtaskEntity"
resultMap="ServiceSubtaskResult">
<include refid="selectServiceSubtaskVo"/>
where 1=1
@@ -658,7 +658,7 @@
<if test="continueTimeNext != null ">and continue_time_next = #{continueTimeNext}</if>
</select>
- <select id="selectSendstateByCondition" parameterType="com.smartor.domain.ServiceSubtask" resultType="Integer">
+ <select id="selectSendstateByCondition" parameterType="com.ruoyi.task.domain.ServiceSubtask" resultType="Integer">
SELECT b.sendstate
from service_task a
JOIN service_subtask b on a.taskid = b.taskid and a.pat_cycle = 0 and b.del_flag = 0
@@ -673,7 +673,7 @@
<if test="campusid != null and campusid != ''">and b.campusid = #{campusid}</if>
</select>
- <select id="selectTimelyRate" parameterType="com.smartor.domain.ServiceSubtask" resultType="double">
+ <select id="selectTimelyRate" parameterType="com.ruoyi.task.domain.ServiceSubtask" resultType="double">
SELECT sum( a.finished )/ sum( 1 ) FROM
(SELECT id, visit_time, finishtime,
(CASE WHEN ( DATE_FORMAT( visit_time, '%y%m%d' )< DATE_FORMAT( IF ( ISNULL( finishtime ), NOW(), finishtime
@@ -711,7 +711,7 @@
) a
</select>
- <select id="selectTimelyRateBatch" parameterType="com.smartor.domain.entity.ServiceSubtaskEntity" resultType="map">
+ <select id="selectTimelyRateBatch" parameterType="com.ruoyi.task.domain.entity.ServiceSubtaskEntity" resultType="map">
SELECT
<if test="groupKey != null and groupKey != ''">
ss.${groupKey} as groupKey,
@@ -790,7 +790,7 @@
</if>
</select>
- <select id="selectTimelyRateDetail" parameterType="com.smartor.domain.ServiceSubtask"
+ <select id="selectTimelyRateDetail" parameterType="com.ruoyi.task.domain.ServiceSubtask"
resultMap="ServiceSubtaskResult">
<include refid="selectServiceSubtaskVo"/>
where 1=1
@@ -830,7 +830,7 @@
where id = #{id}
</select>
- <select id="selectServiceSubtaskByDiagname" parameterType="com.smartor.domain.ServiceSubtask"
+ <select id="selectServiceSubtaskByDiagname" parameterType="com.ruoyi.task.domain.ServiceSubtask"
resultMap="ServiceSubtaskResult">
select sendstate,starttime,endtime,nurse_name,phone,sex,task_name,sendname,leavediagname,visit_time FROM
service_subtask WHERE del_flag=0
@@ -856,7 +856,7 @@
<if test="pageSize != null and pageNum != null">limit ${pageSize} OFFSET ${pageNum}</if>
</select>
- <insert id="insertServiceSubtask" parameterType="com.smartor.domain.ServiceSubtask" useGeneratedKeys="true"
+ <insert id="insertServiceSubtask" parameterType="com.ruoyi.task.domain.ServiceSubtask" useGeneratedKeys="true"
keyProperty="id">
insert into service_subtask
<trim prefix="(" suffix=")" suffixOverrides=",">
@@ -1057,7 +1057,7 @@
</trim>
</insert>
- <update id="updateServiceSubtask" parameterType="com.smartor.domain.ServiceSubtask">
+ <update id="updateServiceSubtask" parameterType="com.ruoyi.task.domain.ServiceSubtask">
update service_subtask
<trim prefix="SET" suffixOverrides=",">
<if test="sendname != null">sendname = #{sendname},</if>
@@ -1161,7 +1161,7 @@
where id = #{id}
</update>
- <update id="updateServiceSubtaskByPatId" parameterType="com.smartor.domain.ServiceSubtask">
+ <update id="updateServiceSubtaskByPatId" parameterType="com.ruoyi.task.domain.ServiceSubtask">
update service_subtask
<trim prefix="SET" suffixOverrides=",">
<if test="sendname != null">sendname = #{sendname},</if>
@@ -1265,7 +1265,7 @@
<if test="campusid != null and campusid != ''">and campusid = #{campusid}</if>
</update>
- <update id="updateServiceSubtaskByCondition" parameterType="com.smartor.domain.ServiceSubtask">
+ <update id="updateServiceSubtaskByCondition" parameterType="com.ruoyi.task.domain.ServiceSubtask">
update service_subtask
<trim prefix="SET" suffixOverrides=",">
<if test="sendname != null">sendname = #{sendname},</if>
@@ -1377,7 +1377,7 @@
</where>
</update>
- <update id="updateServiceSubtaskByTaskGuid" parameterType="com.smartor.domain.ServiceSubtask">
+ <update id="updateServiceSubtaskByTaskGuid" parameterType="com.ruoyi.task.domain.ServiceSubtask">
update service_subtask
<trim prefix="SET" suffixOverrides=",">
<if test="sendname != null">sendname = #{sendname},</if>
@@ -1491,7 +1491,7 @@
where patid = #{patid} and taskid = #{taskid}
</update>
- <select id="getSfStatistics" parameterType="com.smartor.domain.ServiceSubtaskCountReq"
+ <select id="getSfStatistics" parameterType="com.ruoyi.task.domain.ServiceSubtaskCountReq"
resultMap="ServiceSubtaskResult">
select id,
visit_count,
@@ -1597,7 +1597,7 @@
</if>
</select>
- <select id="getSpecialSfStatistics" parameterType="com.smartor.domain.ServiceSubtaskCountReq"
+ <select id="getSpecialSfStatistics" parameterType="com.ruoyi.task.domain.ServiceSubtaskCountReq"
resultMap="ServiceSubtaskStatisticResult">
select
<if test="groupKey != null and groupKey == 'task_name'">
@@ -1710,7 +1710,7 @@
</if>
</select>
- <select id="getSfStatisticsGroupKey" parameterType="com.smartor.domain.ServiceSubtaskCountReq"
+ <select id="getSfStatisticsGroupKey" parameterType="com.ruoyi.task.domain.ServiceSubtaskCountReq"
resultType="String">
select
<if test="groupKey != null and groupKey != ''">
@@ -1779,7 +1779,7 @@
</if>
</select>
- <select id="getSfStatisticsHyperlink" parameterType="com.smartor.domain.ServiceSubtaskCountReq"
+ <select id="getSfStatisticsHyperlink" parameterType="com.ruoyi.task.domain.ServiceSubtaskCountReq"
resultMap="ServiceSubtaskResult">
select id,
visit_count,
@@ -1912,7 +1912,7 @@
</if>
</select>
- <select id="getSfStatisticsJoy" parameterType="com.smartor.domain.ServiceSubtaskCountReq"
+ <select id="getSfStatisticsJoy" parameterType="com.ruoyi.task.domain.ServiceSubtaskCountReq"
resultMap="ServiceSubtaskResult2">
SELECT sub_id as subTaskId,COUNT(sub_id) joyCount,
(SELECT COUNT(1) FROM ivr_liba_target WHERE assortid IN (SELECT config_value FROM sys_config WHERE
@@ -1961,7 +1961,7 @@
GROUP BY sub_id
</select>
- <select id="getSfStatisticsJoydetails" parameterType="com.smartor.domain.ServiceSubtaskCountReq"
+ <select id="getSfStatisticsJoydetails" parameterType="com.ruoyi.task.domain.ServiceSubtaskCountReq"
resultMap="ServiceSubtaskResult2">
SELECT joyName,joyCount,joyAllCount,ROUND(joyCount/joyAllCount,2) joyTotal FROM (
SELECT targetname joyName,
@@ -2042,7 +2042,7 @@
)a1
</select>
- <select id="getSfStatisticsCategory" parameterType="com.smartor.domain.ServiceSubtaskCountReq"
+ <select id="getSfStatisticsCategory" parameterType="com.ruoyi.task.domain.ServiceSubtaskCountReq"
resultMap="ServiceSubtaskResult2">
SELECT
<if test="configValue != null and configValue != ''">
@@ -2115,7 +2115,7 @@
GROUP BY a.sub_id
</select>
- <select id="getSfStatisticsScriptDetails" parameterType="com.smartor.domain.ServiceSubtaskCountReq"
+ <select id="getSfStatisticsScriptDetails" parameterType="com.ruoyi.task.domain.ServiceSubtaskCountReq"
resultMap="ServiceSubtaskScriptCountResult">
SELECT
a.id as scriptid,
@@ -2196,7 +2196,7 @@
</if>
</select>
- <select id="getSfStatisticsScriptItemDetails" parameterType="com.smartor.domain.ServiceSubtaskCountReq"
+ <select id="getSfStatisticsScriptItemDetails" parameterType="com.ruoyi.task.domain.ServiceSubtaskCountReq"
resultMap="ServiceSubtaskScriptCountResult">
SELECT
ssd.scriptid,
@@ -2338,7 +2338,7 @@
</select>
<!-- 鑾峰彇闅忚闂ㄨ瘖姣忔湀鐨勬暟閲�-->
- <select id="getSfFzInfoEveryMonth" parameterType="com.smartor.domain.ServiceSubtaskCountReq"
+ <select id="getSfFzInfoEveryMonth" parameterType="com.ruoyi.task.domain.ServiceSubtaskCountReq"
resultMap="ServiceSubtaskResult2">
SELECT DATE_FORMAT(st.finishtime, '%Y-%m') AS month,
st.service_type as service_type,
@@ -2380,8 +2380,8 @@
</select>
<!-- 鏈嶅姟缁熻鏌ヨ - 鎸夋椂闂寸淮搴︾粺璁″嚭闄�/闂ㄨ瘖闅忚鏁版嵁 -->
- <select id="getServiceStatistics" parameterType="com.smartor.domain.ServiceStatisticsRequest"
- resultType="com.smartor.domain.ServiceStatisticsResponse">
+ <select id="getServiceStatistics" parameterType="com.ruoyi.task.domain.ServiceStatisticsRequest"
+ resultType="com.ruoyi.task.domain.ServiceStatisticsResponse">
SELECT
timePeriod,
SUM(dischargeFollowCount) AS dischargeFollowCount,
@@ -2549,7 +2549,7 @@
</select>
<!-- 浼樺寲鐨勭粺璁℃煡璇細鐩存帴鍦ㄦ暟鎹簱灞傚畬鎴愯仛鍚堣绠� -->
- <select id="countByCondition" parameterType="com.smartor.domain.entity.ServiceSubtaskEntity" resultType="map">
+ <select id="countByCondition" parameterType="com.ruoyi.task.domain.entity.ServiceSubtaskEntity" 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,
@@ -2786,7 +2786,7 @@
</if>
</select>
- <select id="getCurrentUserServiceSubtaskCount" parameterType="com.smartor.domain.entity.ServiceSubtaskEntity"
+ <select id="getCurrentUserServiceSubtaskCount" parameterType="com.ruoyi.task.domain.entity.ServiceSubtaskEntity"
resultType="map">
SELECT
COUNT(CASE WHEN sendstate = 2 AND date_format(visit_time,'%y%m%d') <= date_format(CURDATE(),'%y%m%d') THEN 1
@@ -2830,7 +2830,7 @@
-->
<!-- 鎸夌梾鍖哄垎缁勭粺璁″欢缁姢鐞嗘暟閲� -->
<select id="getContinueNurseCount"
- parameterType="com.smartor.domain.VO.ServiceSubtaskCotinueCountVO"
+ parameterType="com.ruoyi.task.domain.VO.ServiceSubtaskCotinueCountVO"
resultType="java.util.Map">
SELECT
leavehospitaldistrictcode AS groupCode,
@@ -2859,7 +2859,7 @@
<!-- 鎸夌瀹ゅ垎缁勭粺璁″欢缁姢鐞嗘暟閲� -->
<select id="getContinueNurseCountByDept"
- parameterType="com.smartor.domain.VO.ServiceSubtaskCotinueCountVO"
+ parameterType="com.ruoyi.task.domain.VO.ServiceSubtaskCotinueCountVO"
resultType="java.util.Map">
SELECT
deptcode AS groupCode,
@@ -3045,7 +3045,7 @@
</if>
</select>
- <select id="selectServiceSubtaskListDeadLine" parameterType="com.smartor.domain.entity.ServiceSubtaskEntity"
+ <select id="selectServiceSubtaskListDeadLine" parameterType="com.ruoyi.task.domain.entity.ServiceSubtaskEntity"
resultMap="ServiceSubtaskResult">
<include refid="selectServiceSubtaskVo"/>
where 1=1
--
Gitblit v1.9.3