保安员导入修改,培训报名查询接口修改

钟日健

2021-09-26 ada15aaecffa8795304a6eab07a372375b519c9a

保安员导入修改,培训报名查询接口修改

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

@@ -366,8 +366,8 @@
    @PostMapping("import-user")
    @ApiOperationSupport(order = 12)
    @ApiOperation(value = "导入用户", notes = "传入excel")
    public R importUser(MultipartFile file, Integer isCovered) {
        UserImporter userImporter = new UserImporter(userService, false);
    public R importUser(MultipartFile file, Integer isCovered,String deptId) {
        UserImporter userImporter = new UserImporter(userService, false,deptId);
        ExcelUtil.save(file, userImporter, UserExcel.class);
        return R.success("操作成功");
    }

 src/main/java/org/springblade/modules/system/excel/UserImporter.java

@@ -32,9 +32,10 @@

    private final IUserService service;
    private final Boolean isCovered;
    private final String deptId;

    @Override
    public void save(List<UserExcel> data) {
        service.importUser(data, isCovered);
        service.importUser(data, isCovered,deptId);
    }
}

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

@@ -183,7 +183,7 @@
     * @param isCovered
     * @return
     */
    void importUser(List<UserExcel> data, Boolean isCovered);
    void importUser(List<UserExcel> data, Boolean isCovered,String deptId);

    /**
     * 导出用户数据

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

@@ -382,7 +382,7 @@

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void importUser(List<UserExcel> data, Boolean isCovered) {
    public void importUser(List<UserExcel> data, Boolean isCovered,String deptId) {
        data.forEach(userExcel -> {
            User user = Objects.requireNonNull(BeanUtil.copy(userExcel, User.class));
            // 设置租户ID
@@ -413,7 +413,15 @@
                }
            }
            //设置部门id
            user.setDeptId(userDeptService.selectIn(user.getDeptId()));
            String deptIds = userDeptService.selectIn(user.getDeptId());
            if (null!=deptIds && !deptIds.equals("")) {
                if (null != deptId && !deptId.equals("")) {
                    if (!deptId.equals(deptIds)) {
                        throw new ServiceException("不能导入不是本公司的保安员数据!");
                    }
                }
                user.setDeptId(deptIds);
            }
            //设置账号
            user.setAccount(user.getCardid());
            //获取默认密码配置

 src/main/java/org/springblade/modules/training/mapper/TrainingRegistrationMapper.xml

@@ -42,6 +42,9 @@
        <if test="trainingRegistration.userId!=null and  trainingRegistration.userId!=''">
            and sr.user_id = #{trainingRegistration.userId}
        </if>
        <if test="trainingRegistration.deptId!=null and  trainingRegistration.deptId!=''">
            and bu.dept_id = #{trainingRegistration.deptId}
        </if>
        <if test="trainingRegistration.auditStatus!=null and trainingRegistration.auditStatus!=0">
            and sr.audit_status = #{trainingRegistration.auditStatus}
        </if>