记得上下班打卡 | git大法好,push需谨慎

Commit cb839394 authored by 胡佳晨's avatar 胡佳晨

统计增加 use_end

parent cc2558ca
...@@ -9,7 +9,7 @@ import com.liquidnet.client.admin.zhengzai.kylin.dto.PerformanceCalendarResp; ...@@ -9,7 +9,7 @@ import com.liquidnet.client.admin.zhengzai.kylin.dto.PerformanceCalendarResp;
import com.liquidnet.commons.lang.util.DateUtil; import com.liquidnet.commons.lang.util.DateUtil;
import com.liquidnet.commons.lang.util.StringUtil; import com.liquidnet.commons.lang.util.StringUtil;
import com.liquidnet.service.kylin.entity.KylinPerformances; import com.liquidnet.service.kylin.entity.KylinPerformances;
import com.liquidnet.service.kylin.service.admin.IKylinPerformancesAdminService; import com.liquidnet.service.kylin.mapper.KylinPerformancesMapper;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
...@@ -38,7 +38,7 @@ public class PerformanceCalendarController extends BaseController{ ...@@ -38,7 +38,7 @@ public class PerformanceCalendarController extends BaseController{
private String prefix = "zhengzai/kylin/performanceCalendar"; private String prefix = "zhengzai/kylin/performanceCalendar";
@Autowired @Autowired
private IKylinPerformancesAdminService kylinPerformancesAdminService; private KylinPerformancesMapper performancesMapper;
@RequiresPermissions("kylin:performanceCalendar:view") @RequiresPermissions("kylin:performanceCalendar:view")
@GetMapping() @GetMapping()
...@@ -84,7 +84,7 @@ public class PerformanceCalendarController extends BaseController{ ...@@ -84,7 +84,7 @@ public class PerformanceCalendarController extends BaseController{
wrapper.le(KylinPerformances::getTimeStart, DateUtil.addDay(DateUtil.parse(performanceCalendarReq.getTimeEnd(),DateUtil.DATE_SMALL_STR),1)); wrapper.le(KylinPerformances::getTimeStart, DateUtil.addDay(DateUtil.parse(performanceCalendarReq.getTimeEnd(),DateUtil.DATE_SMALL_STR),1));
} }
List<KylinPerformances> list = kylinPerformancesAdminService.list(wrapper); List<KylinPerformances> list = performancesMapper.selectList(wrapper);
String[][] dateArray2 = getDateList(DateUtil.parse(startTime,DateUtil.DATE_SMALL_STR),days); String[][] dateArray2 = getDateList(DateUtil.parse(startTime,DateUtil.DATE_SMALL_STR),days);
//初始化对象 //初始化对象
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment