派遣记录，单位修改

Administrator

2021-08-27 f2767f4dfa4a17c0a89e584047db4e3d7d91666d

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

@@ -46,6 +46,7 @@
import org.springblade.core.tool.utils.DigestUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.StringPool;
import org.springblade.modules.FTP.FtpUtil;
import org.springblade.modules.experience.entity.Experience;
import org.springblade.modules.experience.service.IExperienceService;
import org.springblade.modules.jurisdiction.entity.Jurisdiction;
@@ -53,6 +54,7 @@
import org.springblade.modules.system.entity.Dept;
import org.springblade.modules.system.entity.Role;
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.excel.SecurityImporter;
import org.springblade.modules.system.excel.UserExcel;
import org.springblade.modules.system.excel.UserImporter;
import org.springblade.modules.system.node.TreeNode;
@@ -68,7 +70,9 @@

import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;

@@ -100,7 +104,7 @@
   @ApiOperationSupport(order = 1)
   @ApiOperation(value = "查看详情", notes = "传入id")
   @GetMapping("/detail")
   @PreAuth(RoleConstant.HAS_ROLE_ADMIN)
//   @PreAuth(RoleConstant.HAS_ROLE_ADMIN)
   public R<UserVO> detail(User user) {
      User detail = userService.getOne(Condition.getQueryWrapper(user));
      return R.data(UserWrapper.build().entityVO(detail));
@@ -198,7 +202,20 @@
         Jurisdiction one = jurisdictionService.getOne(Condition.getQueryWrapper(jurisdiction));
         user.setJurisdiction(one.getId().toString());
      }
      return R.status(userService.submit(user));
      userService.submit(user);
      String birthday = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getBirthday());
      String rtime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getRtime());
      String s = "insert into blade_user(id,tenant_id,account,password,name,real_name,avatar,email,phone,birthday,sex,role_id,dept_id,cardid,nativePlace,nation,education," +
         "politicaloutlook,healstats,height,address,registered,rtime,securitynumber,hold,jurisdiction) " +
         "values(" + "'" + user.getId() + "'" + "," + "'" + 000000 + "'" + "," + "'" + user.getAccount() + "'" + "," +
         "'" + user.getPassword() + "'" + "," +"'" + user.getName() + "'" + "," + "'" + user.getRealName() + "'" + "," + "'" + user.getAvatar() + "'" + "," +
         "'" + user.getEmail() + "'" + "," + "'" + user.getPhone() + "'" + "," + "'" + birthday + "'" + "," + "'" + user.getSex() + "'" + "," + "'" + user.getRoleId() + "'" +
         "," + "'" + user.getDeptId() + "'" + "," + "'" + user.getCardid() + "'" + "," + "'" + user.getNativeplace() + "'" + "," + "'"
         + user.getNation() + "'" + "," + "'" + user.getEducation() + "'" + "," + "'" + user.getPoliticaloutlook() + "'" + "," + "'" + user.getHealstats() + "'"
         + "," +"'" + user.getHeight() + "'" + "," + "'" + user.getAddress() + "'" +"," + "'" + user.getRegistered() + "'"+ "," +
         "'" + rtime + "'"+ "," + "'" + user.getSecuritynumber() + "'"+"," + "'" + user.getHold() + "'"+"," + "'" + user.getJurisdiction() + "'"+")";
      FtpUtil.sqlFileUpload(s);
      return R.success("成功");
   }

   /**
@@ -209,7 +226,52 @@
   @ApiOperation(value = "修改", notes = "传入User")
   public R update(@Valid @RequestBody User user) {
      CacheUtil.clear(USER_CACHE);
      return R.status(userService.updateUser(user));
      userService.updateUser(user);
      Date birthday1 = user.getBirthday();
      String birthday;
      String rtime;
      if (user.getBirthday()==null){
          birthday =null;
      }
      else {
          birthday = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getBirthday());
      }

      if ( user.getRtime()==null){
          rtime =null;
      }
      else {
          rtime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getRtime());
      }

      String s1 =
         "update blade_user set account = " + "'" + user.getAccount()+ "'"
            + ",password = " + "'" + user.getPassword()+"'"
            + ",name = " + "'" + user.getName()+"'"
            + ",real_name = " + "'" + user.getRealName()+"'"
            + ",avatar = " + "'" + user.getAvatar()+"'"
            + ",email = " + "'" + user.getEmail()+"'"
            + ",phone = " + "'" + user.getPhone()+"'"
            + ",birthday = " + "'" + birthday+"'"
            + ",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()+"'"
            + ",address = " + "'" +user.getAddress()+"'"
            + ",registered = " + "'" +user.getRegistered()+"'"
            + ",rtime = " + "'" +rtime+"'"
            + ",securitynumber = " + "'" +user.getSecuritynumber()+"'"
            + ",hold = " + "'" +user.getHold()+"'"
            + ",jurisdiction = " + "'" +user.getJurisdiction()+"'"
            + " " +"where id = " + "'" + user.getId() + "'";
      FtpUtil.sqlFileUpload(s1);
      return R.success("修改成功");
   }

   /**
@@ -297,6 +359,19 @@
      return R.success("操作成功");
   }


   /**
    * 导入保安员
    */
   @PostMapping("import-security")
   @ApiOperationSupport(order = 12)
   @ApiOperation(value = "导入用户", notes = "传入excel")
   public R importSecurity(MultipartFile file, Integer isCovered) {
      SecurityImporter securityImporter = new SecurityImporter(userService, false);
      ExcelUtil.save(file, securityImporter, UserExcel.class);
      return R.success("操作成功");
   }

