Merge branch 'lal' into 'develop'

Lal

See merge request 8timerv2/8timerapiv200!222

src/main/java/cn/timer/api/controller/kqgl/AttController.java

@@ -289,7 +289,7 @@ public class AttController {
 	 * 	查询列表-考勤组-分页【新】
 	 */
 	@PostMapping(value = "/attendance_group")
-	@ApiOperation(value = "34：查询列表-我审批的/抄送我的-分页", httpMethod = "POST", notes = "查询列表-我审批的-关键字、审批状态、发起时间-分页")
+	@ApiOperation(value = "34：查询列表-考勤组-分页-分页", httpMethod = "POST", notes = "查询列表-考勤组-分页-分页")
 	@ApiOperationSupport(order = 34)
 	public Result<Object> AttendanceGroup(@CurrentUser UserBean userBean, @Validated @RequestBody AttqueryCriteriaDto attquerycriteriadto){
 			IPage<KqglMainKqzDto> page = new Page<KqglMainKqzDto>(

src/main/java/cn/timer/api/controller/kqgl/TimeCardController.java

@@ -155,7 +155,7 @@ public class TimeCardController {
 			 attquerycriteriadto.getTotalPage() == null ? 10 : attquerycriteriadto.getTotalPage());
 			attquerycriteriadto.setOrgCode(userBean.getOrgCode());
 			attquerycriteriadto.setEmpNum(userBean.getEmpNum());
-			IPage<KqglAssoBcsz> pageAs = kqglassobcszmapper.selectPage(page, new QueryWrapper<KqglAssoBcsz>().lambda().eq(KqglAssoBcsz::getQyid, userBean.getOrgCode()));
+			IPage<KqglAssoBcsz> pageAs = kqglassobcszmapper.selectPage(page, new QueryWrapper<KqglAssoBcsz>().lambda().eq(KqglAssoBcsz::getQyid, userBean.getOrgCode()).orderByDesc(KqglAssoBcsz::getId));
 			List<KqglAssoBcsz> listAs = pageAs.getRecords();
 			return ResultUtil.data(pageAs, listAs, "操作成功!");
 	}
@@ -731,7 +731,7 @@ public class TimeCardController {
 			attquerycriteriadto.setOrgCode(userBean.getOrgCode());
 			attquerycriteriadto.setEmpNum(userBean.getEmpNum());
 			
-			IPage<KqglAssoDkdz> pageAs = kqglassodkdzmapper.selectPage(page, new QueryWrapper<KqglAssoDkdz>().lambda().eq(KqglAssoDkdz::getQyid, userBean.getOrgCode()));
+			IPage<KqglAssoDkdz> pageAs = kqglassodkdzmapper.selectPage(page, new QueryWrapper<KqglAssoDkdz>().lambda().eq(KqglAssoDkdz::getQyid, userBean.getOrgCode()).orderByDesc(KqglAssoDkdz::getId));
 			List<KqglAssoDkdz> listAs = pageAs.getRecords();
 			return ResultUtil.data(pageAs, listAs, "操作成功!");
 	}
@@ -789,7 +789,7 @@ public class TimeCardController {
 			attquerycriteriadto.setOrgCode(userBean.getOrgCode());
 			attquerycriteriadto.setEmpNum(userBean.getEmpNum());
 			
-			IPage<KqglAssoDkwx> pageAs = kqglassodkwxmapper.selectPage(page, new QueryWrapper<KqglAssoDkwx>().lambda().eq(KqglAssoDkwx::getQyid, userBean.getOrgCode()));
+			IPage<KqglAssoDkwx> pageAs = kqglassodkwxmapper.selectPage(page, new QueryWrapper<KqglAssoDkwx>().lambda().eq(KqglAssoDkwx::getQyid, userBean.getOrgCode()).orderByDesc(KqglAssoDkwx::getId));
 			List<KqglAssoDkwx> listAs = pageAs.getRecords();
 			return ResultUtil.data(pageAs, listAs, "操作成功!");
 	}
@@ -1007,7 +1007,7 @@ public class TimeCardController {
 	@ApiOperation(value = "38：获取员工数据-根据 组织机构代码", httpMethod = "GET", notes = "接口发布说明")
 	@ApiOperationSupport(order = 38)
 	public Result<Object> getEmployeeData(@CurrentUser UserBean userBean) {
-			List<YgglMainEmp> yggl = YgglMainEmp.builder().build().selectList(new QueryWrapper<YgglMainEmp>().lambda().eq(YgglMainEmp::getOrgCode, userBean.getOrgCode()).eq(YgglMainEmp::getJobStatus, "1"));
+			List<YgglMainEmp> yggl = YgglMainEmp.builder().build().selectList(new QueryWrapper<YgglMainEmp>().lambda().eq(YgglMainEmp::getOrgCode, userBean.getOrgCode()).ne(YgglMainEmp::getJobStatus, "3"));
 			return ResultUtil.data(yggl);
 	}
 	

src/main/java/cn/timer/api/controller/kqgl/atttimer/AttendanceTaskTiming.java

@@ -442,7 +442,7 @@ public class AttendanceTaskTiming{
 						
 						//排查请假是否在最后一次打卡范围内  查询当月的请假所有日期
 						List<KqglAssoRelationSummary> leainv = kqglassorelationsummarymapper.LeaveInvestigation(user.getEmpnum(), 2, ttstr);
-						KqglAssoBcsz shif = KqglAssoBcsz.builder().build();
+//						KqglAssoBcsz shif = KqglAssoBcsz.builder().build();
 						String beginTime = sdf1.format(new Date());
 //							List<String> rowData = new ArrayList<String>();
 						//遍历目前为止所有日期 结合该用户发起的审批进行结合
@@ -543,6 +543,8 @@ public class AttendanceTaskTiming{
 								}
 							}
 							
+							KqglAssoBcsz shif = KqglAssoBcsz.builder().build();
+							
 							if(attgro.getPbfs() == 1){
 								int several = Integer.valueOf(ClockInTool.dateToWeek(num));//
 								KqglAssoTeshu tesu = KqglAssoTeshu.builder().build().selectOne(new QueryWrapper<KqglAssoTeshu>().lambda().eq(KqglAssoTeshu::getKqzid, attgro.getId()).eq(KqglAssoTeshu::getTsrq, num));
@@ -563,6 +565,7 @@ public class AttendanceTaskTiming{
 								KqglAssoZhoupaiban gudingpb = KqglAssoZhoupaiban.builder().build().selectOne(new QueryWrapper<KqglAssoZhoupaiban>().lambda().eq(KqglAssoZhoupaiban::getKqzid, attgro.getId())
 										.eq(KqglAssoZhoupaiban::getType, several));
 								if(gudingpb != null) {
+									    shif = KqglAssoBcsz.builder().build();
 										shif = shif.selectOne(new QueryWrapper<KqglAssoBcsz>().lambda().eq(KqglAssoBcsz::getId, gudingpb.getBcid()));
 								}
 							}else if(attgro.getPbfs() == 2){

src/main/resources/mapping/kqmk/KqglMainKqzMapper.xml

@@ -166,6 +166,7 @@
 			<if test="param.query != null and param.query != ''">
 				and kqz.`name` like CONCAT('%',#{param.query},'%')
 			</if>
+			ORDER BY kqz.id DESC;
 	  </select>
 
 	<!--