From b181d08b9c8c4f3f4d8c475a60506ba4d93c8382 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期三, 09 四月 2025 11:38:23 +0800
Subject: [PATCH] 灌溉计划详情页，包含计划信息、轮灌组信息、取水口命令发布员结果信息
---
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigatePlan/IrrigatePlanSv.java | 50 ++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 46 insertions(+), 4 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigatePlan/IrrigatePlanSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigatePlan/IrrigatePlanSv.java
index 6761b72..0fdabce 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigatePlan/IrrigatePlanSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigatePlan/IrrigatePlanSv.java
@@ -1,17 +1,18 @@
package com.dy.pipIrrWechat.irrigatePlan;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
import com.dy.pipIrrGlobal.daoIr.*;
import com.dy.pipIrrGlobal.daoRm.RmCommandHistoryMapper;
import com.dy.pipIrrGlobal.pojoIr.IrIrrigatePlan;
import com.dy.pipIrrGlobal.pojoIr.IrIrrigateSchedule;
import com.dy.pipIrrGlobal.pojoIr.IrPlanOperate;
import com.dy.pipIrrGlobal.pojoIr.IrPlanSchedule;
-import com.dy.pipIrrGlobal.voIr.VoIrrigateSchedule;
-import com.dy.pipIrrGlobal.voIr.VoPlanSimple;
-import com.dy.pipIrrGlobal.voIr.VoPlans;
-import com.dy.pipIrrGlobal.voIr.VoToTerminateIntakes;
+import com.dy.pipIrrGlobal.voIr.*;
import com.dy.pipIrrGlobal.voRm.VoIntakeVc;
import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -271,4 +272,45 @@
public Long getIntakeIdByUnitId(Long unitId) {
return irIrrigateUnitMapper.getIntakeIdByUnitId(unitId);
}
+
+ /**
+ * 鏍规嵁璁″垝ID鑾峰彇璁″垝鍙戝竷缁撴灉
+ * @param planId
+ * @return
+ */
+ public VoPlanDetails getPublishResults(Long planId) {
+ List<VoGroupResult> groupResults = irIrrigateGroupMapper.getGroupResult(planId);
+ if(groupResults == null || groupResults.size() == 0){
+ return null;
+ }
+
+ VoPlanDetails planDetails = irrigatePlanMapper.getPlanDetails(planId);
+
+ for (VoGroupResult groupResult : groupResults) {
+ List<VoIntakeResult> intakeResults = irIntakeOperateMapper.getIntakeResult(planId, groupResult.getGroupId());
+ if(intakeResults != null) {
+ groupResult.setPublishResult(intakeResults);
+ }
+ }
+
+ planDetails.setGroups(groupResults);
+ return planDetails;
+
+
+ //JSONArray array_groupResult = (JSONArray) JSON.toJSON(groupResults);
+ //for(int i = 0; i < array_groupResult.size(); i++){
+ // JSONObject job_groupResult = array_groupResult.getJSONObject(i);
+ // Long groupId = job_groupResult.getLong("groupId");
+ //
+ // List<VoIntakeResult> intakeResults = irIntakeOperateMapper.getIntakeResult(planId, groupId);
+ // if(intakeResults != null) {
+ // JSONArray array_intakeResult = (JSONArray) JSON.toJSON(intakeResults);
+ // job_groupResult.put("publishResult", array_intakeResult);
+ // }
+ //}
+ //
+ //List<VoGroupResult> publishResults = array_groupResult.toJavaList(VoGroupResult.class);
+ //return publishResults;
+
+ }
}
--
Gitblit v1.8.0