Commit 1f5f9255 by Your Name

更新了每个页面的数据都有一定的概率不加载数据的问题

parent df105773
...@@ -1170,7 +1170,7 @@ public class TimeCardController { ...@@ -1170,7 +1170,7 @@ public class TimeCardController {
@ApiOperation(value = "35:获取打卡地址数据", httpMethod = "GET", notes = "接口发布说明") @ApiOperation(value = "35:获取打卡地址数据", httpMethod = "GET", notes = "接口发布说明")
@ApiOperationSupport(order = 35) @ApiOperationSupport(order = 35)
public Result<Object> getInGroupPunchAddress(@CurrentUser UserBean userBean) { public Result<Object> getInGroupPunchAddress(@CurrentUser UserBean userBean) {
List<KqglAssoDkdz> shiftList = KqglAssoDkdz.builder().build().selectList(new QueryWrapper<KqglAssoDkdz>().lambda().eq(KqglAssoDkdz::getQyid, userBean.getOrgCode())); List<KqglAssoDkdz> shiftList = KqglAssoDkdz.builder().build().selectList(new QueryWrapper<KqglAssoDkdz>().lambda().eq(KqglAssoDkdz::getQyid, userBean.getOrgCode()).orderByAsc(KqglAssoDkdz::getId));
return ResultUtil.data(shiftList); return ResultUtil.data(shiftList);
} }
...@@ -1181,7 +1181,7 @@ public class TimeCardController { ...@@ -1181,7 +1181,7 @@ public class TimeCardController {
@ApiOperation(value = "36:获取打卡WIFI数据", httpMethod = "GET", notes = "接口发布说明") @ApiOperation(value = "36:获取打卡WIFI数据", httpMethod = "GET", notes = "接口发布说明")
@ApiOperationSupport(order = 36) @ApiOperationSupport(order = 36)
public Result<Object> getInGroupPunchWIFI(@CurrentUser UserBean userBean) { public Result<Object> getInGroupPunchWIFI(@CurrentUser UserBean userBean) {
List<KqglAssoDkwx> shiftList = KqglAssoDkwx.builder().build().selectList(new QueryWrapper<KqglAssoDkwx>().lambda().eq(KqglAssoDkwx::getQyid, userBean.getOrgCode())); List<KqglAssoDkwx> shiftList = KqglAssoDkwx.builder().build().selectList(new QueryWrapper<KqglAssoDkwx>().lambda().eq(KqglAssoDkwx::getQyid, userBean.getOrgCode()).orderByAsc(KqglAssoDkwx:: getId));
return ResultUtil.data(shiftList); return ResultUtil.data(shiftList);
} }
...@@ -1192,7 +1192,7 @@ public class TimeCardController { ...@@ -1192,7 +1192,7 @@ public class TimeCardController {
@ApiOperation(value = "37:获取班次-根据 组织机构代码", httpMethod = "GET", notes = "接口发布说明") @ApiOperation(value = "37:获取班次-根据 组织机构代码", httpMethod = "GET", notes = "接口发布说明")
@ApiOperationSupport(order = 37) @ApiOperationSupport(order = 37)
public Result<Object> getAttShiftList(@CurrentUser UserBean userBean) { public Result<Object> getAttShiftList(@CurrentUser UserBean userBean) {
List<KqglAssoBcsz> attshiftList = KqglAssoBcsz.builder().build().selectList(new QueryWrapper<KqglAssoBcsz>().lambda().eq(KqglAssoBcsz::getQyid, userBean.getOrgCode())); List<KqglAssoBcsz> attshiftList = KqglAssoBcsz.builder().build().selectList(new QueryWrapper<KqglAssoBcsz>().lambda().eq(KqglAssoBcsz::getQyid, userBean.getOrgCode()).orderByAsc(KqglAssoBcsz:: getId));
return ResultUtil.data(attshiftList); return ResultUtil.data(attshiftList);
} }
...@@ -1206,6 +1206,16 @@ public class TimeCardController { ...@@ -1206,6 +1206,16 @@ public class TimeCardController {
List<YgglMainEmp> yggl = YgglMainEmp.builder().build().selectList(new QueryWrapper<YgglMainEmp>().lambda().eq(YgglMainEmp::getOrgCode, userBean.getOrgCode()).ne(YgglMainEmp::getJobStatus, "3")); List<YgglMainEmp> yggl = YgglMainEmp.builder().build().selectList(new QueryWrapper<YgglMainEmp>().lambda().eq(YgglMainEmp::getOrgCode, userBean.getOrgCode()).ne(YgglMainEmp::getJobStatus, "3"));
return ResultUtil.data(yggl); return ResultUtil.data(yggl);
} }
/**
* 成员设置数据
*/
@GetMapping(value="/EmployeeNum")
@ApiOperation(value = "38.1:成员设置数据-根据 组织机构代码", httpMethod = "GET", notes = "接口发布说明")
@ApiOperationSupport(order = 38)
public Result<Object> getEmployeeNum(@CurrentUser UserBean userBean) {
List<YgglMainEmp> yggl = YgglMainEmp.builder().build().selectList(new QueryWrapper<YgglMainEmp>().lambda().eq(YgglMainEmp::getOrgCode, userBean.getOrgCode()).ne(YgglMainEmp::getJobStatus, "3"));
return ResultUtil.data(yggl);
}
//用户与设备关系表 //用户与设备关系表
@Autowired @Autowired
......
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