From e36f70174333c6fd405dd3bbe0e516f8330d2cb5 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期一, 05 一月 2026 14:12:08 +0800
Subject: [PATCH] 【市一】随访满意度明细调整

---
 smartor/src/main/java/com/smartor/domain/ServiceSubtaskCountReq.java    |   17 ++++++++
 smartor/src/main/java/com/smartor/domain/ServiceSubtaskScriptCount.java |   76 ++++++++++++++++++++++++++++++++++++++
 smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml      |   11 +++++
 3 files changed, 103 insertions(+), 1 deletions(-)

diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskCountReq.java b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskCountReq.java
index e747b86..6c694a3 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskCountReq.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskCountReq.java
@@ -1,6 +1,7 @@
 package com.smartor.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -61,5 +62,19 @@
     @ApiModelProperty(value = "闂嵎鍒嗙被缂栫爜")
     private Long svyCategoryid;
 
+    @ApiModelProperty(value = "浠诲姟绫诲瀷锛�1锛屾満鍣ㄤ汉璇煶  2锛岄棶鍗凤紱3锛岄�氱煡锛�")
+    private String type;
 
-}
+    @ApiModelProperty(value = "鏌ヨ鍙傛暟 joyCount-婊℃剰搴︾粺璁�; returnVisitCount-澶嶈瘖缁熻")
+    private String configKey;
+
+    @ApiModelProperty(value = "鏌ヨ鍙傛暟瀵瑰簲鍊� joyCount-婊℃剰搴︾粺璁�; returnVisitCount-澶嶈瘖缁熻")
+    private String configValue;
+
+    /**
+     * 鏈烘瀯缂栫爜
+     */
+    @ApiModelProperty("鏈烘瀯缂栫爜")
+    private String orgid;
+
+}
\ No newline at end of file
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskScriptCount.java b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskScriptCount.java
new file mode 100644
index 0000000..0bdd682
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskScriptCount.java
@@ -0,0 +1,76 @@
+package com.smartor.domain;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 瀛愪换鍔￠棶棰橀�夐」缁熻缁撴灉
+ *
+ * @author 闄堟樁鑱�
+ * &#064;date  2025-12-31
+ */
+@ApiModel(value = "ServiceSubtaskScriptCount", description = "瀛愪换鍔￠棶棰橀�夐」缁熻缁撴灉")
+@Data
+public class ServiceSubtaskScriptCount implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 闂ID
+     */
+    @ApiModelProperty(name = "闂ID")
+    private Long scriptid;
+
+    /**
+     * 闂鍐呭
+     */
+    @ApiModelProperty("闂鍐呭")
+    private String scriptContent;
+
+    /**
+     * 宸插～鍐欐暟閲�
+     */
+    @ApiModelProperty(value = "宸插～鍐欐暟閲�")
+    private Integer completedQuantity;
+
+    /**
+     * 鎵�鏈夋暟閲�
+     */
+    @ApiModelProperty(value = "鎵�鏈夋暟閲�")
+    private Integer allQuantity;
+
+    /**
+     * 宸插～鍐欐瘮渚�
+     */
+    @ApiModelProperty(value = "宸插～鍐欐瘮渚�")
+    private String completedPercentage;
+
+    /**
+     * 闂閫夐」
+     */
+    @ApiModelProperty(value = "闂閫夐」")
+    private String optionText;
+
+    /**
+     * 闂閫夋嫨鏁�
+     */
+    @ApiModelProperty(value = "闂閫夋嫨鏁�")
+    private Integer chosenQuantity;
+
+    /**
+     * 閫夋嫨姣斾緥 = (chosenQuantity / completedQuantity)
+     */
+    @ApiModelProperty(value = "閫夋嫨姣斾緥")
+    private String chosenPercentage;
+
+
+    /**
+     * 鏄庣粏
+     */
+    @ApiModelProperty(value = "鏄庣粏")
+    private List<ServiceSubtaskScriptCount> details;
+
+}
\ No newline at end of file
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index 62fce89..e58aa65 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -110,6 +110,17 @@
         <result property="name" column="name"/>
     </resultMap>
 
+    <resultMap type="com.smartor.domain.ServiceSubtaskScriptCount" id="ServiceSubtaskScriptCountResult">
+        <result property="scriptid" column="scriptid"/>
+        <result property="scriptContent" column="script_content"/>
+        <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"/>
+    </resultMap>
+
     <sql id="selectServiceSubtaskVo">
         select id,
                hosp_type,

--
Gitblit v1.9.3