Commit aa36a77e authored by 廖旭伟's avatar 廖旭伟

考勤异常信息list条件增加

parent 0d7479c4
...@@ -19,5 +19,14 @@ public class PerformErrorMessageVo extends BaseEntityLong { ...@@ -19,5 +19,14 @@ public class PerformErrorMessageVo extends BaseEntityLong {
/** 序号,主键,自增长列表 */ /** 序号,主键,自增长列表 */
private List <Long> idList; private List <Long> idList;
/** 开始 异常时间 */
private String errorTimeStart;
/** 结束 异常时间 */
private String errorTimeEnd;
private String yearmonth;
/** 申诉状态(0.未申诉,1.申诉中,2.申诉拒绝,3.申诉通过)列表 */
private List <Integer> appealStatusList;
} }
\ No newline at end of file
...@@ -26,7 +26,7 @@ public class PerformErrorMessageServiceImpl extends AbstractCRUDServiceImpl<Perf ...@@ -26,7 +26,7 @@ public class PerformErrorMessageServiceImpl extends AbstractCRUDServiceImpl<Perf
PerformErrorMessageEntity entity = this.dao.get(key); PerformErrorMessageEntity entity = this.dao.get(key);
if(context!=null && context.getUser()!=null && entity!=null){ if(context!=null && context.getUser()!=null && entity!=null){
Long staffId = context.getUser().getCustomerId(); Long staffId = context.getUser().getCustomerId();
if(staffId!=null && staffId==entity.getStaffId()){ if(staffId!=null && staffId.longValue() == entity.getStaffId().longValue()){
PerformErrorMessageEntity update = new PerformErrorMessageEntity(); PerformErrorMessageEntity update = new PerformErrorMessageEntity();
update.setId(entity.getId()); update.setId(entity.getId());
update.setUpdateTime(new Date()); update.setUpdateTime(new Date());
......
package com.mortals.xhx.module.perform.web; package com.mortals.xhx.module.perform.web;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.mortals.framework.annotation.UnAuth;
import com.mortals.framework.model.Context; import com.mortals.framework.model.Context;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController; import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService; import com.mortals.xhx.base.system.param.service.ParamService;
......
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