From 9fb370afff71f4d5659d8904e8751479280d5b48 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期一, 07 四月 2025 09:26:50 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigatePlan/IrrigatePlanSv.java | 65 ++++++++++++++++++++++++++++++++
1 files changed, 65 insertions(+), 0 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 6367ea5..4ac5574 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
@@ -7,6 +7,7 @@
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 lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -48,6 +49,9 @@
@Autowired
private IrGroupIntakeMapper irGroupIntakeMapper;
+ @Autowired
+ private IrIntakeOperateMapper irIntakeOperateMapper;
+
/**
* 娣诲姞鐏屾簤璁″垝
* @param po
@@ -56,6 +60,58 @@
public Long addIrrigatePlan(IrIrrigatePlan po) {
irrigatePlanMapper.insert(po);
return po.getId();
+ }
+
+ /**
+ * 鏍规嵁璁″垝ID鑾峰彇寰呯粓姝㈣鍒掔殑缁撴潫鏃堕棿锛氭湭鍒犻櫎銆佹湭缁堟銆佸凡鍙戝竷銆佸綋鍓嶆椂闂村皬浜庤鍒掔粨鏉熸椂闂�
+ * @param planId
+ * @return
+ */
+ public Date getToTerminatePlan(Long planId) {
+ return irrigatePlanMapper.getToTerminatePlan(planId);
+ }
+
+ /**
+ * 鏍规嵁璁″垝ID鑾峰彇寰呯粓姝㈢殑鍙栨按鍙D锛堝凡鍙戝竷寮�鍙戝懡浠わ紝鏃犺鏄惁鎴愬姛锛�
+ * @param planId
+ * @return
+ */
+ public List<Long> getToTerminateIntakeIds(Long planId) {
+ return irIntakeOperateMapper.getToTerminateIntakeIds(planId);
+ }
+
+ /**
+ * 鏍规嵁璁″垝ID鑾峰彇寰呯粓姝㈢殑鍛戒护ID
+ * @param planId
+ * @return
+ */
+ public List<Long> getTerminateCommandIds(Long planId) {
+ return irIntakeOperateMapper.getTerminateCommandIds(planId);
+ }
+
+ /**
+ * 淇敼鐏屾簤璁″垝
+ * @param po
+ * @return
+ */
+ public Integer updatePlan(IrIrrigatePlan po) {
+ return irrigatePlanMapper.updateByPrimaryKeySelective(po);
+ }
+
+ /**
+ * 鑾峰彇鏈畬鎴愮殑璁″垝鍒楄〃锛屽皬绋嬪簭璁″垝鍒楄〃椤典娇鐢�
+ * @return
+ */
+ public List<VoPlans> getNotCompletePlans() {
+ return irrigatePlanMapper.getNotCompletePlans();
+ }
+
+ /**
+ * 鑾峰彇宸插畬鎴愮殑璁″垝鍒楄〃锛屽皬绋嬪簭璁″垝鍒楄〃椤典娇鐢�
+ * @return
+ */
+ public List<VoPlans> getCompletedPlans() {
+ return irrigatePlanMapper.getCompletedPlans();
}
/**
@@ -107,6 +163,15 @@
}
/**
+ * 鏍规嵁璁″垝ID缁堟鐏屾簤娆″簭锛屽皢鐏屾簤娆″簭鐨勫綋鍓嶇姸鎬佹敼涓哄凡缁堟
+ * @param planId
+ * @return
+ */
+ public Integer terminateSchedule(Long planId) {
+ return irIrrigateScheduleMapper.terminateSchedule(planId);
+ }
+
+ /**
* 鏍规嵁璁″垝ID鑾峰彇鐏屾簤娆″簭璁板綍
* @param planId
* @return
--
Gitblit v1.8.0