From 1ac814a8d8491e432697f58daf91b73404c93b12 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期六, 14 十二月 2024 11:50:54 +0800
Subject: [PATCH] pipIrr-web-temp增加一些日志信息

---
 pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/changeSome/ChSomeIntakeAmountSv.java |   36 ++++++++++++++++++++++++++++++------
 1 files changed, 30 insertions(+), 6 deletions(-)

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 fa7191c..46bcf4c 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
@@ -7,6 +7,7 @@
 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;
 
@@ -43,16 +44,24 @@
                         if(lastAd == null){
                             lastAd = ad ;
                             if(lastAd.amount != null && lastAd.amount > IntakeAmountDayFlag){
-                                dao.updateOneIntakeAmountDay(lastAd.id, 0.0);
+                                this.doUpdateOneIntakeAmountDay(lastAd.id, 0.0);
                             }
                         }else{
                             if(ad.amount != null && ad.amount > IntakeAmountDayFlag){
                                 if(ad.totalAmountLast != null && lastAd.totalAmountLast != null){
+                                    //閲嶆柊璁$畻鏃ュ彇姘撮噺
                                     ad.amount = ad.totalAmountLast - lastAd.totalAmountLast;
-                                    if(ad.amount < 0){//瀛樿繖绉嶆儏鍐�
+                                    if(ad.amount < 0){//璁$畻鏃ュ彇姘撮噺鍚庯紝鍙兘浼氭湁杩欑鎯呭喌鍙戠敓锛堣礋鍊硷級
+                                        log.info("鍑虹幇璋冩暣鍚庣殑鏃ュ彇姘撮噺鍑虹幇璐熷��" + ad.amount
+                                                + "鎯呭喌锛屾暟鎹甶d=" + ad.id
+                                                + "锛屽彇姘村彛id=" + ad.intakeId
+                                                + "锛屾棩鏈�=" + ad.dt
+                                                + "锛岃缃按閲�=0.0"
+                                        );
                                         ad.amount = 0.0 ;
                                     }
                                     if(ad.amount > IntakeAmountDayFlag){
+                                        //璁$畻鏃ュ彇姘撮噺鍚庯紝浠嶅ぇ浜嶪ntakeAmountDayFlag
                                         log.info("鍑虹幇璋冩暣鍚庣殑鏃ュ彇姘撮噺浠嶅ぇ浜�"
                                                 + IntakeAmountDayFlag
                                                 + "鐨勬儏鍐碉紝鏁版嵁id=" + ad.id
@@ -63,14 +72,15 @@
                                         if(ad.dt != null && lastAd.dt != null){
                                             if(DateTime.daysBetweenyyyy_MM_dd(ad.dt, lastAd.dt) == 1){
                                                 //鍙浉宸竴澶�
-                                                ad.amount = 0.0 ;
                                                 log.info("鍑虹幇鐩稿樊涓�澶╀絾鏃ュ彇姘撮噺澶т簬"
                                                         + IntakeAmountDayFlag
                                                         + "鐨勬儏鍐碉紝鏁版嵁id=" + ad.id
                                                         + "锛屽彇姘村彛id=" + ad.intakeId
                                                         + "锛屾棩鏈�=" + ad.dt
-                                                        + "锛屾按閲�=" + ad.amount
+                                                        + "锛岃缃按閲�=0.0"
+                                                        + "锛岃缃墠姘撮噺= " + ad.amount
                                                 );
+                                                ad.amount = 0.0 ;
                                             }else{
                                                 //宸茬粡淇敼鍚庣殑鏁板�间粛鐒跺ぇ浜嶪ntakeAmountDayFlag锛岃鏄庢槸澶ф棩鏈笂鎶ユ暟鎹�岀Н绱笅鏉�,鍙互澶т簬IntakeAmountDayFlag
                                                 //ad.amount = ad.amount ;
@@ -79,20 +89,34 @@
                                                         + "鐨勬儏鍐碉紝鏁版嵁id=" + ad.id
                                                         + "锛屽彇姘村彛id=" + ad.intakeId
                                                         + "锛屾棩鏈�=" + ad.dt
-                                                        + "锛屾按閲�=" + ad.amount
+                                                        + "锛屾按閲忎繚鎸佷笉鍙�=" + ad.amount
                                                 );
                                             }
                                         }
                                     }
                                 }else{
+                                    log.info("鍑虹幇鐩稿樊澶氬ぉ鏃ュ彇姘撮噺澶т簬"
+                                            + IntakeAmountDayFlag
+                                            + "骞朵笖灞炴�otalAmountLast涓簄ull鐨勬儏鍐碉紝鏁版嵁id=" + ad.id
+                                            + "锛屽彇姘村彛id=" + ad.intakeId
+                                            + "锛屾棩鏈�=" + ad.dt
+                                            + "锛岃缃按閲�=0.0"
+                                            + "锛岃缃墠姘撮噺= " + ad.amount
+                                    );
                                     ad.amount = 0.0 ;
                                 }
-                                dao.updateOneIntakeAmountDay(ad.id, 0.0);
+                                this.doUpdateOneIntakeAmountDay(ad.id, 0.0);
                             }
                         }
+                        lastAd = ad ;
                     }
                 }
             }
         }
     }
+
+    @Transactional
+    int doUpdateOneIntakeAmountDay(Long id, Double amount){
+        return dao.updateOneIntakeAmountDay(id, amount);
+    }
 }

--
Gitblit v1.8.0