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-project/src/main/java/com/dy/pipIrrProject/flowMonitoring/DtoToFlowmeterPojo.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/flowMonitoring/DtoToFlowmeterPojo.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/flowMonitoring/DtoToFlowmeterPojo.java
index 32ae88f..437231a 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/flowMonitoring/DtoToFlowmeterPojo.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/flowMonitoring/DtoToFlowmeterPojo.java
@@ -3,6 +3,7 @@
import com.dy.pipIrrGlobal.pojoPr.PrFlowmeter;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
+import org.mapstruct.ReportingPolicy;
import org.mapstruct.factory.Mappers;
/**
@@ -12,14 +13,14 @@
* @Description
*/
-@Mapper
+@Mapper(unmappedTargetPolicy = ReportingPolicy.IGNORE)
public interface DtoToFlowmeterPojo {
DtoToFlowmeterPojo INSTANCT = Mappers.getMapper(DtoToFlowmeterPojo.class);
- @Mapping(target = "code", source = "code")
- @Mapping(target = "protocol", source = "protocol")
- @Mapping(target = "onlinestate", source = "onlineState")
- @Mapping(target = "addways", source = "addWays")
- @Mapping(target = "operator", source = "operator")
- @Mapping(target = "remarks", source = "remarks")
+// @Mapping(target = "code", source = "code")
+// @Mapping(target = "protocol", source = "protocol")
+// @Mapping(target = "onlineState", source = "onlineState")
+// @Mapping(target = "addWays", source = "addWays")
+// @Mapping(target = "operator", source = "operator")
+// @Mapping(target = "remarks", source = "remarks")
PrFlowmeter po2vo(DtoFlowmeter po);
}
--
Gitblit v1.8.0