From 5a90071cd2797bcacc286fcad31a8b0b0875d6aa Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Wed, 03 Feb 2021 10:27:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/controller/healthcodeController.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/controller/healthcodeController.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/controller/healthcodeController.java
index 0aa1861..745ce17 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/controller/healthcodeController.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/controller/healthcodeController.java
@@ -132,7 +132,7 @@
* 统计接口
*/
@PostMapping("/selectCount")
- public R selectCount(String type, HttpServletResponse response) {
+ public R selectCount(@RequestBody String type, HttpServletResponse response) {
response.setHeader("Access-Control-Allow-Origin", "*");
response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
response.setHeader("Access-Control-Allow-Credentials","true");
@@ -147,7 +147,10 @@
if (1 == dayWeek) {
cal.add(Calendar.DAY_OF_MONTH, -1);
}
- switch(type){
+ String type1 = type;
+ String substring = type1.substring(9, 10);
+ System.out.println(substring);
+ switch(substring){
case "0" :
//日
String times = sdf.format(cal.getTime());
@@ -189,6 +192,7 @@
return R.data(list);
}
+
private static Date getMonthStart(Date date) {
Calendar calendar = Calendar.getInstance();
--
Gitblit v1.9.3