From 203223860baa19deb6860eb2ba3181910d662980 Mon Sep 17 00:00:00 2001 From: zhubaomin <zhubaomin> Date: 星期四, 17 四月 2025 14:22:59 +0800 Subject: [PATCH] 1. 轮灌组被终止时灌溉时长为实际数值。2. 计划历史表按照创建时间倒排序。3. 发布计划时判断是否同项目下未完成计划,是否其他项目下使用了本计划的轮灌组且计划未完成。4. 根据计划ID获取计划最新状态。 --- pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/intakeAmountDay/IntakeAmountDaySv.java | 71 +++++++++++++++++++++++++++++++++++ 1 files changed, 71 insertions(+), 0 deletions(-) diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/intakeAmountDay/IntakeAmountDaySv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/intakeAmountDay/IntakeAmountDaySv.java new file mode 100644 index 0000000..7b8a90a --- /dev/null +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/intakeAmountDay/IntakeAmountDaySv.java @@ -0,0 +1,71 @@ +package com.dy.pipIrrRemote.records.intakeAmountDay; + +import com.dy.common.webUtil.QueryResultVo; +import com.dy.pipIrrGlobal.daoRm.RmIntakeAmountDayLastMapper; +import com.dy.pipIrrGlobal.daoRm.RmIntakeAmountDayMapper; +import com.dy.pipIrrGlobal.voRm.VoIntakeAmountDay; +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; + +/** + * @author :WuZeYu + * @Date :2024/7/24 14:38 + * @LastEditTime :2024/7/24 14:38 + * @Description + */ +@Slf4j +@Service +public class IntakeAmountDaySv { + + @Autowired + private RmIntakeAmountDayMapper rmIntakeAmountDayMapper; + @Autowired + private RmIntakeAmountDayLastMapper rmIntakeAmountDayLastMapper; + + + /** + * 鑾峰緱涓�椤靛彇姘村彛鏃ュ彇姘撮噺婕忔崯璁板綍(鍘嗗彶) + * @param vo + * @return + */ + public QueryResultVo<List<VoIntakeAmountDay>> getIntakeAmountDayHistory(IntakeAmountDayQueryVo vo) { + + Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(vo); + + Long itemTotal = rmIntakeAmountDayMapper.getRecordCount(params); + + QueryResultVo<List<VoIntakeAmountDay>> rsVo = new QueryResultVo<>(); + rsVo.pageSize = vo.pageSize; + rsVo.pageCurr = vo.pageCurr; + + rsVo.calculateAndSet(itemTotal, params); + rsVo.obj = rmIntakeAmountDayMapper.getIntakeAmountDayHistory(params); + return rsVo; + } + + + /** + * 鑾峰緱涓�椤靛彇姘村彛鏃ュ彇姘撮噺婕忔崯璁板綍(鏈�鏂�) + * @param vo + * @return + */ + public QueryResultVo<List<VoIntakeAmountDay>> getIntakeAmountDayLast(IntakeAmountDayQueryVo vo) { + + Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(vo); + + Long itemTotal = rmIntakeAmountDayLastMapper.getRecordCount(params); + + QueryResultVo<List<VoIntakeAmountDay>> rsVo = new QueryResultVo<>(); + rsVo.pageSize = vo.pageSize; + rsVo.pageCurr = vo.pageCurr; + + rsVo.calculateAndSet(itemTotal, params); + rsVo.obj = rmIntakeAmountDayLastMapper.getIntakeAmountDayLast(params); + return rsVo; + } +} -- Gitblit v1.8.0