bug修复

runeconomy-xk/src/main/java/com/gyee/runeconomy/controller/SingleAnalysisController.java

@@ -264,14 +264,14 @@ public class SingleAnalysisController {
             SingleAnalysisVo byzb = singleAnalysisService.SingleAnalysisListByWtId(wtId, recordDate);
 
             byzb.setWtcode(wtcode);
-            SingleAnalysisVo singleAnalysisVo = singleAnalysisService.SingleAnalysisTurbineinfoday(wtId, year, month, byzb);
+            SingleAnalysisVo singleAnalysisVo = singleAnalysisService.SingleAnalysisTurbineinfoday(wtId, year, month, byzb, "byzb");
 
             cal.add(Calendar.YEAR, -1);
             Date lastYear = DateUtils.truncate(cal.getTime());
             LocalDate localDate = lastYear.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
 
             SingleAnalysisVo tqzb = singleAnalysisService.SingleAnalysisListByWtId(wtId, lastYear);
-            SingleAnalysisVo tqzbNew = singleAnalysisService.SingleAnalysisTurbineinfoday(wtId, String.valueOf(localDate.getYear()), month, tqzb);
+            SingleAnalysisVo tqzbNew = singleAnalysisService.SingleAnalysisTurbineinfoday(wtId, String.valueOf(localDate.getYear()), month, tqzb, "tqzb");
 
             SingleAnalysisVo tbzb = singleAnalysisService.SingleAnalysisListByWtId(byzb, tqzb);
 
@@ -286,7 +286,7 @@ public class SingleAnalysisController {
             Date lastMonth = DateUtils.truncate(cal.getTime());
             SingleAnalysisVo hqzb = singleAnalysisService.SingleAnalysisListByWtId(wtId, lastMonth);
 
-            SingleAnalysisVo hqzbnew = singleAnalysisService.SingleAnalysisTurbineinfoday(wtId, year, monthStr, hqzb);
+            SingleAnalysisVo hqzbnew = singleAnalysisService.SingleAnalysisTurbineinfoday(wtId, year, monthStr, hqzb, "hqzb");
 
             SingleAnalysisVo hbzb = singleAnalysisService.SingleAnalysisListByWtId(byzb, hqzb);
 

runeconomy-xk/src/main/java/com/gyee/runeconomy/service/singleanalysis/SingleAnalysisService.java

@@ -1595,7 +1595,7 @@ public class SingleAnalysisService {
     }
 
 
-    public SingleAnalysisVo SingleAnalysisTurbineinfoday(String wtId, String year, String month, SingleAnalysisVo byzb) {
+    public SingleAnalysisVo SingleAnalysisTurbineinfoday(String wtId, String year, String month, SingleAnalysisVo byzb, String type) {
         LocalDate now = LocalDate.now();
         String date = year + "-" + month;
         int yearCurrent = now.getYear();
@@ -1619,7 +1619,7 @@ public class SingleAnalysisService {
                 date = yearCurrent + "-" + monthCurrent;
             }
         }
-        if (now.getMonthValue() == 1) {
+        if ("hqzb".equals(type) && now.getMonthValue() == 1) {
             yearCurrent = yearCurrent - 1;
             monthCurrent = 12;
             date = yearCurrent + "-" + monthCurrent;