保安员新增，修改，时间同步，定时任务打印时间

Administrator

2021-12-08 f47e7d71f9ce13f3964b7d3753d3b42b36d35582

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

@@ -281,7 +281,7 @@
   public R update(@Valid @RequestBody User user) throws Exception {
      CacheUtil.clear(USER_CACHE);
      User user1 = userService.getById(user.getId());
      String url = null;
      String url = "";
      if (null!=user.getFingerprint() && !user.getFingerprint().equals("")) {
         if (user.getFingerprint().length()>100) {
            //指纹图片上传并返回url
@@ -388,6 +388,7 @@
      }

      user.setPassword(user1.getPassword());
      user.setUpdateTime(new Date());
      userService.updateById(user);
      String rtime;
      if (user.getRtime() == null) {
@@ -424,6 +425,7 @@
            + ",jurisdiction = " + "'" + user.getJurisdiction() + "'"
            + ",reason_for_leav = " + "'" + user.getReasonForLeav() + "'"
            + ",guncode = " + "'" + user.getGuncode() + "'"
            + ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getUpdateTime()) + "'"
            + " " + "where id = " + "'" + user.getId() + "'";
      FtpUtil.sqlFileUpload(s1);
      return R.success("修改成功");
@@ -446,7 +448,8 @@
            url = split[1];
         }
      }

      user.setUpdateTime(new Date());
      //更新
      userService.updateById(user);

      //内网同步
@@ -462,6 +465,7 @@
            + ",address = " + "'" + user.getAddress() + "'"
            + ",registered = " + "'" + user.getRegistered() + "'"
            + ",securitynumber = " + "'" + user.getSecuritynumber() + "'"
            + ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getUpdateTime()) + "'"
            + ",hold = " + "'" + user.getHold() + "'"
            + ",cell = " + "'" + user.getCell() + "'"
            + " " + "where id = " + "'" + user.getId() + "'";
@@ -534,6 +538,7 @@
   @PostMapping("/updatePaperTime")
   public R updatePaperTime(@RequestBody User user) {
      user.setPaperTime(new Date());
      user.setUpdateTime(new Date());
      userService.updateById(user);
      String paperTime = null;
      //发证日期处理
@@ -545,6 +550,7 @@
      String s1 =
         "update blade_user set paper_time = " + "'" + paperTime + "'"
            + ",user_type = " + "'" + user.getUserType() + "'"
            + ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getUpdateTime()) + "'"
            + " " + "where id = " + "'" + user.getId() + "'";
      FtpUtil.sqlFileUpload(s1);
      return R.success("修改成功");
@@ -978,9 +984,11 @@
                  if(!user2.getDeptId().equals(user.getDeptId())) {
                     user2.setStatus(2);
                     //先将原有人员离职  cell 1:手动录入  2：自动录入
                     user2.setUpdateTime(new Date());
                     userService.updateById(user2);
                     //内网同步
                     String s1 = "update blade_user set status = " + user2.getStatus() +
                        ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user2.getUpdateTime()) + "'" +
                        " where id = " + "'" + user2.getId() + "'";
                     FtpUtil.sqlFileUpload(s1);

@@ -998,7 +1006,7 @@
         }
      }

      String url = null;
      String url = "";
      if (null!=user.getFingerprint() && !user.getFingerprint().equals("")) {
         if (user.getFingerprint().length()>100) {
            String s = uploadBase64String(user);
@@ -1023,6 +1031,7 @@
         //取身份证号码后6位作为密码
         user.setPassword(DigestUtil.encrypt(user.getCardid().substring(user.getCardid().length() - 6)));
      }
      user.setCreateTime(new Date());
      user.setTenantId("000000");
      //用户新增
      boolean status = userService.save(user);
@@ -1063,7 +1072,7 @@
         "id,tenant_id,account,password,name,real_name,avatar,email,phone,sex," +
         "role_id,dept_id,cardid,nativePlace,nation,fingerprint,education," +
         "politicaloutlook,healstats,height,address,registered,rtime," +
         "securitynumber,hold,jurisdiction,examination_type,status,is_deleted,dispatch,guncode,cell) " +
         "securitynumber,hold,jurisdiction,examination_type,status,is_deleted,dispatch,guncode,create_time,cell) " +
         "values(" + "'" + user.getId() + "'" +
         "," + "'" + user.getTenantId() + "'" +
         "," + "'" + user.getAccount() + "'" +
@@ -1095,6 +1104,7 @@
         "," + "'" + user.getIsDeleted() + "'" +
         "," + "'" + user.getDispatch() + "'" +
         "," + "'" + user.getGuncode() + "'" +
         "," + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getCreateTime()) + "'" +
         "," + "'" + user.getCell() + "'" + ");"+
      "insert into sys_experience(id,name,post,entryTime," +
         "cardId,companyname,securityId) " +