From 0a8f9800a264c848adf1361db5bcab5b2fc32869 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 05 二月 2026 15:56:34 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java | 14 +++++---------
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java | 9 +++++----
smartor/src/main/java/com/smartor/domain/ServiceSubtaskVO.java | 14 +++++++-------
3 files changed, 17 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 6c906c4..e482d71 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
@@ -69,15 +69,11 @@
List<Map<String, Object>> list = new ArrayList<>();
list.add(map);
//鑾峰彇total
- long total = PageUtils.count(new ISelect() {
- @Override
- public void doSelect() {
- serviceSubtaskVO.setPageNum(null);
- serviceSubtaskVO.setPageSize(null);
- serviceSubtaskService.patItem(serviceSubtaskVO);
- }
- });
- return getDataTable3(total, list);
+ serviceSubtaskVO.setPageNum(null);
+ serviceSubtaskVO.setPageSize(null);
+ List<ServiceSubtask> serviceSubtasks = serviceSubtaskService.patItem(serviceSubtaskVO);
+
+ return getDataTable3(CollectionUtils.isNotEmpty(serviceSubtasks)?serviceSubtasks.size():0, list);
}
/**
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskVO.java b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskVO.java
index 87591aa..c012ac7 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskVO.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskVO.java
@@ -94,6 +94,13 @@
@ApiModelProperty(value = "鍙戦�佺姸鎬� : 1鏂板缓 2鎵ц涓� 3鏆傚仠 4缁堟 5瀹屾垚")
private List<Long> sendstates;
+ /**
+ * 鍙戦�佺姸鎬�
+ */
+ @Excel(name = " 鍙戦�佺姸鎬� ")
+ @ApiModelProperty(value = "鍙戦�佺姸鎬� 锛�1 琚鍙� 2 寰呭彂閫� 3 宸插彂閫� 4 涓嶆墽琛� 5 鍙戦�佸け璐� 6 宸插畬鎴�")
+ private Long sendstate;
+
/**
* 鍙戝鐞嗘剰瑙侊細1鏆備笉澶勭悊銆�2閫氱煡灏辫瘖銆�3鐥呮儏绋冲畾銆�4浜哄伐闅忚銆�5澶辫閫乁UID
@@ -272,13 +279,6 @@
@Excel(name = " 鏅氫笂缁撴潫鍙戦�佹椂闂撮檺鍒� ")
@ApiModelProperty(value = "鏅氫笂缁撴潫鍙戦�佹椂闂撮檺鍒�")
private String sendlimitnend;
-
- /**
- * 鍙戦�佺姸鎬�
- */
- @Excel(name = " 鍙戦�佺姸鎬� ")
- @ApiModelProperty(value = "鍙戦�佺姸鎬� : 1鏂板缓 2鎵ц涓� 3鏆傚仠 4缁堟 5瀹屾垚")
- private Long sendstate;
/**
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 d946a1d..c474912 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -298,10 +298,11 @@
@Override
public Map<String, Object> patItemCount(ServiceSubtaskVO serviceSubtaskVO) {
- serviceSubtaskVO.setSendstate(null);
- serviceSubtaskVO.setPageSize(99999999);
- serviceSubtaskVO.setPageNum(1);
- List<ServiceSubtask> selectServiceSubtaskList = this.selectServiceSubtaskList(serviceSubtaskVO);
+ ServiceSubtaskVO serviceSubtaskVO1 = DtoConversionUtils.sourceToTarget(serviceSubtaskVO, ServiceSubtaskVO.class);
+ serviceSubtaskVO1.setSendstate(null);
+ serviceSubtaskVO1.setPageSize(99999999);
+ serviceSubtaskVO1.setPageNum(1);
+ List<ServiceSubtask> selectServiceSubtaskList = this.selectServiceSubtaskList(serviceSubtaskVO1);
Map<String, Object> map = new HashMap<>();
Integer wzx = 0;
Integer ysf = 0;
--
Gitblit v1.9.3