1.二维码批量生成修改，新增图片批量下载 2.用户修改 rtime bug 修改

Administrator

2021-12-10 00754b2fb8e71be738e6c312e11d62e64a4e82c3

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

@@ -62,6 +62,8 @@
import org.springblade.modules.experience.service.IExperienceService;
import org.springblade.modules.jurisdiction.entity.Jurisdiction;
import org.springblade.modules.jurisdiction.service.JurisdictionService;
import org.springblade.modules.signinrecords.entity.SignInRecords;
import org.springblade.modules.signinrecords.service.SignInRecordsService;
import org.springblade.modules.system.entity.Dept;
import org.springblade.modules.system.entity.Role;
import org.springblade.modules.system.entity.User;
@@ -73,6 +75,8 @@
import org.springblade.modules.system.vo.DeptVO;
import org.springblade.modules.system.vo.UserVO;
import org.springblade.modules.system.wrapper.UserWrapper;
import org.springblade.modules.training.entity.TrainingRegistration;
import org.springblade.modules.training.service.TrainingRegistrationService;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -115,6 +119,11 @@
   private final JurisdictionService jurisdictionService;

   private final IDispatcherService dispatcherService;

   private final SignInRecordsService signInRecordsService;


   private final TrainingRegistrationService trainingRegistrationService;

   /**
    * 查询单条
@@ -281,7 +290,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,44 +397,74 @@
      }

      user.setPassword(user1.getPassword());
      user.setUpdateTime(new Date());
      userService.updateById(user);
      String rtime;
      if (user.getRtime() == null) {
         rtime = null;
         String s1 =
            "update blade_user set account = " + "'" + user.getAccount() + "'"
               + ",name = " + "'" + user.getName() + "'"
               + ",real_name = " + "'" + user.getRealName() + "'"
               + ",avatar = " + "'" + user.getAvatar() + "'"
               + ",email = " + "'" + user.getEmail() + "'"
               + ",phone = " + "'" + user.getPhone() + "'"
               + ",sex = " + "'" + user.getSex() + "'"
               + ",role_id = " + "'" + user.getRoleId() + "'"
               + ",dept_id = " + "'" + user.getDeptId() + "'"
               + ",cardid = " + "'" + user.getCardid() + "'"
               + ",nativePlace = " + "'" + user.getNativeplace() + "'"
               + ",nation = " + "'" + user.getNation() + "'"
               + ",education = " + "'" + user.getEducation() + "'"
               + ",politicaloutlook = " + "'" + user.getPoliticaloutlook() + "'"
               + ",healstats = " + "'" + user.getHealstats() + "'"
               + ",height = " + "'" + user.getHeight() + "'"
               + ",fingerprint = " + "'" + url + "'"
               + ",my_picture = " + "'" + user.getMyPicture() + "'"
               + ",address = " + "'" + user.getAddress() + "'"
               + ",registered = " + "'" + user.getRegistered() + "'"
               + ",dispatch = " + "'" + user.getDispatch() + "'"
               + ",securitynumber = " + "'" + user.getSecuritynumber() + "'"
               + ",hold = " + "'" + user.getHold() + "'"
               + ",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);
      } else {
         rtime = new SimpleDateFormat("yyyy-MM-dd").format(user.getRtime());
         String s1 =
            "update blade_user set account = " + "'" + user.getAccount() + "'"
               + ",name = " + "'" + user.getName() + "'"
               + ",real_name = " + "'" + user.getRealName() + "'"
               + ",avatar = " + "'" + user.getAvatar() + "'"
               + ",email = " + "'" + user.getEmail() + "'"
               + ",phone = " + "'" + user.getPhone() + "'"
               + ",sex = " + "'" + user.getSex() + "'"
               + ",role_id = " + "'" + user.getRoleId() + "'"
               + ",dept_id = " + "'" + user.getDeptId() + "'"
               + ",cardid = " + "'" + user.getCardid() + "'"
               + ",nativePlace = " + "'" + user.getNativeplace() + "'"
               + ",nation = " + "'" + user.getNation() + "'"
               + ",education = " + "'" + user.getEducation() + "'"
               + ",politicaloutlook = " + "'" + user.getPoliticaloutlook() + "'"
               + ",healstats = " + "'" + user.getHealstats() + "'"
               + ",height = " + "'" + user.getHeight() + "'"
               + ",fingerprint = " + "'" + url + "'"
               + ",my_picture = " + "'" + user.getMyPicture() + "'"
               + ",address = " + "'" + user.getAddress() + "'"
               + ",registered = " + "'" + user.getRegistered() + "'"
               + ",rtime = " + "'" + rtime + "'"
               + ",dispatch = " + "'" + user.getDispatch() + "'"
               + ",securitynumber = " + "'" + user.getSecuritynumber() + "'"
               + ",hold = " + "'" + user.getHold() + "'"
               + ",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);
      }

      String s1 =
         "update blade_user set account = " + "'" + user.getAccount() + "'"
            + ",name = " + "'" + user.getName() + "'"
            + ",real_name = " + "'" + user.getRealName() + "'"
            + ",avatar = " + "'" + user.getAvatar() + "'"
            + ",email = " + "'" + user.getEmail() + "'"
            + ",phone = " + "'" + user.getPhone() + "'"
            + ",sex = " + "'" + user.getSex() + "'"
            + ",role_id = " + "'" + user.getRoleId() + "'"
            + ",dept_id = " + "'" + user.getDeptId() + "'"
            + ",cardid = " + "'" + user.getCardid() + "'"
            + ",nativePlace = " + "'" + user.getNativeplace() + "'"
            + ",nation = " + "'" + user.getNation() + "'"
            + ",education = " + "'" + user.getEducation() + "'"
            + ",politicaloutlook = " + "'" + user.getPoliticaloutlook() + "'"
            + ",healstats = " + "'" + user.getHealstats() + "'"
            + ",height = " + "'" + user.getHeight() + "'"
            + ",fingerprint = " + "'" + url + "'"
            + ",my_picture = " + "'" + user.getMyPicture() + "'"
            + ",address = " + "'" + user.getAddress() + "'"
            + ",registered = " + "'" + user.getRegistered() + "'"
            + ",rtime = " + "'" + rtime + "'"
            + ",dispatch = " + "'" + user.getDispatch() + "'"
            + ",securitynumber = " + "'" + user.getSecuritynumber() + "'"
            + ",hold = " + "'" + user.getHold() + "'"
            + ",jurisdiction = " + "'" + user.getJurisdiction() + "'"
            + ",reason_for_leav = " + "'" + user.getReasonForLeav() + "'"
            + ",guncode = " + "'" + user.getGuncode() + "'"
            + " " + "where id = " + "'" + user.getId() + "'";
      FtpUtil.sqlFileUpload(s1);
      return R.success("修改成功");
   }

@@ -434,7 +473,7 @@
    * 修改
    */
   @PostMapping("/updateUserInfo")
   public R updateUserInfo(@Valid @RequestBody User user) throws Exception {
   public R updateUserInfo(@Valid @RequestBody UserVO user) throws Exception {
      String url = null;
      if (null!=user.getFingerprint() && !user.getFingerprint().equals("")) {
         if (user.getFingerprint().length()>100) {
@@ -446,8 +485,38 @@
            url = split[1];
         }
      }

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

      //生成签到记录
      if (null!=user.getCandidateNo() && !user.getCandidateNo().equals("")){
         //查询签到记录，如果已有，则更新，没有就新增
         SignInRecords signInRecords = new SignInRecords();
         signInRecords.setCandidateNo(user.getCandidateNo());
         SignInRecords inRecordsServiceOne = signInRecordsService.getOne(Condition.getQueryWrapper(signInRecords));
         //如果为null
         if (null==inRecordsServiceOne){
            //查询报名信息
            TrainingRegistration trainingRegistration = new TrainingRegistration();
            trainingRegistration.setCandidateNo(user.getCandidateNo());
            TrainingRegistration one = trainingRegistrationService.getOne(Condition.getQueryWrapper(trainingRegistration));
            //新增,数据封装
            SignInRecords sign = new SignInRecords();
            sign.setCreateTime(new Date());
            sign.setUpdateTime(new Date());
            sign.setCandidateNo(user.getCandidateNo());
            sign.setUserId(user.getId());
            sign.setApplyId(one.getId());
            sign.setExamId(Long.parseLong(one.getTrainExamId()));
            //新增
            signInRecordsService.save(sign);
         }else {
            //更新
            inRecordsServiceOne.setUpdateTime(new Date());
            signInRecordsService.updateById(inRecordsServiceOne);
         }
      }

      //内网同步
      String s1 =
@@ -462,6 +531,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 +604,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 +616,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,14 +1050,16 @@
                  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);

                     //人员离职后修改派遣记录，修改从业记录
                     updateUserDispatcherExp(user);
                     updateUserDispatcherExp(user2);
                  }else {
                     throw new ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getAccount()));
                  }
@@ -998,7 +1072,7 @@
         }
      }

      String url = null;
      String url = "";
      if (null!=user.getFingerprint() && !user.getFingerprint().equals("")) {
         if (user.getFingerprint().length()>100) {
            String s = uploadBase64String(user);
@@ -1023,6 +1097,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 +1138,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 +1170,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) " +