Commit dc708bbf by lal Committed by chenzg

提交

parent dc280e6d
...@@ -283,9 +283,9 @@ public class TimeCardController { ...@@ -283,9 +283,9 @@ public class TimeCardController {
String[] naryid = 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];//用户名 // 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()));
nary = new String[overtim.size()];//用户名 nary = new String[overtim.size()];//用户名
...@@ -613,7 +613,7 @@ public class TimeCardController { ...@@ -613,7 +613,7 @@ public class TimeCardController {
sta.setState(Integer.valueOf(object.get("data").toString())); sta.setState(Integer.valueOf(object.get("data").toString()));
stas.add(sta); stas.add(sta);
} catch (RestClientException e) { } catch (RestClientException e) {
System.err.println("提示:考勤机服务出错"); System.err.println("提示:考勤机服务出错-1");
return ResultUtil.success("失败"); return ResultUtil.success("失败");
} }
} }
...@@ -638,7 +638,7 @@ public class TimeCardController { ...@@ -638,7 +638,7 @@ public class TimeCardController {
ResponseEntity<String> request = restTemplate.postForEntity(url, httpEntity, String.class); ResponseEntity<String> request = restTemplate.postForEntity(url, httpEntity, String.class);
System.err.print(request.getBody()); System.err.print(request.getBody());
} catch (RestClientException e) { } catch (RestClientException e) {
System.err.println("提示:考勤机服务出错"); System.err.println("提示:考勤机服务出错-2");
return ResultUtil.success("失败"); return ResultUtil.success("失败");
} }
return ResultUtil.success("成功"); return ResultUtil.success("成功");
...@@ -668,7 +668,7 @@ public class TimeCardController { ...@@ -668,7 +668,7 @@ public class TimeCardController {
ResponseEntity<String> request = restTemplate.postForEntity(url, httpEntity, String.class); ResponseEntity<String> request = restTemplate.postForEntity(url, httpEntity, String.class);
System.err.print(request.getBody()); System.err.print(request.getBody());
} catch (RestClientException e) { } catch (RestClientException e) {
System.err.println("提示:考勤机服务出错"); System.err.println("提示:考勤机服务出错-3");
return ResultUtil.success("失败"); return ResultUtil.success("失败");
} }
KqglAssoYhsb.builder().id(id).isGly(0).build().updateById(); KqglAssoYhsb.builder().id(id).isGly(0).build().updateById();
...@@ -700,7 +700,7 @@ public class TimeCardController { ...@@ -700,7 +700,7 @@ public class TimeCardController {
ResponseEntity<String> request = restTemplate.postForEntity(url, httpEntity, String.class); ResponseEntity<String> request = restTemplate.postForEntity(url, httpEntity, String.class);
System.err.print(request.getBody()); System.err.print(request.getBody());
} catch (RestClientException e) { } catch (RestClientException e) {
System.err.println("提示:考勤机服务出错"); System.err.println("提示:考勤机服务出错-4");
return ResultUtil.success("失败"); return ResultUtil.success("失败");
} }
...@@ -1213,7 +1213,7 @@ public class TimeCardController { ...@@ -1213,7 +1213,7 @@ public class TimeCardController {
ResponseEntity<String> request = restTemplate.postForEntity(url, httpEntity, String.class); ResponseEntity<String> request = restTemplate.postForEntity(url, httpEntity, String.class);
System.err.print(request.getBody()); System.err.print(request.getBody());
} catch (RestClientException e) { } catch (RestClientException e) {
System.err.println("提示:考勤机服务出错"); System.err.println("提示:考勤机服务出错-5");
return ResultUtil.error("删除失败:提示:考勤机服务出错"); return ResultUtil.error("删除失败:提示:考勤机服务出错");
} }
......
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