1. 上岗证新增审核 2. 上岗证导出和证书打印记录时间

Administrator

2022-01-10 a2128bbba47602e6795f2667cf2948992f24bebe

 src/main/java/org/springblade/modules/system/controller/UserController.java

@@ -661,6 +661,8 @@
         AccreditationRecords accreditationRecords1 = collect.get(0);
         //修改为已制证状态
         accreditationRecords1.setStatus(2);
         //记录打印时间
         accreditationRecords1.setPaperTime(new Date());
         //更新
         accreditationRecordsService.updateById(accreditationRecords1);
         //同步
@@ -881,7 +883,7 @@
      securityExcel.setCardid("360XXX19XXXXXX****");
      securityExcel.setNation("汉");
      securityExcel.setRegistered("江西省南昌市******");
      securityExcel.setHold("是");
//      securityExcel.setHold("是");
      securityExcel.setSecuritynumber("赣洪202100001");
      list.add(securityExcel);

@@ -893,7 +895,7 @@
      securityExcel1.setCardid("360XXX19XXXXXX****");
      securityExcel1.setNation("汉");
      securityExcel1.setRegistered("江西省南昌市******");
      securityExcel1.setHold("否");
//      securityExcel1.setHold("否");
      securityExcel1.setSecuritynumber("");
      list.add(securityExcel1);
      String fileName = null;
@@ -926,7 +928,7 @@
      securityExcel.setCardid("360XXX19XXXXXX****");
      securityExcel.setNation("汉");
      securityExcel.setRegistered("江西省南昌市******");
      securityExcel.setHold("是");
//      securityExcel.setHold("是");
      securityExcel.setSecuritynumber("赣洪202100001");
      list.add(securityExcel);

@@ -938,7 +940,7 @@
      securityExcel1.setCardid("360XXX19XXXXXX****");
      securityExcel1.setNation("汉");
      securityExcel1.setRegistered("江西省南昌市******");
      securityExcel1.setHold("否");
//      securityExcel1.setHold("否");
      securityExcel1.setSecuritynumber("");
      list.add(securityExcel1);
      String fileName = null;
@@ -1419,4 +1421,44 @@
//      ExcelUtil.export(response, "保安员导入数据模板", "保安员数据表", list, UserExcel.class);
   }


   /**
    * 保安员账号校验
    * @param user
    * @return
    */
   @GetMapping("/checkAccount")
   public void checkAccount(User user) {
      //根据身份证号查询用户
      User user1 = new User();
      user1.setAccount(user.getCardid());
      user1.setIsDeleted(0);
      user1.setStatus(1);
      User user2 = userService.getOne(Condition.getQueryWrapper(user1));
      if (null!=user2){
         //判断是单位否一致
         if (null!=user.getDeptId() && !user.getDeptId().equals("")) {
            if (!user2.getDeptId().equals(user.getDeptId())) {
               throw new ServiceException(StringUtil.format("当前用户 [{}] 已在其他单位录入!", user.getCardid()));
            } else {
               throw new ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getCardid()));
            }
         }else {
            //没有传 deptId 的情况
            throw new ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getCardid()));
         }
      }
   }

   /**
    * 年龄分布查询
    * @param user
    * @return
    */
   @PostMapping("/getAgeStatistics")
   public R getAgeStatistics(UserVO user){
      return R.data(userService.getAgeStatistics(user));
   }


}