From 488ceb7d5ee4c04e5610196bc1018410b442cb4c Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 15 五月 2026 09:35:03 +0800
Subject: [PATCH] 【市一】Service_Task\Service_SubTask新增院区ID
---
smartor/src/main/java/com/smartor/domain/ServiceSubtask.java | 6 ++++++
smartor/src/main/java/com/smartor/domain/ServiceTask.java | 6 ++++++
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java | 2 +-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java | 3 +++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskController.java | 7 ++++---
smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml | 5 +++++
smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml | 7 +++++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskSingleController.java | 2 ++
8 files changed, 34 insertions(+), 4 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 3915cc4..0e34fb3 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
@@ -401,6 +401,7 @@
ivrTaskVO.setCreateBy(user.getNickName());
ivrTaskVO.setUpdateBy(user.getNickName());
ivrTaskVO.setOrgid(user.getOrgid());
+ ivrTaskVO.setCampusid(user.getCampusid());
return success(serviceSubtaskService.insertOrUpdateTask(ivrTaskVO));
}
@@ -426,6 +427,7 @@
public AjaxResult addSubTask(@RequestBody ServiceSubtask serviceSubtask) {
SysUser user = getLoginUser().getUser();
if (ObjectUtils.isNotEmpty(user)) serviceSubtask.setOrgid(user.getOrgid());
+ if (ObjectUtils.isNotEmpty(user)) serviceSubtask.setCampusid(user.getCampusid());
return toAjax(serviceSubtaskService.insertServiceSubtask(serviceSubtask));
}
@@ -435,6 +437,7 @@
public AjaxResult addSubTaskAgain(@RequestBody ServiceSubtask serviceSubtask) {
SysUser user = getLoginUser().getUser();
if (ObjectUtils.isNotEmpty(user)) serviceSubtask.setOrgid(user.getOrgid());
+ if (ObjectUtils.isNotEmpty(user)) serviceSubtask.setCampusid(user.getCampusid());
return success(serviceSubtaskService.addSubTaskAgain(serviceSubtask));
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskController.java
index d33cc59..801edca 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskController.java
@@ -150,10 +150,11 @@
@Log(title = "璇煶浠诲姟", businessType = BusinessType.INSERT)
@AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
- public AjaxResult add(@RequestBody ServiceTask ServiceTask) {
+ public AjaxResult add(@RequestBody ServiceTask serviceTask) {
SysUser user = getLoginUser().getUser();
- ServiceTask.setOrgid(user.getOrgid());
- return toAjax(serviceTaskService.insertServiceTask(ServiceTask));
+ serviceTask.setOrgid(user.getOrgid());
+ serviceTask.setCampusid(user.getCampusid());
+ return toAjax(serviceTaskService.insertServiceTask(serviceTask));
}
/**
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskSingleController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskSingleController.java
index fcbc337..d706491 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskSingleController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskSingleController.java
@@ -37,6 +37,8 @@
LoginUser loginUser = getLoginUser();
SysUser user = loginUser.getUser();
svyTaskVO.setCreateBy(user.getNickName());
+ svyTaskVO.setOrgid(user.getOrgid());
+ svyTaskVO.setCampusid(svyTaskVO.getCampusid());
ServiceTaskVO serviceTaskVO = DtoConversionUtils.sourceToTarget(svyTaskVO, ServiceTaskVO.class);
return toAjax(svyTaskSingleService.insertOrUpdateSvyTask(serviceTaskVO));
}
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 0cfa4c9..49d39bc 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
@@ -864,7 +864,7 @@
}
}
} else if (active.equals("hzszlyy")) {//甯備竴鍖婚櫌
- String content = sendMagParam.getContent().replace("銆愭柊鍗庡尰闄€��", "");
+ String content = sendMagParam.getContent().replace("銆愬競涓�鍖婚櫌銆�", "");
String result = smsUtils.sendSms(xhsmsPath, xhsmsAccount, xhsmsPwd, sendMagParam.getPhone(), content);
//杩欓噷闇�瑕佹牴鎹畆esult杩斿洖鐨勫�煎幓鍒ゆ柇锛屾槸鍚︽垚鍔燂紝鐒跺悗灏嗗�艰祴鍊肩粰isSuccess
if (StringUtils.isNotEmpty(result) && result.contains("澶勭悊鎴愬姛")) {
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java b/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java
index 147b291..5f92c5d 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java
@@ -357,6 +357,12 @@
private String orgid;
/**
+ * 闄㈠尯ID
+ */
+ @ApiModelProperty(value = "闄㈠尯ID")
+ private String campusid;
+
+ /**
* 鏂囨湰鍙橀噺鍙傛暟
*/
@Excel(name = "鏂囨湰鍙橀噺鍙傛暟")
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceTask.java b/smartor/src/main/java/com/smartor/domain/ServiceTask.java
index da0606e..33638f4 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceTask.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceTask.java
@@ -256,6 +256,12 @@
private String orgid;
/**
+ * 闄㈠尯ID
+ */
+ @ApiModelProperty(value = "闄㈠尯ID")
+ private String campusid;
+
+ /**
* 鐖禝D
*/
@Excel(name = " 鐖禝D ")
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index fc77ed8..c55d298 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -36,6 +36,7 @@
<result property="isupload" column="isupload"/>
<result property="uploadTime" column="upload_time"/>
<result property="orgid" column="orgid"/>
+ <result property="campusid" column="campusid"/>
<result property="pid" column="pid"/>
<result property="guid" column="guid"/>
<result property="taskGuid" column="task_guid"/>
@@ -812,6 +813,7 @@
<if test="isupload != null">isupload,</if>
<if test="uploadTime != null">upload_time,</if>
<if test="orgid != null">orgid,</if>
+ <if test="campusid != null">campusid,</if>
<if test="pid != null">pid,</if>
<if test="guid != null">guid,</if>
<if test="textParam != null">text_param,</if>
@@ -904,6 +906,7 @@
<if test="isupload != null">#{isupload},</if>
<if test="uploadTime != null">#{uploadTime},</if>
<if test="orgid != null">#{orgid},</if>
+ <if test="campusid != null">#{campusid},</if>
<if test="pid != null">#{pid},</if>
<if test="guid != null">#{guid},</if>
<if test="textParam != null">#{textParam},</if>
@@ -1001,6 +1004,7 @@
<if test="isupload != null">isupload = #{isupload},</if>
<if test="uploadTime != null">upload_time = #{uploadTime},</if>
<if test="orgid != null">orgid = #{orgid},</if>
+ <if test="campusid != null">campusid = #{campusid},</if>
<if test="pid != null">pid = #{pid},</if>
<if test="guid != null">guid = #{guid},</if>
<if test="textParam != null">text_param = #{textParam},</if>
@@ -1099,6 +1103,7 @@
<if test="isupload != null">isupload = #{isupload},</if>
<if test="uploadTime != null">upload_time = #{uploadTime},</if>
<if test="orgid != null">orgid = #{orgid},</if>
+ <if test="campusid != null">campusid = #{campusid},</if>
<if test="pid != null">pid = #{pid},</if>
<if test="guid != null">guid = #{guid},</if>
<if test="textParam != null">text_param = #{textParam},</if>
@@ -1201,6 +1206,7 @@
<if test="isupload != null">isupload = #{isupload},</if>
<if test="uploadTime != null">upload_time = #{uploadTime},</if>
<if test="orgid != null">orgid = #{orgid},</if>
+ <if test="campusid != null">campusid = #{campusid},</if>
<if test="pid != null">pid = #{pid},</if>
<if test="guid != null">guid = #{guid},</if>
<if test="visitCount != null">visit_count = #{visitCount},</if>
@@ -1300,6 +1306,7 @@
<if test="isupload != null">isupload = #{isupload},</if>
<if test="uploadTime != null">upload_time = #{uploadTime},</if>
<if test="orgid != null">orgid = #{orgid},</if>
+ <if test="campusid != null">campusid = #{campusid},</if>
<if test="pid != null">pid = #{pid},</if>
<if test="guid != null">guid = #{guid},</if>
<if test="textParam != null">text_param = #{textParam},</if>
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml
index e961099..7a1aeae 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml
@@ -30,6 +30,7 @@
<result property="isupload" column="isupload"/>
<result property="uploadTime" column="upload_time"/>
<result property="orgid" column="orgid"/>
+ <result property="campusid" column="campusid"/>
<result property="pid" column="pid"/>
<result property="guid" column="guid"/>
<result property="preachform" column="preachform"/>
@@ -161,6 +162,7 @@
<if test="isupload != null ">and isupload = #{isupload}</if>
<if test="uploadTime != null ">and upload_time = #{uploadTime}</if>
<if test="orgid != null and orgid != ''">and orgid = #{orgid}</if>
+ <if test="campusid != null and campusid != ''">and campusid = #{campusid}</if>
<if test="compensateDate != null and compensateDate != ''">and compensate_date = #{compensateDate}</if>
<if test="hospType != null and hospType != ''">and hosp_type = #{hospType}</if>
<if test="libtemplateid != null ">and libtemplateid = #{libtemplateid}</if>
@@ -367,6 +369,7 @@
<if test="isupload != null">isupload,</if>
<if test="uploadTime != null">upload_time,</if>
<if test="orgid != null">orgid,</if>
+ <if test="campusid != null">campusid,</if>
<if test="pid != null">pid,</if>
<if test="guid != null">guid,</if>
<if test="preachform != null">preachform,</if>
@@ -420,6 +423,7 @@
<if test="isupload != null">#{isupload},</if>
<if test="uploadTime != null">#{uploadTime},</if>
<if test="orgid != null">#{orgid},</if>
+ <if test="campusid != null">#{campusid},</if>
<if test="nexttaskflag != null">#{nexttaskflag},</if>
<if test="nexttaskid != null">#{nexttaskid},</if>
<if test="nexttaskname != null">#{nexttaskname},</if>
@@ -480,6 +484,7 @@
<if test="isupload != null">isupload = #{isupload},</if>
<if test="uploadTime != null">upload_time = #{uploadTime},</if>
<if test="orgid != null">orgid = #{orgid},</if>
+ <if test="campusid != null">campusid = #{campusid},</if>
<if test="nexttaskflag != null">nexttaskflag = #{nexttaskflag},</if>
<if test="nexttaskid != null">nexttaskid = #{nexttaskid},</if>
<if test="nexttaskname != null">nexttaskname = #{nexttaskname},</if>
--
Gitblit v1.9.3