报名新增，报名查询，报名清册，培训报名，培训报名查询修改

Administrator

2021-09-13 0d99d26f39e055ee17fdbf2c5cbd1daf695c4310

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

@@ -17,8 +17,10 @@
package org.springblade.modules.system.controller;


import com.aliyun.oss.ServiceException;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -42,10 +44,7 @@
import org.springblade.core.tool.constant.BladeConstant;
import org.springblade.core.tool.constant.RoleConstant;
import org.springblade.core.tool.support.Kv;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.DigestUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.StringPool;
import org.springblade.core.tool.utils.*;
import org.springblade.modules.FTP.FtpUtil;
import org.springblade.modules.experience.entity.Experience;
import org.springblade.modules.experience.service.IExperienceService;
@@ -180,17 +179,17 @@
   public R submit(@Valid @RequestBody User user) throws Exception {
      CacheUtil.clear(USER_CACHE);
      //查询角色
      if (null!=user.getRoleId()){
         Role role = new Role();
         role.setId(Long.parseLong(user.getRoleId()));
         Role one = roleService.getOne(Condition.getQueryWrapper(role));
         if (one.getRoleAlias().equals("保安")){
            user.setHold("1");
         }
         if (one.getRoleAlias().equals("未持证保安")){
            user.setHold("2");
         }
      }
//      if (null!=user.getRoleId()){
//         Role role = new Role();
//         role.setId(Long.parseLong(user.getRoleId()));
//         Role one = roleService.getOne(Condition.getQueryWrapper(role));
//         if (one.getRoleAlias().equals("保安")){
//            user.setHold("1");
//         }
//         if (one.getRoleAlias().equals("未持证保安")){
//            user.setHold("2");
//         }
//      }

      //根据 deptId 查询dept信息,公安管理员
      Dept dept = iDeptService.getById(user.getDeptId());
@@ -351,7 +350,7 @@
   }

   /**
    * 导入用户
    * 导入用户page-security-apply
    */
   @PostMapping("import-user")
   @ApiOperationSupport(order = 12)
@@ -569,24 +568,30 @@
      //获取user
      User user = JSON.parseObject(JSON.toJSONString(userMap.get("user")),User.class);
      //判断是否为空
      if (null!=user.getHold()){
//      if (null!=user.getHold()){
         //持证
         if (user.getHold().equals("1")){
//         if (user.getHold().equals("1")){
            //分配保安角色
            Role role = new Role();
            role.setRoleAlias("保安");
            Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
            user.setRoleId(oneRole.getId().toString());
         }
         //未持证
         if (user.getHold().equals("2")){
            //分配未持证保安角色
            Role role = new Role();
            role.setRoleAlias("未持证保安");
            Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
            user.setRoleId(oneRole.getId().toString());
         }
      Role role = new Role();
      role.setRoleAlias("保安");
      Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
      user.setRoleId(oneRole.getId().toString());
      user.setDispatch("1");

      Integer userCount = userService.selectCount(user.getAccount());
      if (userCount > 0 && Func.isEmpty(user.getId())) {
         throw new ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getAccount()));
      }
//         }
         //未持证
//         if (user.getHold().equals("2")){
//            //分配未持证保安角色
//            Role role = new Role();
//            role.setRoleAlias("未持证保安");
//            Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
//            user.setRoleId(oneRole.getId().toString());
//         }
//      }
      //密码加密
      if (Func.isNotEmpty(user.getPassword())) {
         user.setPassword(DigestUtil.encrypt(user.getPassword()));
@@ -614,14 +619,24 @@


      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) " +
         "politicaloutlook,healstats,height,address,registered,rtime,securitynumber,hold,jurisdiction,dispatch) " +
         "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() + "'"+")";
         "," + "'" + 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() + "'"+
         "," + "'" + user.getDispatch() + "'"+")";
      FtpUtil.sqlFileUpload(s);

      //获取从业记录
@@ -662,8 +677,8 @@
    * @return
    */
   @GetMapping("/seleL")
   public R seleL(String type,String deptid, String jurisdiction) {
      List<Map<String, Object>> list = userService.seleL(type,deptid, jurisdiction);
   public R seleL(String type,String deptid, String jurisdiction,Long userId) {
      List<Map<String, Object>> list = userService.seleL(type,deptid, jurisdiction,userId);
      return R.data(list);
   }