From 09538e3f9a0392144637d04495d5975b6d7578b8 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 18 四月 2025 16:58:54 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 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 68fb69b..7ee202b 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
@@ -7,6 +7,7 @@
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.DtoConversionUtils;
import com.ruoyi.common.utils.PageUtils;
@@ -18,6 +19,7 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -58,7 +60,8 @@
for (ServiceSubtask serviceSubtask : serviceSubtaskList) {
ServiceSubtaskRecord serviceSubtaskRecord = new ServiceSubtaskRecord();
serviceSubtaskRecord.setSubtaskId(serviceSubtask.getId());
- serviceSubtaskRecord.setTaskid(serviceSubtask.getTaskid().toString());
+ if (ObjectUtils.isNotEmpty((serviceSubtask.getTaskid())))
+ serviceSubtaskRecord.setTaskid(serviceSubtask.getTaskid().toString());
serviceSubtask.setServiceSubtaskRecordList(serviceSubtaskRecordService.selectServiceSubtaskRecordList(serviceSubtaskRecord));
}
Map<String, Object> map = serviceSubtaskService.patItemCount(serviceSubtaskVO);
@@ -146,6 +149,7 @@
LoginUser loginUser = getLoginUser();
SysUser user = loginUser.getUser();
ivrTaskVO.setCreateBy(user.getNickName());
+ ivrTaskVO.setUpdateBy(user.getNickName());
ivrTaskVO.setOrgid(user.getOrgid());
return success(serviceSubtaskService.insertOrUpdateTask(ivrTaskVO));
}
@@ -153,6 +157,7 @@
@ApiOperation("淇敼瀛愪换鍔�")
@PostMapping("/update")
public AjaxResult update(@RequestBody ServiceSubtask serviceSubtask) {
+ serviceSubtask.setUpdateBy(getLoginUser().getUser().getNickName());
return toAjax(serviceSubtaskService.updateServiceSubtask(serviceSubtask));
}
@@ -160,7 +165,7 @@
@PostMapping("/addSubTask")
public AjaxResult addSubTask(@RequestBody ServiceSubtask serviceSubtask) {
SysUser user = getLoginUser().getUser();
- serviceSubtask.setOrgid(user.getOrgid());
+ if (ObjectUtils.isNotEmpty(user)) serviceSubtask.setOrgid(user.getOrgid());
return toAjax(serviceSubtaskService.insertServiceSubtask(serviceSubtask));
}
@@ -265,4 +270,16 @@
return success(serviceSubtaskService.getSfStatistics(serviceSubtaskCountReq));
}
+ /**
+ * 闅忚缁熻瀵煎嚭
+ */
+ //@PreAuthorize("@ss.hasPermi('system:taskcall:export')")
+ @Log(title = "闅忚缁熻瀵煎嚭锛�", businessType = BusinessType.EXPORT)
+ @PostMapping("/getSfStatisticsExport")
+ public void export(HttpServletResponse response, ServiceSubtaskCountReq serviceSubtaskCountReq) {
+ List<ServiceSubtaskStatistic> sfStatistics = serviceSubtaskService.getSfStatistics(serviceSubtaskCountReq);
+ ExcelUtil<ServiceSubtaskStatistic> util = new ExcelUtil<ServiceSubtaskStatistic>(ServiceSubtaskStatistic.class);
+ util.exportExcel(response, sfStatistics, "闅忚缁熻瀵煎嚭");
+ }
+
}
--
Gitblit v1.9.3