From 3d5d75e25d2e0078814a4efd66b72c5b1b5f93c4 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 19 二月 2025 17:14:07 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/domain/ServiceTaskInfo.java | 9 +++++++++
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 1 +
smartor/src/main/java/com/smartor/service/impl/SvyTaskSingleServiceImpl.java | 2 ++
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java | 2 ++
4 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index e274bbb..e126467 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -395,6 +395,7 @@
List<SysUserDept> sysUserDepts = sysUserDeptMapper.selectSysUserDeptList(sysUserDept);
sysUserDept.setDelFlag(0L);
sysUserDept.setDeptType("2");
+ sysUserDept.setOrgid(user.getOrgid());
sysUserDept.setDeptName(sysDept.getDeptName());
sysUserDept.setUpdateTime(new Date());
if (!CollectionUtils.isEmpty(sysUserDepts)) {
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceTaskInfo.java b/smartor/src/main/java/com/smartor/domain/ServiceTaskInfo.java
index 8328239..1c55451 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceTaskInfo.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceTaskInfo.java
@@ -124,6 +124,15 @@
@ApiModelProperty(value = "绉戝")
private String deptname;
+ @ApiModelProperty(value = "绉戝CODE")
+ private String deptcode;
+
+ @ApiModelProperty(value = "鐥呭尯CODE")
+ private String districtcode;
+
+ @ApiModelProperty(value = "鐥呭尯鍚嶇О")
+ private String districtname;
+
@ApiModelProperty(value = "beizhu")
private String remark;
/**
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 c3058b5..56fff07 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -1875,6 +1875,8 @@
redisCache.deleteObject(phoneCallRecordVO.getTaskid() + "recordAccept-hungup");
} else {
//鎮ｈ�呮嫆缁濋殢璁�
+ //鍏堟妸璇ubId浠巆ache_exist涓墧闄わ紝鍙鏈夊洖璋冨氨鍓旈櫎锛堢洰鐨勬槸锛屽敖蹇cache-exist涓虹┖锛屽幓缂撳瓨涓嬩竴鎵硅鎵撶殑鐢佃瘽;杩欓噷鍓旈櫎涓嶅奖鍝嶇數璇濈殑姝ｅ父涓氬姟锛�
+ redisCache.removeElementFromList("cache-exist", phoneCallRecordVO.getTaskid());
ServiceSubtask serviceSubtask = new ServiceSubtask();
serviceSubtask.setRemark("鐢佃瘽鎺ラ�氭垚鍔燂紝鎮ｈ�呮嫆缁濋殢璁�");
serviceSubtask.setId(Long.valueOf(phoneCallRecordVO.getTaskid()));
diff --git a/smartor/src/main/java/com/smartor/service/impl/SvyTaskSingleServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/SvyTaskSingleServiceImpl.java
index b57b366..fbb8737 100644
--- a/smartor/src/main/java/com/smartor/service/impl/SvyTaskSingleServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/SvyTaskSingleServiceImpl.java
@@ -256,8 +256,10 @@
serviceSubtask.setRoomno(serviceTaskVO.getRoomno());
serviceSubtask.setBedNo(serviceTaskVO.getBedno());
serviceSubtask.setDeptname(serviceTaskVO.getDeptname());
+ serviceSubtask.setDeptcode(serviceTaskVO.getDeptcode());
serviceSubtask.setSendstate(1L);
serviceSubtask.setCreateTime(new Date());
+ serviceSubtask.setLeavehospitaldistrictcode(serviceTaskVO.getDistrictcode());
//鍏堟煡璇竴閬嶏紝璇askGuid鏄惁瀛樺湪
ServiceSubtaskVO serviceSubtaskVO = new ServiceSubtaskVO();
serviceSubtaskVO.setTaskGuid(serviceTaskVO.getTaskguid());
--
Gitblit v1.9.3