From ce3a1c26186acd7a440570d9f6295f57f92bf85d Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期三, 15 七月 2026 10:11:33 +0800
Subject: [PATCH] 【丽水】宣教超链接统计

---
 smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java |    2 +-
 smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml            |    6 +++---
 smartor/src/main/java/com/smartor/domain/VO/HeLibraryCountVO.java             |   15 ++++++++++++---
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/smartor/src/main/java/com/smartor/domain/VO/HeLibraryCountVO.java b/smartor/src/main/java/com/smartor/domain/VO/HeLibraryCountVO.java
index 9293414..405e3a0 100644
--- a/smartor/src/main/java/com/smartor/domain/VO/HeLibraryCountVO.java
+++ b/smartor/src/main/java/com/smartor/domain/VO/HeLibraryCountVO.java
@@ -41,12 +41,21 @@
     @ApiModelProperty(value = "鏈烘瀯ID")
     private String orgid;
 
-    @ApiModelProperty("鍙戦�佺姸鎬�")
-    private String sendstate;
+    /**
+     * 鍙戦�佺姸鎬�
+     */
+    @Excel(name = " 鍙戦�佺姸鎬� ")
+    @ApiModelProperty(value = "鍙戦�佺姸鎬� 1 琚鍙�(鍦ㄤ换鍔′腑鏄柊寤猴紝鍦ㄦ湇鍔′腑鏄棰嗗彇)  2 寰呭彂閫�  3 宸插彂閫�  4 涓嶆墽琛�  5 鍙戦�佸け璐� 6 宸插畬鎴� 7 瓒呮椂(浜哄伐)")
+    private Long sendstate;
 
     @ApiModelProperty("瀹屾垚鐘舵�侊紙0鏈畬鎴� 1宸插畬鎴� 瀵瑰簲finishtime鏄惁鏈夊�硷級")
     private String isFinished;
-
+    /**
+     * 瓒呴摼鎺ョ粺璁″垪琛ㄧ被鍨� - 瀹ｆ暀瓒呴摼鎺ョ粺璁�
+     * totalCountInfo - 瀹ｆ暀鍙戦�佹�婚噺
+     * sendSuccessCountInfo - 鍙戦�佹垚鍔熼噺 sendstate = 6
+     * readCountInfo - 宸茶閲� finishtime 锛�= null
+     */
     @ApiModelProperty("瓒呴摼鎺ョ粺璁″垪琛ㄧ被鍨�")
     private String hyperLinkInfoType;
 
diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
index 34af42e..a6e4416 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -4544,7 +4544,7 @@
                 case "totalCountInfo":
                     break;
                 case "sendSuccessCountInfo":
-                    heLibraryCountVO.setSendstate("6");
+                    heLibraryCountVO.setSendstate(6L);
                     break;
                 case "readCountInfo":
                     heLibraryCountVO.setIsFinished("1");
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index 70b2679..76e7d8d 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -2878,7 +2878,7 @@
         <if test="sendstate != null">
             AND sendstate = #{sendstate}
         </if>
-        <if test="isFinished != null and isFinished != '0'">
+        <if test="isFinished != null and isFinished == '1'">
             AND finishtime is not null
         </if>
         <if test="starttime != null">AND starttime &gt;= #{starttime}</if>
@@ -2955,10 +2955,10 @@
         <if test="orgid != null and orgid != ''">
             and orgid = #{orgid}
         </if>
-        <if test="sendstate != null and isFinished != '0'">
+        <if test="sendstate != null">
             AND sendstate = #{sendstate}
         </if>
-        <if test="isFinished != null">
+        <if test="isFinished != null and isFinished == '1'">
             AND finishtime is not null
         </if>
         <if test="hospitaldistrictcodes != null and hospitaldistrictcodes.size() > 0">

--
Gitblit v1.9.3