From 8249bbcc710c42f89c69fb0bd575094acd2e418d Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 17 四月 2026 16:33:27 +0800
Subject: [PATCH] 南华附一上线、首页问题、定时任务问题处理
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java | 49 +++++++++++++++++++++++++------------------------
1 files changed, 25 insertions(+), 24 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 3559e57..e734dbc 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
@@ -14,6 +14,7 @@
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.enums.PreachFormEnum;
import com.ruoyi.common.exception.base.BaseException;
+import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.DtoConversionUtils;
import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.StringUtils;
@@ -36,14 +37,12 @@
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.WebDataBinder;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.time.LocalDate;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
@@ -58,6 +57,11 @@
@RestController
@RequestMapping("/smartor/serviceSubtask")
public class ServiceSubtaskController extends BaseController {
+ @InitBinder
+ public void initBinder(WebDataBinder binder) {
+ binder.setAutoGrowCollectionLimit(1024); // 鎴� 2048銆�4096 绛�
+ }
+
@Autowired
private IServiceSubtaskService serviceSubtaskService;
@@ -115,16 +119,6 @@
// 鐩存帴浠庡凡鏈夎仛鍚堢粨鏋滄帹绠梩otal锛岄伩鍏嶅幓鎺夊垎椤靛悗鍐嶅叏閲忔煡涓�閬嶅ぇ琛�
long total = 0L;
try {
-// * wzx: 鏈墽琛屾暟閲�
-// * ysf: 宸查殢璁挎暟閲�
-// * fssb: 鍙戦�佸け璐ユ暟閲�
-// * yfs: 宸插彂閫佹暟閲�
-// * dsf: 寰呴殢璁挎暟閲�
-
-// long wzx = map.get("wzx") != null ? ((Number) map.get("wzx")).longValue() : 0L;
-// long ysf = map.get("ysf") != null ? ((Number) map.get("ysf")).longValue() : 0L;
-// long dsf = map.get("dsf") != null ? ((Number) map.get("dsf")).longValue() : 0L;
-// long fssb = map.get("fssb") != null ? ((Number) map.get("fssb")).longValue() : 0L;
total = map.get("total") != null ? ((Number) map.get("total")).longValue() : 0L;
} catch (Exception e) {
@@ -213,24 +207,31 @@
//@PreAuthorize("@ss.hasPermi('system:taskcall:export')")
@Log(title = "鍗曚竴浠诲姟锛堥殢璁垮鏁欙級", businessType = BusinessType.EXPORT)
@PostMapping("/patItemExport")
- public void patItemExport(HttpServletResponse response, @RequestBody ServiceSubtaskEntity serviceSubtaskVO) {
+ public void patItemExport(HttpServletResponse response, ServiceSubtaskEntity serviceSubtaskVO) {
+ LoginUser loginUser = getLoginUser();
+ SysUser user = loginUser.getUser();
+ serviceSubtaskVO.setOrgid(user.getOrgid());
List<ServiceSubtaskRes> serviceSubtaskList = null;
if (serviceSubtaskVO != null) {
- if (serviceSubtaskVO.getPageNum() != null && serviceSubtaskVO.getPageSize() != null)
- PageUtils.startPageByPost(serviceSubtaskVO.getPageNum(), serviceSubtaskVO.getPageSize());
serviceSubtaskList = serviceSubtaskService.patItem(serviceSubtaskVO);
}
- List<ServiceSubtaskExprot> serviceSubtaskExprots = null;
+ List<ServiceSubtaskExport> serviceSubtaskExports = null;
if (!CollectionUtils.isEmpty(serviceSubtaskList)) {
- serviceSubtaskExprots = DtoConversionUtils.sourceToTarget(serviceSubtaskList, ServiceSubtaskExprot.class);
- for (ServiceSubtaskExprot serviceSubtaskExprot : serviceSubtaskExprots) {
- String pf = PreachFormEnum.getDescByCode(serviceSubtaskExprot.getPreachform());
- serviceSubtaskExprot.setPreachform(pf);
+ serviceSubtaskExports = DtoConversionUtils.sourceToTarget(serviceSubtaskList, ServiceSubtaskExport.class);
+ for (ServiceSubtaskExport serviceSubtaskExport : serviceSubtaskExports) {
+ String pf = PreachFormEnum.getDescByCode(serviceSubtaskExport.getPreachform());
+ serviceSubtaskExport.setPreachform(pf);
+
+ //璁＄畻鍑洪櫌澶╂暟
+ if (!Objects.isNull(serviceSubtaskExport.getEndtime())) {
+ Integer endDay = DateUtils.differentDaysByMillisecond(serviceSubtaskExport.getEndtime(), new Date());
+ serviceSubtaskExport.setEndDay(endDay);
+ }
}
}
- ExcelUtil<ServiceSubtaskExprot> util = new ExcelUtil<ServiceSubtaskExprot>(ServiceSubtaskExprot.class);
- util.exportExcel(response, serviceSubtaskExprots, "鎮ｈ�呴殢璁夸俊鎭〃鍗�");
+ ExcelUtil<ServiceSubtaskExport> util = new ExcelUtil<ServiceSubtaskExport>(ServiceSubtaskExport.class);
+ util.exportExcel(response, serviceSubtaskExports, "鎮ｈ�呴殢璁夸俊鎭〃鍗�");
}
--
Gitblit v1.9.3