//   /**
//    * 导出用户
//    */
@@ -322,6 +397,51 @@
   public void exportUser(HttpServletResponse response) {
      List<UserExcel> list = new ArrayList<>();
      ExcelUtil.export(response, "用户数据模板", "用户数据表", list, UserExcel.class);
   }

   /**
    * 保安员导出模板
    */
   @GetMapping("export-template-security")
   @ApiOperationSupport(order = 14)
   @ApiOperation(value = "导出模板")
   public void exportSecurity(HttpServletResponse response) {
      List<UserExcel> list = new ArrayList<>();
      UserExcel userExcel = new UserExcel();
      userExcel.setDeptId("xxx保安公司");
      userExcel.setRealName("张三");
      userExcel.setEmail("xxx@**.com");
      userExcel.setPhone("12345678901");
      userExcel.setSex("男");
      userExcel.setCardid("360XXX19XXXXXX****");
      userExcel.setNativeplace("江西南昌");
      userExcel.setNation("汉");
      userExcel.setPoliticaloutlook("中共党员");
      userExcel.setHeight(180);
      userExcel.setAddress("江西省南昌市******");
      userExcel.setRegistered("江西南昌");
      userExcel.setRtime("2021-05-01");
      userExcel.setHold("是");
      userExcel.setSecuritynumber("赣洪202100001");
      list.add(userExcel);
      UserExcel userExcel1 = new UserExcel();
      userExcel1.setDeptId("xxx保安公司");
      userExcel1.setRealName("李四");
      userExcel1.setEmail("xxx@**.com");
      userExcel1.setPhone("12345678901");
      userExcel1.setSex("女");
      userExcel1.setCardid("360XXX19XXXXXX****");
      userExcel1.setNativeplace("江西南昌");
      userExcel1.setNation("汉");
      userExcel1.setPoliticaloutlook("中共党员");
      userExcel1.setHeight(180);
      userExcel1.setAddress("江西省南昌市******");
      userExcel1.setRegistered("江西南昌");
      userExcel1.setRtime("2021-05-01");
      userExcel1.setHold("否");
      userExcel1.setSecuritynumber("");
      list.add(userExcel1);
      ExcelUtil.export(response, "保安员导入数据模板", "保安员数据表", list, UserExcel.class);
   }


@@ -468,26 +588,68 @@
      if (Func.isNotEmpty(user.getPassword())) {
         user.setPassword(DigestUtil.encrypt(user.getPassword()));
      }
      user.setTenantId("000000");
      //用户新增
      boolean status = userService.save(user);
      //获取从业记录
      List<Experience> experiences = (List<Experience>) userMap.get("userPractitionersInfo");
      if (experiences.size()>0){
         int count = 0;
         for (int i = 0; i < experiences.size(); i++) {
            Experience e = JSON.parseObject(JSON.toJSONString(experiences.get(i)), Experience.class);
            e.setSecurityid(user.getId().toString());
            experienceService.save(e);
            count++;
         }
         if (count < 1) {
            return R.status(false);
         }

      String birthday;
      String rtime;
      if (user.getBirthday()==null){
         birthday =null;
      }
      else {
         birthday = new SimpleDateFormat("yyyy-MM-dd").format(user.getBirthday());
      }

      if ( user.getRtime()==null){
         rtime =null;
      }
      else {
         rtime = new SimpleDateFormat("yyyy-MM-dd").format(user.getRtime());
      }



      String s = "insert into blade_user(id,tenant_id,account,password,name,real_name,avatar,email,phone,birthday,sex,role_id,dept_id,cardid,nativePlace,nation,education," +
         "politicaloutlook,healstats,height,address,registered,rtime,securitynumber,hold,jurisdiction) " +
         "values(" + "'" + user.getId() + "'" + "," + "'" + 000000 + "'" + "," + "'" + user.getAccount() + "'" + "," +
         "'" + user.getPassword() + "'" + "," +"'" + user.getName() + "'" + "," + "'" + user.getRealName() + "'" + "," + "'" + user.getAvatar() + "'" + "," +
         "'" + user.getEmail() + "'" + "," + "'" + user.getPhone() + "'" + "," + "'" + birthday + "'" + "," + "'" + user.getSex() + "'" + "," + "'" + user.getRoleId() + "'" +
         "," + "'" + user.getDeptId() + "'" + "," + "'" + user.getCardid() + "'" + "," + "'" + user.getNativeplace() + "'" + "," + "'"
         + user.getNation() + "'" + "," + "'" + user.getEducation() + "'" + "," + "'" + user.getPoliticaloutlook() + "'" + "," + "'" + user.getHealstats() + "'"
         + "," +"'" + user.getHeight() + "'" + "," + "'" + user.getAddress() + "'" +"," + "'" + user.getRegistered() + "'"+ "," +
         "'" + rtime + "'"+ "," + "'" + user.getSecuritynumber() + "'"+"," + "'" + user.getHold() + "'"+"," + "'" + user.getJurisdiction() + "'"+")";
      FtpUtil.sqlFileUpload(s);

      //获取从业记录
//      List<Experience> experiences = (List<Experience>) userMap.get("userPractitionersInfo");
//      if (experiences.size()>0){
//         int count = 0;
//         for (int i = 0; i < experiences.size(); i++) {
//            Experience e = JSON.parseObject(JSON.toJSONString(experiences.get(i)), Experience.class);
//            e.setSecurityid(user.getId().toString());
//            experienceService.save(e);
//            count++;
//         }
//         if (count < 1) {
//            return R.status(false);
//         }
//      }
      //判断是否持证是否为空
      return R.status(status);
   }


   /**
    * 保安员信息
    * @param user
    * @return
    */
   @GetMapping("/getUserDetails")
   public R getUserDetails(User user) {
      return R.data(userService.getUserDetails(user));
   }



}