Ver código fonte

Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents into dev

傅行帆 5 anos atrás
pai
commit
cdce4a8586

+ 1
- 1
src/main/java/com/huiju/estateagents/controller/TsConsultantKpiController.java Ver arquivo

@@ -143,7 +143,7 @@ public class TsConsultantKpiController extends BaseController {
143 143
             }
144 144
 
145 145
             startTime = DateUtils.day2LocalDateime(startDate.substring(0,4) + "-" + startDate.substring(4, 6) + "-" + startDate.substring(6, 8));
146
-            endTime = DateUtils.day2LocalDateime(endDate.substring(0,4) + "-" + endDate.substring(4, 6) + "-" + endDate.substring(6, 8));
146
+            endTime = DateUtils.dayToLocalDateime(endDate.substring(0,4) + "-" + endDate.substring(4, 6) + "-" + endDate.substring(6, 8) + " 23:59:59");
147 147
         }
148 148
 
149 149
         return new LocalDateTime[]{startTime, endTime};