考勤查询接口修改，电子围栏自定义新增、修改，查询一个点是否在电子围栏内接口新增

Administrator

2022-03-10 ffb62aac389a6ac596fe8d0d44d4e242beeea0f2

 src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java

@@ -86,7 +86,7 @@
   @ApiOperation(value = "新增", notes = "传入trainingRegistration")
   public R save(@RequestBody TrainingRegistration trainingRegistration){
      //查询人员是否已报名
      User user = userService.getById(trainingRegistration.getUserId());
      User user = userService.getUserById(trainingRegistration.getUserId());
      if (null==user.getIsTrain()){
         //已报名
         trainingRegistration.setCancel(1);
@@ -181,7 +181,8 @@
   @PostMapping("/cancelTrain")
   public R cancelApply(@RequestBody TrainingRegistration trainingRegistration){
      //查询人员是否已报名
      User user = userService.getById(trainingRegistration.getUserId());
      User user = userService.getUserById(trainingRegistration.getUserId());

      if(null==user.getIsTrain()){
         trainingRegistration.setCancel(2);
         boolean status = trainingRegistrationService.updateById(trainingRegistration);
@@ -224,7 +225,7 @@
   @PostMapping("/auditSucess")
   public R auditSucess(@RequestBody TrainingRegistration trainingRegistration){
      //查询人员信息
      User user = userService.getById(trainingRegistration.getUserId());
      User user = userService.getUserById(trainingRegistration.getUserId());
      boolean status = false;
      if (null!=user){
         //修改为已报名状态
@@ -249,7 +250,7 @@
   @PostMapping("/cancelTrainAudit")
   public R cancelApplyAudit(@RequestBody TrainingRegistration trainingRegistration){
      //查询人员是否已报名
      User user = userService.getById(trainingRegistration.getUserId());
      User user = userService.getUserById(trainingRegistration.getUserId());
      if(null==user.getIsTrain()){
         trainingRegistration.setCancel(2);
         trainingRegistration.setAuditStatus(2);
@@ -315,7 +316,7 @@
//      AtomicReference<StringBuilder> builder = new AtomicReference<>(new StringBuilder());
      //遍历
      list.forEach(userId ->{
         User user = userService.getById(userId);
         User user = userService.getUserById(userId);
         UserVO userVO = userService.getUserAgeById(Long.parseLong(userId));
         //判断年龄
         if (userVO.getAge()>=18 && userVO.getAge()<=60) {