From 7a4465ad9ffccaa6d8d9e4545c6d9fce0344ac45 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 22 四月 2026 19:41:37 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/smartor
---
smartor/src/main/java/com/smartor/domain/ServiceSubtask.java | 3 +++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java | 31 -------------------------------
smartor/src/main/java/com/smartor/domain/ServiceSubtaskStatistic.java | 3 +++
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java | 15 +++++++++++++++
smartor/src/main/java/com/smartor/domain/ServiceSubtaskCountReq.java | 4 ++--
smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml | 4 ++++
6 files changed, 27 insertions(+), 33 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
index 3f0b9e2..92bfa3d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
@@ -437,37 +437,6 @@
}
/**
- * 鏂板鎴栦慨鏀瑰垹闄ゅ崟涓�浠诲姟(涓存椂鎺ュ彛)
- */
- @ApiOperation("鏂板鎴栦慨鏀瑰垹闄ゅ崟涓�浠诲姟(涓存椂鎺ュ彛)")
- //@PreAuthorize("@ss.hasPermi('system:task:add')")
- @Log(title = "鍗曚竴浠诲姟锛堥殢璁匡級", businessType = BusinessType.INSERT)
- @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
- @PostMapping("/insertOrUpdateTaskByTaskId")
- public AjaxResult insertOrUpdateTaskByTaskId(@RequestBody ServiceTaskVO ivrTaskVO) {
- log.info("insertOrUpdateTaskByTaskId鐨勫叆鍙備负锛歿}", ivrTaskVO);
- LoginUser loginUser = getLoginUser();
- SysUser user = loginUser.getUser();
- ivrTaskVO.setCreateBy(user.getNickName());
- ivrTaskVO.setUpdateBy(user.getNickName());
- ivrTaskVO.setOrgid(user.getOrgid());
- //鏍规嵁鍏ュ弬鏌ヨ淇℃伅-鐢ㄦ埛鍏崇郴
- ServiceSubtask serviceSubtask = new ServiceSubtask();
- if(ObjectUtils.isNotEmpty(ivrTaskVO.getTaskid())){
- serviceSubtask.setTaskid(ivrTaskVO.getTaskid());
- serviceSubtask.setOrgid(user.getOrgid());
- serviceSubtask.setCampusid(user.getCampusid());
- ServiceTaskVO ivrTaskVO1 = serviceSubtaskService.queryTaskByCondition(serviceSubtask);
- ivrTaskVO.setPatTaskRelevances(ivrTaskVO1.getPatTaskRelevances());
-
- return success(serviceSubtaskService.insertOrUpdateTask(ivrTaskVO));
- }else {
- return error("insertOrUpdateTaskByTaskId taskid涓嶅彲涓虹┖");
- }
-
- }
-
- /**
* 鐢佃瘽鍥炶皟浠诲姟(涓婃捣)
*/
@ApiOperation("鐢佃瘽鍥炶皟浠诲姟")
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java b/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java
index 0c6d83e..5b127de 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java
@@ -162,6 +162,9 @@
@ApiModelProperty(value = "鏈嶅姟绫诲瀷(1銆佺洃娴嬭瘎浼帮紱2銆佸嚭闄㈤殢璁匡紱3銆侀棬璇婇殢璁匡紱4銆佸鏁欏叧鎬�锛�5銆佸璇婄鐞嗭紱6銆佷綇闄㈡弧鎰忓害璋冩煡锛�7銆佹偅鑰呮姤鍛婏紱 8銆佸叾浠栭�氱煡 9浣撴闅忚 10.鍖绘妧闅忚 11锛屽奖鍍忎笓绉戦殢璁� 12銆佸績鐢典笓绉戦殢璁匡紝 13涓撶闅忚 14銆侀棬璇婃弧鎰忓害璋冩煡 15鎶曡瘔寤鸿 16璇鹃闅忚")
private String serviceType;
+ @ApiModelProperty(value = "鏈嶅姟绫诲瀷闆嗗悎锛屾寜閫楀彿鍒嗗壊")
+ private String serviceTypes;
+
/**
* 妯℃澘ID
*/
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskCountReq.java b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskCountReq.java
index ce8c398..71d72c3 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskCountReq.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskCountReq.java
@@ -31,11 +31,11 @@
@ApiModelProperty(value = "寮傚父棰勮锛�0缁胯壊锛�1绾㈣壊锛�2榛勮壊")
private Integer isabnormal;
- @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@ApiModelProperty(value = "寮�濮嬫椂闂�")
private Date startTime;
- @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@ApiModelProperty(value = "缁撴潫鏃堕棿")
private Date endTime;
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskStatistic.java b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskStatistic.java
index f134da8..69e9f56 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskStatistic.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskStatistic.java
@@ -118,6 +118,9 @@
@Excel(name = " 棣栨闅忚澶辫触 ")
private Long followUpFail = 0L;
+ @ApiModelProperty(value = "鏃犻渶闅忚璇︽儏")
+ private List<ServiceSubtask> nonFollowUpInfo;
+
@ApiModelProperty(value = "棣栨搴旈殢璁胯鎯�")
private List<ServiceSubtask> needFollowUpInfo;
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 5805099..3cf792e 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -2685,6 +2685,8 @@
serviceSubtaskStatistic.setDrname(serviceSubtaskList.get(0).getDrname());
//鍑洪櫌浜烘
serviceSubtaskStatistic.setDischargeCount(serviceSubtaskList.size());
+ //鏃犻渶闅忚璇︽儏
+ List<ServiceSubtask> nonFollowUpInfo = new ArrayList<>();
//璁板綍杩囨护鎮ｈ�呰鎯�
List<ServiceSubtask> filterServiceSubtasks = new ArrayList<>();
//璁板綍棣栨搴旈殢璁胯鎯�
@@ -2721,6 +2723,7 @@
//鏃犻渶闅忚浜烘
if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() == 4) {
serviceSubtaskStatistic.setNonFollowUp(serviceSubtaskStatistic.getNonFollowUp() + 1L);
+ nonFollowUpInfo.add(serviceSubtask);
if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 6) {
serviceSubtaskStatistic.setFilterCount(serviceSubtaskStatistic.getFilterCount() + 1L);
filterServiceSubtasks.add(serviceSubtask);
@@ -2899,6 +2902,8 @@
}
}
serviceSubtaskStatistic.setFilterCountList(filterServiceSubtasks);
+ //璁板綍鏃犻渶闅忚璇︽儏
+ serviceSubtaskStatistic.setNonFollowUpInfo(nonFollowUpInfo);
//璁板綍棣栨搴旈殢璁胯鎯�
serviceSubtaskStatistic.setNeedFollowUpInfo(needFollowUpInfo);
//璁板綍棣栨寰呴殢璁胯鎯�
@@ -2951,6 +2956,8 @@
serviceSubtaskStatistic.setDrname(serviceSubtaskList.get(0).getDrname());
//鍑洪櫌浜烘
serviceSubtaskStatistic.setDischargeCount(serviceSubtaskList.size());
+ //鏃犻渶闅忚璇︽儏
+ List<ServiceSubtask> nonFollowUpInfo = new ArrayList<>();
//璁板綍杩囨护鎮ｈ�呰鎯�
List<ServiceSubtask> filterServiceSubtasks = new ArrayList<>();
//璁板綍棣栨搴旈殢璁胯鎯�
@@ -2972,6 +2979,7 @@
//鏃犻渶闅忚浜烘
if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() == 4) {
serviceSubtaskStatistic.setNonFollowUp(serviceSubtaskStatistic.getNonFollowUp() + 1L);
+ nonFollowUpInfo.add(serviceSubtask);
if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 6) {
serviceSubtaskStatistic.setFilterCount(serviceSubtaskStatistic.getFilterCount() + 1L);
filterServiceSubtasks.add(serviceSubtask);
@@ -3077,6 +3085,8 @@
}
}
serviceSubtaskStatistic.setFilterCountList(filterServiceSubtasks);
+ //璁板綍鏃犻渶闅忚璇︽儏
+ serviceSubtaskStatistic.setNonFollowUpInfo(nonFollowUpInfo);
//璁板綍棣栨搴旈殢璁胯鎯�
serviceSubtaskStatistic.setNeedFollowUpInfo(needFollowUpInfo);
//璁板綍棣栨寰呴殢璁胯鎯�
@@ -3113,6 +3123,8 @@
serviceSubtaskStatistic.setDrname(serviceSubtaskList.get(0).getDrname());
//鍑洪櫌浜烘
serviceSubtaskStatistic.setDischargeCount(serviceSubtaskList.size());
+ //鏃犻渶闅忚璇︽儏
+ List<ServiceSubtask> nonFollowUpInfo = new ArrayList<>();
//璁板綍杩囨护鎮ｈ�呰鎯�
List<ServiceSubtask> filterServiceSubtasks = new ArrayList<>();
@@ -3135,6 +3147,7 @@
//鏃犻渶闅忚浜烘
if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() == 4) {
serviceSubtaskStatistic.setNonFollowUp(serviceSubtaskStatistic.getNonFollowUp() + 1L);
+ nonFollowUpInfo.add(serviceSubtask);
if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 6) {
serviceSubtaskStatistic.setFilterCount(serviceSubtaskStatistic.getFilterCount() + 1L);
filterServiceSubtasks.add(serviceSubtask);
@@ -3240,6 +3253,8 @@
}
}
serviceSubtaskStatistic.setFilterCountList(filterServiceSubtasks);
+ //璁板綍鏃犻渶闅忚璇︽儏
+ serviceSubtaskStatistic.setNonFollowUpInfo(nonFollowUpInfo);
//璁板綍鍐嶆搴旈殢璁胯鎯�
serviceSubtaskStatistic.setNeedFollowUpAgainInfo(needFollowUpAgainInfo);
//璁板綍鍐嶆寰呴殢璁胯鎯�
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index d502e49..1c33426 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -646,6 +646,8 @@
AND date_format(visit_time,'%y%m%d') <= date_format(#{endtime},'%y%m%d')
</if>
<if test="orgid != null and orgid != ''">and orgid = #{orgid}</if>
+ <if test="serviceType != null and serviceType != ''">and service_type = #{serviceType}</if>
+ <if test="serviceTypes != null and serviceTypes != ''">and service_type IN (#{serviceTypes})</if>
<if test="deptcode != null and deptcode != ''">and deptcode = #{deptcode}</if>
<if test="deptname != null and deptname != ''">and deptname = #{deptname}</if>
<if test="isabnormal != null">and isabnormal = #{isabnormal}</if>
@@ -725,6 +727,8 @@
AND date_format(visit_time,'%y%m%d') <= date_format(#{endtime},'%y%m%d')
</if>
<if test="orgid != null and orgid != ''">and orgid = #{orgid}</if>
+ <if test="serviceType != null and serviceType != ''">and service_type = #{serviceType}</if>
+ <if test="serviceTypes != null and serviceTypes != ''">and service_type IN (#{serviceTypes})</if>
<if test="isabnormal != null ">and isabnormal = #{isabnormal}</if>
<if test="deptcode != null and deptcode != ''">and deptcode = #{deptcode}</if>
<if test="deptname != null and deptname != ''">and deptname = #{deptname}</if>
--
Gitblit v1.9.3