From 836ec39fdad422b1a148699a4c5fb8c5b4d395f0 Mon Sep 17 00:00:00 2001
From: zuoxiao <lf_zuo@163.com>
Date: 星期三, 25 六月 2025 11:04:33 +0800
Subject: [PATCH] feat(card): 添加管理类型卡写卡功能并优化卡片相关逻辑- 在 OperateTypeENUM 中添加 SUPPLEMENT 和 MANAGEMENT_CARD_WRITE 枚举值 - 在 SeManagementCard 中添加 cancelTime 和 state 字段 - 更新相关 mapper 和 XML 文件以支持新增字段 - 修改 CardSv 中的回调处理逻辑，支持管理类型卡写卡 - 优化 CreateManagementCardDto 中识别码的示例值
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmIntakeAmountDayMapper.java | 80 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 76 insertions(+), 4 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmIntakeAmountDayMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmIntakeAmountDayMapper.java
index a934457..ff757f0 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmIntakeAmountDayMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmIntakeAmountDayMapper.java
@@ -3,9 +3,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dy.pipIrrGlobal.pojoRm.RmIntakeAmountDay;
import com.dy.pipIrrGlobal.voRm.VoIntakeAmountDay;
-import com.dy.pipIrrGlobal.voSt.VoDayIntakeAmount;
-import com.dy.pipIrrGlobal.voSt.VoIntakeAmountStatistics;
-import com.dy.pipIrrGlobal.voSt.VoMonthAmount;
+import com.dy.pipIrrGlobal.voSt.*;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -87,7 +85,7 @@
/**
* 浠ュ彇姘村彛缁村害缁熻鍙栨按鍙ｅ彇姘撮噺
* @param statisticsStartId 缁熻鏃堕棿娈靛紑濮嬫椂闂村搴旂殑ID
- * @param statisticsEndId 缁熻鏃堕棿娈垫埅姝㈡椂闂村搴旂殑ID
+ * @param statisticsEndId 缁熻鏃堕棿娈电粨鏉熸椂闂村搴旂殑ID
* @return
*/
List<VoIntakeAmountStatistics> statisticsByIntake(@Param("startId")Long statisticsStartId, @Param("endId")Long statisticsEndId) ;
@@ -119,4 +117,78 @@
* @return
*/
List<VoMonthAmount> getMonthIntakeAmount(Map<?, ?> params);
+
+ ////////////////////////////////////////////////
+ // 缁熻鏌ヨ
+ ///////////////////////////////////////////////
+
+ /**
+ * 涓烘煡璇㈢粺璁″彇姘村彛鏃ユ紡鎹熼噺锛岀粺璁″彇姘村彛鏁伴噺
+ * @param intakeN
+ * @return
+ */
+ Long selectIntakeCount4AmountDay(@Param("intakeNum")String intakeN) ;
+
+ /**
+ * 涓烘煡璇㈢粺璁″彇姘村彛鏃ユ紡鎹熼噺锛屾煡璇竴椤靛彇姘村彛ID
+ * @param params
+ * @return
+ */
+ List<VoDayIntakeAmount> selectIntakes4AmountDay(Map<?, ?> params) ;
+
+ /**
+ * 鏌ヨ缁熻鍙栨按鍙ｆ棩婕忔崯閲�
+ * @param params
+ * @return
+ */
+ //涓嬮潰1鍒�31鍙峰垎浜�6涓煡璇紝鍘熷洜鏄叆涓�涓煡璇腑锛岄潪甯告參锛屼笉鐭ラ亾浠�涔堝師鍥狅紝涔熻鏄瓙鏌ヨ澶鐨勫師鍥�
+ List<VoDayIntakeAmount> selectIntakeAmountOfDay01_05(Map<?, ?> params);
+ List<VoDayIntakeAmount> selectIntakeAmountOfDay06_10(Map<?, ?> params);
+ List<VoDayIntakeAmount> selectIntakeAmountOfDay11_15(Map<?, ?> params);
+ List<VoDayIntakeAmount> selectIntakeAmountOfDay16_20(Map<?, ?> params);
+ List<VoDayIntakeAmount> selectIntakeAmountOfDay21_25(Map<?, ?> params);
+ List<VoDayIntakeAmount> selectIntakeAmountOfDay26_31(Map<?, ?> params);
+
+
+ /**
+ * 鎸囧畾鏃堕棿娈电敤姘撮噺瓒呰繃鎸囧畾鍊肩殑鍙栨按鍙ｆ暟閲�
+ * @param params
+ * @return
+ */
+ Long getUseWaterGtValueIntakesCount(Map<String, Object> params);
+
+ /**
+ * 鎸囧畾鏃堕棿娈电敤姘撮噺瓒呰繃鎸囧畾鍊肩殑鍙栨按鍙�
+ * @param params
+ * @return
+ */
+ List<VoIntakeAccumulateAmount> getUseWaterGtValueIntakes(Map<String, Object> params);
+ /**
+ * 鎸囧畾鏃堕棿娈靛唴娑堣垂閲戦瓒呰繃鎸囧畾鍊肩殑鍙栨按鍙ｇ殑鏁伴噺
+ * @param params
+ * @return
+ */
+ Long getExpenseGtValueIntakesCount(Map<String, Object> params);
+
+ /**
+ * 鎸囧畾鏃堕棿娈靛唴娑堣垂閲戦瓒呰繃鎸囧畾鍊肩殑鍙栨按鍙�
+ * @param params
+ * @return
+ */
+ List<VoIntakeAccumulateAmount> getExpenseGtValueIntakes(Map<String, Object> params);
+
+ /**
+ * 鎸囧畾鏃堕棿娈靛唴鍙栨按娆℃暟瓒呰繃鎸囧畾鍊肩殑鍙栨按鍙ｇ殑鏁伴噺
+ * @param params
+ * @return
+ */
+ Long getUseWaterTimesGtValueIntakesCount(Map<String, Object> params);
+
+ /**
+ * 鎸囧畾鏃堕棿娈靛唴鍙栨按娆℃暟瓒呰繃鎸囧畾鍊肩殑鍙栨按鍙�
+ * @param params
+ * @return
+ */
+ List<VoIntakeAccumulateAmount> getUseWaterTimesGtValueIntakes(Map<String, Object> params);
+
}
\ No newline at end of file
--
Gitblit v1.8.0