Commit 420375c8 authored by 赵啸非's avatar 赵啸非

修改考勤汇总查询

parent 9962a0fe
...@@ -34,9 +34,9 @@ public class AttendanceStaffStatServiceImpl extends AbstractCRUDServiceImpl<Atte ...@@ -34,9 +34,9 @@ public class AttendanceStaffStatServiceImpl extends AbstractCRUDServiceImpl<Atte
if(params==null){ if(params==null){
throw new AppException("查询条件对象不能为空"); throw new AppException("查询条件对象不能为空");
} }
if(params.getStaffId()==null){ /* if(params.getStaffId()==null){
throw new AppException("人员信息id不能为空"); throw new AppException("人员信息id不能为空");
} }*/
if(StringUtils.isEmpty(params.getSummaryTimeStart())||StringUtils.isEmpty(params.getSummaryTimeEnd())){ if(StringUtils.isEmpty(params.getSummaryTimeStart())||StringUtils.isEmpty(params.getSummaryTimeEnd())){
throw new AppException("查询日期范围不能为空"); throw new AppException("查询日期范围不能为空");
} }
......
package com.mortals.xhx.module.dept.service.impl; package com.mortals.xhx.module.dept.service.impl;
import com.alibaba.fastjson.JSON;
import com.mortals.framework.common.Rest; import com.mortals.framework.common.Rest;
import com.mortals.xhx.common.code.EnableEnum; import com.mortals.xhx.common.code.EnableEnum;
import com.mortals.xhx.common.code.EnabledEnum; import com.mortals.xhx.common.code.EnabledEnum;
...@@ -308,6 +309,7 @@ public class DeptServiceImpl extends AbstractCRUDServiceImpl<DeptDao, DeptEntity ...@@ -308,6 +309,7 @@ public class DeptServiceImpl extends AbstractCRUDServiceImpl<DeptDao, DeptEntity
Rest<OrgDataInfo> orgRest = hikPersonService.getOrgList(orgListReq); Rest<OrgDataInfo> orgRest = hikPersonService.getOrgList(orgListReq);
if (orgRest.getCode() == YesNoEnum.YES.getValue()) { if (orgRest.getCode() == YesNoEnum.YES.getValue()) {
List<OrgInfo> orgInfoList = orgRest.getData().getList(); List<OrgInfo> orgInfoList = orgRest.getData().getList();
log.info("orgInfoList:{}", JSON.toJSONString(orgInfoList));
for (OrgInfo orgInfo : orgInfoList) { for (OrgInfo orgInfo : orgInfoList) {
//查询数据库信息 //查询数据库信息
DeptEntity deptEntity = this.selectOne(new DeptQuery().deptCode(orgInfo.getOrgIndexCode())); DeptEntity deptEntity = this.selectOne(new DeptQuery().deptCode(orgInfo.getOrgIndexCode()));
...@@ -344,8 +346,6 @@ public class DeptServiceImpl extends AbstractCRUDServiceImpl<DeptDao, DeptEntity ...@@ -344,8 +346,6 @@ public class DeptServiceImpl extends AbstractCRUDServiceImpl<DeptDao, DeptEntity
@Override @Override
public Rest<String> syncDeptByDevice(Context context) { public Rest<String> syncDeptByDevice(Context context) {
//todo //todo
return Rest.ok(); return Rest.ok();
} }
......
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