Merge branch 'lal' into 'develop'

Lal

See merge request 8timerv2/8timerapiv200!191

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

@@ -257,20 +257,40 @@ public class TimeCardController {
 			List<KqglAssoOvertimeRulesDto> rulesdto = new ArrayList<KqglAssoOvertimeRulesDto>();
 			List<KqglAssoOvertimeRulesDto> rulesdto = new ArrayList<KqglAssoOvertimeRulesDto>();
 			for (int i = 0, n = listAs.size(); i < n; i++) {
 			for (int i = 0, n = listAs.size(); i < n; i++) {
 				String[] nary = null;
 				String[] nary = null;
+				String[] naryid = null;
 				if(listAs.get(i).getAppliedScope() == 0) {//全公司
 				if(listAs.get(i).getAppliedScope() == 0) {//全公司
 					nary = new String[1];//用户名
 					nary = new String[1];//用户名
+					naryid = new String[1];//用户名
 					nary[0] = "全公司";
 					nary[0] = "全公司";
+					naryid[0] = "0";
 				}else {
 				}else {
 					List<KqglAssoOvertimeRange> overtim = kqglassoovertimerangemapper.selectList(new QueryWrapper<KqglAssoOvertimeRange>().lambda().eq(KqglAssoOvertimeRange::getOvertimeRulesId, listAs.get(i).getId()));
 					List<KqglAssoOvertimeRange> overtim = kqglassoovertimerangemapper.selectList(new QueryWrapper<KqglAssoOvertimeRange>().lambda().eq(KqglAssoOvertimeRange::getOvertimeRulesId, listAs.get(i).getId()));
 					nary = new String[overtim.size()];//用户名
 					nary = new String[overtim.size()];//用户名
+					naryid = new String[overtim.size()];//用户名
 					for(int y = 0,l = overtim.size(); y < l ; y++) {
 					for(int y = 0,l = overtim.size(); y < l ; y++) {
 						KqglMainKqz kqzmc = kqglmainkqzmapper.selectOne(new QueryWrapper<KqglMainKqz>().lambda().eq(KqglMainKqz::getId, overtim.get(y).getAttgroupId()));
 						KqglMainKqz kqzmc = kqglmainkqzmapper.selectOne(new QueryWrapper<KqglMainKqz>().lambda().eq(KqglMainKqz::getId, overtim.get(y).getAttgroupId()));
 						nary[y] = kqzmc.getName();
 						nary[y] = kqzmc.getName();
+						naryid[y] = String.valueOf(kqzmc.getId());
 					}
 					}
 				}
 				}
+				
+				
+				List<KqglAssOvertimeVice> vice = kqglassovertimevicemapper.selectList(new QueryWrapper<KqglAssOvertimeVice>().lambda().eq(KqglAssOvertimeVice::getOvertimeRulesId, listAs.get(i).getId()));
+				
+				StartTimeRestDto[] starttime = new StartTimeRestDto[vice.size()];//用户名;
+				
+				for(int r = 0,t = vice.size(); r < t ; r++) {
+					StartTimeRestDto startt = new StartTimeRestDto(vice.get(r).getBreakStartTime(),vice.get(r).getBreakEndTime(),vice.get(r).getOverType());
+					starttime[r] = startt;
+				}
+				
+				
+				
 				KqglAssoOvertimeRulesDto ruldto = KqglAssoOvertimeRulesDto.builder().build();
 				KqglAssoOvertimeRulesDto ruldto = KqglAssoOvertimeRulesDto.builder().build();
 				ruldto.setApplyrange(nary);
 				ruldto.setApplyrange(nary);
-				BeanUtil.copyProperties(listAs.get(i), ruldto , "starttime","applyrange");
+				ruldto.setApplyrangeid(naryid);
+				ruldto.setStarttime(starttime);
+				BeanUtil.copyProperties(listAs.get(i), ruldto , "starttime","applyrange","applyrangeid");
 				rulesdto.add(ruldto);
 				rulesdto.add(ruldto);
 			}
 			}
 			return ResultUtil.data(pageAs, rulesdto, "操作成功!");
 			return ResultUtil.data(pageAs, rulesdto, "操作成功!");
@@ -296,7 +316,7 @@ public class TimeCardController {
 		Integer id = rul.getId();
 		Integer id = rul.getId();
 		Console.log("新增/修改加班规则id: " + id);
 		Console.log("新增/修改加班规则id: " + id);
 		List<KqglAssoOvertimeRange> overatts=new ArrayList<KqglAssoOvertimeRange>();
 		List<KqglAssoOvertimeRange> overatts=new ArrayList<KqglAssoOvertimeRange>();
-		String[] launchs = overrules.getApplyrange();
+		String[] launchs = overrules.getApplyrangeid();
 		if(launchs.length == 0) {
 		if(launchs.length == 0) {
 			KqglAssoOvertimeRange.builder().build().delete(new QueryWrapper<KqglAssoOvertimeRange>().lambda().eq(KqglAssoOvertimeRange::getOvertimeRulesId, id));
 			KqglAssoOvertimeRange.builder().build().delete(new QueryWrapper<KqglAssoOvertimeRange>().lambda().eq(KqglAssoOvertimeRange::getOvertimeRulesId, id));
 		}else if(launchs != null && launchs.length>0){
 		}else if(launchs != null && launchs.length>0){
@@ -2006,7 +2026,7 @@ public class TimeCardController {
 	public Result<Object> LeaveBalanceList(@CurrentUser UserBean userBean, @Validated @RequestBody AttqueryCriteriaDto attquerycriteriadto) {
 	public Result<Object> LeaveBalanceList(@CurrentUser UserBean userBean, @Validated @RequestBody AttqueryCriteriaDto attquerycriteriadto) {
 		IPage<EmployeeLeaveBalanceDto> page = new Page<EmployeeLeaveBalanceDto>(
 		IPage<EmployeeLeaveBalanceDto> page = new Page<EmployeeLeaveBalanceDto>(
 				attquerycriteriadto.getCurrentPage() == null ? 1 : attquerycriteriadto.getCurrentPage(),
 				attquerycriteriadto.getCurrentPage() == null ? 1 : attquerycriteriadto.getCurrentPage(),
-				attquerycriteriadto.getTotalPage() == null ? 10 : attquerycriteriadto.getTotalPage());
+				attquerycriteriadto.getTotalPage() == 10 ? 9999 : attquerycriteriadto.getTotalPage());
 				attquerycriteriadto.setOrgCode(userBean.getOrgCode());
 				attquerycriteriadto.setOrgCode(userBean.getOrgCode());
 				attquerycriteriadto.setEmpNum(userBean.getEmpNum());
 				attquerycriteriadto.setEmpNum(userBean.getEmpNum());
 				// 缺-部门id 搜索
 				// 缺-部门id 搜索

src/main/java/cn/timer/api/dto/kqmk/KqglAssoOvertimeRulesDto.java

@@ -98,7 +98,10 @@ public class KqglAssoOvertimeRulesDto {
 	@ApiModelProperty(value = "扣除休息时间段", example = "12:00-13:30")
 	@ApiModelProperty(value = "扣除休息时间段", example = "12:00-13:30")
 	private StartTimeRestDto[] starttime;
 	private StartTimeRestDto[] starttime;
 	
 	
-	@ApiModelProperty(value = "应用范围", example = "[]")
+	@ApiModelProperty(value = "应用范围name", example = "[]")
 	private String[] applyrange;
 	private String[] applyrange;
 	
 	
+	@ApiModelProperty(value = "应用范围id", example = "[]")
+	private String[] applyrangeid;
+
 }
 }
\ No newline at end of file