From 30c41afb4fe4fd4b857f579e98543da211c11989 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期六, 11 十月 2025 11:35:31 +0800
Subject: [PATCH] 新增随访情况统计
---
smartor/src/main/java/com/smartor/domain/ServiceSubtask.java | 2 +-
smartor/src/main/java/com/smartor/domain/ServiceSubtaskStatistic.java | 19 +++++++++++++++++++
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java | 21 +++++++++++++++++++--
ruoyi-admin/pom.xml | 6 ------
ruoyi-admin/src/main/resources/application-druid.yml | 4 ++--
5 files changed, 41 insertions(+), 11 deletions(-)
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index 8f2bf2c..c83d8c9 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -180,12 +180,6 @@
<artifactId>postgresql</artifactId>
<version>42.6.0</version> <!-- 璇锋牴鎹渶瑕侀�夋嫨鏈�鏂扮増鏈� -->
</dependency>
- <!--oracle-->
- <dependency>
- <groupId>com.oracle.database.jdbc</groupId>
- <artifactId>ojdbc8</artifactId>
- <scope>runtime</scope>
- </dependency>
</dependencies>
<build>
<plugins>
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index d149156..c1eaa91 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -34,7 +34,7 @@
# password: Hxerp2000
# driverClassName: com.mysql.cj.jdbc.Driver
# 鍏徃鏈湴
- url: jdbc:mysql://haiershi.a1.luyouxia.net:23844/smartor_lishui?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ url: jdbc:mysql://192.168.100.10:3306/smartor_lishui?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: smartor
password: Smartor.2023
driverClassName: com.mysql.cj.jdbc.Driver
@@ -113,7 +113,7 @@
multi-statement-allow: true
# redis 閰嶇疆
redis:
- host: 192.168.100.10
+ host: 127.0.0.1 #192.168.100.10
port: 6020
database: 0
password: Smartor
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java b/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java
index e688230..558e6af 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java
@@ -640,5 +640,5 @@
private String managementDoctor;
@ApiModelProperty(value = "闅忚鎯呭喌:1姝ｅ父璇煶,2鎮ｈ�呮嫆鎺ユ垨鎷掕,3闈㈣鎴栬�呮帴璇�,4寰俊闅忚,5闅忚鐢佃瘽涓嶆纭�,6鍏朵粬")
- private String taskSituation;
+ private Integer taskSituation;
}
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskStatistic.java b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskStatistic.java
index b98759a..eabcd62 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskStatistic.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskStatistic.java
@@ -188,4 +188,23 @@
@ApiModelProperty(value = "婊℃剰搴︽瘮渚�")
private String joyTotal="";
+
+ @ApiModelProperty(value = "闅忚鎯呭喌:1姝ｅ父璇煶")
+ private Integer taskSituation1 = 0;
+
+ @ApiModelProperty(value = "闅忚鎯呭喌:2鎮ｈ�呮嫆鎺ユ垨鎷掕")
+ private Integer taskSituation2 = 0;
+
+ @ApiModelProperty(value = "闅忚鎯呭喌:3闈㈣鎴栬�呮帴璇�")
+ private Integer taskSituation3 = 0;
+
+ @ApiModelProperty(value = "闅忚鎯呭喌:4寰俊闅忚")
+ private Integer taskSituation4 = 0;
+
+ @ApiModelProperty(value = "闅忚鎯呭喌:5闅忚鐢佃瘽涓嶆纭�")
+ private Integer taskSituation5 = 0;
+
+ @ApiModelProperty(value = "闅忚鎯呭喌:6鍏朵粬")
+ private Integer taskSituation6 = 0;
+
}
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 92b45c6..c41df45 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -2437,8 +2437,25 @@
serviceSubtaskStatistic.setAbnormalAgain(serviceSubtaskStatistic.getAbnormalAgain() + 1L);
}
}
-
-
+ //闅忚鎯呭喌
+ if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() ==1) {
+ serviceSubtaskStatistic.setTaskSituation1(serviceSubtaskStatistic.getTaskSituation1() + 1);
+ }
+ if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() ==2) {
+ serviceSubtaskStatistic.setTaskSituation2(serviceSubtaskStatistic.getTaskSituation2() + 1);
+ }
+ if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() ==3) {
+ serviceSubtaskStatistic.setTaskSituation3(serviceSubtaskStatistic.getTaskSituation3() + 1);
+ }
+ if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() ==4) {
+ serviceSubtaskStatistic.setTaskSituation4(serviceSubtaskStatistic.getTaskSituation4() + 1);
+ }
+ if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() ==5) {
+ serviceSubtaskStatistic.setTaskSituation5(serviceSubtaskStatistic.getTaskSituation5() + 1);
+ }
+ if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() ==6) {
+ serviceSubtaskStatistic.setTaskSituation6(serviceSubtaskStatistic.getTaskSituation6() + 1);
+ }
}
--
Gitblit v1.9.3