导入修改

Administrator

2022-06-17 dc2e7030b0312910dfa7e88229eae96cc80f4501

 src/main/java/org/springblade/modules/FTP/DataHanlder.java

@@ -123,27 +123,29 @@
            user.setUpdateTime(new Date());
            user.setUserType(7);
            //更新保安数据
            hanlder.userService.updateById(user);
            boolean flag = hanlder.userService.updateById(user);

            //生成保安证的同时向保安证管理表中插入一条数据
            SecurityPaper securityPaper = new SecurityPaper();
            securityPaper.setUserId(user.getId());
            securityPaper.setNumber(result);
            securityPaper.setCreateTime(new Date());
            securityPaper.setIdCardNo(user.getCardid());
            securityPaper.setPeopleName(user.getRealName());
            securityPaper.setExamId(Long.parseLong(examScore.getExamId()));
            securityPaper.setApplyId(examScore.getApplyId());
            securityPaper.setSource(1);
            hanlder.securityPaperService.save(securityPaper);
            if (flag) {
               //生成保安证的同时向保安证管理表中插入一条数据
               SecurityPaper securityPaper = new SecurityPaper();
               securityPaper.setUserId(user.getId());
               securityPaper.setNumber(result);
               securityPaper.setCreateTime(new Date());
               securityPaper.setIdCardNo(user.getCardid());
               securityPaper.setPeopleName(user.getRealName());
               securityPaper.setExamId(Long.parseLong(examScore.getExamId()));
               securityPaper.setApplyId(examScore.getApplyId());
               securityPaper.setSource(1);
               hanlder.securityPaperService.save(securityPaper);

            //内网同步
            String s1 = "update blade_user set hold = " + "'" + user.getHold() + "'" +
               ",securitynumber = " + "'" + DesensitizedUtil.desensitizedSecurityNumber(result) + "'" +
               ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getUpdateTime()) + "'" +
               ",user_type = " + "'" + user.getUserType() + "'" +
               " " + "where id = " + "'" + user.getId() + "'";
            hanlder.myAsyncService.FTP(s1);
               //内网同步
               String s1 = "update blade_user set hold = " + "'" + user.getHold() + "'" +
                  ",securitynumber = " + "'" + DesensitizedUtil.desensitizedSecurityNumber(result) + "'" +
                  ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getUpdateTime()) + "'" +
                  ",user_type = " + "'" + user.getUserType() + "'" +
                  " " + "where id = " + "'" + user.getId() + "'";
               hanlder.myAsyncService.FTP(s1);
            }
         }
      }
   }
@@ -424,7 +426,7 @@
            if (result.getCode() == 200) {
               user.setReasonForLeav("");
               //直接去审查，审查异常则不新增
               //异步审查
               //审查
               User user1 = hanlder.checkUserExamineByCardNos(user);
               if (null!=user1){
                  if (user1.getExaminationType().equals("0")){
@@ -477,6 +479,10 @@
                  }
               }
            } else if (result.getCode() == 201) {
               User user1 = result.getUser();
               //更新
               result1.setCode(201);
               result1.setUserId(user1.getId());
            } else {
               //不新增,不修改
               //设置返回结果,以在其他单位存在
@@ -496,7 +502,7 @@


   /**
    * 异步审查新增的保安员,审查通过并生成保安员证编号
    * 审查新增的保安员,审查通过并生成保安员证编号
    * @param user0
    */
   public User checkUserExamineByCardNos(User user0){
@@ -784,6 +790,16 @@
         && user.getHold().equals("1")
         && null!=user.getSecuritynumber()
         && !user.getSecuritynumber().equals("")){
         //截取，这个范围的不校验
//         String pre = user.getSecuritynumber().substring(0,6);
//         String number = user.getSecuritynumber().substring(6);
//         if (pre.equals("赣洪2022")){
//            int num = Integer.parseInt(number);
//            if (num>=21000 && num<=23000){
//               user.setSecuritynumber(DesensitizedUtil.desensitizedSecurityNumber(user.getSecuritynumber()));
//               return new Result(200,null,"",user);
//            }
//         }
         //持证，校验保安证编号是否合法
         SecurityPaper securityPaper = new SecurityPaper();
         securityPaper.setIdCardNo(user.getCardid());