Skip to content

8
8timerapiv200
Commit 84698311 by lal Committed by chenzg
Options

修复BUG

parent 9e826e0f
Showing with 40 additions and 28 deletions
src/main/java/cn/timer/api/controller/kqgl/TimeCardController.java
...@@ -984,6 +984,9 @@ public class TimeCardController { ...@@ -984,6 +984,9 @@ public class TimeCardController {
lea.setCompany(company); lea.setCompany(company);
leas.add(lea); leas.add(lea);
} }
return ResultUtil.data(leas, "操作成功!");
}else {
return ResultUtil.success("请先加入考勤组") ;
} }
// List<KqglAssoLeaveRules> balheas = kqglassoleaverulesmapper.selHeaderdata(userBean.getOrgCode(), 2, 1); // List<KqglAssoLeaveRules> balheas = kqglassoleaverulesmapper.selHeaderdata(userBean.getOrgCode(), 2, 1);
...@@ -994,7 +997,7 @@ public class TimeCardController { ...@@ -994,7 +997,7 @@ public class TimeCardController {
// lea.setValue(rul.getName()); // lea.setValue(rul.getName());
// leas.add(lea); // leas.add(lea);
// } // }
return ResultUtil.data(leas, "操作成功!");
} }
/** /**
...@@ -2565,36 +2568,41 @@ public class TimeCardController { ...@@ -2565,36 +2568,41 @@ public class TimeCardController {
@ApiOperation(value = "222: 加班类型", httpMethod = "GET", notes = " 查询列表-加班补偿方式") @ApiOperation(value = "222: 加班类型", httpMethod = "GET", notes = " 查询列表-加班补偿方式")
public Result<Object> overtimetypelist(@CurrentUser UserBean userBean) { public Result<Object> overtimetypelist(@CurrentUser UserBean userBean) {
List<CompensateDto> coms = new ArrayList<CompensateDto>(); KqglMainKqz attgro = kqglmainkqzmapper.getAttendanceGroupInformationByUserid(userBean.getEmpNum(),userBean.getOrgCode()); //考勤组信息
if(attgro != null) {
KqglAssoYhkqz yhd = KqglAssoYhkqz.builder().build().selectOne(new QueryWrapper<KqglAssoYhkqz>().lambda().eq(KqglAssoYhkqz::getUserid, userBean.getEmpNum()).eq(KqglAssoYhkqz::getQyid, userBean.getOrgCode())); List<CompensateDto> coms = new ArrayList<CompensateDto>();
if(yhd != null) {
KqglAssoOvertimeRange timeran = KqglAssoOvertimeRange.builder().build().selectOne(new QueryWrapper<KqglAssoOvertimeRange>().lambda().eq(KqglAssoOvertimeRange::getAttgroupId, yhd.getKqzid())); KqglAssoYhkqz yhd = KqglAssoYhkqz.builder().build().selectOne(new QueryWrapper<KqglAssoYhkqz>().lambda().eq(KqglAssoYhkqz::getUserid, userBean.getEmpNum()).eq(KqglAssoYhkqz::getQyid, userBean.getOrgCode()));
if(timeran != null) { if(yhd != null) {
KqglAssoOvertimeRules rul = KqglAssoOvertimeRules.builder().build().selectOne(new QueryWrapper<KqglAssoOvertimeRules>().lambda().eq(KqglAssoOvertimeRules::getId, timeran.getOvertimeRulesId()).eq(KqglAssoOvertimeRules::getOrgCode, userBean.getOrgCode())); KqglAssoOvertimeRange timeran = KqglAssoOvertimeRange.builder().build().selectOne(new QueryWrapper<KqglAssoOvertimeRange>().lambda().eq(KqglAssoOvertimeRange::getAttgroupId, yhd.getKqzid()));
if(rul != null) { if(timeran != null) {
if(rul.getIsWorkovertime() == 1) { KqglAssoOvertimeRules rul = KqglAssoOvertimeRules.builder().build().selectOne(new QueryWrapper<KqglAssoOvertimeRules>().lambda().eq(KqglAssoOvertimeRules::getId, timeran.getOvertimeRulesId()).eq(KqglAssoOvertimeRules::getOrgCode, userBean.getOrgCode()));
CompensateDto com = CompensateDto.builder().build(); if(rul != null) {
com.setId(1); if(rul.getIsWorkovertime() == 1) {
com.setValue("工作日加班"); CompensateDto com = CompensateDto.builder().build();
coms.add(com); com.setId(1);
} com.setValue("工作日加班");
if(rul.getIsRestovertime() == 1) { coms.add(com);
CompensateDto com2 = CompensateDto.builder().build(); }
com2.setId(2); if(rul.getIsRestovertime() == 1) {
com2.setValue("休息日加班"); CompensateDto com2 = CompensateDto.builder().build();
coms.add(com2); com2.setId(2);
} com2.setValue("休息日加班");
if(rul.getIsHolidays() == 1) { coms.add(com2);
CompensateDto com3 = CompensateDto.builder().build(); }
com3.setId(3); if(rul.getIsHolidays() == 1) {
com3.setValue("节假日加班"); CompensateDto com3 = CompensateDto.builder().build();
coms.add(com3); com3.setId(3);
com3.setValue("节假日加班");
coms.add(com3);
}
} }
} }
} }
return ResultUtil.data(coms, "操作成功!");
}else {
return ResultUtil.success("操作失败，请先加入考勤组");
} }
return ResultUtil.data(coms, "操作成功!");
} }
......
src/main/java/cn/timer/api/utils/router/RouterUtils.java
...@@ -190,7 +190,11 @@ public class RouterUtils { ...@@ -190,7 +190,11 @@ public class RouterUtils {
// 装配 部门人员 // 装配 部门人员
if (RELATION_TYPE_DEPARTMENT.equals(listRelations.get(i).getType()) && listRelations.get(i).getDepartmentId() != null) { if (RELATION_TYPE_DEPARTMENT.equals(listRelations.get(i).getType()) && listRelations.get(i).getDepartmentId() != null) {
List<YgglMainEmp> listYgglMainEmp = selectOtherlistent(Integer.parseInt(obj.get("orgCode",FromData.class).getValue().trim()), Integer.valueOf(listRelations.get(i).getDepartmentId().trim())); String asd = listRelations.get(i).getDepartmentId();
asd = asd.replaceAll("\\[", "").replaceAll("\\]", "").replaceAll("\\\"", "");
// List<YgglMainEmp> listYgglMainEmp = selectOtherlistent(Integer.parseInt(obj.get("orgCode",FromData.class).getValue().trim()), Integer.valueOf(listRelations.get(i).getDepartmentId().trim()));
List<YgglMainEmp> listYgglMainEmp = selectOtherlistent(Integer.parseInt(obj.get("orgCode").toString()), Integer.valueOf(asd));
if (listYgglMainEmp != null && listYgglMainEmp.size() > 0) { if (listYgglMainEmp != null && listYgglMainEmp.size() > 0) {
List<User> listUsers = new ArrayList<User>(); List<User> listUsers = new ArrayList<User>();
......
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