From 9569ab058ad88dd61541415ba0179e8fb6c6f6d3 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 06 一月 2026 20:18:19 +0800
Subject: [PATCH] 补偿修改
---
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java | 32 ++++++++--------
smartor/src/main/java/com/smartor/mapper/ServiceSubtaskMapper.java | 7 +++
smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml | 32 +++++++++++----
3 files changed, 46 insertions(+), 25 deletions(-)
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
index 9697149..93f236a 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
@@ -473,11 +473,11 @@
* 澶勭悊琛ュ伩浠诲姟
*/
public void compensateTask() {
- //鑾峰彇鍒皊endstate=3 骞朵笖 visit_time涓轰粖澶╃殑subtask
+ //鑾峰彇鍒皊endstate=3 骞朵笖 visit_time涓哄皬浜庣瓑浜庝粖澶╃殑subtask
ServiceSubtaskVO serviceSubtaskVO = new ServiceSubtaskVO();
serviceSubtaskVO.setSendstate(3L);
serviceSubtaskVO.setVisitTime(new Date());
- List<ServiceSubtask> serviceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtaskVO);
+ List<ServiceSubtask> serviceSubtaskList = serviceSubtaskMapper.getCompensateServiceSubtaskList(serviceSubtaskVO);
for (ServiceSubtask serviceSubtask : serviceSubtaskList) {
//鏍规嵁褰撳墠鐨勬墽琛屾柟寮忥紝鑾峰彇涓嬩竴绉嶆墽琛屾柟寮�
ServiceSubtaskPreachform serviceSubtaskPreachform = new ServiceSubtaskPreachform();
@@ -748,11 +748,11 @@
serviceSubtask.setSendstate(3L);
if (StringUtils.isNotEmpty(isSuccess) && isSuccess.equals("true")) {
serviceSubtask.setResult("success");
- serviceSubtask.setRemark("鐭俊鍙戦�佹垚鍔�");
+ serviceSubtask.setRemark(serviceSubtask.getRemark() + "," + "鐭俊鍙戦�佹垚鍔�");
setSuccessPreachForm(serviceSubtask, sendPreachform, "鐭俊鍙戦�佹垚鍔�", "2");
} else {
serviceSubtask.setResult("error");
- serviceSubtask.setRemark("鐭俊鍙戦�佸け璐�" + now);
+ serviceSubtask.setRemark(serviceSubtask.getRemark() + "," +"鐭俊鍙戦�佸け璐�" + now);
setSuccessPreachForm(serviceSubtask, sendPreachform, "鐭俊鍙戦�佸け璐�" + now, "5");
}
} catch (Exception e) {
@@ -792,18 +792,18 @@
if (active.equals("hzszlyy")) {
//澶勭悊涓枃涔辩爜闂
/**String title = URLEncoder.encode("鎮ㄥソ锛岄個璇锋偍濉啓鍑洪櫌璋冩煡琛紝璇风偣鍑诲～鍐欍��", StandardCharsets.UTF_8.toString());
- String content = URLEncoder.encode("鎮ㄥソ锛岄個璇锋偍濉啓鍑洪櫌璋冩煡琛紝璇风偣鍑诲～鍐欍��", StandardCharsets.UTF_8.toString());
- String encodedUrl = URLEncoder.encode(url, StandardCharsets.UTF_8.toString());
- String urlTemp = "http://192.200.54.14:5003/sfjk/SendMessage?sfzh=" + serviceSubtask.getSfzh() +
- "&title=" + title +
- "&content=" + content +
- "&phone=" + patArchive.getTelcode() +
- "&url=" + encodedUrl +
- "&key=ff76f8904f5f32b5ee1739e8ea46e60g";
-// HttpUtils.sendGet(urlTemp);
- String sendMsg = "";
- sendMsg = HttpUtils.sendPost(urlTemp);
- log.info(sendMsg); **/
+ String content = URLEncoder.encode("鎮ㄥソ锛岄個璇锋偍濉啓鍑洪櫌璋冩煡琛紝璇风偣鍑诲～鍐欍��", StandardCharsets.UTF_8.toString());
+ String encodedUrl = URLEncoder.encode(url, StandardCharsets.UTF_8.toString());
+ String urlTemp = "http://192.200.54.14:5003/sfjk/SendMessage?sfzh=" + serviceSubtask.getSfzh() +
+ "&title=" + title +
+ "&content=" + content +
+ "&phone=" + patArchive.getTelcode() +
+ "&url=" + encodedUrl +
+ "&key=ff76f8904f5f32b5ee1739e8ea46e60g";
+ // HttpUtils.sendGet(urlTemp);
+ String sendMsg = "";
+ sendMsg = HttpUtils.sendPost(urlTemp);
+ log.info(sendMsg); **/
wxCode = smsUtils.sendChat(url, patArchive.getTelcode(), serviceSubtask.getSfzh());
log.info(wxCode);
diff --git a/smartor/src/main/java/com/smartor/mapper/ServiceSubtaskMapper.java b/smartor/src/main/java/com/smartor/mapper/ServiceSubtaskMapper.java
index e44108c..ff2d5c6 100644
--- a/smartor/src/main/java/com/smartor/mapper/ServiceSubtaskMapper.java
+++ b/smartor/src/main/java/com/smartor/mapper/ServiceSubtaskMapper.java
@@ -31,6 +31,13 @@
*/
public List<ServiceSubtask> selectServiceSubtaskList(ServiceSubtaskVO serviceSubtaskVO);
+ /**
+ * 鐢ㄤ簬琛ュ伩鏌ヨ
+ * @param serviceSubtaskVO
+ * @return
+ */
+ public List<ServiceSubtask> getCompensateServiceSubtaskList(ServiceSubtaskVO serviceSubtaskVO);
+
public List<ServiceSubtask> selectServiceSubtaskByDiagname(ServiceSubtask serviceSubtask);
public List<ServiceSubtask> queryServiceSubtaskList(ServiceSubtaskVO serviceSubtaskVO);
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index 7915cd4..fe4f4ed 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -384,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>-->
@@ -407,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') <= 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"
@@ -1820,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
@@ -1951,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