Commit 4c5df218 authored by 赵啸非's avatar 赵啸非

添加申诉统计业务

parent eaa2b774
package com.mortals.xhx.module.perform.model.vo; package com.mortals.xhx.module.perform.model.vo;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.perform.model.PerformAttendAppealEntity;
import java.util.ArrayList;
import java.util.List;
import lombok.Data; import lombok.Data;
import com.mortals.framework.annotation.Excel;
import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
/** /**
* 绩效记录申诉信息视图对象 * 绩效记录申诉信息视图对象
...@@ -19,7 +16,7 @@ public class PerformAttendAppealVo extends BaseEntityLong { ...@@ -19,7 +16,7 @@ public class PerformAttendAppealVo extends BaseEntityLong {
/** /**
* 时间 * 时间
*/ */
private Date appealTimeStart; private String appealTimeStart;
/** /**
* 统计类型(1.申诉次数部门排名,2.申诉次数个人排名,3.申诉次数规则排名) * 统计类型(1.申诉次数部门排名,2.申诉次数个人排名,3.申诉次数规则排名)
*/ */
......
...@@ -167,8 +167,8 @@ public class PerformAttendAppealServiceImpl extends AbstractCRUDServiceImpl<Perf ...@@ -167,8 +167,8 @@ public class PerformAttendAppealServiceImpl extends AbstractCRUDServiceImpl<Perf
query.setCreateTimeEnd(DateUtil.today()); query.setCreateTimeEnd(DateUtil.today());
} else { } else {
//格式化到指定日期的当月 //格式化到指定日期的当月
query.setCreateTimeStart(DateUtil.beginOfMonth(appeal.getAppealTimeStart()).toDateStr()); query.setCreateTimeStart(DateUtil.beginOfMonth(DateUtil.parse(appeal.getAppealTimeStart()).toJdkDate()).toDateStr());
query.setCreateTimeEnd(DateUtil.endOfMonth(appeal.getAppealTimeStart()).toDateStr()); query.setCreateTimeEnd(DateUtil.endOfMonth(DateUtil.parse(appeal.getAppealTimeStart()).toJdkDate()).toDateStr());
} }
query.setGroupList(Arrays.asList(groupName)); query.setGroupList(Arrays.asList(groupName));
query.setOrderColList(Arrays.asList(new OrderCol("number", OrderCol.DESCENDING), new OrderCol("month", OrderCol.DESCENDING), new OrderCol("day", OrderCol.DESCENDING), new OrderCol("createTime"))); query.setOrderColList(Arrays.asList(new OrderCol("number", OrderCol.DESCENDING), new OrderCol("month", OrderCol.DESCENDING), new OrderCol("day", OrderCol.DESCENDING), new OrderCol("createTime")));
......
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