From cc3fe1ad9b366533d184d9e239b45f731f014e74 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期四, 23 四月 2026 11:22:38 +0800
Subject: [PATCH] Merge branch 'master' into master-手术随访
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java | 32 --------------------------------
1 files changed, 0 insertions(+), 32 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 e56e2f7..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("鐢佃瘽鍥炶皟浠诲姟")
@@ -758,6 +727,5 @@
}
return map;
}
-
}
--
Gitblit v1.9.3