1. 保安员导入去除是否持证 2. 考试成绩统计查询新增查询接口 3. 新增保安员证导入接口 4. 上岗证导出修改为导出即修改制证状态

Administrator

2021-12-31 d3397094c217c642d68313ca6b9996e6a133b362

 src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java

@@ -870,13 +870,10 @@
            user.setStatus(1);
            user.setIsDeleted(0);
            //判断是否持证
            if (null != userExcel.getHold() && userExcel.getHold() != "") {
               if (userExcel.getHold().equals("是")) {
            if (null != userExcel.getSecuritynumber() && userExcel.getSecuritynumber() != "") {
                  user.setHold("1");
               }
               if (userExcel.getHold().equals("否")) {
            }else {
                  user.setHold("2");
               }
            }
            //判断年龄，超过60岁的不入
//            if (AgeUtil.idCardToAge(user.getCardid())<60) {
@@ -936,20 +933,16 @@
               if (dept.getId().equals(1432626178757275649L) && dept1.getParentId().equals(1432626178757275649L)){
                  user2.setDeptId(dept1.getId().toString());
                  //判断是否持证
                  if (null != userExcel.getHold() && userExcel.getHold() != "") {
                     if (userExcel.getHold().equals("是") && userExcel.getSecuritynumber()!=null && !userExcel.getSecuritynumber().equals("")) {
                        user2.setHold("1");
                        //更新保安证编号
                        user2.setSecuritynumber(user.getSecuritynumber());
                     }
                     if (userExcel.getHold().equals("否")) {
                        user2.setHold("2");
                     }
                  }
                  if (null!=userExcel.getRegistered()){
                     user2.setRegistered(userExcel.getRegistered());
                  if (null != userExcel.getSecuritynumber() && userExcel.getSecuritynumber() != "") {
                     user.setHold("1");
                  }else {
                     user2.setRegistered("");
                     user.setHold("2");
                  }
                  if (null != userExcel.getSecuritynumber() && userExcel.getSecuritynumber() != "") {
                     user2.setHold("1");
                     user2.setSecuritynumber(user.getSecuritynumber());
                  }else {
                     user2.setHold("2");
                  }
                  //更新用户数据
                  user2.setUpdateTime(new Date());
@@ -973,15 +966,11 @@
            }else {
               //如果是一致，则更新用户数据
               //判断是否持证
               if (null != userExcel.getHold() && userExcel.getHold() != "") {
                  if (userExcel.getHold().equals("是") && userExcel.getSecuritynumber()!=null && !userExcel.getSecuritynumber().equals("")) {
               if (null != userExcel.getSecuritynumber() && userExcel.getSecuritynumber() != "") {
                     user2.setHold("1");
                     //更新保安证编号
                     user2.setSecuritynumber(user.getSecuritynumber());
                  }
                  if (userExcel.getHold().equals("否")) {
               }else {
                     user2.setHold("2");
                  }
               }
               if (null!=userExcel.getRegistered()){
                  user2.setRegistered(userExcel.getRegistered());
@@ -1184,13 +1173,10 @@
            user.setStatus(1);
            user.setIsDeleted(0);
            //判断是否持证
            if (null != userExcel.getHold() && userExcel.getHold() != "") {
               if (userExcel.getHold().equals("是")) {
            if (null != userExcel.getSecuritynumber() && userExcel.getSecuritynumber() != "") {
                  user.setHold("1");
               }
               if (userExcel.getHold().equals("否")) {
            }else {
                  user.setHold("2");
               }
            }
            //分配保安角色
            Role role = new Role();
@@ -1299,15 +1285,21 @@
               if (dept.getId().equals(1432626178757275649L) && dept1.getParentId().equals(1432626178757275649L)){
                  user2.setDeptId(dept1.getId().toString());
                  //判断是否持证
                  if (null != userExcel.getHold() && userExcel.getHold() != "") {
                     if (userExcel.getHold().equals("是") && userExcel.getSecuritynumber()!=null && !userExcel.getSecuritynumber().equals("")) {
//                  if (null != userExcel.getHold() && userExcel.getHold() != "") {
//                     if (userExcel.getHold().equals("是") && userExcel.getSecuritynumber()!=null && !userExcel.getSecuritynumber().equals("")) {
//                        user2.setHold("1");
//                        //更新保安证编号
//                        user2.setSecuritynumber(user.getSecuritynumber());
//                     }
//                     if (userExcel.getHold().equals("否")) {
//                        user2.setHold("2");
//                     }
//                  }
                  if (null != userExcel.getSecuritynumber() && userExcel.getSecuritynumber() != "") {
                        user2.setHold("1");
                        //更新保安证编号
                        user2.setSecuritynumber(user.getSecuritynumber());
                     }
                     if (userExcel.getHold().equals("否")) {
                  }else {
                        user2.setHold("2");
                     }
                  }
                  if (null!=userExcel.getRegistered()){
                     user2.setRegistered(userExcel.getRegistered());
@@ -1335,15 +1327,21 @@
            }else {
               //如果是一致，则更新用户数据
               //判断是否持证
               if (null != userExcel.getHold() && userExcel.getHold() != "") {
                  if (userExcel.getHold().equals("是") && userExcel.getSecuritynumber()!=null && !userExcel.getSecuritynumber().equals("")) {
//               if (null != userExcel.getHold() && userExcel.getHold() != "") {
//                  if (userExcel.getHold().equals("是") && userExcel.getSecuritynumber()!=null && !userExcel.getSecuritynumber().equals("")) {
//                     user2.setHold("1");
//                     //更新保安证编号
//                     user2.setSecuritynumber(user.getSecuritynumber());
//                  }
//                  if (userExcel.getHold().equals("否")) {
//                     user2.setHold("2");
//                  }
//               }
               if (null != userExcel.getSecuritynumber() && userExcel.getSecuritynumber() != "") {
                     user2.setHold("1");
                     //更新保安证编号
                     user2.setSecuritynumber(user.getSecuritynumber());
                  }
                  if (userExcel.getHold().equals("否")) {
               }else {
                     user2.setHold("2");
                  }
               }
               if (null!=userExcel.getRegistered()){
                  user2.setRegistered(userExcel.getRegistered());