From 7bf80c057f8e17fd37f1936e5b8dc1e1efad4bea Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 11 七月 2024 20:32:14 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/dbSv/DbSv.java | 100 ++++++++++++++++++++++++++++++++++++++------------
1 files changed, 76 insertions(+), 24 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/dbSv/DbSv.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/dbSv/DbSv.java
index a83efff..847d2b8 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/dbSv/DbSv.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/dbSv/DbSv.java
@@ -50,9 +50,13 @@
@Autowired
private RmWorkReportHistoryMapper rmWorkReportHistoryMapperDao ;//鎺у埗鍣ㄥ巻鍙插伐浣滄姤鏁版嵁DAO
@Autowired
- private RmIntakeAmountDayLastMapper rmIntakeAmountDayLastMapperDao ;//鍙栨按鍙ｅ彇姘村拰婕忔崯缁熻鏈�鏂版暟鎹瓺AO
+ private RmIntakeAmountDayLastMapper rmIntakeAmountDayLastMapperDao ;//鍙栨按鍙ｅ彇姘寸粺璁℃渶鏂版暟鎹瓺AO
@Autowired
private RmIntakeAmountDayMapper rmIntakeAmountDayMapperDao ;//鍙栨按鍙ｅ彇姘村拰婕忔崯缁熻DAO
+ @Autowired
+ private RmClientAmountDayLastMapper rmClientAmountDayLastMapperDao ;//鍐滄埛鏃ョ敤姘撮噺缁熻鏈�鏂版暟鎹瓺AO
+ @Autowired
+ private RmClientAmountDayMapper rmClientAmountDayMapperDao ;//鍐滄埛鏃ョ敤姘撮噺缁熻鏁版嵁DAO
@Autowired
private RmLossLastMapper rmLossLastMapperDao ;//鎺у埗鍣ㄦ紡鎹熸按閲忕粺璁℃渶鏂版暟鎹瓺AO
@Autowired
@@ -417,7 +421,7 @@
//
////////////////////////////////////////////////
/**
- * 寰楀埌鎺у埗鍣ㄦ紡鎹熸按閲忕粺璁℃渶鏂拌褰�
+ * 寰楀埌鏈�鏂拌褰�
* @param intakeId
* @return
*/
@@ -429,7 +433,7 @@
return null ;
}
/**
- * 淇濆瓨鎺у埗鍣ㄦ紡鎹熸按閲忕粺璁℃渶鏂拌褰�
+ * 淇濆瓨鏈�鏂拌褰�
* @param po
*/
@Transactional(rollbackFor = Exception.class)
@@ -437,7 +441,7 @@
this.rmIntakeAmountDayLastMapperDao.insert(po) ;
}
/**
- * 淇濆瓨鎺у埗鍣ㄦ紡鎹熸按閲忕粺璁℃渶鏂拌褰�
+ * 淇濆瓨璁板綍
* @param po
*/
@Transactional(rollbackFor = Exception.class)
@@ -445,15 +449,15 @@
this.rmIntakeAmountDayMapperDao.insert(po) ;
}
/**
- * 淇濆瓨鎺у埗鍣ㄦ紡鎹熸按閲忕粺璁℃渶鏂拌褰�
+ * 淇濆瓨鏈�鏂拌褰�
* @param po
*/
@Transactional(rollbackFor = Exception.class)
- public void updateRmIntakeAmountLast(RmIntakeAmountDay po){
- this.rmIntakeAmountDayMapperDao.updateByPrimaryKey(po) ;
+ public void updateRmIntakeAmountLast(RmIntakeAmountDayLast po){
+ this.rmIntakeAmountDayLastMapperDao.updateByPrimaryKey(po) ;
}
/**
- * 淇濆瓨鎺у埗鍣ㄦ紡鎹熸按閲忕粺璁℃渶鏂拌褰�
+ * 淇濆瓨鍘嗗彶璁板綍
* @param po
*/
@Transactional(rollbackFor = Exception.class)
@@ -462,7 +466,7 @@
}
/**
- * 寰楀埌鎺у埗鍣ㄦ紡鎹熸按閲忕粺璁″巻鍙茶褰曚腑鐨勬渶鏂拌褰�
+ * 寰楀埌绗﹀悎鏉′欢鐨勫巻鍙茶褰�
* @param id
* @return
*/
@@ -470,32 +474,80 @@
return rmIntakeAmountDayMapperDao.selectByPrimaryKey(id) ;
}
+ /////////////////////////////////////////////////
+ //
+ // 鍐滄埛鏃ョ敤姘撮噺鍙婅姳璐圭粺璁″姛鑳�
+ //
+ ////////////////////////////////////////////////
+ /**
+ * 寰楀埌鏈�鏂拌褰�
+ * @param clientId
+ * @return
+ */
+ public RmClientAmountDayLast getRmClientAmountLast(Long clientId){
+ List<RmClientAmountDayLast> list = rmClientAmountDayLastMapperDao.selectByClientId(clientId) ;
+ if(list != null && list.size() > 0){
+ return list.get(0) ;
+ }
+ return null ;
+ }
+ /**
+ * 淇濆瓨鏈�鏂拌褰�
+ * @param po
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public void saveRmClientAmountLast(RmClientAmountDayLast po){
+ this.rmClientAmountDayLastMapperDao.insert(po) ;
+ }
+ /**
+ * 淇濆瓨璁板綍
+ * @param po
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public void saveRmClientAmountDay(RmClientAmountDay po){
+ this.rmClientAmountDayMapperDao.insert(po) ;
+ }
+ /**
+ * 鏇存柊鏈�鏂拌褰�
+ * @param po
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public void updateRmClientAmountLast(RmClientAmountDayLast po){
+ this.rmClientAmountDayLastMapperDao.updateByPrimaryKey(po) ;
+ }
+ /**
+ * 鏇存柊璁板綍
+ * @param po
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public void updateRmClientAmountDay(RmClientAmountDay po){
+ this.rmClientAmountDayMapperDao.updateByPrimaryKey(po) ;
+ }
/**
- * 寰楀埌鎺у埗鍣ㄦ紡鎹熸按閲忕粺璁℃渶鏂拌褰�
+ * 寰楀埌绗﹀悎鏉′欢鐨勫巻鍙茶褰�
+ * @param id
+ * @return
+ */
+ public RmClientAmountDay getRmClientAmountDay(Long id){
+ return rmClientAmountDayMapperDao.selectByPrimaryKey(id) ;
+ }
+
+
+ /**
+ * 寰楀埌绗﹀悎鏉′欢鐨勫巻鍙茶褰�
+ * @param clientId
* @param dt
* @return
*/
- public RmIntakeAmountDay getRmIntakeAmountLastByDate(Date dt){
- List<RmIntakeAmountDay> list = rmIntakeAmountDayMapperDao.selectByDate(dt) ;
+ public RmClientAmountDay getRmClientAmountByClientAndDate(Long clientId, Date dt){
+ List<RmClientAmountDay> list = rmClientAmountDayMapperDao.selectByClientAndDate(clientId, dt) ;
if(list != null && list.size() > 0){
return list.get(0) ;
}
return null ;
}
- /**
- * 寰楀埌鎺у埗鍣ㄦ紡鎹熸按閲忕粺璁″巻鍙茶褰曚腑鐨勬煇鏃ヨ褰�
- * @param dt
- * @return
- */
- public RmIntakeAmountDay getRmIntakeAmountDayByDate(Date dt){
- List<RmIntakeAmountDay> list = rmIntakeAmountDayMapperDao.selectByDate(dt) ;
- if(list != null && list.size() > 0){
- return list.get(0) ;
- }
- return null ;
- }
/////////////////////////////////////////////////
//
--
Gitblit v1.8.0