提交

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

@@ -276,7 +276,7 @@ public class TimeCardController {
 				if(listAs.get(i).getAppliedScope() == 0) {//全公司
 				if(listAs.get(i).getAppliedScope() == 0) {//全公司
 					nary = new String[1];//用户名
 					nary = new String[1];//用户名
 					naryid = new String[1];//用户名
 					naryid = new String[1];//用户名
-					nary[0] = "全公司";
+					nary[0] = "未使用";
 					naryid[0] = "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()));
@@ -3296,4 +3296,30 @@ public class TimeCardController {
 		return ResultUtil.data(tabl, "操作成功!");
 		return ResultUtil.data(tabl, "操作成功!");
 	}
 	}
 	
 	
+	
+	@PostMapping(value = "/isitused")
+	@ApiOperation(value = "（加班规则）当选择加班规则范围中存在已使用的考勤组时，在用户确认后给用户一个提示，提示用户哪个考勤组已被使用，是否修改", httpMethod = "POST", notes = "接口发布说明")
+	public Result<Object> Isitused(@CurrentUser UserBean userBean,@RequestBody KqglAssoOvertimeRulesDto overrules) {
+		
+		String msg = "";
+		
+		String[] launchs = overrules.getApplyrangeid();
+		if(launchs.length > 0) {
+			for(int p=0;p<launchs.length;p++){
+				KqglAssoOvertimeRange ran = KqglAssoOvertimeRange.builder().build().selectOne(new QueryWrapper<KqglAssoOvertimeRange>().lambda().eq(KqglAssoOvertimeRange::getAttgroupId, launchs[p]));
+				if(ran != null) {
+					KqglMainKqz kqz = KqglMainKqz.builder().build().selectOne(new QueryWrapper<KqglMainKqz>().lambda().eq(KqglMainKqz::getId, ran.getAttgroupId()));
+					if(p == 0) {
+						msg += kqz.getName();
+					}else {
+						msg += "、"+kqz.getName();
+					}
+					
+				}
+			}
+		}
+		
+		return ResultUtil.data(msg, "操作成功!");
+	}
+	
 }
 }