diff --git a/src/main/java/org/springblade/modules/business/controller/ApmConfigController.java b/src/main/java/org/springblade/modules/business/controller/ApmConfigController.java index fff9054..5314281 100644 --- a/src/main/java/org/springblade/modules/business/controller/ApmConfigController.java +++ b/src/main/java/org/springblade/modules/business/controller/ApmConfigController.java @@ -62,7 +62,7 @@ public class ApmConfigController extends BladeController { return R.fail(ErrorMsgEnum.PARAMS_NULL_CREATE_DEPT.getValue()); } - Map> res = apmConfigService.alreadyConfigDay(createDept, startTime, endTime); + Map>> res = apmConfigService.alreadyConfigDay(createDept, startTime, endTime); return R.data(res); } diff --git a/src/main/java/org/springblade/modules/business/mapper/ApmRecordMapper.xml b/src/main/java/org/springblade/modules/business/mapper/ApmRecordMapper.xml index 66203ab..832351a 100644 --- a/src/main/java/org/springblade/modules/business/mapper/ApmRecordMapper.xml +++ b/src/main/java/org/springblade/modules/business/mapper/ApmRecordMapper.xml @@ -79,12 +79,12 @@ from ca_apm_record where is_deleted = 0 and create_dept = #{createDept} - and ar.apm_day >= #{startTime} + and apm_day >= #{startTime} - and ar.apm_day <= #{endTime} + and apm_day <= #{endTime} - group by DATE_FORMAT(apm_day, '%Y-%m-%d'), project, period, time_frame + group by DATE_FORMAT(apm_day, '%Y-%m-%d')