From 1577fd7ee29d1b0b7eea979264d5dcdbeab52743 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 15 五月 2026 13:42:48 +0800
Subject: [PATCH] 1首先执行 2次要执行 如果设置了1，只生成1的，2的不生成；如果1的没有生成成功，才会生成2
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java | 41 +++++++++++++++++++++--------------------
1 files changed, 21 insertions(+), 20 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 6685d7f..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
@@ -20,6 +20,7 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.utils.reflect.ReflectUtils;
+import com.ruoyi.quartz.service.ICollectHISService;
import com.ruoyi.quartz.task.RyTask;
import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.system.service.ISysUserDeptService;
@@ -81,6 +82,9 @@
@Autowired
private RyTask ryTask;
+
+ @Autowired
+ private ICollectHISService collectHISService;
@Value("${spring.profiles.active}")
private String active;
@@ -397,6 +401,7 @@
ivrTaskVO.setCreateBy(user.getNickName());
ivrTaskVO.setUpdateBy(user.getNickName());
ivrTaskVO.setOrgid(user.getOrgid());
+ ivrTaskVO.setCampusid(user.getCampusid());
return success(serviceSubtaskService.insertOrUpdateTask(ivrTaskVO));
}
@@ -408,12 +413,21 @@
return toAjax(serviceSubtaskService.updateServiceSubtask(serviceSubtask));
}
+ @ApiOperation("淇敼瀛愪换鍔℃ā鏉�")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("/updateTemplate")
+ public AjaxResult updateTemplate(@RequestBody ServiceSubtaskTemplateVO serviceSubtaskTemplateVO) {
+ serviceSubtaskTemplateVO.setUpdateBy(getLoginUser().getUser().getNickName());
+ return toAjax(serviceSubtaskService.updateTemplate(serviceSubtaskTemplateVO));
+ }
+
@ApiOperation("鏂板瀛愪换鍔�")
@AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/addSubTask")
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));
}
@@ -423,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));
}
@@ -584,25 +599,6 @@
return success(serviceStatistics);
}
- /**
- * 闅忚寮傚父缁熻瀵煎嚭
- */
- //@PreAuthorize("@ss.hasPermi('system:taskcall:export')")
- @Log(title = "闅忚缁熻瀵煎嚭", businessType = BusinessType.EXPORT)
- @PostMapping("/getSfStatisticsIsAbnormalExport")
- public void getSfStatisticsIsAbnormalExport(HttpServletResponse response, ServiceSubtaskCountReq serviceSubtaskCountReq) {
- List<ServiceSubtaskIsAbnormalStatistic> sfStatistics = serviceSubtaskService.getSfStatisticsIsAbnormalExport(serviceSubtaskCountReq);
- ExcelUtil<ServiceSubtaskIsAbnormalStatistic> util = new ExcelUtil<ServiceSubtaskIsAbnormalStatistic>(ServiceSubtaskIsAbnormalStatistic.class);
- String sheetName = "";
- String fileName = "";
- if (active.equals("ls") || active.equals("druid")) {
- fileName = sheetName = LocalDate.now().getMonthValue() + "鏈堝嚭闄㈤殢璁垮紓甯哥粺璁¤〃";
- util.exportExcelWithFileName(response, sfStatistics, sheetName, fileName);
- } else {
- sheetName = "闅忚寮傚父缁熻瀵煎嚭";
- util.exportExcel(response, sfStatistics, sheetName);
- }
- }
/**
* 鑾峰彇闅忚缁熻姣斾緥
@@ -763,6 +759,11 @@
@PostMapping("/test")
public void test() {
- ryTask.longTaskSend();
+ ryTask.dealOutHospInfo();
+ }
+
+ @PostMapping("/syncMedInhospForShiyi")
+ public void syncMedInhospForShiyi(@RequestParam("startTime") String startTime, @RequestParam("endTime") String endTime) {
+ collectHISService.syncMedInhosp(startTime, endTime);
}
}
--
Gitblit v1.9.3