From dd6e29aba4f614f236cf60aca4aa972a51a8dfb5 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期一, 30 十二月 2024 11:54:43 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StatisticsJob.java | 27
pipIrr-platform/pipIrr-global/src/main/resources/application-global(test测试系统).yml | 2
pipIrr-platform/pipIrr-web/pipIrr-web-temp/说明.txt | 18
pipIrr-platform/文档/SaaS/端口、IP、标签配置.docx | 0
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StClientAmountDayMapper.java | 87 +
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StIntakeAmountSv.java | 2
pipIrr-platform/pipIrr-global/src/main/resources/application-global(mq民勤系统).yml | 2
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StIntakeAmount.java | 4
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StLossAmount.java | 4
pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/statistics/StSomeCtrl.java | 46
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StRechargeIcDayMapper.java | 3
pipIrr-platform/pipIrr-global/src/main/resources/application-global(sp沙盘系统).yml | 2
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StRechargeIcMonthMapper.java | 3
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmClientAmountDay.java | 7
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StClientAmountSv.java | 345 +++++++
pipIrr-platform/pipIrr-global/src/main/resources/application-global(ym元谋系统).yml | 2
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StConsumeClientYearMapper.java | 3
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StConsumeIcDayMapper.java | 3
pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/statistics/StClientAmountSv.java | 321 ++++++
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StConsumeIcMonthMapper.java | 3
pipIrr-platform/pipIrr-global/src/main/resources/mapper/StClientAmountDayMapper.xml | 1205 ++++++++++++++++++++++++
pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/changeSome/ChSomeIntakeAmountSv.java | 19
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoClientConsumeStatistics.java | 4
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StRechargeIcYearMapper.java | 3
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoClientAmountStatistics.java | 5
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StConsumeIcYearMapper.java | 3
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StClientAmount.java | 71 +
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StLossAmountSv.java | 2
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StConsumeClientDayMapper.java | 3
pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/PipIrrWebTempApplication.java | 2
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StRechargeClientMonthMapper.java | 3
/dev/null | 0
pipIrr-platform/文档/SaaS/管灌系统增加一个客户系统.docx | 0
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StConsumeClientMonthMapper.java | 3
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StRechargeClientDayMapper.java | 3
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StRechargeClientYearMapper.java | 3
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1/TkDealClientAmountDay.java | 22
pipIrr-platform/pipIrr-global/src/main/resources/application-global(mj梅江系统).yml | 2
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayMapper.xml | 20
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmClientAmountDayMapper.java | 2
pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml | 2
pipIrr-platform/文档/SaaS/民勤设备地址.xlsx | 0
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StConsumeByClientSv.java | 88
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSt/StClientAmountDay.java | 581 +++++++++++
44 files changed, 2,806 insertions(+), 124 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmClientAmountDayMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmClientAmountDayMapper.java
index 807bfae..f78cd1c 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmClientAmountDayMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmClientAmountDayMapper.java
@@ -98,4 +98,6 @@
*/
List<VoClientAmountStatistics> statisticsByClient(@Param("startId")Long statisticsStartId, @Param("endId")Long statisticsEndId) ;
+
+
}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StClientAmountDayMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StClientAmountDayMapper.java
new file mode 100644
index 0000000..f53b91f
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StClientAmountDayMapper.java
@@ -0,0 +1,87 @@
+package com.dy.pipIrrGlobal.daoSt;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dy.pipIrrGlobal.pojoSt.StClientAmountDay;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @Author: liurunyu
+ * @Date: 2024/12/28 11:58
+ * @Description
+ */
+@Mapper
+public interface StClientAmountDayMapper extends BaseMapper<StClientAmountDay> {
+ /**
+ * delete by primary key
+ *
+ * @param id primaryKey
+ * @return deleteCount
+ */
+ int deleteByPrimaryKey(Long id);
+
+ /**
+ * insert record to table
+ *
+ * @param record the record
+ * @return insert count
+ */
+ int insert(StClientAmountDay record);
+
+ /**
+ * insert record to table selective
+ *
+ * @param record the record
+ * @return insert count
+ */
+ int insertSelective(StClientAmountDay record);
+
+ /**
+ * select by primary key
+ *
+ * @param id primary key
+ * @return object by primary key
+ */
+ StClientAmountDay selectByPrimaryKey(Long id);
+
+ /**
+ * update record selective
+ *
+ * @param record the updated record
+ * @return update count
+ */
+ int updateByPrimaryKeySelective(StClientAmountDay record);
+
+ /**
+ * update record
+ *
+ * @param record the updated record
+ * @return update count
+ */
+ int updateByPrimaryKey(StClientAmountDay record);
+
+
+ //////////////////////////////////////
+ //缁熻鐩稿叧
+ /**
+ * 鏌ヨ鐢ㄦ按鎴蜂竴涓湀鎵�鏈夋棩鐨勭敤姘撮噺
+ * @param clientId
+ * @param year
+ * @param month
+ * @return
+ */
+ List<StClientAmountDay> selectByClientIdAndYearAndMonthAndDay(@Param("clientId")Long clientId,
+ @Param("year")Integer year,
+ @Param("month")Integer month) ;
+
+ //////////////////////////////////////
+ //涓存椂浠诲姟鐩稿叧
+
+ /**
+ * 鍒犻櫎鍏ㄩ儴
+ * @return
+ */
+ int deleteAll() ;
+}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StConsumeClientDayMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StConsumeClientDayMapper.java
index 84f83aa..8dbdf85 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StConsumeClientDayMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StConsumeClientDayMapper.java
@@ -1,5 +1,6 @@
package com.dy.pipIrrGlobal.daoSt;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dy.pipIrrGlobal.pojoSt.StConsumeClientDay;
import com.dy.pipIrrGlobal.voSt.VoClientConsumeStatistics;
import org.apache.ibatis.annotations.Mapper;
@@ -13,7 +14,7 @@
* @Description
*/
@Mapper
-public interface StConsumeClientDayMapper {
+public interface StConsumeClientDayMapper extends BaseMapper<StConsumeClientDay> {
/**
* delete by primary key
*
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StConsumeClientMonthMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StConsumeClientMonthMapper.java
index 9c6e9d0..d898201 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StConsumeClientMonthMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StConsumeClientMonthMapper.java
@@ -1,5 +1,6 @@
package com.dy.pipIrrGlobal.daoSt;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dy.pipIrrGlobal.pojoSt.StConsumeClientMonth;
import com.dy.pipIrrGlobal.voSt.VoClientConsumeStatistics;
import org.apache.ibatis.annotations.Mapper;
@@ -13,7 +14,7 @@
* @Description
*/
@Mapper
-public interface StConsumeClientMonthMapper {
+public interface StConsumeClientMonthMapper extends BaseMapper<StConsumeClientMonth> {
/**
* delete by primary key
*
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StConsumeClientYearMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StConsumeClientYearMapper.java
index ab1f91f..891c1ec 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StConsumeClientYearMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StConsumeClientYearMapper.java
@@ -1,5 +1,6 @@
package com.dy.pipIrrGlobal.daoSt;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dy.pipIrrGlobal.pojoSt.StConsumeClientYear;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -12,7 +13,7 @@
* @Description
*/
@Mapper
-public interface StConsumeClientYearMapper {
+public interface StConsumeClientYearMapper extends BaseMapper<StConsumeClientYear> {
/**
* delete by primary key
* @param id primaryKey
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StConsumeIcDayMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StConsumeIcDayMapper.java
index ed9a731..c49f08b 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StConsumeIcDayMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StConsumeIcDayMapper.java
@@ -1,5 +1,6 @@
package com.dy.pipIrrGlobal.daoSt;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dy.pipIrrGlobal.pojoSt.StConsumeIcDay;
import com.dy.pipIrrGlobal.voSt.VoIcConsumeStatistics;
import org.apache.ibatis.annotations.Mapper;
@@ -13,7 +14,7 @@
* @Description
*/
@Mapper
-public interface StConsumeIcDayMapper {
+public interface StConsumeIcDayMapper extends BaseMapper<StConsumeIcDay> {
/**
* delete by primary key
*
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StConsumeIcMonthMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StConsumeIcMonthMapper.java
index 8f838be..0dbcbdc 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StConsumeIcMonthMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StConsumeIcMonthMapper.java
@@ -1,5 +1,6 @@
package com.dy.pipIrrGlobal.daoSt;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dy.pipIrrGlobal.pojoSt.StConsumeIcMonth;
import com.dy.pipIrrGlobal.voSt.VoIcConsumeStatistics;
import org.apache.ibatis.annotations.Mapper;
@@ -13,7 +14,7 @@
* @Description
*/
@Mapper
-public interface StConsumeIcMonthMapper {
+public interface StConsumeIcMonthMapper extends BaseMapper<StConsumeIcMonth> {
/**
* delete by primary key
*
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StConsumeIcYearMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StConsumeIcYearMapper.java
index 6d31cd5..a292f55 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StConsumeIcYearMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StConsumeIcYearMapper.java
@@ -1,5 +1,6 @@
package com.dy.pipIrrGlobal.daoSt;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dy.pipIrrGlobal.pojoSt.StConsumeIcYear;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -12,7 +13,7 @@
* @Description
*/
@Mapper
-public interface StConsumeIcYearMapper {
+public interface StConsumeIcYearMapper extends BaseMapper<StConsumeIcYear> {
/**
* delete by primary key
* @param id primaryKey
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StRechargeClientDayMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StRechargeClientDayMapper.java
index 765dd34..9508b16 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StRechargeClientDayMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StRechargeClientDayMapper.java
@@ -1,5 +1,6 @@
package com.dy.pipIrrGlobal.daoSt;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dy.pipIrrGlobal.pojoSt.StRechargeClientDay;
import com.dy.pipIrrGlobal.voSt.VoClientRechargeStatistics;
import org.apache.ibatis.annotations.Mapper;
@@ -13,7 +14,7 @@
* @Description
*/
@Mapper
-public interface StRechargeClientDayMapper {
+public interface StRechargeClientDayMapper extends BaseMapper<StRechargeClientDay> {
/**
* delete by primary key
*
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StRechargeClientMonthMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StRechargeClientMonthMapper.java
index 247f1f8..4ee86f6 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StRechargeClientMonthMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StRechargeClientMonthMapper.java
@@ -1,5 +1,6 @@
package com.dy.pipIrrGlobal.daoSt;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dy.pipIrrGlobal.pojoSt.StRechargeClientMonth;
import com.dy.pipIrrGlobal.voSt.VoClientRechargeStatistics;
import org.apache.ibatis.annotations.Mapper;
@@ -13,7 +14,7 @@
* @Description
*/
@Mapper
-public interface StRechargeClientMonthMapper {
+public interface StRechargeClientMonthMapper extends BaseMapper<StRechargeClientMonth> {
/**
* delete by primary key
*
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StRechargeClientYearMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StRechargeClientYearMapper.java
index 2636dca..6e75c2c 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StRechargeClientYearMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StRechargeClientYearMapper.java
@@ -1,5 +1,6 @@
package com.dy.pipIrrGlobal.daoSt;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dy.pipIrrGlobal.pojoSt.StRechargeClientYear;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -12,7 +13,7 @@
* @Description
*/
@Mapper
-public interface StRechargeClientYearMapper {
+public interface StRechargeClientYearMapper extends BaseMapper<StRechargeClientYear> {
/**
* delete by primary key
* @param id primaryKey
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StRechargeIcDayMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StRechargeIcDayMapper.java
index cdfd513..7c3a898 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StRechargeIcDayMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StRechargeIcDayMapper.java
@@ -1,5 +1,6 @@
package com.dy.pipIrrGlobal.daoSt;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dy.pipIrrGlobal.pojoSt.StRechargeIcDay;
import com.dy.pipIrrGlobal.voSt.VoIcRechargeStatistics;
import org.apache.ibatis.annotations.Mapper;
@@ -13,7 +14,7 @@
* @Description
*/
@Mapper
-public interface StRechargeIcDayMapper {
+public interface StRechargeIcDayMapper extends BaseMapper<StRechargeIcDay> {
/**
* delete by primary key
*
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StRechargeIcMonthMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StRechargeIcMonthMapper.java
index 6c5b533..ba2fe86 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StRechargeIcMonthMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StRechargeIcMonthMapper.java
@@ -1,5 +1,6 @@
package com.dy.pipIrrGlobal.daoSt;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dy.pipIrrGlobal.pojoSt.StRechargeIcMonth;
import com.dy.pipIrrGlobal.voSt.VoIcRechargeStatistics;
import org.apache.ibatis.annotations.Mapper;
@@ -13,7 +14,7 @@
* @Description
*/
@Mapper
-public interface StRechargeIcMonthMapper {
+public interface StRechargeIcMonthMapper extends BaseMapper<StRechargeIcMonth> {
/**
* delete by primary key
*
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StRechargeIcYearMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StRechargeIcYearMapper.java
index 63fbf64..bf7b20e 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StRechargeIcYearMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StRechargeIcYearMapper.java
@@ -1,5 +1,6 @@
package com.dy.pipIrrGlobal.daoSt;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dy.pipIrrGlobal.pojoSt.StRechargeIcYear;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -12,7 +13,7 @@
* @Description
*/
@Mapper
-public interface StRechargeIcYearMapper {
+public interface StRechargeIcYearMapper extends BaseMapper<StRechargeIcYear> {
/**
* delete by primary key
* @param id primaryKey
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmClientAmountDay.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmClientAmountDay.java
index 3068ca8..559206d 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmClientAmountDay.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmClientAmountDay.java
@@ -48,12 +48,17 @@
public Double amount;
/**
- * 鏃ュ彇鑺辫垂閲戦
+ * 鏃ュ彇姘磋姳璐归噾棰�
*/
@JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
public Double money;
/**
+ * 鏃ュ彇姘存鏁�
+ */
+ public Integer times;
+
+ /**
* 缁熻鏃ユ湡(yyyy-mm-dd)
*/
@Schema(description = "缁熻鏃ユ湡", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSt/StClientAmountDay.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSt/StClientAmountDay.java
new file mode 100644
index 0000000..a4d19a0
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSt/StClientAmountDay.java
@@ -0,0 +1,581 @@
+package com.dy.pipIrrGlobal.pojoSt;
+
+/**
+ * @Author: liurunyu
+ * @Date: 2024/12/28 11:16
+ * @Description
+ */
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.dy.common.po.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+
+@TableName(value="st_client_amount_day", autoResultMap = true)
+@Data
+@Builder
+@ToString
+@NoArgsConstructor
+@AllArgsConstructor
+@Schema(name = "鍐滄埛鐢ㄦ按閲忔棩缁熻")
+public class StClientAmountDay implements BaseEntity {
+
+ public static final long serialVersionUID = 202412281145001L;
+ /**
+ * 涓婚敭
+ */
+ @Schema(description = "涓婚敭", requiredMode = Schema.RequiredMode.REQUIRED)
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ @TableId(type = IdType.INPUT)
+ public Long id;
+
+ /**
+ * 澶栭敭锛屾寚鍚戝啘鎴�
+ */
+ @Schema(description = "鍐滄埛澶栭敭", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ public Long clientId;
+
+ /**
+ * 骞村害
+ */
+ public Integer year;
+
+ /**
+ * 鏈堜唤
+ */
+ public Integer month;
+
+ /**
+ * 1鍙风敤姘撮噺缁熻
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ public Double amount1;
+
+ /**
+ * 1鍙疯姳璐归噾棰�
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ public Double money1;
+
+ /**
+ * 1鍙风敤姘存鏁�
+ */
+ public Integer times1;
+
+ /**
+ * 2鍙风敤姘撮噺缁熻
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ public Double amount2;
+
+ /**
+ * 2鍙疯姳璐归噾棰�
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ public Double money2;
+
+ /**
+ * 2鍙风敤姘存鏁�
+ */
+ public Integer times2;
+
+ /**
+ * 3鍙风敤姘撮噺缁熻
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ public Double amount3;
+
+ /**
+ * 3鍙疯姳璐归噾棰�
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ public Double money3;
+
+ /**
+ * 3鍙风敤姘存鏁�
+ */
+ public Integer times3;
+
+ /**
+ * 4鍙风敤姘撮噺缁熻
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ public Double amount4;
+
+ /**
+ * 4鍙疯姳璐归噾棰�
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ public Double money4;
+
+ /**
+ * 4鍙风敤姘存鏁�
+ */
+ public Integer times4;
+
+ /**
+ * 5鍙风敤姘撮噺缁熻
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ public Double amount5;
+
+ /**
+ * 5鍙疯姳璐归噾棰�
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ public Double money5;
+
+ /**
+ * 5鍙风敤姘存鏁�
+ */
+ public Integer times5;
+
+ /**
+ * 6鍙风敤姘撮噺缁熻
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ public Double amount6;
+
+ /**
+ * 6鍙疯姳璐归噾棰�
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ public Double money6;
+
+ /**
+ * 6鍙风敤姘存鏁�
+ */
+ public Integer times6;
+
+ /**
+ * 7鍙风敤姘撮噺缁熻
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ public Double amount7;
+
+ /**
+ * 7鍙疯姳璐归噾棰�
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ public Double money7;
+
+ /**
+ * 7鍙风敤姘存鏁�
+ */
+ public Integer times7;
+
+ /**
+ * 8鍙风敤姘撮噺缁熻
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ public Double amount8;
+
+ /**
+ * 8鍙疯姳璐归噾棰�
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ public Double money8;
+
+ /**
+ * 8鍙风敤姘存鏁�
+ */
+ public Integer times8;
+
+ /**
+ * 9鍙风敤姘撮噺缁熻
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ public Double amount9;
+
+ /**
+ * 9鍙疯姳璐归噾棰�
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ public Double money9;
+
+ /**
+ * 9鍙风敤姘存鏁�
+ */
+ public Integer times9;
+
+ /**
+ * 10鍙风敤姘撮噺缁熻
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ public Double amount10;
+
+ /**
+ * 10鍙疯姳璐归噾棰�
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ public Double money10;
+
+ /**
+ * 10鍙风敤姘存鏁�
+ */
+ public Integer times10;
+
+ /**
+ * 11鍙风敤姘撮噺缁熻
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ public Double amount11;
+
+ /**
+ * 11鍙疯姳璐归噾棰�
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ public Double money11;
+
+ /**
+ * 11鍙风敤姘存鏁�
+ */
+ public Integer times11;
+
+ /**
+ * 12鍙风敤姘撮噺缁熻
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ public Double amount12;
+
+ /**
+ * 12鍙疯姳璐归噾棰�
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ public Double money12;
+
+ /**
+ * 12鍙风敤姘存鏁�
+ */
+ public Integer times12;
+
+ /**
+ * 13鍙风敤姘撮噺缁熻
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ public Double amount13;
+
+ /**
+ * 13鍙疯姳璐归噾棰�
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ public Double money13;
+
+ /**
+ * 13鍙风敤姘存鏁�
+ */
+ public Integer times13;
+
+ /**
+ * 14鍙风敤姘撮噺缁熻
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ public Double amount14;
+
+ /**
+ * 14鍙疯姳璐归噾棰�
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ public Double money14;
+
+ /**
+ * 14鍙风敤姘存鏁�
+ */
+ public Integer times14;
+
+ /**
+ * 15鍙风敤姘撮噺缁熻
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ public Double amount15;
+
+ /**
+ * 15鍙疯姳璐归噾棰�
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ public Double money15;
+
+ /**
+ * 15鍙风敤姘存鏁�
+ */
+ public Integer times15;
+
+ /**
+ * 16鍙风敤姘撮噺缁熻
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ public Double amount16;
+
+ /**
+ * 16鍙疯姳璐归噾棰�
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ public Double money16;
+
+ /**
+ * 16鍙风敤姘存鏁�
+ */
+ public Integer times16;
+
+ /**
+ * 17鍙风敤姘撮噺缁熻
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ public Double amount17;
+
+ /**
+ * 17鍙疯姳璐归噾棰�
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ public Double money17;
+
+ /**
+ * 17鍙风敤姘存鏁�
+ */
+ public Integer times17;
+
+ /**
+ * 18鍙风敤姘撮噺缁熻
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ public Double amount18;
+
+ /**
+ * 18鍙疯姳璐归噾棰�
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ public Double money18;
+
+ /**
+ * 18鍙风敤姘存鏁�
+ */
+ public Integer times18;
+
+ /**
+ * 19鍙风敤姘撮噺缁熻
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ public Double amount19;
+
+ /**
+ * 19鍙疯姳璐归噾棰�
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ public Double money19;
+
+ /**
+ * 19鍙风敤姘存鏁�
+ */
+ public Integer times19;
+
+ /**
+ * 20鍙风敤姘撮噺缁熻
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ public Double amount20;
+
+ /**
+ * 20鍙疯姳璐归噾棰�
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ public Double money20;
+
+ /**
+ * 20鍙风敤姘存鏁�
+ */
+ public Integer times20;
+
+ /**
+ * 21鍙风敤姘撮噺缁熻
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ public Double amount21;
+
+ /**
+ * 21鍙疯姳璐归噾棰�
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ public Double money21;
+
+ /**
+ * 21鍙风敤姘存鏁�
+ */
+ public Integer times21;
+
+ /**
+ * 22鍙风敤姘撮噺缁熻
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ public Double amount22;
+
+ /**
+ * 22鍙疯姳璐归噾棰�
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ public Double money22;
+
+ /**
+ * 22鍙风敤姘存鏁�
+ */
+ public Integer times22;
+
+ /**
+ * 23鍙风敤姘撮噺缁熻
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ public Double amount23;
+
+ /**
+ * 23鍙疯姳璐归噾棰�
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ public Double money23;
+
+ /**
+ * 23鍙风敤姘存鏁�
+ */
+ public Integer times23;
+
+ /**
+ * 24鍙风敤姘撮噺缁熻
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ public Double amount24;
+
+ /**
+ * 24鍙疯姳璐归噾棰�
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ public Double money24;
+
+ /**
+ * 24鍙风敤姘存鏁�
+ */
+ public Integer times24;
+
+ /**
+ * 25鍙风敤姘撮噺缁熻
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ public Double amount25;
+
+ /**
+ * 25鍙疯姳璐归噾棰�
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ public Double money25;
+
+ /**
+ * 25鍙风敤姘存鏁�
+ */
+ public Integer times25;
+
+ /**
+ * 26鍙风敤姘撮噺缁熻
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ public Double amount26;
+
+ /**
+ * 26鍙疯姳璐归噾棰�
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ public Double money26;
+
+ /**
+ * 26鍙风敤姘存鏁�
+ */
+ public Integer times26;
+
+ /**
+ * 27鍙风敤姘撮噺缁熻
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ public Double amount27;
+
+ /**
+ * 27鍙疯姳璐归噾棰�
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ public Double money27;
+
+ /**
+ * 27鍙风敤姘存鏁�
+ */
+ public Integer times27;
+
+ /**
+ * 28鍙风敤姘撮噺缁熻
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ public Double amount28;
+
+ /**
+ * 28鍙疯姳璐归噾棰�
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ public Double money28;
+
+ /**
+ * 28鍙风敤姘存鏁�
+ */
+ public Integer times28;
+
+ /**
+ * 29鍙风敤姘撮噺缁熻
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ public Double amount29;
+
+ /**
+ * 29鍙疯姳璐归噾棰�
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ public Double money29;
+
+ /**
+ * 29鍙风敤姘存鏁�
+ */
+ public Integer times29;
+
+ /**
+ * 30鍙风敤姘撮噺缁熻
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ public Double amount30;
+
+ /**
+ * 30鍙疯姳璐归噾棰�
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ public Double money30;
+
+ /**
+ * 30鍙风敤姘存鏁�
+ */
+ public Integer times30;
+
+ /**
+ * 31鍙风敤姘撮噺缁熻
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ public Double amount31;
+
+ /**
+ * 31鍙疯姳璐归噾棰�
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ public Double money31;
+
+ /**
+ * 31鍙风敤姘存鏁�
+ */
+ public Integer times31;
+
+}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoClientAmountStatistics.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoClientAmountStatistics.java
index 49b7b19..47e34a1 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoClientAmountStatistics.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoClientAmountStatistics.java
@@ -12,7 +12,8 @@
public class VoClientAmountStatistics {
public Long clientId ;
@JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
- public Double amount;
+ public Double amount;//鐢ㄦ按閲�
@JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
- public Double money;
+ public Double money;//姘磋垂閲戦
+ public Integer times;//娆℃暟
}
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoClientConsumeStatistics.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoClientConsumeStatistics.java
index f1817fc..686e1af 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoClientConsumeStatistics.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoClientConsumeStatistics.java
@@ -10,8 +10,8 @@
@Data
public class VoClientConsumeStatistics {
public Long clientId ;
- public Double water;//鐢ㄦ按閲忥紙m3锛�
- public Double amount;//鑺辫垂閲戦(鎵ｈ垂)锛堝厓锛�
+ public Double amount;//鐢ㄦ按閲忥紙m3锛�
+ public Double money;//鑺辫垂閲戦(鎵ｈ垂)锛堝厓锛�
public Integer duration; //鏃堕暱(鍒嗛挓)
public Integer times;//鐢ㄦ按娆℃暟
}
diff --git "a/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050mj\346\242\205\346\261\237\347\263\273\347\273\237\051.yml" "b/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050mj\346\242\205\346\261\237\347\263\273\347\273\237\051.yml"
index fb19525..767216c 100644
--- "a/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050mj\346\242\205\346\261\237\347\263\273\347\273\237\051.yml"
+++ "b/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050mj\346\242\205\346\261\237\347\263\273\347\273\237\051.yml"
@@ -66,7 +66,7 @@
configuration:
#log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #鏃惰�岃緭鍑烘棩蹇楋紝鏃惰�屼笉杈撳嚭鏃ュ織
#log-impl: org.apache.ibatis.logging.log4j2.Log4j2Impl 涓嶅啀搴旂敤锛屾敼涓篜rintSqlInterceptor鎷︽埅鍣ㄨ緭鍑簊ql鏃ュ織锛屼笅闈rint-sql椤归厤缃�
- print-sql: true # 杈撳嚭sql鏃ュ織寮�鍏筹紝鎺у埗PrintSqlInterceptor鎷︽埅鍣ㄦ槸鍚﹀姞杞�
+ print-sql: false # 杈撳嚭sql鏃ュ織寮�鍏筹紝鎺у埗PrintSqlInterceptor鎷︽埅鍣ㄦ槸鍚﹀姞杞�
#寮�鍚┘宄皍Name鑷姩鏄犲皠鍒皍_name
#2023-10-24缁忓疄楠岋紝涓嬮潰閰嶇疆true鎴杅alse锛岄兘鑳戒粠u_name鏄犲皠鍒皍Name
#map-underscore-to-camel-case: true
diff --git "a/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050mq\346\260\221\345\213\244\347\263\273\347\273\237\051.yml" "b/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050mq\346\260\221\345\213\244\347\263\273\347\273\237\051.yml"
index 3ad2ac9..d37f961 100644
--- "a/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050mq\346\260\221\345\213\244\347\263\273\347\273\237\051.yml"
+++ "b/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050mq\346\260\221\345\213\244\347\263\273\347\273\237\051.yml"
@@ -66,7 +66,7 @@
configuration:
#log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #鏃惰�岃緭鍑烘棩蹇楋紝鏃惰�屼笉杈撳嚭鏃ュ織
#log-impl: org.apache.ibatis.logging.log4j2.Log4j2Impl 涓嶅啀搴旂敤锛屾敼涓篜rintSqlInterceptor鎷︽埅鍣ㄨ緭鍑簊ql鏃ュ織锛屼笅闈rint-sql椤归厤缃�
- print-sql: true # 杈撳嚭sql鏃ュ織寮�鍏筹紝鎺у埗PrintSqlInterceptor鎷︽埅鍣ㄦ槸鍚﹀姞杞�
+ print-sql: false # 杈撳嚭sql鏃ュ織寮�鍏筹紝鎺у埗PrintSqlInterceptor鎷︽埅鍣ㄦ槸鍚﹀姞杞�
#寮�鍚┘宄皍Name鑷姩鏄犲皠鍒皍_name
#2023-10-24缁忓疄楠岋紝涓嬮潰閰嶇疆true鎴杅alse锛岄兘鑳戒粠u_name鏄犲皠鍒皍Name
#map-underscore-to-camel-case: true
diff --git "a/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050sp\346\262\231\347\233\230\347\263\273\347\273\237\051.yml" "b/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050sp\346\262\231\347\233\230\347\263\273\347\273\237\051.yml"
index 5c782bc..389c68f 100644
--- "a/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050sp\346\262\231\347\233\230\347\263\273\347\273\237\051.yml"
+++ "b/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050sp\346\262\231\347\233\230\347\263\273\347\273\237\051.yml"
@@ -66,7 +66,7 @@
configuration:
#log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #鏃惰�岃緭鍑烘棩蹇楋紝鏃惰�屼笉杈撳嚭鏃ュ織
#log-impl: org.apache.ibatis.logging.log4j2.Log4j2Impl 涓嶅啀搴旂敤锛屾敼涓篜rintSqlInterceptor鎷︽埅鍣ㄨ緭鍑簊ql鏃ュ織锛屼笅闈rint-sql椤归厤缃�
- print-sql: true # 杈撳嚭sql鏃ュ織寮�鍏筹紝鎺у埗PrintSqlInterceptor鎷︽埅鍣ㄦ槸鍚﹀姞杞�
+ print-sql: false # 杈撳嚭sql鏃ュ織寮�鍏筹紝鎺у埗PrintSqlInterceptor鎷︽埅鍣ㄦ槸鍚﹀姞杞�
#寮�鍚┘宄皍Name鑷姩鏄犲皠鍒皍_name
#2023-10-24缁忓疄楠岋紝涓嬮潰閰嶇疆true鎴杅alse锛岄兘鑳戒粠u_name鏄犲皠鍒皍Name
#map-underscore-to-camel-case: true
diff --git "a/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050test\346\265\213\350\257\225\347\263\273\347\273\237\051.yml" "b/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050test\346\265\213\350\257\225\347\263\273\347\273\237\051.yml"
index 6abf1aa..831cb7f 100644
--- "a/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050test\346\265\213\350\257\225\347\263\273\347\273\237\051.yml"
+++ "b/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050test\346\265\213\350\257\225\347\263\273\347\273\237\051.yml"
@@ -66,7 +66,7 @@
configuration:
#log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #鏃惰�岃緭鍑烘棩蹇楋紝鏃惰�屼笉杈撳嚭鏃ュ織
#log-impl: org.apache.ibatis.logging.log4j2.Log4j2Impl 涓嶅啀搴旂敤锛屾敼涓篜rintSqlInterceptor鎷︽埅鍣ㄨ緭鍑簊ql鏃ュ織锛屼笅闈rint-sql椤归厤缃�
- print-sql: true # 杈撳嚭sql鏃ュ織寮�鍏筹紝鎺у埗PrintSqlInterceptor鎷︽埅鍣ㄦ槸鍚﹀姞杞�
+ print-sql: false # 杈撳嚭sql鏃ュ織寮�鍏筹紝鎺у埗PrintSqlInterceptor鎷︽埅鍣ㄦ槸鍚﹀姞杞�
#寮�鍚┘宄皍Name鑷姩鏄犲皠鍒皍_name
#2023-10-24缁忓疄楠岋紝涓嬮潰閰嶇疆true鎴杅alse锛岄兘鑳戒粠u_name鏄犲皠鍒皍Name
#map-underscore-to-camel-case: true
diff --git "a/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050ym\345\205\203\350\260\213\347\263\273\347\273\237\051.yml" "b/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050ym\345\205\203\350\260\213\347\263\273\347\273\237\051.yml"
index 7c7205b..9d6d2be 100644
--- "a/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050ym\345\205\203\350\260\213\347\263\273\347\273\237\051.yml"
+++ "b/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050ym\345\205\203\350\260\213\347\263\273\347\273\237\051.yml"
@@ -66,7 +66,7 @@
configuration:
#log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #鏃惰�岃緭鍑烘棩蹇楋紝鏃惰�屼笉杈撳嚭鏃ュ織
#log-impl: org.apache.ibatis.logging.log4j2.Log4j2Impl 涓嶅啀搴旂敤锛屾敼涓篜rintSqlInterceptor鎷︽埅鍣ㄨ緭鍑簊ql鏃ュ織锛屼笅闈rint-sql椤归厤缃�
- print-sql: true # 杈撳嚭sql鏃ュ織寮�鍏筹紝鎺у埗PrintSqlInterceptor鎷︽埅鍣ㄦ槸鍚﹀姞杞�
+ print-sql: false # 杈撳嚭sql鏃ュ織寮�鍏筹紝鎺у埗PrintSqlInterceptor鎷︽埅鍣ㄦ槸鍚﹀姞杞�
#寮�鍚┘宄皍Name鑷姩鏄犲皠鍒皍_name
#2023-10-24缁忓疄楠岋紝涓嬮潰閰嶇疆true鎴杅alse锛岄兘鑳戒粠u_name鏄犲皠鍒皍Name
#map-underscore-to-camel-case: true
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
index 730b1dd..9b198e4 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
@@ -66,7 +66,7 @@
configuration:
#log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #鏃惰�岃緭鍑烘棩蹇楋紝鏃惰�屼笉杈撳嚭鏃ュ織
#log-impl: org.apache.ibatis.logging.log4j2.Log4j2Impl 涓嶅啀搴旂敤锛屾敼涓篜rintSqlInterceptor鎷︽埅鍣ㄨ緭鍑簊ql鏃ュ織锛屼笅闈rint-sql椤归厤缃�
- print-sql: true # 杈撳嚭sql鏃ュ織寮�鍏筹紝鎺у埗PrintSqlInterceptor鎷︽埅鍣ㄦ槸鍚﹀姞杞�
+ print-sql: false # 杈撳嚭sql鏃ュ織寮�鍏筹紝鎺у埗PrintSqlInterceptor鎷︽埅鍣ㄦ槸鍚﹀姞杞�
#寮�鍚┘宄皍Name鑷姩鏄犲皠鍒皍_name
#2023-10-24缁忓疄楠岋紝涓嬮潰閰嶇疆true鎴杅alse锛岄兘鑳戒粠u_name鏄犲皠鍒皍Name
#map-underscore-to-camel-case: true
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayMapper.xml
index 0c43003..23981d4 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayMapper.xml
@@ -8,6 +8,7 @@
<result column="client_id" jdbcType="BIGINT" property="clientId" />
<result column="amount" jdbcType="FLOAT" property="amount" />
<result column="money" jdbcType="FLOAT" property="money" />
+ <result column="times" jdbcType="INTEGER" property="times" />
<result column="dt" jdbcType="DATE" property="dt" />
<result column="open_dt_last" jdbcType="TIMESTAMP" property="openDtLast" />
<result column="close_dt_last" jdbcType="TIMESTAMP" property="closeDtLast" />
@@ -18,7 +19,7 @@
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
- id, client_id, amount, money, dt, open_dt_last, close_dt_last, this_amount_last, this_money_last,
+ id, client_id, amount, money, times, dt, open_dt_last, close_dt_last, this_amount_last, this_money_last,
this_time_last, rtu_dt_last
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
@@ -43,11 +44,11 @@
</delete>
<insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoRm.RmClientAmountDay">
<!--@mbg.generated-->
- insert into rm_client_amount_day (id, client_id, amount, money,
+ insert into rm_client_amount_day (id, client_id, amount, money, times,
dt, open_dt_last, close_dt_last,
this_amount_last, this_money_last, this_time_last,
rtu_dt_last)
- values (#{id,jdbcType=BIGINT}, #{clientId,jdbcType=BIGINT}, #{amount,jdbcType=FLOAT}, #{money,jdbcType=FLOAT},
+ values (#{id,jdbcType=BIGINT}, #{clientId,jdbcType=BIGINT}, #{amount,jdbcType=FLOAT}, #{money,jdbcType=FLOAT}, #{times,jdbcType=FLOAT},
#{dt,jdbcType=DATE}, #{openDtLast,jdbcType=TIMESTAMP}, #{closeDtLast,jdbcType=TIMESTAMP},
#{thisAmountLast,jdbcType=FLOAT}, #{thisMoneyLast,jdbcType=FLOAT}, #{thisTimeLast,jdbcType=INTEGER},
#{rtuDtLast,jdbcType=TIMESTAMP})
@@ -67,6 +68,9 @@
</if>
<if test="money != null">
money,
+ </if>
+ <if test="times != null">
+ times,
</if>
<if test="dt != null">
dt,
@@ -102,6 +106,9 @@
</if>
<if test="money != null">
#{money,jdbcType=FLOAT},
+ </if>
+ <if test="times != null">
+ #{times,jdbcType=INTEGER},
</if>
<if test="dt != null">
#{dt,jdbcType=DATE},
@@ -139,6 +146,9 @@
<if test="money != null">
money = #{money,jdbcType=FLOAT},
</if>
+ <if test="times != null">
+ times = #{times,jdbcType=INTEGER},
+ </if>
<if test="dt != null">
dt = #{dt,jdbcType=DATE},
</if>
@@ -169,6 +179,7 @@
set client_id = #{clientId,jdbcType=BIGINT},
amount = #{amount,jdbcType=FLOAT},
money = #{money,jdbcType=FLOAT},
+ times = #{times,jdbcType=INTEGER},
dt = #{dt,jdbcType=DATE},
open_dt_last = #{openDtLast,jdbcType=TIMESTAMP},
close_dt_last = #{closeDtLast,jdbcType=TIMESTAMP},
@@ -204,6 +215,7 @@
CAST(rcad.client_id AS char)AS clientId,
rcad.amount as amount,
rcad.money as money,
+ rcad.times as times,
rcad.dt as dt,
rcad.open_dt_last as openDtLast,
rcad.close_dt_last as closeDtLast,
@@ -236,7 +248,7 @@
<select id="statisticsByClient" resultType="com.dy.pipIrrGlobal.voSt.VoClientAmountStatistics">
- select client_id, sum(amount) as amount, sum(money) as money
+ select client_id, sum(amount) as amount, sum(money) as money, sum(times) as times
from rm_client_amount_day
where id <![CDATA[>=]]> #{startId,jdbcType=BIGINT} and id <![CDATA[<]]> #{endId,jdbcType=BIGINT}
group by client_id
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/StClientAmountDayMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/StClientAmountDayMapper.xml
new file mode 100644
index 0000000..cd1e7c5
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/StClientAmountDayMapper.xml
@@ -0,0 +1,1205 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dy.pipIrrGlobal.daoSt.StClientAmountDayMapper">
+ <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.pojoSt.StClientAmountDay">
+ <!--@mbg.generated-->
+ <!--@Table st_client_amount_day-->
+ <id column="id" jdbcType="BIGINT" property="id" />
+ <result column="client_id" jdbcType="BIGINT" property="clientId" />
+ <result column="year" jdbcType="INTEGER" property="year" />
+ <result column="month" jdbcType="INTEGER" property="month" />
+ <result column="amount1" jdbcType="FLOAT" property="amount1" />
+ <result column="money1" jdbcType="FLOAT" property="money1" />
+ <result column="times1" jdbcType="INTEGER" property="times1" />
+ <result column="amount2" jdbcType="FLOAT" property="amount2" />
+ <result column="money2" jdbcType="FLOAT" property="money2" />
+ <result column="times2" jdbcType="INTEGER" property="times2" />
+ <result column="amount3" jdbcType="FLOAT" property="amount3" />
+ <result column="money3" jdbcType="FLOAT" property="money3" />
+ <result column="times3" jdbcType="INTEGER" property="times3" />
+ <result column="amount4" jdbcType="FLOAT" property="amount4" />
+ <result column="money4" jdbcType="FLOAT" property="money4" />
+ <result column="times4" jdbcType="INTEGER" property="times4" />
+ <result column="amount5" jdbcType="FLOAT" property="amount5" />
+ <result column="money5" jdbcType="FLOAT" property="money5" />
+ <result column="times5" jdbcType="INTEGER" property="times5" />
+ <result column="amount6" jdbcType="FLOAT" property="amount6" />
+ <result column="money6" jdbcType="FLOAT" property="money6" />
+ <result column="times6" jdbcType="INTEGER" property="times6" />
+ <result column="amount7" jdbcType="FLOAT" property="amount7" />
+ <result column="money7" jdbcType="FLOAT" property="money7" />
+ <result column="times7" jdbcType="INTEGER" property="times7" />
+ <result column="amount8" jdbcType="FLOAT" property="amount8" />
+ <result column="money8" jdbcType="FLOAT" property="money8" />
+ <result column="times8" jdbcType="INTEGER" property="times8" />
+ <result column="amount9" jdbcType="FLOAT" property="amount9" />
+ <result column="money9" jdbcType="FLOAT" property="money9" />
+ <result column="times9" jdbcType="INTEGER" property="times9" />
+ <result column="amount10" jdbcType="FLOAT" property="amount10" />
+ <result column="money10" jdbcType="FLOAT" property="money10" />
+ <result column="times10" jdbcType="INTEGER" property="times10" />
+ <result column="amount11" jdbcType="FLOAT" property="amount11" />
+ <result column="money11" jdbcType="FLOAT" property="money11" />
+ <result column="times11" jdbcType="INTEGER" property="times11" />
+ <result column="amount12" jdbcType="FLOAT" property="amount12" />
+ <result column="money12" jdbcType="FLOAT" property="money12" />
+ <result column="times12" jdbcType="INTEGER" property="times12" />
+ <result column="amount13" jdbcType="FLOAT" property="amount13" />
+ <result column="money13" jdbcType="FLOAT" property="money13" />
+ <result column="times13" jdbcType="INTEGER" property="times13" />
+ <result column="amount14" jdbcType="FLOAT" property="amount14" />
+ <result column="money14" jdbcType="FLOAT" property="money14" />
+ <result column="times14" jdbcType="INTEGER" property="times14" />
+ <result column="amount15" jdbcType="FLOAT" property="amount15" />
+ <result column="money15" jdbcType="FLOAT" property="money15" />
+ <result column="times15" jdbcType="INTEGER" property="times15" />
+ <result column="amount16" jdbcType="FLOAT" property="amount16" />
+ <result column="money16" jdbcType="FLOAT" property="money16" />
+ <result column="times16" jdbcType="INTEGER" property="times16" />
+ <result column="amount17" jdbcType="FLOAT" property="amount17" />
+ <result column="money17" jdbcType="FLOAT" property="money17" />
+ <result column="times17" jdbcType="INTEGER" property="times17" />
+ <result column="amount18" jdbcType="FLOAT" property="amount18" />
+ <result column="money18" jdbcType="FLOAT" property="money18" />
+ <result column="times18" jdbcType="INTEGER" property="times18" />
+ <result column="amount19" jdbcType="FLOAT" property="amount19" />
+ <result column="money19" jdbcType="FLOAT" property="money19" />
+ <result column="times19" jdbcType="INTEGER" property="times19" />
+ <result column="amount20" jdbcType="FLOAT" property="amount20" />
+ <result column="money20" jdbcType="FLOAT" property="money20" />
+ <result column="times20" jdbcType="INTEGER" property="times20" />
+ <result column="amount21" jdbcType="FLOAT" property="amount21" />
+ <result column="money21" jdbcType="FLOAT" property="money21" />
+ <result column="times21" jdbcType="INTEGER" property="times21" />
+ <result column="amount22" jdbcType="FLOAT" property="amount22" />
+ <result column="money22" jdbcType="FLOAT" property="money22" />
+ <result column="times22" jdbcType="INTEGER" property="times22" />
+ <result column="amount23" jdbcType="FLOAT" property="amount23" />
+ <result column="money23" jdbcType="FLOAT" property="money23" />
+ <result column="times23" jdbcType="INTEGER" property="times23" />
+ <result column="amount24" jdbcType="FLOAT" property="amount24" />
+ <result column="money24" jdbcType="FLOAT" property="money24" />
+ <result column="times24" jdbcType="INTEGER" property="times24" />
+ <result column="amount25" jdbcType="FLOAT" property="amount25" />
+ <result column="money25" jdbcType="FLOAT" property="money25" />
+ <result column="times25" jdbcType="INTEGER" property="times25" />
+ <result column="amount26" jdbcType="FLOAT" property="amount26" />
+ <result column="money26" jdbcType="FLOAT" property="money26" />
+ <result column="times26" jdbcType="INTEGER" property="times26" />
+ <result column="amount27" jdbcType="FLOAT" property="amount27" />
+ <result column="money27" jdbcType="FLOAT" property="money27" />
+ <result column="times27" jdbcType="INTEGER" property="times27" />
+ <result column="amount28" jdbcType="FLOAT" property="amount28" />
+ <result column="money28" jdbcType="FLOAT" property="money28" />
+ <result column="times28" jdbcType="INTEGER" property="times28" />
+ <result column="amount29" jdbcType="FLOAT" property="amount29" />
+ <result column="money29" jdbcType="FLOAT" property="money29" />
+ <result column="times29" jdbcType="INTEGER" property="times29" />
+ <result column="amount30" jdbcType="FLOAT" property="amount30" />
+ <result column="money30" jdbcType="FLOAT" property="money30" />
+ <result column="times30" jdbcType="INTEGER" property="times30" />
+ <result column="amount31" jdbcType="FLOAT" property="amount31" />
+ <result column="money31" jdbcType="FLOAT" property="money31" />
+ <result column="times31" jdbcType="INTEGER" property="times31" />
+ </resultMap>
+ <sql id="Base_Column_List">
+ <!--@mbg.generated-->
+ id, client_id, `year`, `month`, amount1, money1, times1, amount2, money2, times2,
+ amount3, money3, times3, amount4, money4, times4, amount5, money5, times5, amount6,
+ money6, times6, amount7, money7, times7, amount8, money8, times8, amount9, money9,
+ times9, amount10, money10, times10, amount11, money11, times11, amount12, money12,
+ times12, amount13, money13, times13, amount14, money14, times14, amount15, money15,
+ times15, amount16, money16, times16, amount17, money17, times17, amount18, money18,
+ times18, amount19, money19, times19, amount20, money20, times20, amount21, money21,
+ times21, amount22, money22, times22, amount23, money23, times23, amount24, money24,
+ times24, amount25, money25, times25, amount26, money26, times26, amount27, money27,
+ times27, amount28, money28, times28, amount29, money29, times29, amount30, money30,
+ times30, amount31, money31, times31
+ </sql>
+ <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+ <!--@mbg.generated-->
+ select
+ <include refid="Base_Column_List" />
+ from st_client_amount_day
+ where id = #{id,jdbcType=BIGINT}
+ </select>
+ <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+ <!--@mbg.generated-->
+ delete from st_client_amount_day
+ where id = #{id,jdbcType=BIGINT}
+ </delete>
+ <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoSt.StClientAmountDay">
+ <!--@mbg.generated-->
+ insert into st_client_amount_day (id, client_id, `year`,
+ `month`, amount1, money1,
+ times1, amount2, money2,
+ times2, amount3, money3,
+ times3, amount4, money4,
+ times4, amount5, money5,
+ times5, amount6, money6,
+ times6, amount7, money7,
+ times7, amount8, money8,
+ times8, amount9, money9,
+ times9, amount10, money10,
+ times10, amount11, money11,
+ times11, amount12, money12,
+ times12, amount13, money13,
+ times13, amount14, money14,
+ times14, amount15, money15,
+ times15, amount16, money16,
+ times16, amount17, money17,
+ times17, amount18, money18,
+ times18, amount19, money19,
+ times19, amount20, money20,
+ times20, amount21, money21,
+ times21, amount22, money22,
+ times22, amount23, money23,
+ times23, amount24, money24,
+ times24, amount25, money25,
+ times25, amount26, money26,
+ times26, amount27, money27,
+ times27, amount28, money28,
+ times28, amount29, money29,
+ times29, amount30, money30,
+ times30, amount31, money31,
+ times31)
+ values (#{id,jdbcType=BIGINT}, #{clientId,jdbcType=BIGINT}, #{year,jdbcType=INTEGER},
+ #{month,jdbcType=INTEGER}, #{amount1,jdbcType=FLOAT}, #{money1,jdbcType=FLOAT},
+ #{times1,jdbcType=INTEGER}, #{amount2,jdbcType=FLOAT}, #{money2,jdbcType=FLOAT},
+ #{times2,jdbcType=INTEGER}, #{amount3,jdbcType=FLOAT}, #{money3,jdbcType=FLOAT},
+ #{times3,jdbcType=INTEGER}, #{amount4,jdbcType=FLOAT}, #{money4,jdbcType=FLOAT},
+ #{times4,jdbcType=INTEGER}, #{amount5,jdbcType=FLOAT}, #{money5,jdbcType=FLOAT},
+ #{times5,jdbcType=INTEGER}, #{amount6,jdbcType=FLOAT}, #{money6,jdbcType=FLOAT},
+ #{times6,jdbcType=INTEGER}, #{amount7,jdbcType=FLOAT}, #{money7,jdbcType=FLOAT},
+ #{times7,jdbcType=INTEGER}, #{amount8,jdbcType=FLOAT}, #{money8,jdbcType=FLOAT},
+ #{times8,jdbcType=INTEGER}, #{amount9,jdbcType=FLOAT}, #{money9,jdbcType=FLOAT},
+ #{times9,jdbcType=INTEGER}, #{amount10,jdbcType=FLOAT}, #{money10,jdbcType=FLOAT},
+ #{times10,jdbcType=INTEGER}, #{amount11,jdbcType=FLOAT}, #{money11,jdbcType=FLOAT},
+ #{times11,jdbcType=INTEGER}, #{amount12,jdbcType=FLOAT}, #{money12,jdbcType=FLOAT},
+ #{times12,jdbcType=INTEGER}, #{amount13,jdbcType=FLOAT}, #{money13,jdbcType=FLOAT},
+ #{times13,jdbcType=INTEGER}, #{amount14,jdbcType=FLOAT}, #{money14,jdbcType=FLOAT},
+ #{times14,jdbcType=INTEGER}, #{amount15,jdbcType=FLOAT}, #{money15,jdbcType=FLOAT},
+ #{times15,jdbcType=INTEGER}, #{amount16,jdbcType=FLOAT}, #{money16,jdbcType=FLOAT},
+ #{times16,jdbcType=INTEGER}, #{amount17,jdbcType=FLOAT}, #{money17,jdbcType=FLOAT},
+ #{times17,jdbcType=INTEGER}, #{amount18,jdbcType=FLOAT}, #{money18,jdbcType=FLOAT},
+ #{times18,jdbcType=INTEGER}, #{amount19,jdbcType=FLOAT}, #{money19,jdbcType=FLOAT},
+ #{times19,jdbcType=INTEGER}, #{amount20,jdbcType=FLOAT}, #{money20,jdbcType=FLOAT},
+ #{times20,jdbcType=INTEGER}, #{amount21,jdbcType=FLOAT}, #{money21,jdbcType=FLOAT},
+ #{times21,jdbcType=INTEGER}, #{amount22,jdbcType=FLOAT}, #{money22,jdbcType=FLOAT},
+ #{times22,jdbcType=INTEGER}, #{amount23,jdbcType=FLOAT}, #{money23,jdbcType=FLOAT},
+ #{times23,jdbcType=INTEGER}, #{amount24,jdbcType=FLOAT}, #{money24,jdbcType=FLOAT},
+ #{times24,jdbcType=INTEGER}, #{amount25,jdbcType=FLOAT}, #{money25,jdbcType=FLOAT},
+ #{times25,jdbcType=INTEGER}, #{amount26,jdbcType=FLOAT}, #{money26,jdbcType=FLOAT},
+ #{times26,jdbcType=INTEGER}, #{amount27,jdbcType=FLOAT}, #{money27,jdbcType=FLOAT},
+ #{times27,jdbcType=INTEGER}, #{amount28,jdbcType=FLOAT}, #{money28,jdbcType=FLOAT},
+ #{times28,jdbcType=INTEGER}, #{amount29,jdbcType=FLOAT}, #{money29,jdbcType=FLOAT},
+ #{times29,jdbcType=INTEGER}, #{amount30,jdbcType=FLOAT}, #{money30,jdbcType=FLOAT},
+ #{times30,jdbcType=INTEGER}, #{amount31,jdbcType=FLOAT}, #{money31,jdbcType=FLOAT},
+ #{times31,jdbcType=INTEGER})
+ </insert>
+ <insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoSt.StClientAmountDay">
+ <!--@mbg.generated-->
+ insert into st_client_amount_day
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="id != null">
+ id,
+ </if>
+ <if test="clientId != null">
+ client_id,
+ </if>
+ <if test="year != null">
+ `year`,
+ </if>
+ <if test="month != null">
+ `month`,
+ </if>
+ <if test="amount1 != null">
+ amount1,
+ </if>
+ <if test="money1 != null">
+ money1,
+ </if>
+ <if test="times1 != null">
+ times1,
+ </if>
+ <if test="amount2 != null">
+ amount2,
+ </if>
+ <if test="money2 != null">
+ money2,
+ </if>
+ <if test="times2 != null">
+ times2,
+ </if>
+ <if test="amount3 != null">
+ amount3,
+ </if>
+ <if test="money3 != null">
+ money3,
+ </if>
+ <if test="times3 != null">
+ times3,
+ </if>
+ <if test="amount4 != null">
+ amount4,
+ </if>
+ <if test="money4 != null">
+ money4,
+ </if>
+ <if test="times4 != null">
+ times4,
+ </if>
+ <if test="amount5 != null">
+ amount5,
+ </if>
+ <if test="money5 != null">
+ money5,
+ </if>
+ <if test="times5 != null">
+ times5,
+ </if>
+ <if test="amount6 != null">
+ amount6,
+ </if>
+ <if test="money6 != null">
+ money6,
+ </if>
+ <if test="times6 != null">
+ times6,
+ </if>
+ <if test="amount7 != null">
+ amount7,
+ </if>
+ <if test="money7 != null">
+ money7,
+ </if>
+ <if test="times7 != null">
+ times7,
+ </if>
+ <if test="amount8 != null">
+ amount8,
+ </if>
+ <if test="money8 != null">
+ money8,
+ </if>
+ <if test="times8 != null">
+ times8,
+ </if>
+ <if test="amount9 != null">
+ amount9,
+ </if>
+ <if test="money9 != null">
+ money9,
+ </if>
+ <if test="times9 != null">
+ times9,
+ </if>
+ <if test="amount10 != null">
+ amount10,
+ </if>
+ <if test="money10 != null">
+ money10,
+ </if>
+ <if test="times10 != null">
+ times10,
+ </if>
+ <if test="amount11 != null">
+ amount11,
+ </if>
+ <if test="money11 != null">
+ money11,
+ </if>
+ <if test="times11 != null">
+ times11,
+ </if>
+ <if test="amount12 != null">
+ amount12,
+ </if>
+ <if test="money12 != null">
+ money12,
+ </if>
+ <if test="times12 != null">
+ times12,
+ </if>
+ <if test="amount13 != null">
+ amount13,
+ </if>
+ <if test="money13 != null">
+ money13,
+ </if>
+ <if test="times13 != null">
+ times13,
+ </if>
+ <if test="amount14 != null">
+ amount14,
+ </if>
+ <if test="money14 != null">
+ money14,
+ </if>
+ <if test="times14 != null">
+ times14,
+ </if>
+ <if test="amount15 != null">
+ amount15,
+ </if>
+ <if test="money15 != null">
+ money15,
+ </if>
+ <if test="times15 != null">
+ times15,
+ </if>
+ <if test="amount16 != null">
+ amount16,
+ </if>
+ <if test="money16 != null">
+ money16,
+ </if>
+ <if test="times16 != null">
+ times16,
+ </if>
+ <if test="amount17 != null">
+ amount17,
+ </if>
+ <if test="money17 != null">
+ money17,
+ </if>
+ <if test="times17 != null">
+ times17,
+ </if>
+ <if test="amount18 != null">
+ amount18,
+ </if>
+ <if test="money18 != null">
+ money18,
+ </if>
+ <if test="times18 != null">
+ times18,
+ </if>
+ <if test="amount19 != null">
+ amount19,
+ </if>
+ <if test="money19 != null">
+ money19,
+ </if>
+ <if test="times19 != null">
+ times19,
+ </if>
+ <if test="amount20 != null">
+ amount20,
+ </if>
+ <if test="money20 != null">
+ money20,
+ </if>
+ <if test="times20 != null">
+ times20,
+ </if>
+ <if test="amount21 != null">
+ amount21,
+ </if>
+ <if test="money21 != null">
+ money21,
+ </if>
+ <if test="times21 != null">
+ times21,
+ </if>
+ <if test="amount22 != null">
+ amount22,
+ </if>
+ <if test="money22 != null">
+ money22,
+ </if>
+ <if test="times22 != null">
+ times22,
+ </if>
+ <if test="amount23 != null">
+ amount23,
+ </if>
+ <if test="money23 != null">
+ money23,
+ </if>
+ <if test="times23 != null">
+ times23,
+ </if>
+ <if test="amount24 != null">
+ amount24,
+ </if>
+ <if test="money24 != null">
+ money24,
+ </if>
+ <if test="times24 != null">
+ times24,
+ </if>
+ <if test="amount25 != null">
+ amount25,
+ </if>
+ <if test="money25 != null">
+ money25,
+ </if>
+ <if test="times25 != null">
+ times25,
+ </if>
+ <if test="amount26 != null">
+ amount26,
+ </if>
+ <if test="money26 != null">
+ money26,
+ </if>
+ <if test="times26 != null">
+ times26,
+ </if>
+ <if test="amount27 != null">
+ amount27,
+ </if>
+ <if test="money27 != null">
+ money27,
+ </if>
+ <if test="times27 != null">
+ times27,
+ </if>
+ <if test="amount28 != null">
+ amount28,
+ </if>
+ <if test="money28 != null">
+ money28,
+ </if>
+ <if test="times28 != null">
+ times28,
+ </if>
+ <if test="amount29 != null">
+ amount29,
+ </if>
+ <if test="money29 != null">
+ money29,
+ </if>
+ <if test="times29 != null">
+ times29,
+ </if>
+ <if test="amount30 != null">
+ amount30,
+ </if>
+ <if test="money30 != null">
+ money30,
+ </if>
+ <if test="times30 != null">
+ times30,
+ </if>
+ <if test="amount31 != null">
+ amount31,
+ </if>
+ <if test="money31 != null">
+ money31,
+ </if>
+ <if test="times31 != null">
+ times31,
+ </if>
+ </trim>
+ <trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test="id != null">
+ #{id,jdbcType=BIGINT},
+ </if>
+ <if test="clientId != null">
+ #{clientId,jdbcType=BIGINT},
+ </if>
+ <if test="year != null">
+ #{year,jdbcType=INTEGER},
+ </if>
+ <if test="month != null">
+ #{month,jdbcType=INTEGER},
+ </if>
+ <if test="amount1 != null">
+ #{amount1,jdbcType=FLOAT},
+ </if>
+ <if test="money1 != null">
+ #{money1,jdbcType=FLOAT},
+ </if>
+ <if test="times1 != null">
+ #{times1,jdbcType=INTEGER},
+ </if>
+ <if test="amount2 != null">
+ #{amount2,jdbcType=FLOAT},
+ </if>
+ <if test="money2 != null">
+ #{money2,jdbcType=FLOAT},
+ </if>
+ <if test="times2 != null">
+ #{times2,jdbcType=INTEGER},
+ </if>
+ <if test="amount3 != null">
+ #{amount3,jdbcType=FLOAT},
+ </if>
+ <if test="money3 != null">
+ #{money3,jdbcType=FLOAT},
+ </if>
+ <if test="times3 != null">
+ #{times3,jdbcType=INTEGER},
+ </if>
+ <if test="amount4 != null">
+ #{amount4,jdbcType=FLOAT},
+ </if>
+ <if test="money4 != null">
+ #{money4,jdbcType=FLOAT},
+ </if>
+ <if test="times4 != null">
+ #{times4,jdbcType=INTEGER},
+ </if>
+ <if test="amount5 != null">
+ #{amount5,jdbcType=FLOAT},
+ </if>
+ <if test="money5 != null">
+ #{money5,jdbcType=FLOAT},
+ </if>
+ <if test="times5 != null">
+ #{times5,jdbcType=INTEGER},
+ </if>
+ <if test="amount6 != null">
+ #{amount6,jdbcType=FLOAT},
+ </if>
+ <if test="money6 != null">
+ #{money6,jdbcType=FLOAT},
+ </if>
+ <if test="times6 != null">
+ #{times6,jdbcType=INTEGER},
+ </if>
+ <if test="amount7 != null">
+ #{amount7,jdbcType=FLOAT},
+ </if>
+ <if test="money7 != null">
+ #{money7,jdbcType=FLOAT},
+ </if>
+ <if test="times7 != null">
+ #{times7,jdbcType=INTEGER},
+ </if>
+ <if test="amount8 != null">
+ #{amount8,jdbcType=FLOAT},
+ </if>
+ <if test="money8 != null">
+ #{money8,jdbcType=FLOAT},
+ </if>
+ <if test="times8 != null">
+ #{times8,jdbcType=INTEGER},
+ </if>
+ <if test="amount9 != null">
+ #{amount9,jdbcType=FLOAT},
+ </if>
+ <if test="money9 != null">
+ #{money9,jdbcType=FLOAT},
+ </if>
+ <if test="times9 != null">
+ #{times9,jdbcType=INTEGER},
+ </if>
+ <if test="amount10 != null">
+ #{amount10,jdbcType=FLOAT},
+ </if>
+ <if test="money10 != null">
+ #{money10,jdbcType=FLOAT},
+ </if>
+ <if test="times10 != null">
+ #{times10,jdbcType=INTEGER},
+ </if>
+ <if test="amount11 != null">
+ #{amount11,jdbcType=FLOAT},
+ </if>
+ <if test="money11 != null">
+ #{money11,jdbcType=FLOAT},
+ </if>
+ <if test="times11 != null">
+ #{times11,jdbcType=INTEGER},
+ </if>
+ <if test="amount12 != null">
+ #{amount12,jdbcType=FLOAT},
+ </if>
+ <if test="money12 != null">
+ #{money12,jdbcType=FLOAT},
+ </if>
+ <if test="times12 != null">
+ #{times12,jdbcType=INTEGER},
+ </if>
+ <if test="amount13 != null">
+ #{amount13,jdbcType=FLOAT},
+ </if>
+ <if test="money13 != null">
+ #{money13,jdbcType=FLOAT},
+ </if>
+ <if test="times13 != null">
+ #{times13,jdbcType=INTEGER},
+ </if>
+ <if test="amount14 != null">
+ #{amount14,jdbcType=FLOAT},
+ </if>
+ <if test="money14 != null">
+ #{money14,jdbcType=FLOAT},
+ </if>
+ <if test="times14 != null">
+ #{times14,jdbcType=INTEGER},
+ </if>
+ <if test="amount15 != null">
+ #{amount15,jdbcType=FLOAT},
+ </if>
+ <if test="money15 != null">
+ #{money15,jdbcType=FLOAT},
+ </if>
+ <if test="times15 != null">
+ #{times15,jdbcType=INTEGER},
+ </if>
+ <if test="amount16 != null">
+ #{amount16,jdbcType=FLOAT},
+ </if>
+ <if test="money16 != null">
+ #{money16,jdbcType=FLOAT},
+ </if>
+ <if test="times16 != null">
+ #{times16,jdbcType=INTEGER},
+ </if>
+ <if test="amount17 != null">
+ #{amount17,jdbcType=FLOAT},
+ </if>
+ <if test="money17 != null">
+ #{money17,jdbcType=FLOAT},
+ </if>
+ <if test="times17 != null">
+ #{times17,jdbcType=INTEGER},
+ </if>
+ <if test="amount18 != null">
+ #{amount18,jdbcType=FLOAT},
+ </if>
+ <if test="money18 != null">
+ #{money18,jdbcType=FLOAT},
+ </if>
+ <if test="times18 != null">
+ #{times18,jdbcType=INTEGER},
+ </if>
+ <if test="amount19 != null">
+ #{amount19,jdbcType=FLOAT},
+ </if>
+ <if test="money19 != null">
+ #{money19,jdbcType=FLOAT},
+ </if>
+ <if test="times19 != null">
+ #{times19,jdbcType=INTEGER},
+ </if>
+ <if test="amount20 != null">
+ #{amount20,jdbcType=FLOAT},
+ </if>
+ <if test="money20 != null">
+ #{money20,jdbcType=FLOAT},
+ </if>
+ <if test="times20 != null">
+ #{times20,jdbcType=INTEGER},
+ </if>
+ <if test="amount21 != null">
+ #{amount21,jdbcType=FLOAT},
+ </if>
+ <if test="money21 != null">
+ #{money21,jdbcType=FLOAT},
+ </if>
+ <if test="times21 != null">
+ #{times21,jdbcType=INTEGER},
+ </if>
+ <if test="amount22 != null">
+ #{amount22,jdbcType=FLOAT},
+ </if>
+ <if test="money22 != null">
+ #{money22,jdbcType=FLOAT},
+ </if>
+ <if test="times22 != null">
+ #{times22,jdbcType=INTEGER},
+ </if>
+ <if test="amount23 != null">
+ #{amount23,jdbcType=FLOAT},
+ </if>
+ <if test="money23 != null">
+ #{money23,jdbcType=FLOAT},
+ </if>
+ <if test="times23 != null">
+ #{times23,jdbcType=INTEGER},
+ </if>
+ <if test="amount24 != null">
+ #{amount24,jdbcType=FLOAT},
+ </if>
+ <if test="money24 != null">
+ #{money24,jdbcType=FLOAT},
+ </if>
+ <if test="times24 != null">
+ #{times24,jdbcType=INTEGER},
+ </if>
+ <if test="amount25 != null">
+ #{amount25,jdbcType=FLOAT},
+ </if>
+ <if test="money25 != null">
+ #{money25,jdbcType=FLOAT},
+ </if>
+ <if test="times25 != null">
+ #{times25,jdbcType=INTEGER},
+ </if>
+ <if test="amount26 != null">
+ #{amount26,jdbcType=FLOAT},
+ </if>
+ <if test="money26 != null">
+ #{money26,jdbcType=FLOAT},
+ </if>
+ <if test="times26 != null">
+ #{times26,jdbcType=INTEGER},
+ </if>
+ <if test="amount27 != null">
+ #{amount27,jdbcType=FLOAT},
+ </if>
+ <if test="money27 != null">
+ #{money27,jdbcType=FLOAT},
+ </if>
+ <if test="times27 != null">
+ #{times27,jdbcType=INTEGER},
+ </if>
+ <if test="amount28 != null">
+ #{amount28,jdbcType=FLOAT},
+ </if>
+ <if test="money28 != null">
+ #{money28,jdbcType=FLOAT},
+ </if>
+ <if test="times28 != null">
+ #{times28,jdbcType=INTEGER},
+ </if>
+ <if test="amount29 != null">
+ #{amount29,jdbcType=FLOAT},
+ </if>
+ <if test="money29 != null">
+ #{money29,jdbcType=FLOAT},
+ </if>
+ <if test="times29 != null">
+ #{times29,jdbcType=INTEGER},
+ </if>
+ <if test="amount30 != null">
+ #{amount30,jdbcType=FLOAT},
+ </if>
+ <if test="money30 != null">
+ #{money30,jdbcType=FLOAT},
+ </if>
+ <if test="times30 != null">
+ #{times30,jdbcType=INTEGER},
+ </if>
+ <if test="amount31 != null">
+ #{amount31,jdbcType=FLOAT},
+ </if>
+ <if test="money31 != null">
+ #{money31,jdbcType=FLOAT},
+ </if>
+ <if test="times31 != null">
+ #{times31,jdbcType=INTEGER},
+ </if>
+ </trim>
+ </insert>
+ <update id="updateByPrimaryKeySelective" parameterType="com.dy.pipIrrGlobal.pojoSt.StClientAmountDay">
+ <!--@mbg.generated-->
+ update st_client_amount_day
+ <set>
+ <if test="clientId != null">
+ client_id = #{clientId,jdbcType=BIGINT},
+ </if>
+ <if test="year != null">
+ `year` = #{year,jdbcType=INTEGER},
+ </if>
+ <if test="month != null">
+ `month` = #{month,jdbcType=INTEGER},
+ </if>
+ <if test="amount1 != null">
+ amount1 = #{amount1,jdbcType=FLOAT},
+ </if>
+ <if test="money1 != null">
+ money1 = #{money1,jdbcType=FLOAT},
+ </if>
+ <if test="times1 != null">
+ times1 = #{times1,jdbcType=INTEGER},
+ </if>
+ <if test="amount2 != null">
+ amount2 = #{amount2,jdbcType=FLOAT},
+ </if>
+ <if test="money2 != null">
+ money2 = #{money2,jdbcType=FLOAT},
+ </if>
+ <if test="times2 != null">
+ times2 = #{times2,jdbcType=INTEGER},
+ </if>
+ <if test="amount3 != null">
+ amount3 = #{amount3,jdbcType=FLOAT},
+ </if>
+ <if test="money3 != null">
+ money3 = #{money3,jdbcType=FLOAT},
+ </if>
+ <if test="times3 != null">
+ times3 = #{times3,jdbcType=INTEGER},
+ </if>
+ <if test="amount4 != null">
+ amount4 = #{amount4,jdbcType=FLOAT},
+ </if>
+ <if test="money4 != null">
+ money4 = #{money4,jdbcType=FLOAT},
+ </if>
+ <if test="times4 != null">
+ times4 = #{times4,jdbcType=INTEGER},
+ </if>
+ <if test="amount5 != null">
+ amount5 = #{amount5,jdbcType=FLOAT},
+ </if>
+ <if test="money5 != null">
+ money5 = #{money5,jdbcType=FLOAT},
+ </if>
+ <if test="times5 != null">
+ times5 = #{times5,jdbcType=INTEGER},
+ </if>
+ <if test="amount6 != null">
+ amount6 = #{amount6,jdbcType=FLOAT},
+ </if>
+ <if test="money6 != null">
+ money6 = #{money6,jdbcType=FLOAT},
+ </if>
+ <if test="times6 != null">
+ times6 = #{times6,jdbcType=INTEGER},
+ </if>
+ <if test="amount7 != null">
+ amount7 = #{amount7,jdbcType=FLOAT},
+ </if>
+ <if test="money7 != null">
+ money7 = #{money7,jdbcType=FLOAT},
+ </if>
+ <if test="times7 != null">
+ times7 = #{times7,jdbcType=INTEGER},
+ </if>
+ <if test="amount8 != null">
+ amount8 = #{amount8,jdbcType=FLOAT},
+ </if>
+ <if test="money8 != null">
+ money8 = #{money8,jdbcType=FLOAT},
+ </if>
+ <if test="times8 != null">
+ times8 = #{times8,jdbcType=INTEGER},
+ </if>
+ <if test="amount9 != null">
+ amount9 = #{amount9,jdbcType=FLOAT},
+ </if>
+ <if test="money9 != null">
+ money9 = #{money9,jdbcType=FLOAT},
+ </if>
+ <if test="times9 != null">
+ times9 = #{times9,jdbcType=INTEGER},
+ </if>
+ <if test="amount10 != null">
+ amount10 = #{amount10,jdbcType=FLOAT},
+ </if>
+ <if test="money10 != null">
+ money10 = #{money10,jdbcType=FLOAT},
+ </if>
+ <if test="times10 != null">
+ times10 = #{times10,jdbcType=INTEGER},
+ </if>
+ <if test="amount11 != null">
+ amount11 = #{amount11,jdbcType=FLOAT},
+ </if>
+ <if test="money11 != null">
+ money11 = #{money11,jdbcType=FLOAT},
+ </if>
+ <if test="times11 != null">
+ times11 = #{times11,jdbcType=INTEGER},
+ </if>
+ <if test="amount12 != null">
+ amount12 = #{amount12,jdbcType=FLOAT},
+ </if>
+ <if test="money12 != null">
+ money12 = #{money12,jdbcType=FLOAT},
+ </if>
+ <if test="times12 != null">
+ times12 = #{times12,jdbcType=INTEGER},
+ </if>
+ <if test="amount13 != null">
+ amount13 = #{amount13,jdbcType=FLOAT},
+ </if>
+ <if test="money13 != null">
+ money13 = #{money13,jdbcType=FLOAT},
+ </if>
+ <if test="times13 != null">
+ times13 = #{times13,jdbcType=INTEGER},
+ </if>
+ <if test="amount14 != null">
+ amount14 = #{amount14,jdbcType=FLOAT},
+ </if>
+ <if test="money14 != null">
+ money14 = #{money14,jdbcType=FLOAT},
+ </if>
+ <if test="times14 != null">
+ times14 = #{times14,jdbcType=INTEGER},
+ </if>
+ <if test="amount15 != null">
+ amount15 = #{amount15,jdbcType=FLOAT},
+ </if>
+ <if test="money15 != null">
+ money15 = #{money15,jdbcType=FLOAT},
+ </if>
+ <if test="times15 != null">
+ times15 = #{times15,jdbcType=INTEGER},
+ </if>
+ <if test="amount16 != null">
+ amount16 = #{amount16,jdbcType=FLOAT},
+ </if>
+ <if test="money16 != null">
+ money16 = #{money16,jdbcType=FLOAT},
+ </if>
+ <if test="times16 != null">
+ times16 = #{times16,jdbcType=INTEGER},
+ </if>
+ <if test="amount17 != null">
+ amount17 = #{amount17,jdbcType=FLOAT},
+ </if>
+ <if test="money17 != null">
+ money17 = #{money17,jdbcType=FLOAT},
+ </if>
+ <if test="times17 != null">
+ times17 = #{times17,jdbcType=INTEGER},
+ </if>
+ <if test="amount18 != null">
+ amount18 = #{amount18,jdbcType=FLOAT},
+ </if>
+ <if test="money18 != null">
+ money18 = #{money18,jdbcType=FLOAT},
+ </if>
+ <if test="times18 != null">
+ times18 = #{times18,jdbcType=INTEGER},
+ </if>
+ <if test="amount19 != null">
+ amount19 = #{amount19,jdbcType=FLOAT},
+ </if>
+ <if test="money19 != null">
+ money19 = #{money19,jdbcType=FLOAT},
+ </if>
+ <if test="times19 != null">
+ times19 = #{times19,jdbcType=INTEGER},
+ </if>
+ <if test="amount20 != null">
+ amount20 = #{amount20,jdbcType=FLOAT},
+ </if>
+ <if test="money20 != null">
+ money20 = #{money20,jdbcType=FLOAT},
+ </if>
+ <if test="times20 != null">
+ times20 = #{times20,jdbcType=INTEGER},
+ </if>
+ <if test="amount21 != null">
+ amount21 = #{amount21,jdbcType=FLOAT},
+ </if>
+ <if test="money21 != null">
+ money21 = #{money21,jdbcType=FLOAT},
+ </if>
+ <if test="times21 != null">
+ times21 = #{times21,jdbcType=INTEGER},
+ </if>
+ <if test="amount22 != null">
+ amount22 = #{amount22,jdbcType=FLOAT},
+ </if>
+ <if test="money22 != null">
+ money22 = #{money22,jdbcType=FLOAT},
+ </if>
+ <if test="times22 != null">
+ times22 = #{times22,jdbcType=INTEGER},
+ </if>
+ <if test="amount23 != null">
+ amount23 = #{amount23,jdbcType=FLOAT},
+ </if>
+ <if test="money23 != null">
+ money23 = #{money23,jdbcType=FLOAT},
+ </if>
+ <if test="times23 != null">
+ times23 = #{times23,jdbcType=INTEGER},
+ </if>
+ <if test="amount24 != null">
+ amount24 = #{amount24,jdbcType=FLOAT},
+ </if>
+ <if test="money24 != null">
+ money24 = #{money24,jdbcType=FLOAT},
+ </if>
+ <if test="times24 != null">
+ times24 = #{times24,jdbcType=INTEGER},
+ </if>
+ <if test="amount25 != null">
+ amount25 = #{amount25,jdbcType=FLOAT},
+ </if>
+ <if test="money25 != null">
+ money25 = #{money25,jdbcType=FLOAT},
+ </if>
+ <if test="times25 != null">
+ times25 = #{times25,jdbcType=INTEGER},
+ </if>
+ <if test="amount26 != null">
+ amount26 = #{amount26,jdbcType=FLOAT},
+ </if>
+ <if test="money26 != null">
+ money26 = #{money26,jdbcType=FLOAT},
+ </if>
+ <if test="times26 != null">
+ times26 = #{times26,jdbcType=INTEGER},
+ </if>
+ <if test="amount27 != null">
+ amount27 = #{amount27,jdbcType=FLOAT},
+ </if>
+ <if test="money27 != null">
+ money27 = #{money27,jdbcType=FLOAT},
+ </if>
+ <if test="times27 != null">
+ times27 = #{times27,jdbcType=INTEGER},
+ </if>
+ <if test="amount28 != null">
+ amount28 = #{amount28,jdbcType=FLOAT},
+ </if>
+ <if test="money28 != null">
+ money28 = #{money28,jdbcType=FLOAT},
+ </if>
+ <if test="times28 != null">
+ times28 = #{times28,jdbcType=INTEGER},
+ </if>
+ <if test="amount29 != null">
+ amount29 = #{amount29,jdbcType=FLOAT},
+ </if>
+ <if test="money29 != null">
+ money29 = #{money29,jdbcType=FLOAT},
+ </if>
+ <if test="times29 != null">
+ times29 = #{times29,jdbcType=INTEGER},
+ </if>
+ <if test="amount30 != null">
+ amount30 = #{amount30,jdbcType=FLOAT},
+ </if>
+ <if test="money30 != null">
+ money30 = #{money30,jdbcType=FLOAT},
+ </if>
+ <if test="times30 != null">
+ times30 = #{times30,jdbcType=INTEGER},
+ </if>
+ <if test="amount31 != null">
+ amount31 = #{amount31,jdbcType=FLOAT},
+ </if>
+ <if test="money31 != null">
+ money31 = #{money31,jdbcType=FLOAT},
+ </if>
+ <if test="times31 != null">
+ times31 = #{times31,jdbcType=INTEGER},
+ </if>
+ </set>
+ where id = #{id,jdbcType=BIGINT}
+ </update>
+ <update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoSt.StClientAmountDay">
+ <!--@mbg.generated-->
+ update st_client_amount_day
+ set client_id = #{clientId,jdbcType=BIGINT},
+ `year` = #{year,jdbcType=INTEGER},
+ `month` = #{month,jdbcType=INTEGER},
+ amount1 = #{amount1,jdbcType=FLOAT},
+ money1 = #{money1,jdbcType=FLOAT},
+ times1 = #{times1,jdbcType=INTEGER},
+ amount2 = #{amount2,jdbcType=FLOAT},
+ money2 = #{money2,jdbcType=FLOAT},
+ times2 = #{times2,jdbcType=INTEGER},
+ amount3 = #{amount3,jdbcType=FLOAT},
+ money3 = #{money3,jdbcType=FLOAT},
+ times3 = #{times3,jdbcType=INTEGER},
+ amount4 = #{amount4,jdbcType=FLOAT},
+ money4 = #{money4,jdbcType=FLOAT},
+ times4 = #{times4,jdbcType=INTEGER},
+ amount5 = #{amount5,jdbcType=FLOAT},
+ money5 = #{money5,jdbcType=FLOAT},
+ times5 = #{times5,jdbcType=INTEGER},
+ amount6 = #{amount6,jdbcType=FLOAT},
+ money6 = #{money6,jdbcType=FLOAT},
+ times6 = #{times6,jdbcType=INTEGER},
+ amount7 = #{amount7,jdbcType=FLOAT},
+ money7 = #{money7,jdbcType=FLOAT},
+ times7 = #{times7,jdbcType=INTEGER},
+ amount8 = #{amount8,jdbcType=FLOAT},
+ money8 = #{money8,jdbcType=FLOAT},
+ times8 = #{times8,jdbcType=INTEGER},
+ amount9 = #{amount9,jdbcType=FLOAT},
+ money9 = #{money9,jdbcType=FLOAT},
+ times9 = #{times9,jdbcType=INTEGER},
+ amount10 = #{amount10,jdbcType=FLOAT},
+ money10 = #{money10,jdbcType=FLOAT},
+ times10 = #{times10,jdbcType=INTEGER},
+ amount11 = #{amount11,jdbcType=FLOAT},
+ money11 = #{money11,jdbcType=FLOAT},
+ times11 = #{times11,jdbcType=INTEGER},
+ amount12 = #{amount12,jdbcType=FLOAT},
+ money12 = #{money12,jdbcType=FLOAT},
+ times12 = #{times12,jdbcType=INTEGER},
+ amount13 = #{amount13,jdbcType=FLOAT},
+ money13 = #{money13,jdbcType=FLOAT},
+ times13 = #{times13,jdbcType=INTEGER},
+ amount14 = #{amount14,jdbcType=FLOAT},
+ money14 = #{money14,jdbcType=FLOAT},
+ times14 = #{times14,jdbcType=INTEGER},
+ amount15 = #{amount15,jdbcType=FLOAT},
+ money15 = #{money15,jdbcType=FLOAT},
+ times15 = #{times15,jdbcType=INTEGER},
+ amount16 = #{amount16,jdbcType=FLOAT},
+ money16 = #{money16,jdbcType=FLOAT},
+ times16 = #{times16,jdbcType=INTEGER},
+ amount17 = #{amount17,jdbcType=FLOAT},
+ money17 = #{money17,jdbcType=FLOAT},
+ times17 = #{times17,jdbcType=INTEGER},
+ amount18 = #{amount18,jdbcType=FLOAT},
+ money18 = #{money18,jdbcType=FLOAT},
+ times18 = #{times18,jdbcType=INTEGER},
+ amount19 = #{amount19,jdbcType=FLOAT},
+ money19 = #{money19,jdbcType=FLOAT},
+ times19 = #{times19,jdbcType=INTEGER},
+ amount20 = #{amount20,jdbcType=FLOAT},
+ money20 = #{money20,jdbcType=FLOAT},
+ times20 = #{times20,jdbcType=INTEGER},
+ amount21 = #{amount21,jdbcType=FLOAT},
+ money21 = #{money21,jdbcType=FLOAT},
+ times21 = #{times21,jdbcType=INTEGER},
+ amount22 = #{amount22,jdbcType=FLOAT},
+ money22 = #{money22,jdbcType=FLOAT},
+ times22 = #{times22,jdbcType=INTEGER},
+ amount23 = #{amount23,jdbcType=FLOAT},
+ money23 = #{money23,jdbcType=FLOAT},
+ times23 = #{times23,jdbcType=INTEGER},
+ amount24 = #{amount24,jdbcType=FLOAT},
+ money24 = #{money24,jdbcType=FLOAT},
+ times24 = #{times24,jdbcType=INTEGER},
+ amount25 = #{amount25,jdbcType=FLOAT},
+ money25 = #{money25,jdbcType=FLOAT},
+ times25 = #{times25,jdbcType=INTEGER},
+ amount26 = #{amount26,jdbcType=FLOAT},
+ money26 = #{money26,jdbcType=FLOAT},
+ times26 = #{times26,jdbcType=INTEGER},
+ amount27 = #{amount27,jdbcType=FLOAT},
+ money27 = #{money27,jdbcType=FLOAT},
+ times27 = #{times27,jdbcType=INTEGER},
+ amount28 = #{amount28,jdbcType=FLOAT},
+ money28 = #{money28,jdbcType=FLOAT},
+ times28 = #{times28,jdbcType=INTEGER},
+ amount29 = #{amount29,jdbcType=FLOAT},
+ money29 = #{money29,jdbcType=FLOAT},
+ times29 = #{times29,jdbcType=INTEGER},
+ amount30 = #{amount30,jdbcType=FLOAT},
+ money30 = #{money30,jdbcType=FLOAT},
+ times30 = #{times30,jdbcType=INTEGER},
+ amount31 = #{amount31,jdbcType=FLOAT},
+ money31 = #{money31,jdbcType=FLOAT},
+ times31 = #{times31,jdbcType=INTEGER}
+ where id = #{id,jdbcType=BIGINT}
+ </update>
+
+ <!-- ////////////////////////////////// -->
+ <!-- 缁熻鐩稿叧 -->
+ <!-- ////////////////////////////////// -->
+ <select id="selectByClientIdAndYearAndMonthAndDay" resultType="com.dy.pipIrrGlobal.pojoSt.StClientAmountDay">
+ select
+ <include refid="Base_Column_List" />
+ from st_client_amount_day
+ where client_id = #{clientId,jdbcType=BIGINT}
+ and year = #{year,jdbcType=INTEGER}
+ and month = #{month,jdbcType=INTEGER}
+ </select>
+
+ <!-- ////////////////////////////////// -->
+ <!-- 涓存椂浠诲姟鐩稿叧 -->
+ <!-- ////////////////////////////////// -->
+ <delete id="deleteAll">
+ delete from st_client_amount_day
+ </delete>
+</mapper>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1/TkDealClientAmountDay.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1/TkDealClientAmountDay.java
index 1f665ff..ca51f91 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1/TkDealClientAmountDay.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1/TkDealClientAmountDay.java
@@ -40,8 +40,8 @@
if (cdObj != null && cdObj instanceof DataCd83CloseVo) {
/*
鍙兘閲囩敤DataCd83CloseVo鏉ヨ绠楀啘鎴锋棩鐢ㄦ按閲忕殑鍘熷洜锛�
- 1銆佸鏋滈噰鐢―ataCd84Vo鏉ヨ绠楀啘鎴锋棩鐢ㄦ按閲忥紝蹇呴』閲囩敤鏈绱娴侀噺鍑忎笂娆＄疮娴侀噺鐨勫樊鍊间綔涓洪樁娈靛啘鎴风敤姘撮噺锛�
- 鐒跺悗鍚勪釜闃舵鐩稿姞锛屽緱鍒版湰娆″啘鎴风敤姘撮噺锛岃繖涓敤姘撮噺杩樻病鍔犲埌鍐滄埛鏃ョ敤姘撮噺涓紝鍥犱负鍙湁鏀朵笉鍒癉ataCd83CloseVo
+ 1銆佸鏋滈噰鐢―ataCd84Vo(寮�闃�宸ヤ綔鎶�)鏉ヨ绠楀啘鎴锋棩鐢ㄦ按閲忥紝蹇呴』閲囩敤鏈绱娴侀噺鍑忎笂娆＄疮娴侀噺鐨勫樊鍊间綔涓洪樁娈靛啘鎴风敤姘撮噺锛�
+ 鐒跺悗鍚勪釜闃舵鐩稿姞锛屽緱鍒版湰娆″啘鎴风敤姘撮噺锛岃繖涓敤姘撮噺杩樻病鍔犲埌鍐滄埛鏃ョ敤姘撮噺涓紝鍥犱负鍙湁鏀朵笉鍒癉ataCd83CloseVo(鍏抽榾鎶�)
涓婃姤鏁版嵁鏃舵墠鑳藉姞鍒板啘鎴风敤姘撮噺涓紝鍚﹀垯灏变細閲嶅璁＄畻锛屼絾浠�涔堟椂鍊欏強鑳藉惁鏀跺埌DataCd83CloseVo涓嶅彲棰勭煡銆�
2銆佸鏋滃啘鎴锋湁澶氬紶IC鍗★紝鍚屾椂鍦ㄥ涓彇姘村彛鍙栨按锛屽皢浼氭槸鏇村鏉傜殑璁＄畻锛岃澶氭儏褰㈡洿涓嶅彲棰勬祴锛屼笖鏃堕棿澶嶆潅搴�
蹇呯劧寰堥珮锛岃繖鏍风▼搴忚繍琛屾椂闂存洿闀匡紝灏嗕細閫犳垚涓婅鏁版嵁鍫靛鐜拌薄銆�
@@ -51,7 +51,7 @@
琛ユ姤DataCd83CloseVo澶勭悊鏂规硶锛�
閲囩敤DataCd83CloseVo鏁版嵁涓殑鍏抽榾鏃堕棿closeDt璁＄畻鍑哄啘鎴风敤姘存棩鏈燂紝涓嶈兘鐢ㄦ暟鎹帴鏀舵棩鏈熸椂闂翠綔涓哄啘鎴风敤姘存棩鏈燂紝
浣嗚繖绉嶈绠楁柟娉曞彲鑳戒細鏈夐噸澶嶄笂鎶ユ儏鍐靛彂鐢燂紝鍗抽噸澶嶈绠椾簡锛屽鏋滆鍒ゆ柇閲嶅锛屽繀鐒惰澧炲姞涓�涓叧闃�鏃堕棿鏁版嵁搴撹〃锛屽鍔犳椂闂�
- 澶嶆潅搴︼紝璁＄畻鐢ㄦ椂灏嗕細闀匡紝鏈郴缁熷亣璁惧彧瑕丷TU涓婃姤涓婃潵鏁版嵁浜嗭紝璇存槑褰撳墠缃戠粶杈冨ソ锛屽繀鐒惰兘鏀跺埌涓嬭搴旂瓟锛屼笉浼氬彂琛岄噸澶嶈ˉ鎶ャ��
+ 澶嶆潅搴︼紝璁＄畻鐢ㄦ椂灏嗕細闀匡紝鏈郴缁熷亣璁惧彧瑕丷TU涓婃姤涓婃潵鏁版嵁浜嗭紝璇存槑褰撳墠缃戠粶杈冨ソ锛屽繀鐒惰兘鏀跺埌涓嬭搴旂瓟锛屼笉浼氬彂鐢熼噸澶嶈ˉ鎶ャ��
*/
Object[] objs = this.getTaskResults(TkPreGenObjs.taskId);
DbSv sv = (DbSv) objs[0];
@@ -173,6 +173,7 @@
}else{
poHistory.money = lastPo.money ;
}
+ poHistory.times = 1 ;
poHistory.dt = lastPo.dt ;
poHistory.openDtLast = lastPo.openDtLast ;
poHistory.closeDtLast = lastPo.closeDtLast ;
@@ -183,6 +184,7 @@
}else{
poHistory.amount = cdData.thisAmount ;
poHistory.money = cdData.thisMoney ;
+ poHistory.times = 1 ;
poHistory.dt = DateTime.dateFrom_yyyy_MM_dd1(cdData.closeDt);//閲囩敤鍏抽榾鏃ユ湡浣滀负缁熻鏃ユ湡
poHistory.openDtLast = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(cdData.openDt);
poHistory.closeDtLast = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(cdData.closeDt);
@@ -289,6 +291,11 @@
}else{
poHistory.money = cdData.thisMoney ;
}
+ if(poHistory.times != null){
+ poHistory.times += 1 ;
+ }else{
+ poHistory.times = 1 ;
+ }
poHistory.dt = lastPo.dt ;
poHistory.openDtLast = lastPo.openDtLast ;
poHistory.closeDtLast = lastPo.closeDtLast ;
@@ -320,6 +327,11 @@
}else{
poHistory.money = cdData.thisMoney ;
}
+ if(poHistory.times != null){
+ poHistory.times += 1 ;
+ }else{
+ poHistory.times = 1 ;
+ }
poHistory.dt = DateTime.dateFrom_yyyy_MM_dd1(cdData.closeDt);//閲囩敤鍏抽榾鏃ユ湡浣滀负缁熻鏃ユ湡
poHistory.openDtLast = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(cdData.openDt) ;
poHistory.closeDtLast = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(cdData.closeDt) ;
@@ -329,8 +341,4 @@
poHistory.rtuDtLast = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(cdData.rtuDt) ;
return poHistory ;
}
-
-
-
-
}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StClient.java b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StClient.java
deleted file mode 100644
index 82aebe8..0000000
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StClient.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.dy.pipIrrStatistics.statistics;
-
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-/**
- * @Author: liurunyu
- * @Date: 2024/7/24 9:31
- * @Description
- */
-@Slf4j
-@Component
-public class StClient {
-
- @Autowired
- protected StClientSv sv ;
-
- private Integer statisticsYear;
- private Integer statisticsMonth;
- private Long statisticsStartId ;
- private Long statisticsEndId ;
-
- protected void statistics(Integer statisticsYear,
- Integer statisticsMonth,
- Long statisticsStartId,
- Long statisticsEndId){
- this.statisticsYear = statisticsYear ;
- this.statisticsMonth = statisticsMonth ;
- this.statisticsStartId = statisticsStartId ;
- this.statisticsEndId = statisticsEndId ;
- this.statisticsMonth() ;
- this.statisticsYear() ;
- }
-
- /**
- * 鏈堢粺璁�---鍐滄埛
- */
- private void statisticsMonth(){
- sv.statisticsMonth(statisticsYear, statisticsMonth, statisticsStartId, statisticsEndId);
- }
-
- /**
- * 骞寸粺璁�---鍐滄埛
- */
- private void statisticsYear(){
- sv.statisticsYear(statisticsYear);
- }
-}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StClientAmount.java b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StClientAmount.java
new file mode 100644
index 0000000..ca738b9
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StClientAmount.java
@@ -0,0 +1,71 @@
+package com.dy.pipIrrStatistics.statistics;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Author: liurunyu
+ * @Date: 2024/7/24 9:31
+ * @Description
+ */
+@Slf4j
+@Component
+public class StClientAmount {
+
+ @Autowired
+ protected StClientAmountSv sv ;
+
+ private Integer statisticsYear;
+ private Integer statisticsMonth;
+ private Integer statisticsDay;
+ private Long statisticsStartId ;
+ private Long statisticsEndId ;
+
+ protected void statistics4Day(Integer statisticsYear,
+ Integer statisticsMonth,
+ Integer statisticsDay,
+ Long statisticsStartId,
+ Long statisticsEndId){
+ this.statisticsYear = statisticsYear ;
+ this.statisticsMonth = statisticsMonth ;
+ this.statisticsDay = statisticsDay ;
+ this.statisticsStartId = statisticsStartId ;
+ this.statisticsEndId = statisticsEndId ;
+ this.statisticsDay() ;
+ }
+
+ protected void statistics(Integer statisticsYear,
+ Integer statisticsMonth,
+ Long statisticsStartId,
+ Long statisticsEndId){
+ this.statisticsYear = statisticsYear ;
+ this.statisticsMonth = statisticsMonth ;
+ this.statisticsStartId = statisticsStartId ;
+ this.statisticsEndId = statisticsEndId ;
+ this.statisticsDay() ;
+ this.statisticsMonth() ;
+ this.statisticsYear() ;
+ }
+
+ /**
+ * 鏃ョ粺璁�---鍐滄埛
+ */
+ private void statisticsDay(){
+ sv.statisticsDay(statisticsYear, statisticsMonth, statisticsDay, statisticsStartId, statisticsEndId);
+ }
+
+ /**
+ * 鏈堢粺璁�---鍐滄埛
+ */
+ private void statisticsMonth(){
+ sv.statisticsMonth(statisticsYear, statisticsMonth, statisticsStartId, statisticsEndId);
+ }
+
+ /**
+ * 骞寸粺璁�---鍐滄埛
+ */
+ private void statisticsYear(){
+ sv.statisticsYear(statisticsYear);
+ }
+}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StClientAmountSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StClientAmountSv.java
new file mode 100644
index 0000000..52f52f4
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StClientAmountSv.java
@@ -0,0 +1,345 @@
+package com.dy.pipIrrStatistics.statistics;
+
+import com.dy.pipIrrGlobal.daoRm.RmClientAmountDayMapper;
+import com.dy.pipIrrGlobal.daoSt.StClientAmountDayMapper;
+import com.dy.pipIrrGlobal.daoSt.StClientAmountMonthMapper;
+import com.dy.pipIrrGlobal.daoSt.StClientAmountYearMapper;
+import com.dy.pipIrrGlobal.pojoSt.*;
+import com.dy.pipIrrGlobal.voSt.VoClientAmountStatistics;
+import com.dy.pipIrrGlobal.voSt.VoClientConsumeStatistics;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * @Author: liurunyu
+ * @Date: 2024/7/24 16:28
+ * @Description
+ */
+@Component
+public class StClientAmountSv {
+
+ @Autowired
+ protected RmClientAmountDayMapper rmClientAmountDayDao;
+
+ @Autowired
+ protected StClientAmountDayMapper stClientAmountDayDao;
+
+ @Autowired
+ protected StClientAmountMonthMapper stClientAmountMonthDao ;
+
+ @Autowired
+ protected StClientAmountYearMapper stClientAmountYearDao ;
+
+ /**
+ * 鏃ョ粺璁�---鍐滄埛鐢ㄦ按閲忓強閲戦锛岀敱绾靛瀷鏁版嵁鏀规垚琛屽瀷鏁版嵁
+ */
+ @Transactional
+ protected void statisticsDay(Integer statisticsYear, Integer statisticsMonth, Integer statisticsDay, Long statisticsStartId, Long statisticsEndId){
+ List<VoClientAmountStatistics> list = rmClientAmountDayDao.statisticsByClient(statisticsStartId, statisticsEndId) ;
+ if(list != null && list.size() > 0){
+ for(VoClientAmountStatistics vo : list){
+ List<StClientAmountDay> listOfDay = stClientAmountDayDao.selectByClientIdAndYearAndMonthAndDay(vo.clientId, statisticsYear, statisticsMonth) ;
+ StClientAmountDay po = null ;
+ if(listOfDay != null && listOfDay.size() > 0){
+ //绋嬪簭閫昏緫鎺у埗涓婏紝闆嗗悎涓彧鏈変竴涓璞�
+ po = listOfDay.get(0) ;
+ }
+ if(po == null){
+ po = new StClientAmountDay() ;
+ po.clientId = vo.clientId ;
+ po.year = statisticsYear ;
+ po.month = statisticsMonth ;
+ }
+ this.setValueOfDayOfMonth(statisticsDay, vo, po);
+ if(po.id == null) {
+ stClientAmountDayDao.insert(po);
+ }else{
+ stClientAmountDayDao.updateByPrimaryKeySelective(po) ;
+ }
+ }
+ }
+ }
+
+ /**
+ * 鏈堢粺璁�---鍐滄埛鐢ㄦ按閲忓強閲戦
+ */
+ @Transactional
+ protected void statisticsMonth(Integer statisticsYear, Integer statisticsMonth, Long statisticsStartId, Long statisticsEndId){
+ List<VoClientAmountStatistics> list = rmClientAmountDayDao.statisticsByClient(statisticsStartId, statisticsEndId) ;
+ if(list != null && list.size() > 0){
+ for(VoClientAmountStatistics vo : list){
+ List<StClientAmountMonth> listOfMonth = stClientAmountMonthDao.selectByClientIdAndYearAndMonth(vo.clientId, statisticsYear, statisticsMonth) ;
+ StClientAmountMonth po = null ;
+ if(listOfMonth != null && listOfMonth.size() > 0){
+ //绋嬪簭閫昏緫鎺у埗涓婏紝闆嗗悎涓彧鏈変竴涓璞�
+ po = listOfMonth.get(0) ;
+ }
+ if(po == null) {
+ po = new StClientAmountMonth();
+ }
+ po.clientId = vo.clientId ;
+ po.year = statisticsYear ;
+ po.month = statisticsMonth ;
+ po.amount = vo.amount;
+ po.money = vo.money ;
+ if(po.id == null) {
+ stClientAmountMonthDao.insert(po);
+ }else{
+ stClientAmountMonthDao.updateByPrimaryKey(po) ;
+ }
+ }
+ }
+ }
+
+ /**
+ * 骞寸粺璁�---鍐滄埛鐢ㄦ按閲忓強閲戦
+ */
+ @Transactional
+ protected void statisticsYear(Integer statisticsYear){
+ List<VoClientAmountStatistics> list = stClientAmountMonthDao.statisticsByClient(statisticsYear) ;
+ if(list != null && list.size() > 0){
+ for(VoClientAmountStatistics vo : list){
+ List<StClientAmountYear> listOfYear = stClientAmountYearDao.selectByClientIdAndYear(vo.clientId, statisticsYear) ;
+ StClientAmountYear po = null ;
+ if(listOfYear != null && listOfYear.size() > 0){
+ //绋嬪簭閫昏緫鎺у埗涓婏紝闆嗗悎涓彧鏈変竴涓璞�
+ po = listOfYear.get(0) ;
+ }
+ if(po == null) {
+ po = new StClientAmountYear();
+ }
+ po.clientId = vo.clientId ;
+ po.year = statisticsYear ;
+ po.amount = vo.amount;
+ po.money = vo.money ;
+ if(po.id == null) {
+ stClientAmountYearDao.insert(po);
+ }else{
+ stClientAmountYearDao.updateByPrimaryKey(po) ;
+ }
+ }
+ }
+ }
+
+
+ private void setValueOfDayOfMonth(Integer statisticsDay, VoClientAmountStatistics vo, StClientAmountDay po){
+ switch (statisticsDay) {
+ case 1:
+ po.amount1 = vo.amount;
+ po.money1 = vo.money;
+ po.times1 = vo.times;
+ break;
+ case 2:
+ po.amount2 = vo.amount;
+ po.money2 = vo.money;
+ po.times2 = vo.times;
+ break;
+ case 3:
+ po.amount3 = vo.amount;
+ po.money3 = vo.money;
+ po.times3 = vo.times;
+ break;
+ case 4:
+ po.amount4 = vo.amount;
+ po.money4 = vo.money;
+ po.times4 = vo.times;
+ break;
+ case 5:
+ po.amount5 = vo.amount;
+ po.money5 = vo.money;
+ po.times5 = vo.times;
+ break;
+ case 6:
+ po.amount6 = vo.amount;
+ po.money6 = vo.money;
+ po.times6 = vo.times;
+ break;
+ case 7:
+ po.amount7 = vo.amount;
+ po.money7 = vo.money;
+ po.times7 = vo.times;
+ break;
+ case 8:
+ po.amount8 = vo.amount;
+ po.money8 = vo.money;
+ po.times8 = vo.times;
+ break;
+ case 9:
+ po.amount9 = vo.amount;
+ po.money9 = vo.money;
+ po.times9 = vo.times;
+ break;
+ case 10:
+ po.amount10 = vo.amount;
+ po.money10 = vo.money;
+ po.times10 = vo.times;
+ break;
+ case 11:
+ po.amount11 = vo.amount;
+ po.money11 = vo.money;
+ po.times11 = vo.times;
+ break;
+ case 12:
+ po.amount12 = vo.amount;
+ po.money12 = vo.money;
+ po.times12 = vo.times;
+ break;
+ case 13:
+ po.amount13 = vo.amount;
+ po.money13 = vo.money;
+ po.times13 = vo.times;
+ break;
+ case 14:
+ po.amount14 = vo.amount;
+ po.money14 = vo.money;
+ po.times14 = vo.times;
+ break;
+ case 15:
+ po.amount15 = vo.amount;
+ po.money15 = vo.money;
+ po.times15 = vo.times;
+ break;
+ case 16:
+ po.amount16 = vo.amount;
+ po.money16 = vo.money;
+ po.times16 = vo.times;
+ break;
+ case 17:
+ po.amount17 = vo.amount;
+ po.money17 = vo.money;
+ po.times17 = vo.times;
+ break;
+ case 18:
+ po.amount18 = vo.amount;
+ po.money18 = vo.money;
+ po.times18 = vo.times;
+ break;
+ case 19:
+ po.amount19 = vo.amount;
+ po.money19 = vo.money;
+ po.times19 = vo.times;
+ break;
+ case 20:
+ po.amount20 = vo.amount;
+ po.money20 = vo.money;
+ po.times20 = vo.times;
+ break;
+ case 21:
+ po.amount21 = vo.amount;
+ po.money21 = vo.money;
+ po.times21 = vo.times;
+ break;
+ case 22:
+ po.amount22 = vo.amount;
+ po.money22 = vo.money;
+ po.times22 = vo.times;
+ break;
+ case 23:
+ po.amount23 = vo.amount;
+ po.money23 = vo.money;
+ po.times23 = vo.times;
+ break;
+ case 24:
+ po.amount24 = vo.amount;
+ po.money24 = vo.money;
+ po.times24 = vo.times;
+ break;
+ case 25:
+ po.amount25 = vo.amount;
+ po.money25 = vo.money;
+ po.times25 = vo.times;
+ break;
+ case 26:
+ po.amount26 = vo.amount;
+ po.money26 = vo.money;
+ po.times26 = vo.times;
+ break;
+ case 27:
+ po.amount27 = vo.amount;
+ po.money27 = vo.money;
+ po.times27 = vo.times;
+ break;
+ case 28:
+ po.amount28 = vo.amount;
+ po.money28 = vo.money;
+ po.times28 = vo.times;
+ break;
+ case 29:
+ po.amount29 = vo.amount;
+ po.money29 = vo.money;
+ po.times29 = vo.times;
+ break;
+ case 30:
+ po.amount30 = vo.amount;
+ po.money30 = vo.money;
+ po.times30 = vo.times;
+ break;
+ case 31:
+ po.amount31 = vo.amount;
+ po.money31 = vo.money;
+ po.times31 = vo.times;
+ break;
+ }
+ }
+
+ private void setValueOfMonthOfYear(Integer statisticsMonth, VoClientConsumeStatistics vo, StConsumeClientMonth po){
+ switch (statisticsMonth) {
+ case 1:
+ po.amount1 = vo.money;
+ po.times1 = vo.times;
+ break;
+ case 2:
+ po.amount2 = vo.money;
+ po.times2 = vo.times;
+ break;
+ case 3:
+ po.amount3 = vo.money;
+ po.times3 = vo.times;
+ break;
+ case 4:
+ po.amount4 = vo.money;
+ po.times4 = vo.times;
+ break;
+ case 5:
+ po.amount5 = vo.money;
+ po.times5 = vo.times;
+ break;
+ case 6:
+ po.amount6 = vo.money;
+ po.times6 = vo.times;
+ break;
+ case 7:
+ po.amount7 = vo.money;
+ po.times7 = vo.times;
+ break;
+ case 8:
+ po.amount8 = vo.money;
+ po.times8 = vo.times;
+ break;
+ case 9:
+ po.amount9 = vo.money;
+ po.times9 = vo.times;
+ break;
+ case 10:
+ po.amount10 = vo.money;
+ po.times10 = vo.times;
+ break;
+ case 11:
+ po.amount11 = vo.money;
+ po.times11 = vo.times;
+ break;
+ case 12:
+ po.amount12 = vo.money;
+ po.times12 = vo.times;
+ break;
+ }
+ }
+
+ private void setValueOfYear(VoClientConsumeStatistics vo, StConsumeClientYear po){
+ po.amount = vo.money;
+ po.times = vo.times;
+ }
+}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StClientSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StClientSv.java
deleted file mode 100644
index 2cf0dc1..0000000
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StClientSv.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package com.dy.pipIrrStatistics.statistics;
-
-import com.dy.pipIrrGlobal.daoRm.RmClientAmountDayMapper;
-import com.dy.pipIrrGlobal.daoSt.StClientAmountMonthMapper;
-import com.dy.pipIrrGlobal.daoSt.StClientAmountYearMapper;
-import com.dy.pipIrrGlobal.pojoSt.StClientAmountMonth;
-import com.dy.pipIrrGlobal.pojoSt.StClientAmountYear;
-import com.dy.pipIrrGlobal.voSt.VoClientAmountStatistics;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-
-/**
- * @Author: liurunyu
- * @Date: 2024/7/24 16:28
- * @Description
- */
-@Component
-public class StClientSv {
-
- @Autowired
- protected RmClientAmountDayMapper rmClientAmountDayDao;
-
- @Autowired
- protected StClientAmountMonthMapper stClientAmountMonthDao ;
-
- @Autowired
- protected StClientAmountYearMapper stClientAmountYearDao ;
-
- /**
- * 鏈堢粺璁�---鍐滄埛鐢ㄦ按閲忓強閲戦
- */
- @Transactional
- protected void statisticsMonth(Integer statisticsYear, Integer statisticsMonth, Long statisticsStartId, Long statisticsEndId){
- List<VoClientAmountStatistics> list = rmClientAmountDayDao.statisticsByClient(statisticsStartId, statisticsEndId) ;
- if(list != null && list.size() > 0){
- for(VoClientAmountStatistics vo : list){
- List<StClientAmountMonth> listOfMonth = stClientAmountMonthDao.selectByClientIdAndYearAndMonth(vo.clientId, statisticsYear, statisticsMonth) ;
- StClientAmountMonth po = null ;
- if(listOfMonth != null && listOfMonth.size() > 0){
- //绋嬪簭閫昏緫鎺у埗涓婏紝闆嗗悎涓彧鏈変竴涓璞�
- po = listOfMonth.get(0) ;
- }
- if(po == null) {
- po = new StClientAmountMonth();
- }
- po.clientId = vo.clientId ;
- po.year = statisticsYear ;
- po.month = statisticsMonth ;
- po.amount = vo.amount;
- po.money = vo.money ;
- if(po.id == null) {
- stClientAmountMonthDao.insert(po);
- }else{
- stClientAmountMonthDao.updateByPrimaryKey(po) ;
- }
- }
- }
- }
-
- /**
- * 骞寸粺璁�---鍐滄埛鐢ㄦ按閲忓強閲戦
- */
- @Transactional
- protected void statisticsYear(Integer statisticsYear){
- List<VoClientAmountStatistics> list = stClientAmountMonthDao.statisticsByClient(statisticsYear) ;
- if(list != null && list.size() > 0){
- for(VoClientAmountStatistics vo : list){
- List<StClientAmountYear> listOfYear = stClientAmountYearDao.selectByClientIdAndYear(vo.clientId, statisticsYear) ;
- StClientAmountYear po = null ;
- if(listOfYear != null && listOfYear.size() > 0){
- //绋嬪簭閫昏緫鎺у埗涓婏紝闆嗗悎涓彧鏈変竴涓璞�
- po = listOfYear.get(0) ;
- }
- if(po == null) {
- po = new StClientAmountYear();
- }
- po.clientId = vo.clientId ;
- po.year = statisticsYear ;
- po.amount = vo.amount;
- po.money = vo.money ;
- if(po.id == null) {
- stClientAmountYearDao.insert(po);
- }else{
- stClientAmountYearDao.updateByPrimaryKey(po) ;
- }
- }
- }
- }
-}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StConsumeByClientSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StConsumeByClientSv.java
index 306b50d..894dd14 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StConsumeByClientSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StConsumeByClientSv.java
@@ -131,127 +131,127 @@
private void setValueOfDayOfMonth(Integer statisticsDay, VoClientConsumeStatistics vo, StConsumeClientDay po){
switch (statisticsDay) {
case 1:
- po.amount1 = vo.amount;
+ po.amount1 = vo.money;
po.times1 = vo.times;
break;
case 2:
- po.amount2 = vo.amount;
+ po.amount2 = vo.money;
po.times2 = vo.times;
break;
case 3:
- po.amount3 = vo.amount;
+ po.amount3 = vo.money;
po.times3 = vo.times;
break;
case 4:
- po.amount4 = vo.amount;
+ po.amount4 = vo.money;
po.times4 = vo.times;
break;
case 5:
- po.amount5 = vo.amount;
+ po.amount5 = vo.money;
po.times5 = vo.times;
break;
case 6:
- po.amount6 = vo.amount;
+ po.amount6 = vo.money;
po.times6 = vo.times;
break;
case 7:
- po.amount7 = vo.amount;
+ po.amount7 = vo.money;
po.times7 = vo.times;
break;
case 8:
- po.amount8 = vo.amount;
+ po.amount8 = vo.money;
po.times8 = vo.times;
break;
case 9:
- po.amount9 = vo.amount;
+ po.amount9 = vo.money;
po.times9 = vo.times;
break;
case 10:
- po.amount10 = vo.amount;
+ po.amount10 = vo.money;
po.times10 = vo.times;
break;
case 11:
- po.amount11 = vo.amount;
+ po.amount11 = vo.money;
po.times11 = vo.times;
break;
case 12:
- po.amount12 = vo.amount;
+ po.amount12 = vo.money;
po.times12 = vo.times;
break;
case 13:
- po.amount13 = vo.amount;
+ po.amount13 = vo.money;
po.times13 = vo.times;
break;
case 14:
- po.amount14 = vo.amount;
+ po.amount14 = vo.money;
po.times14 = vo.times;
break;
case 15:
- po.amount15 = vo.amount;
+ po.amount15 = vo.money;
po.times15 = vo.times;
break;
case 16:
- po.amount16 = vo.amount;
+ po.amount16 = vo.money;
po.times16 = vo.times;
break;
case 17:
- po.amount17 = vo.amount;
+ po.amount17 = vo.money;
po.times17 = vo.times;
break;
case 18:
- po.amount18 = vo.amount;
+ po.amount18 = vo.money;
po.times18 = vo.times;
break;
case 19:
- po.amount19 = vo.amount;
+ po.amount19 = vo.money;
po.times19 = vo.times;
break;
case 20:
- po.amount20 = vo.amount;
+ po.amount20 = vo.money;
po.times20 = vo.times;
break;
case 21:
- po.amount21 = vo.amount;
+ po.amount21 = vo.money;
po.times21 = vo.times;
break;
case 22:
- po.amount22 = vo.amount;
+ po.amount22 = vo.money;
po.times22 = vo.times;
break;
case 23:
- po.amount23 = vo.amount;
+ po.amount23 = vo.money;
po.times23 = vo.times;
break;
case 24:
- po.amount24 = vo.amount;
+ po.amount24 = vo.money;
po.times24 = vo.times;
break;
case 25:
- po.amount25 = vo.amount;
+ po.amount25 = vo.money;
po.times25 = vo.times;
break;
case 26:
- po.amount26 = vo.amount;
+ po.amount26 = vo.money;
po.times26 = vo.times;
break;
case 27:
- po.amount27 = vo.amount;
+ po.amount27 = vo.money;
po.times27 = vo.times;
break;
case 28:
- po.amount28 = vo.amount;
+ po.amount28 = vo.money;
po.times28 = vo.times;
break;
case 29:
- po.amount29 = vo.amount;
+ po.amount29 = vo.money;
po.times29 = vo.times;
break;
case 30:
- po.amount30 = vo.amount;
+ po.amount30 = vo.money;
po.times30 = vo.times;
break;
case 31:
- po.amount31 = vo.amount;
+ po.amount31 = vo.money;
po.times31 = vo.times;
break;
}
@@ -260,58 +260,58 @@
private void setValueOfMonthOfYear(Integer statisticsMonth, VoClientConsumeStatistics vo, StConsumeClientMonth po){
switch (statisticsMonth) {
case 1:
- po.amount1 = vo.amount;
+ po.amount1 = vo.money;
po.times1 = vo.times;
break;
case 2:
- po.amount2 = vo.amount;
+ po.amount2 = vo.money;
po.times2 = vo.times;
break;
case 3:
- po.amount3 = vo.amount;
+ po.amount3 = vo.money;
po.times3 = vo.times;
break;
case 4:
- po.amount4 = vo.amount;
+ po.amount4 = vo.money;
po.times4 = vo.times;
break;
case 5:
- po.amount5 = vo.amount;
+ po.amount5 = vo.money;
po.times5 = vo.times;
break;
case 6:
- po.amount6 = vo.amount;
+ po.amount6 = vo.money;
po.times6 = vo.times;
break;
case 7:
- po.amount7 = vo.amount;
+ po.amount7 = vo.money;
po.times7 = vo.times;
break;
case 8:
- po.amount8 = vo.amount;
+ po.amount8 = vo.money;
po.times8 = vo.times;
break;
case 9:
- po.amount9 = vo.amount;
+ po.amount9 = vo.money;
po.times9 = vo.times;
break;
case 10:
- po.amount10 = vo.amount;
+ po.amount10 = vo.money;
po.times10 = vo.times;
break;
case 11:
- po.amount11 = vo.amount;
+ po.amount11 = vo.money;
po.times11 = vo.times;
break;
case 12:
- po.amount12 = vo.amount;
+ po.amount12 = vo.money;
po.times12 = vo.times;
break;
}
}
private void setValueOfYear(VoClientConsumeStatistics vo, StConsumeClientYear po){
- po.amount = vo.amount;
+ po.amount = vo.money;
po.times = vo.times;
}
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StIntake.java b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StIntakeAmount.java
similarity index 94%
rename from pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StIntake.java
rename to pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StIntakeAmount.java
index ba6185c..b84940c 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StIntake.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StIntakeAmount.java
@@ -11,10 +11,10 @@
*/
@Slf4j
@Component
-public class StIntake {
+public class StIntakeAmount {
@Autowired
- protected StIntakeSv sv ;
+ protected StIntakeAmountSv sv ;
private Integer statisticsYear;
private Integer statisticsMonth;
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StIntakeSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StIntakeAmountSv.java
similarity index 98%
rename from pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StIntakeSv.java
rename to pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StIntakeAmountSv.java
index 3d6e9c7..7be2c7e 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StIntakeSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StIntakeAmountSv.java
@@ -18,7 +18,7 @@
* @Description
*/
@Component
-public class StIntakeSv {
+public class StIntakeAmountSv {
@Autowired
protected RmIntakeAmountDayMapper rmIntakeAmountDayDao;
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StLoss.java b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StLossAmount.java
similarity index 94%
rename from pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StLoss.java
rename to pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StLossAmount.java
index 0db2469..8b197fe 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StLoss.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StLossAmount.java
@@ -11,10 +11,10 @@
*/
@Slf4j
@Component
-public class StLoss {
+public class StLossAmount {
@Autowired
- protected StLossSv sv ;
+ protected StLossAmountSv sv ;
private Integer statisticsYear;
private Integer statisticsMonth;
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StLossSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StLossAmountSv.java
similarity index 98%
rename from pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StLossSv.java
rename to pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StLossAmountSv.java
index a63881b..5e83be1 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StLossSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StLossAmountSv.java
@@ -18,7 +18,7 @@
* @Description
*/
@Component
-public class StLossSv {
+public class StLossAmountSv {
@Autowired
protected RmLossDayMapper rmLossDayDao;
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StatisticsJob.java b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StatisticsJob.java
index 37fe0d4..a99463a 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StatisticsJob.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StatisticsJob.java
@@ -6,7 +6,6 @@
import com.dy.common.springUtil.SpringContextUtil;
import com.dy.common.util.DateTime;
import com.dy.common.util.IDLongGenerator;
-import com.dy.pipIrrGlobal.util.Org;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.quartz.JobDataMap;
@@ -14,7 +13,6 @@
import org.quartz.JobExecutionException;
import java.util.Date;
-import java.util.List;
/**
* @Author: liurunyu
@@ -27,9 +25,9 @@
private String orgTag ;
- private StLoss stLoss ;
- private StIntake stIntake ;
- private StClient stClient ;
+ private StLossAmount stLossAmount;
+ private StIntakeAmount stIntakeAmount;
+ private StClientAmount stClientAmount;
private StChargeByIc stChargeByIc ;
private StChargeByClient stChargeByClient ;
private StConsumeByIc stConsumeByIc ;
@@ -58,14 +56,14 @@
return ;
}
DataSourceContext.set(orgTag);//璁剧疆鏁版嵁婧�
- stLoss = SpringContextUtil.getBean(StLoss.class);
- stIntake = SpringContextUtil.getBean(StIntake.class);
- stClient = SpringContextUtil.getBean(StClient.class);
+ stLossAmount = SpringContextUtil.getBean(StLossAmount.class);
+ stIntakeAmount = SpringContextUtil.getBean(StIntakeAmount.class);
+ stClientAmount = SpringContextUtil.getBean(StClientAmount.class);
stChargeByIc = SpringContextUtil.getBean(StChargeByIc.class);
stChargeByClient = SpringContextUtil.getBean(StChargeByClient.class);
stConsumeByIc = SpringContextUtil.getBean(StConsumeByIc.class);
stConsumeByClient = SpringContextUtil.getBean(StConsumeByClient.class);
- if(stLoss != null && stIntake != null && stClient != null
+ if(stLossAmount != null && stIntakeAmount != null && stClientAmount != null
&& stChargeByIc != null && stChargeByClient != null
&& stConsumeByIc != null && stConsumeByClient != null){
String yesterday = DateTime.lastXDay_yyyy_MM_dd(1) ;//寰楀埌鏄ㄥぉ锛岄浂鏅ㄦ椂鍒荤粺璁★紝缁熻鏄ㄥぉ鐨勬暟
@@ -73,8 +71,8 @@
statisticsYear = yesterdayGrp[0] ;//缁熻骞�
statisticsMonth = yesterdayGrp[1] ;//缁熻鏈�
statisticsDay = yesterdayGrp[2] ;//缁熻鏃�
- statistics4DayStartId = IDLongGenerator.generateOneDayStartId(statisticsYear, statisticsMonth, 1) ;
- statistics4DayEndId = IDLongGenerator.generateOneDayEndId(statisticsYear, statisticsMonth, DateTime.endDayOfMonth(statisticsYear, statisticsMonth)) ;
+ statistics4DayStartId = IDLongGenerator.generateOneDayStartId(statisticsYear, statisticsMonth, statisticsDay) ;
+ statistics4DayEndId = IDLongGenerator.generateOneDayEndId(statisticsYear, statisticsMonth, statisticsDay) ;
statistics4DayStartDt = DateTime.startOfDay(statisticsYear, statisticsMonth, statisticsDay) ;
statistics4DayEndDt = DateTime.endOfDay(statisticsYear, statisticsMonth, statisticsDay) ;
//缁熻鏃ョ殑閲�
@@ -109,6 +107,7 @@
* 缁熻
*/
private void doStatisticsDay(){
+ stClientAmount.statistics4Day(statisticsYear, statisticsMonth, statisticsDay, statistics4DayStartId, statistics4DayEndId) ;
stChargeByIc.statistics4Day(statisticsYear, statisticsMonth, statisticsDay, statistics4DayStartId, statistics4DayEndId);
stChargeByClient.statistics4Day(statisticsYear, statisticsMonth, statisticsDay, statistics4DayStartId, statistics4DayEndId);
stConsumeByIc.statistics4Day(statisticsYear, statisticsMonth, statisticsDay, statistics4DayStartDt, statistics4DayEndDt);
@@ -118,9 +117,9 @@
* 缁熻
*/
private void doStatisticsMonthAndYear(){
- stLoss.statistics(statisticsYear, statisticsMonth, statistics4MonthYearStartId, statistics4MonthYearEndId) ;
- stIntake.statistics(statisticsYear, statisticsMonth, statistics4MonthYearStartId, statistics4MonthYearEndId) ;
- stClient.statistics(statisticsYear, statisticsMonth, statistics4MonthYearStartId, statistics4MonthYearEndId) ;
+ stLossAmount.statistics(statisticsYear, statisticsMonth, statistics4MonthYearStartId, statistics4MonthYearEndId) ;
+ stIntakeAmount.statistics(statisticsYear, statisticsMonth, statistics4MonthYearStartId, statistics4MonthYearEndId) ;
+ stClientAmount.statistics(statisticsYear, statisticsMonth, statistics4MonthYearStartId, statistics4MonthYearEndId) ;
stChargeByIc.statistics4MonthAndYear(statisticsYear, statisticsMonth);
stChargeByClient.statistics4MonthAndYear(statisticsYear, statisticsMonth);
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/PipIrrWebTempApplication.java b/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/PipIrrWebTempApplication.java
index f1a2aca..bbe4e48 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/PipIrrWebTempApplication.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/PipIrrWebTempApplication.java
@@ -19,7 +19,7 @@
}
)
@MapperScan(basePackages={"com.dy.pipIrrGlobal.daoBa","com.dy.pipIrrGlobal.daoSe","com.dy.pipIrrGlobal.daoRm",
- "com.dy.pipIrrGlobal.daoPr","com.dy.pipIrrGlobal.daoFi","com.dy.pipIrrGlobal.daoOp","com.dy.pipIrrGlobal.daoTmp"
+ "com.dy.pipIrrGlobal"
})
public class PipIrrWebTempApplication {
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/changeSome/ChSomeIntakeAmountSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/changeSome/ChSomeIntakeAmountSv.java
index a23eb3d..d1e6f82 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/changeSome/ChSomeIntakeAmountSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/changeSome/ChSomeIntakeAmountSv.java
@@ -145,21 +145,6 @@
private static final int DealStartYear = 2024 ;
private static final int DealStartMonth = 8 ;
- private static final String endDayOfMonth(int year, int month){
- if(month == 1 || month == 3 || month == 5 || month == 7 || month == 8 || month == 10 || month == 12){
- return "31" ;
- }else{
- if(month == 2){
- if(DateTime.isLeapYear(year)){
- return "29" ;
- }else{
- return "28" ;
- }
- }else{
- return "30" ;
- }
- }
- }
/**
* 鍒犻櫎鎵�鏈夊彇姘村彛鏈堝彇姘撮噺缁熻
* @throws Exception
@@ -184,14 +169,14 @@
if(year < nowYear){
for(int month = 1 ; month <= 12 ; month ++){
startDt = DateTime.dateFrom_yyyy_MM_dd(year + "-" + month + "-01") ;
- endDt = DateTime.dateFrom_yyyy_MM_dd(year + "-" + month + "-" + endDayOfMonth(year, month)) ;
+ endDt = DateTime.dateFrom_yyyy_MM_dd(year + "-" + month + "-" + DateTime.endDayOfMonth(year, month)) ;
list = dao.statisticAllIntakeAmountMonthFromAmountDay(startDt, endDt) ;
this.doStatisticsIntakeAmountMonth(year, month, list) ;
}
}else{
for(int month = 1 ; month <= nowMonth ; month ++){
startDt = DateTime.dateFrom_yyyy_MM_dd(year + "-" + month + "-01") ;
- endDt = DateTime.dateFrom_yyyy_MM_dd(year + "-" + month + "-" + endDayOfMonth(year, month)) ;
+ endDt = DateTime.dateFrom_yyyy_MM_dd(year + "-" + month + "-" + DateTime.endDayOfMonth(year, month)) ;
list = dao.statisticAllIntakeAmountMonthFromAmountDay(startDt, endDt) ;
this.doStatisticsIntakeAmountMonth(year, month, list) ;
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/statistics/StClientAmountSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/statistics/StClientAmountSv.java
new file mode 100644
index 0000000..3509ebc
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/statistics/StClientAmountSv.java
@@ -0,0 +1,321 @@
+package com.dy.pipIrrTemp.statistics;
+
+import com.dy.common.util.DateTime;
+import com.dy.common.util.IDLongGenerator;
+import com.dy.pipIrrGlobal.daoRm.RmClientAmountDayMapper;
+import com.dy.pipIrrGlobal.daoSt.StClientAmountDayMapper;
+import com.dy.pipIrrGlobal.pojoSt.StClientAmountDay;
+import com.dy.pipIrrGlobal.pojoSt.StConsumeClientMonth;
+import com.dy.pipIrrGlobal.pojoSt.StConsumeClientYear;
+import com.dy.pipIrrGlobal.voSt.VoClientAmountStatistics;
+import com.dy.pipIrrGlobal.voSt.VoClientConsumeStatistics;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * @Author: liurunyu
+ * @Date: 2024/12/28 12:52
+ * @Description
+ */
+
+@Slf4j
+@Service
+public class StClientAmountSv {
+
+ protected RmClientAmountDayMapper rmClientAmountDayDao;
+
+ protected StClientAmountDayMapper stClientAmountDayDao;
+
+ @Autowired
+ private void setDao(RmClientAmountDayMapper dao) {
+ this.rmClientAmountDayDao = dao;
+ }
+
+ @Autowired
+ private void setDao(StClientAmountDayMapper dao) {
+ this.stClientAmountDayDao = dao;
+ }
+
+ private static final int[][] yearMonthGrp = {{2024, 9}, {2024, 10}, {2024, 11}, {2024, 12}, {2025, 1}, {2025, 2}, {2025, 3}, {2025, 4}};
+
+ /**
+ * 鍒犻櫎鎵�鏈�
+ * @throws Exception
+ */
+ public void deleteAllStClientAmountDay() throws Exception {
+ stClientAmountDayDao.deleteAll() ;
+ }
+
+ /**
+ * 杞瓨鍐滄埛鏃ュ彇姘撮噺锛岀敱绾靛瀷鏀逛负妯瀷
+ *
+ * @throws Exception
+ */
+ public void transSaveClientAmountDay() throws Exception {
+ Long yesterday = Long.parseLong(DateTime.lastXDay_yyyy_MM_dd(1).replaceAll("-", ""));
+ Long atDay = Long.MAX_VALUE ;
+ int endDayOfMonth = 0 ;
+ for(int[] ym : yearMonthGrp) {
+ endDayOfMonth = DateTime.endDayOfMonth(ym[0], ym[1]) ;
+ for (int day = 1; day <= endDayOfMonth; day++) {
+ atDay = Long.parseLong(ym[0] + "" + (ym[1] < 10?("0" + ym[1]):ym[1]) + "" + (day < 10?("0" + day):day)) ;
+ if(atDay <= yesterday) {
+ Long statistics4DayStartId = IDLongGenerator.generateOneDayStartId(ym[0], ym[1], day);
+ Long statistics4DayEndId = IDLongGenerator.generateOneDayEndId(ym[0], ym[1], day);
+ this.statisticsDay(ym[0], ym[1], day, statistics4DayStartId, statistics4DayEndId);
+ }
+ }
+ }
+ }
+
+
+ @Transactional
+ protected void statisticsDay(Integer statisticsYear, Integer statisticsMonth, Integer statisticsDay, Long statisticsStartId, Long statisticsEndId){
+ List<VoClientAmountStatistics> list = rmClientAmountDayDao.statisticsByClient(statisticsStartId, statisticsEndId) ;
+ if(list != null && list.size() > 0){
+ for(VoClientAmountStatistics vo : list){
+ List<StClientAmountDay> listOfDay = stClientAmountDayDao.selectByClientIdAndYearAndMonthAndDay(vo.clientId, statisticsYear, statisticsMonth) ;
+ StClientAmountDay po = null ;
+ if(listOfDay != null && listOfDay.size() > 0){
+ //绋嬪簭閫昏緫鎺у埗涓婏紝闆嗗悎涓彧鏈変竴涓璞�
+ po = listOfDay.get(0) ;
+ }
+ if(po == null){
+ po = new StClientAmountDay() ;
+ po.clientId = vo.clientId ;
+ po.year = statisticsYear ;
+ po.month = statisticsMonth ;
+ }
+ this.setValueOfDayOfMonth(statisticsDay, vo, po);
+ if(po.id == null) {
+ stClientAmountDayDao.insert(po);
+ }else{
+ stClientAmountDayDao.updateByPrimaryKeySelective(po) ;
+ }
+ }
+ }
+ }
+
+ private void setValueOfDayOfMonth(Integer statisticsDay, VoClientAmountStatistics vo, StClientAmountDay po){
+ switch (statisticsDay) {
+ case 1:
+ po.amount1 = vo.amount;
+ po.money1 = vo.money;
+ po.times1 = vo.times;
+ break;
+ case 2:
+ po.amount2 = vo.amount;
+ po.money2 = vo.money;
+ po.times2 = vo.times;
+ break;
+ case 3:
+ po.amount3 = vo.amount;
+ po.money3 = vo.money;
+ po.times3 = vo.times;
+ break;
+ case 4:
+ po.amount4 = vo.amount;
+ po.money4 = vo.money;
+ po.times4 = vo.times;
+ break;
+ case 5:
+ po.amount5 = vo.amount;
+ po.money5 = vo.money;
+ po.times5 = vo.times;
+ break;
+ case 6:
+ po.amount6 = vo.amount;
+ po.money6 = vo.money;
+ po.times6 = vo.times;
+ break;
+ case 7:
+ po.amount7 = vo.amount;
+ po.money7 = vo.money;
+ po.times7 = vo.times;
+ break;
+ case 8:
+ po.amount8 = vo.amount;
+ po.money8 = vo.money;
+ po.times8 = vo.times;
+ break;
+ case 9:
+ po.amount9 = vo.amount;
+ po.money9 = vo.money;
+ po.times9 = vo.times;
+ break;
+ case 10:
+ po.amount10 = vo.amount;
+ po.money10 = vo.money;
+ po.times10 = vo.times;
+ break;
+ case 11:
+ po.amount11 = vo.amount;
+ po.money11 = vo.money;
+ po.times11 = vo.times;
+ break;
+ case 12:
+ po.amount12 = vo.amount;
+ po.money12 = vo.money;
+ po.times12 = vo.times;
+ break;
+ case 13:
+ po.amount13 = vo.amount;
+ po.money13 = vo.money;
+ po.times13 = vo.times;
+ break;
+ case 14:
+ po.amount14 = vo.amount;
+ po.money14 = vo.money;
+ po.times14 = vo.times;
+ break;
+ case 15:
+ po.amount15 = vo.amount;
+ po.money15 = vo.money;
+ po.times15 = vo.times;
+ break;
+ case 16:
+ po.amount16 = vo.amount;
+ po.money16 = vo.money;
+ po.times16 = vo.times;
+ break;
+ case 17:
+ po.amount17 = vo.amount;
+ po.money17 = vo.money;
+ po.times17 = vo.times;
+ break;
+ case 18:
+ po.amount18 = vo.amount;
+ po.money18 = vo.money;
+ po.times18 = vo.times;
+ break;
+ case 19:
+ po.amount19 = vo.amount;
+ po.money19 = vo.money;
+ po.times19 = vo.times;
+ break;
+ case 20:
+ po.amount20 = vo.amount;
+ po.money20 = vo.money;
+ po.times20 = vo.times;
+ break;
+ case 21:
+ po.amount21 = vo.amount;
+ po.money21 = vo.money;
+ po.times21 = vo.times;
+ break;
+ case 22:
+ po.amount22 = vo.amount;
+ po.money22 = vo.money;
+ po.times22 = vo.times;
+ break;
+ case 23:
+ po.amount23 = vo.amount;
+ po.money23 = vo.money;
+ po.times23 = vo.times;
+ break;
+ case 24:
+ po.amount24 = vo.amount;
+ po.money24 = vo.money;
+ po.times24 = vo.times;
+ break;
+ case 25:
+ po.amount25 = vo.amount;
+ po.money25 = vo.money;
+ po.times25 = vo.times;
+ break;
+ case 26:
+ po.amount26 = vo.amount;
+ po.money26 = vo.money;
+ po.times26 = vo.times;
+ break;
+ case 27:
+ po.amount27 = vo.amount;
+ po.money27 = vo.money;
+ po.times27 = vo.times;
+ break;
+ case 28:
+ po.amount28 = vo.amount;
+ po.money28 = vo.money;
+ po.times28 = vo.times;
+ break;
+ case 29:
+ po.amount29 = vo.amount;
+ po.money29 = vo.money;
+ po.times29 = vo.times;
+ break;
+ case 30:
+ po.amount30 = vo.amount;
+ po.money30 = vo.money;
+ po.times30 = vo.times;
+ break;
+ case 31:
+ po.amount31 = vo.amount;
+ po.money31 = vo.money;
+ po.times31 = vo.times;
+ break;
+ }
+ }
+
+ private void setValueOfMonthOfYear(Integer statisticsMonth, VoClientConsumeStatistics vo, StConsumeClientMonth po){
+ switch (statisticsMonth) {
+ case 1:
+ po.amount1 = vo.amount;
+ po.times1 = vo.times;
+ break;
+ case 2:
+ po.amount2 = vo.amount;
+ po.times2 = vo.times;
+ break;
+ case 3:
+ po.amount3 = vo.amount;
+ po.times3 = vo.times;
+ break;
+ case 4:
+ po.amount4 = vo.amount;
+ po.times4 = vo.times;
+ break;
+ case 5:
+ po.amount5 = vo.amount;
+ po.times5 = vo.times;
+ break;
+ case 6:
+ po.amount6 = vo.amount;
+ po.times6 = vo.times;
+ break;
+ case 7:
+ po.amount7 = vo.amount;
+ po.times7 = vo.times;
+ break;
+ case 8:
+ po.amount8 = vo.amount;
+ po.times8 = vo.times;
+ break;
+ case 9:
+ po.amount9 = vo.amount;
+ po.times9 = vo.times;
+ break;
+ case 10:
+ po.amount10 = vo.amount;
+ po.times10 = vo.times;
+ break;
+ case 11:
+ po.amount11 = vo.amount;
+ po.times11 = vo.times;
+ break;
+ case 12:
+ po.amount12 = vo.amount;
+ po.times12 = vo.times;
+ break;
+ }
+ }
+
+ private void setValueOfYear(VoClientConsumeStatistics vo, StConsumeClientYear po){
+ po.amount = vo.amount;
+ po.times = vo.times;
+ }
+}
+
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/statistics/StSomeCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/statistics/StSomeCtrl.java
new file mode 100644
index 0000000..790a49d
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/statistics/StSomeCtrl.java
@@ -0,0 +1,46 @@
+package com.dy.pipIrrTemp.statistics;
+
+import com.dy.common.aop.SsoAop;
+import com.dy.common.webUtil.BaseResponse;
+import com.dy.common.webUtil.BaseResponseUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Author: liurunyu
+ * @Date: 2024/12/28 13:05
+ * @Description
+ */
+@Slf4j
+@RestController
+@RequestMapping(path = "stSome")
+public class StSomeCtrl {
+
+ private StClientAmountSv stClientAmountSv;
+
+ @Autowired
+ private void setSv(StClientAmountSv sv) {
+ this.stClientAmountSv = sv;
+ }
+
+ ///////////////////////////////////////////
+ //
+ // 鍐滄埛鐩稿叧鍙栨按閲�
+ //
+ ///////////////////////////////////////////
+ /**
+ * 杞瓨鍐滄埛鏃ュ彇姘撮噺锛岀敱绾靛瀷鏀逛负妯瀷
+ * @return
+ */
+ @GetMapping(path = "transSaveClientAmountDay")
+ @SsoAop()
+ public BaseResponse<Boolean> transSaveClientAmountDay() throws Exception{
+ this.stClientAmountSv.deleteAllStClientAmountDay();
+ this.stClientAmountSv.transSaveClientAmountDay();
+ return BaseResponseUtils.buildSuccess(true);
+ }
+
+}
diff --git "a/pipIrr-platform/pipIrr-web/pipIrr-web-temp/\350\257\264\346\230\216.txt" "b/pipIrr-platform/pipIrr-web/pipIrr-web-temp/\350\257\264\346\230\216.txt"
index acbb18b..629f33b 100644
--- "a/pipIrr-platform/pipIrr-web/pipIrr-web-temp/\350\257\264\346\230\216.txt"
+++ "b/pipIrr-platform/pipIrr-web/pipIrr-web-temp/\350\257\264\346\230\216.txt"
@@ -4,25 +4,27 @@
鎵ц鍔熻兘锛�
0銆佹祴璇�
/temp/test/doSome
-1銆佸垹闄や竴浜涙紡鎹熺粺璁�---閲嶅鏁版嵁
+1銆佸垹闄や竴浜涙紡鎹熺粺璁�---閲嶅鏁版嵁锛堟墽琛屼竴娆★級
/temp/delSome/deleteSomeStatisticLossAmount
-2銆佸垹闄や竴浜涘彇姘村彛缁熻---閲嶅鏁版嵁
+2銆佸垹闄や竴浜涘彇姘村彛缁熻---閲嶅鏁版嵁锛堟墽琛屼竴娆★級
/temp/delSome/deleteSomeStatisticIntakeAmount
-3銆佸垹闄や竴浜涘啘鎴风粺璁�---閲嶅鏁版嵁
+3銆佸垹闄や竴浜涘啘鎴风粺璁�---閲嶅鏁版嵁锛堟墽琛屼竴娆★級
/temp/delSome/deleteSomeStatisticClientAmount
-4銆佷慨鏀逛竴浜涘彇姘村彛鏃ュ彇姘撮噺缁熻---鍥燫TU涓�澶╁唴鏁寸偣鎶ヤ腑绱娴侀噺闂存瓏鍑虹幇0鍊硷紝涓ゆ涓婃姤绱娴侀噺宸�间細浜х敓澶у��
+4銆佷慨鏀逛竴浜涘彇姘村彛鏃ュ彇姘撮噺缁熻---鍥燫TU涓�澶╁唴鏁寸偣鎶ヤ腑绱娴侀噺闂存瓏鍑虹幇0鍊硷紝涓ゆ涓婃姤绱娴侀噺宸�间細浜х敓澶у�硷紙鎵ц涓�娆★級
/temp/chSome/changeSomeIntakeDayAmount
5銆侀噸鏂扮粺璁″彇姘村彛鏈堝彇姘撮噺
/temp/chSome/reStatisticsAllIntakeMonthAmount
6銆侀噸鏂扮粺璁″彇姘村彛骞村彇姘撮噺
/temp/chSome/reStatisticsAllIntakeYearAmount
-
-
-7銆佷慨鏀逛竴浜涘彇姘村彛鏃ユ紡鎹熼噺缁熻---鍥犱负鏂板畨瑁呮按閲忥紝琛ㄥ簳鍊兼瘮杈冨ぇ
+7銆佷慨鏀逛竴浜涘彇姘村彛鏃ユ紡鎹熼噺缁熻---鍥犱负鏂板畨瑁呮按閲忥紝琛ㄥ簳鍊兼瘮杈冨ぇ锛堟墽琛屼竴娆★級
/temp/chSome/changeSomeIntakeDayLoss
8銆侀噸鏂扮粺璁″彇姘村彛鏈堟紡鎹熼噺
/temp/chSome/reStatisticsAllIntakeMonthLoss
9銆侀噸鏂扮粺璁″彇姘村彛骞存紡鎹熼噺
-/temp/chSome/reStatisticsAllIntakeYearLoss
\ No newline at end of file
+/temp/chSome/reStatisticsAllIntakeYearLoss
+
+
+10 杞瓨鍐滄埛鏃ュ彇姘撮噺锛岀敱绾靛瀷鏀逛负妯瀷锛�2025骞�4鏈堬紙鍖呮嫭锛夊墠鍙墽琛屽娆★級
+/temp/stSome/transSaveClientAmountDay
\ No newline at end of file
diff --git "a/pipIrr-platform/\346\226\207\346\241\243/SaaS/\346\260\221\345\213\244\350\256\276\345\244\207\345\234\260\345\235\200.xlsx" "b/pipIrr-platform/\346\226\207\346\241\243/SaaS/\346\260\221\345\213\244\350\256\276\345\244\207\345\234\260\345\235\200.xlsx"
new file mode 100644
index 0000000..9eba88d
--- /dev/null
+++ "b/pipIrr-platform/\346\226\207\346\241\243/SaaS/\346\260\221\345\213\244\350\256\276\345\244\207\345\234\260\345\235\200.xlsx"
Binary files differ
diff --git "a/pipIrr-platform/\346\226\207\346\241\243/SaaS/\347\253\257\345\217\243\343\200\201IP\343\200\201\346\240\207\347\255\276\351\205\215\347\275\256.docx" "b/pipIrr-platform/\346\226\207\346\241\243/SaaS/\347\253\257\345\217\243\343\200\201IP\343\200\201\346\240\207\347\255\276\351\205\215\347\275\256.docx"
new file mode 100644
index 0000000..bd278b6
--- /dev/null
+++ "b/pipIrr-platform/\346\226\207\346\241\243/SaaS/\347\253\257\345\217\243\343\200\201IP\343\200\201\346\240\207\347\255\276\351\205\215\347\275\256.docx"
Binary files differ
diff --git "a/pipIrr-platform/\346\226\207\346\241\243/SaaS/\347\256\241\347\201\214\347\263\273\347\273\237\345\242\236\345\212\240\344\270\200\344\270\252\345\256\242\346\210\267\347\263\273\347\273\237.docx" "b/pipIrr-platform/\346\226\207\346\241\243/SaaS/\347\256\241\347\201\214\347\263\273\347\273\237\345\242\236\345\212\240\344\270\200\344\270\252\345\256\242\346\210\267\347\263\273\347\273\237.docx"
new file mode 100644
index 0000000..80804b7
--- /dev/null
+++ "b/pipIrr-platform/\346\226\207\346\241\243/SaaS/\347\256\241\347\201\214\347\263\273\347\273\237\345\242\236\345\212\240\344\270\200\344\270\252\345\256\242\346\210\267\347\263\273\347\273\237.docx"
Binary files differ
diff --git "a/pipIrr-platform/\346\226\207\346\241\243/\345\242\236\345\212\240\344\270\200\344\270\252\345\272\224\347\224\250\346\234\272\346\236\204.docx" "b/pipIrr-platform/\346\226\207\346\241\243/\345\242\236\345\212\240\344\270\200\344\270\252\345\272\224\347\224\250\346\234\272\346\236\204.docx"
deleted file mode 100644
index a187735..0000000
--- "a/pipIrr-platform/\346\226\207\346\241\243/\345\242\236\345\212\240\344\270\200\344\270\252\345\272\224\347\224\250\346\234\272\346\236\204.docx"
+++ /dev/null
Binary files differ
diff --git "a/pipIrr-platform/\346\226\207\346\241\243/\347\256\241\347\201\214\347\263\273\347\273\237\345\242\236\345\212\240\344\270\200\344\270\252\345\256\242\346\210\267\347\263\273\347\273\237.docx" "b/pipIrr-platform/\346\226\207\346\241\243/\347\256\241\347\201\214\347\263\273\347\273\237\345\242\236\345\212\240\344\270\200\344\270\252\345\256\242\346\210\267\347\263\273\347\273\237.docx"
deleted file mode 100644
index deb41b6..0000000
--- "a/pipIrr-platform/\346\226\207\346\241\243/\347\256\241\347\201\214\347\263\273\347\273\237\345\242\236\345\212\240\344\270\200\344\270\252\345\256\242\346\210\267\347\263\273\347\273\237.docx"
+++ /dev/null
Binary files differ
--
Gitblit v1.8.0