From 43a19a4424f67c379934ed0d70e0d1b3512cd769 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 27 三月 2025 09:31:44 +0800
Subject: [PATCH] 灌溉计划表中增加项目ID字段，计划列表返回值中增加项目名称，项目状态改为整数表示
---
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/special/SpecialSv.java | 25 ++++++++++++-------------
1 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/special/SpecialSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/special/SpecialSv.java
index e2c5cb5..def6e7b 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/special/SpecialSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/special/SpecialSv.java
@@ -4,13 +4,12 @@
import com.dy.common.util.DateTime;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pipIrrGlobal.daoSpecial.SpecialMapper;
-import com.dy.pipIrrGlobal.voSpecial.CoAbnormalCloseValve;
+import com.dy.pipIrrGlobal.voSpecial.VoAbnormalCloseValve;
import com.dy.pipIrrGlobal.voSpecial.VoSteal;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.common.utils.PojoUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-
import java.util.List;
import java.util.Map;
import java.util.Optional;
@@ -32,11 +31,11 @@
/**
* 娑夊珜鍋锋按缁熻
- * @param qo
- * @return
+ * @param qo 鏌ヨ鍙傛暟
+ * @return 鏁版嵁闆嗗悎
*/
public QueryResultVo<List<VoSteal>> steal(QoSteal qo) throws Exception {
- if(qo.fromDt != null && qo.fromDt != "") {
+ if(qo.fromDt != null && !qo.fromDt.trim().equals("")) {
qo.fromDate = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(qo.fromDt + " 00:00:00") ;
}
@@ -62,12 +61,12 @@
/**
- * 娑夊珜鍋锋按缁熻
- * @param qo
- * @return
+ * 寮傚父鍏抽榾缁熻
+ * @param qo 鏌ヨ鍙傛暟
+ * @return 鏁版嵁闆嗗悎
*/
- public QueryResultVo<List<CoAbnormalCloseValve>> abnormalCloseValve(QoAbnormalCloseValve qo) throws Exception {
- if(qo.atDt != null && qo.atDt != "") {
+ public QueryResultVo<List<VoAbnormalCloseValve>> abnormalCloseValve(QoAbnormalCloseValve qo) throws Exception {
+ if(qo.atDt != null && !qo.atDt.trim().equals("")) {
qo.atDateStart = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(qo.atDt + " 00:00:00") ;
qo.atDateEnd = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(qo.atDt + " 23:59:59") ;
}
@@ -76,14 +75,14 @@
Long itemTotal = Optional.ofNullable(this.dao.selectAbnormalCloseValveTotal(params)).orElse(0L);
- QueryResultVo<List<CoAbnormalCloseValve>> rsVo = new QueryResultVo<>() ;
+ QueryResultVo<List<VoAbnormalCloseValve>> rsVo = new QueryResultVo<>() ;
rsVo.pageSize = qo.pageSize ;
rsVo.pageCurr = qo.pageCurr ;
rsVo.calculateAndSet(itemTotal, params);
- List<CoAbnormalCloseValve> list = this.dao.selectAbnormalCloseValveSome(params) ;
+ List<VoAbnormalCloseValve> list = this.dao.selectAbnormalCloseValveSome(params) ;
if (list != null && list.size() > 0) {
- for (CoAbnormalCloseValve vo : list) {
+ for (VoAbnormalCloseValve vo : list) {
vo.openType = CommonV1.openCloseValveType(vo.opType) ;
vo.closeType = CommonV1.openCloseValveType(vo.clType) ;
}
--
Gitblit v1.8.0