结束派遣修改

Administrator

2021-09-08 f615ab88f20f46511ba1dce5843da48549731fae

结束派遣修改

 src/main/java/org/springblade/modules/dispatcher/controller/DispatcherController.java

@@ -134,6 +134,7 @@
        User user = new User();
        user.setId(Long.parseLong(dispatcher.getUserIds()));
        user.setDispatch("1");
        userService.updateById(user);

        //内网同步
        String s1 =

 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;
@@ -573,10 +572,16 @@
            //持证
//            if (user.getHold().equals("1")){
                //分配保安角色
                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")){
@@ -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);

        //获取从业记录

 src/main/java/org/springblade/modules/system/mapper/UserMapper.java

@@ -177,4 +177,11 @@


    DispatcherVO getDispatcherInfoByUserId(Long userId);

    /**
     * 查询账号相同的用户数量
     * @param account
     * @return
     */
    Integer selectCountAccount(@Param("account") String account);
}

 src/main/java/org/springblade/modules/system/mapper/UserMapper.xml

@@ -490,4 +490,8 @@
        and sd.status = 0
    </select>

    <!--查询账号相同的数量-->
    <select id="selectCountAccount" resultType="java.lang.Integer">
        select count(*) from blade_user where account = #{account}
    </select>
</mapper>

 src/main/java/org/springblade/modules/system/service/IUserService.java

@@ -299,4 +299,11 @@
     */
    UserVO getUserDetails(User user);
    List<Map<String, Object>> seleL(String type,String deptid,String jurisdiction,Long userId);

    /**
     * 查询账号相同的用户数量
     * @param account
     * @return
     */
    Integer selectCount(String account);
}

 src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java

@@ -675,4 +675,14 @@
        }
        return list;
    }

    /**
     * 查询账号相同的用户数量
     * @param account
     * @return
     */
    @Override
    public Integer selectCount(String account) {
        return baseMapper.selectCountAccount(account);
    }
}

 src/main/resources/application.yml

@@ -43,6 +43,7 @@
        session-stat-enable: true
        session-stat-max-count: 10


# mybatis
mybatis-plus:
  mapper-locations: classpath:org/springblade/**/mapper/*Mapper.xml
@@ -243,6 +244,10 @@
      - client-id: saber
        path-patterns:
          - /blade-saber/**
    #日志
    mybatis-plus:
      sql-log: false

  #多租户配置
  tenant:
    #多租户增强