From 3e0ffedfb7235811cb152323092324b9848660b5 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 20 五月 2025 15:00:51 +0800
Subject: [PATCH] 代码提交
---
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java | 10 +++++
ruoyi-common/src/main/java/com/ruoyi/common/enums/VisitSendStateEnum.java | 56 ++++++++++++++++++++++++++++
2 files changed, 66 insertions(+), 0 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/VisitSendStateEnum.java b/ruoyi-common/src/main/java/com/ruoyi/common/enums/VisitSendStateEnum.java
new file mode 100644
index 0000000..4b7b5dd
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/enums/VisitSendStateEnum.java
@@ -0,0 +1,56 @@
+package com.ruoyi.common.enums;
+
+/**
+ * 鍙戦�佺被鍨嬫灇涓�
+ */
+public enum VisitSendStateEnum {
+ zyy("47231022633110211A2101", "涓芥按涓尰闄�", true),
+ jn("47255004333112711A1001", "鏅畞", false);
+
+
+ private String code;
+ private String desc;
+ private Boolean visitFlag;
+
+ VisitSendStateEnum(String code, String desc, Boolean visitFlag) {
+ this.code = code;
+ this.desc = desc;
+ this.visitFlag = visitFlag;
+ }
+
+ public static Boolean getDescByCode(String code) {
+ VisitSendStateEnum[] organEnums = values();
+ for (int i = 0; i < organEnums.length; i++) {
+ VisitSendStateEnum organEnum = organEnums[i];
+ if (organEnum.getCode() == code) {
+ return organEnum.getVisitFlag();
+ }
+ }
+ return null;
+ }
+
+
+ public Boolean getVisitFlag() {
+ return visitFlag;
+ }
+
+ public void setVisitFlag(Boolean visitFlag) {
+ this.visitFlag = visitFlag;
+ }
+
+ public String getCode() {
+ return code;
+ }
+
+ public void setCode(String code) {
+ this.code = code;
+ }
+
+ public String getDesc() {
+ return desc;
+ }
+
+ public void setDesc(String desc) {
+ this.desc = desc;
+ }
+}
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 c6eb5c5..147be1d 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
@@ -10,6 +10,7 @@
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.enums.MsgLSEnum;
import com.ruoyi.common.enums.ServiceFromEnum;
+import com.ruoyi.common.enums.VisitSendStateEnum;
import com.ruoyi.common.enums.WxGZHEnum;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.HttpUtil;
@@ -334,6 +335,15 @@
ivrTaskcall.setTaskid(commonTaskcallMQ.getTaskid());
ivrTaskcall.setSendstate(2L);
List<ServiceSubtask> subtaskList = iServiceSubtaskService.selectServiceSubtaskList(ivrTaskcall);
+ //涓芥按鏈夌殑鍖婚櫌杩樻病娉曞仛闀挎湡浠诲姟闅忚
+ List<ServiceSubtask> subtaskList2 = new ArrayList<>();
+ if (visitHosp == 2) {
+ for (ServiceSubtask serviceSubtask : subtaskList) {
+ Boolean b = VisitSendStateEnum.getDescByCode(serviceSubtask.getOrgid());
+ if (b) subtaskList2.add(serviceSubtask);
+ }
+ subtaskList = subtaskList2;
+ }
// 鎸夌収 endtime 绂诲綋鍓嶆椂闂存渶杩戠殑鎺掑簭
List<ServiceSubtask> selectServiceSubtaskList = subtaskList.stream().sorted(Comparator.comparing(subtask -> Math.abs(subtask.getEndtime().getTime() - new Date().getTime()))).collect(Collectors.toList());
--
Gitblit v1.9.3