Explorar o código

提交统计相关的bug

wuhp %!s(int64=2) %!d(string=hai) anos
pai
achega
1411c6cf36

+ 2 - 0
src/main/java/com/ydtech/components/TokenInterceptor.java

@@ -87,6 +87,8 @@ public class TokenInterceptor {
         notMatchList.add("/order/pingAnApi/recoverApplyVerifyCode");
         notMatchList.add("/order/pingAnApi/payReturn");
 
+        notMatchList.add("/sysSys/sysList");//登录2  去除验证
+
         return new SaInterceptor(handler -> {
             // 指定一条 match 规则
             SaRouter

+ 2 - 2
src/main/java/com/ydtech/modules/admin/model/report/profitAnalysis/ProfitAnalysisDto.java

@@ -25,10 +25,10 @@ public class ProfitAnalysisDto {
 
     @ApiModelProperty("应收")
     private String sumcount;
-    @ApiModelProperty("实")
+    @ApiModelProperty("实")
     private String paid;
 
-    @ApiModelProperty("未")
+    @ApiModelProperty("未")
     private String unpaid;
 
     @ApiModelProperty("毛利润")

+ 8 - 4
src/main/java/com/ydtech/modules/admin/utils/SliceUpDateUtil.java

@@ -210,9 +210,11 @@ public class SliceUpDateUtil {
         calendar.set(Calendar.MONTH, Calendar.JANUARY);
         calendar.set(Calendar.DAY_OF_MONTH, 1);
         int startYear = calendar.get(Calendar.YEAR);
-        int startMonth = calendar.get(Calendar.MONTH);
+        int startMonth = calendar.get(Calendar.MONTH)+1;
         int startDay = calendar.get(Calendar.DAY_OF_MONTH);
-        return startYear+""+startMonth+""+startDay;
+        String month =startMonth<10?"0"+startMonth: String.valueOf(startMonth);
+        String day =startDay<10?"0"+startDay: String.valueOf(startDay);
+        return startYear+"-"+month+"-"+day;
     }
     /**
      *  @version
@@ -226,8 +228,10 @@ public class SliceUpDateUtil {
         calendar.set(Calendar.MONTH, Calendar.DECEMBER);
         calendar.set(Calendar.DAY_OF_MONTH, 31);
         int startYear = calendar.get(Calendar.YEAR);
-        int startMonth = calendar.get(Calendar.MONTH);
+        int startMonth = calendar.get(Calendar.MONTH)+1;
         int startDay = calendar.get(Calendar.DAY_OF_MONTH);
-        return startYear+""+startMonth+""+startDay;
+        String month =startMonth<10?"0"+startMonth: String.valueOf(startMonth);
+        String day =startDay<10?"0"+startDay: String.valueOf(startDay);
+        return startYear+"-"+month+"-"+day;
     }
 }