添加字段，审批权限修改

ZQN

2024-06-19 72468556f3709380ab3a70e07d8a916fbd47c988

添加字段，审批权限修改

 project-admin/src/main/java/com/project/admin/controller/enforce/EnforceEvaluateController.java

@@ -24,7 +24,7 @@
@Api(value = "执法评价控制器", tags = {"执法评价管理"})
@RequiredArgsConstructor(onConstructor_ = @Autowired)
@RestController
@RequestMapping("/enforce/evaluate/")
@RequestMapping("/enforce/evaluate")
public class EnforceEvaluateController extends BaseController
{


 project-admin/src/main/java/com/project/admin/controller/enforce/EnforceOrderController.java

@@ -44,7 +44,7 @@
    }


    @ApiOperation("查询执法单待审核列表")
    @ApiOperation("查询执法单待审批列表")
    @GetMapping("/checkList")
    public TableDataInfo checkList(EnforceOrderQueryBo bo)
    {

 project-admin/src/main/java/com/project/admin/controller/system/SysCompanyController.java

@@ -9,6 +9,7 @@
import com.project.common.utils.poi.ExcelUtil;
import com.project.system.domain.bo.editBo.SysCompanyBo;
import com.project.system.domain.bo.queryBo.SysCompanyQueryBo;
import com.project.system.domain.vo.SysCompanyResultVo;
import com.project.system.domain.vo.SysCompanyVo;
import com.project.system.service.ISysCompanyService;
import io.swagger.annotations.Api;
@@ -109,13 +110,33 @@
        return util.exportExcel(null, "企业信息模板");
    }

    @ApiOperation(value = "导入活动指标")
    @ApiImplicitParam(value = "上传文件", name = "file", dataType = "file", dataTypeClass = MultipartFile.class)
    @PostMapping("/import")
    public AjaxResult importList(@RequestParam MultipartFile file) throws Exception
    @ApiOperation(value = "处理导入信息")
    @Log(title = "导入企业信息处理" , businessType = BusinessType.OTHER)
    @ApiImplicitParam(value = "企业信息", name = "file", dataType = "file", dataTypeClass = MultipartFile.class)
    @PostMapping("/doImport")
    public AjaxResult doImport(@RequestPart(value = "file") MultipartFile file) throws Exception
    {

        ExcelUtil<SysCompanyVo> util = new ExcelUtil<>(SysCompanyVo.class);
        List<SysCompanyVo> list = util.importExcel(file.getInputStream());
        return toAjax(iSysCompanyService.importList(list) ? 1 : 0);
        return AjaxResult.success(iSysCompanyService.doImport(list));
    }

    @ApiOperation(value = "校验导入信息")
    @Log(title = "导入企业信息校验" , businessType = BusinessType.OTHER)
    @PostMapping("/checkImport")
    public AjaxResult checkImport(@RequestBody SysCompanyResultVo resultVo)
    {
        return AjaxResult.success(iSysCompanyService.checkImport(resultVo));
    }

    @ApiOperation(value = "保存导入信息")
    @Log(title = "导入企业信息保存" , businessType = BusinessType.IMPORT)
    @PostMapping("/saveImport")
    public AjaxResult saveImport(@RequestBody SysCompanyResultVo resultVo)
    {
        return toAjax(iSysCompanyService.saveImport(resultVo) ? 1 : 0);
    }


}

 project-admin/src/main/java/com/project/admin/controller/system/SysLoginController.java

@@ -1,13 +1,6 @@
package com.project.admin.controller.system;

import java.util.List;
import java.util.Set;

import com.project.common.annotation.RepeatSubmit;
import com.project.system.domain.bo.editBo.UserPhoneLoginBo;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
import com.project.common.constant.Constants;
import com.project.common.core.domain.AjaxResult;
import com.project.common.core.domain.entity.SysMenu;
@@ -16,7 +9,14 @@
import com.project.common.utils.SecurityUtils;
import com.project.framework.web.service.SysLoginService;
import com.project.framework.web.service.SysPermissionService;
import com.project.system.domain.bo.editBo.UserPhoneLoginBo;
import com.project.system.service.ISysMenuService;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;

import java.util.List;
import java.util.Set;

/**
 * ç™»å½•éªŒè¯
@@ -56,6 +56,14 @@
        return AjaxResult.success(loginService.getVerifyCode(phone));
    }

    @ApiOperation("校验验证码验证码")
    @PostMapping("/verify")
    @RepeatSubmit
    public AjaxResult verify(@RequestBody UserPhoneLoginBo bo)
    {
        return AjaxResult.success(loginService.verifyPhone(bo.getPhone(), bo.getCode()));
    }

    @ApiOperation("手机号验证码登录")
    @PostMapping("/login/phone")
    @RepeatSubmit

 project-admin/src/main/java/com/project/admin/controller/tool/CheckController.java

@@ -27,6 +27,7 @@

    @ApiOperation("审核")
    @Log(title = "审核", businessType = BusinessType.UPDATE)
//    @PreAuthorize("@ss.hasPermi('sys:company:check')")
    @PostMapping(value = "/checkOrder")
    @RepeatSubmit
    public AjaxResult checkOrder(@RequestBody CheckBo bo)

 project-admin/src/main/resources/application.yml

@@ -143,5 +143,4 @@
            - /system/dict/**
            - /getVerifyCode
            - /login/phone
            - /system/company/**   #临时白名单
            - /tool/**   #临时白名单

 project-common/shenqiuyingshang - ¿ì½Ý·½Ê½.lnk

Binary files differ

 project-common/src/main/java/com/project/common/core/domain/model/ImportError.java

New file
@@ -0,0 +1,31 @@
package com.project.common.core.domain.model;

import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;

/**
 * åŠŸèƒ½æè¿°ï¼š
 *
 * @author ZQN
 * @version 1.0
 */


@Data
@NoArgsConstructor
@AllArgsConstructor
public class ImportError
{

    /**
     * ä¸‹æ ‡
     */
    private Integer index;


    /**
     * é”™è¯¯ä¿¡æ¯
     */
    private String msg;
}

 project-enforce/src/main/java/com/project/enforce/domain/EnforceEvaluateAnswer.java

@@ -1,16 +1,14 @@
package com.project.enforce.domain;

import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.project.common.core.domain.BaseDomain;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
/**
 * æ‰§æ³•è¯„价答案对象 enforce_evaluate_answer
 *
@@ -56,6 +54,9 @@



    @ApiModelProperty("是否选择：0否，1是")
    @TableField(exist = false)
    private Integer isChoose;




 project-enforce/src/main/java/com/project/enforce/domain/EnforceEvaluateQuestion.java

@@ -1,5 +1,6 @@
package com.project.enforce.domain;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.project.common.core.domain.BaseDomain;
@@ -49,8 +50,13 @@
    private String answerIds;

    @ApiModelProperty("题目答案列表")
    @TableField(exist = false)
    private List<EnforceEvaluateAnswer> answerList;

    @ApiModelProperty("本题得分")
    @TableField(exist = false)
    private BigDecimal getScore;





 project-enforce/src/main/java/com/project/enforce/domain/EnforceOrder.java

@@ -1,16 +1,16 @@
package com.project.enforce.domain;

import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.project.common.core.domain.BaseDomain;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;

import java.math.BigDecimal;
import java.util.Date;
/**
 * æ‰§æ³•å•å¯¹è±¡ enforce_order
 *
@@ -69,6 +69,9 @@

    @ApiModelProperty("执法原因")
    private String enforceReason;

    @ApiModelProperty("执法类型")
    private String enforceType;


    @ApiModelProperty("申请人id")
@@ -186,6 +189,12 @@
    @ApiModelProperty("评价总得分")
    private BigDecimal totalScore;

    /** æ˜¯å¦æŠ•è¯‰ï¼š0否，1是 */
    @ApiModelProperty("是否投诉：0否，1是")
    private Integer isComplaint;

    /** æŠ•è¯‰å†…容 */
    @ApiModelProperty("投诉内容")
    private String complaintReason;

}

 project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/EnforceEvaluateLogBo.java

@@ -1,13 +1,9 @@
package com.project.enforce.domain.bo.editBo;

import com.project.common.core.domain.BaseDomain;
import com.project.enforce.domain.vo.EnforceEvaluateVo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import lombok.EqualsAndHashCode;

import java.util.Date;

import java.math.BigDecimal;

@@ -62,6 +58,8 @@
    @ApiModelProperty("执行人单位")
    private Long executeDeptName;



    /** è¯„价说明 */
    @ApiModelProperty("评价说明")
    private String questionRemark;
@@ -74,16 +72,11 @@
    @ApiModelProperty("评价总得分")
    private BigDecimal totalScore;

    /** æ›´æ–°äºº */
    @ApiModelProperty("更新人")
    private String updateBy;

    /** æ›´æ–°æ—¶é—´ */
    @ApiModelProperty("更新时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date updateTime;

    /** å¤‡æ³¨ */
    @ApiModelProperty("备注")
    private String remark;


    @ApiModelProperty("评价问券")
    private EnforceEvaluateVo evaluateVo;
}

 project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/EnforceOrderBo.java

@@ -1,17 +1,12 @@
package com.project.enforce.domain.bo.editBo;

import com.project.common.core.domain.BaseDomain;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import lombok.EqualsAndHashCode;

import java.util.Date;

import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;

/**
 * æ‰§æ³•å•ç¼–辑对象 enforce_order
@@ -67,6 +62,9 @@
    /** æ‰§æ³•åŽŸå›  */
    @ApiModelProperty("执法原因")
    private String enforceReason;

    @ApiModelProperty("执法类型")
    private String enforceType;

    /** ç”³è¯·äººid */
    @ApiModelProperty("申请人id")
@@ -185,4 +183,12 @@
    /** è¯„价总得分 */
    @ApiModelProperty("评价总得分")
    private BigDecimal totalScore;

    /** æ˜¯å¦æŠ•è¯‰ï¼š0否，1是 */
    @ApiModelProperty("是否投诉：0否，1是")
    private Integer isComplaint;

    /** æŠ•è¯‰å†…容 */
    @ApiModelProperty("投诉内容")
    private String complaintReason;
}

 project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/EnforceOrderQueryBo.java

@@ -9,6 +9,7 @@

import java.math.BigDecimal;
import java.util.Date;
import java.util.List;

/**
 * æ‰§æ³•å•åˆ†é¡µæŸ¥è¯¢å¯¹è±¡ enforce_order
@@ -64,6 +65,10 @@
    /** æ‰§æ³•åŽŸå›  */
    @ApiModelProperty("执法原因")
    private String enforceReason;

    @ApiModelProperty("执法类型")
    private String enforceType;

    /** ç”³è¯·äººid */
    @ApiModelProperty("申请人id")
    private Long applyId;
@@ -154,4 +159,19 @@
    @ApiModelProperty("评价总得分")
    private BigDecimal totalScore;

    /** æ˜¯å¦æŠ•è¯‰ï¼š0否，1是 */
    @ApiModelProperty("是否投诉：0否，1是")
    private Integer isComplaint;

    /** æŠ•è¯‰å†…容 */
    @ApiModelProperty("投诉内容")
    private String complaintReason;


    @ApiModelProperty("申请部门ids")
    private List<Long> applyDeptIds;

    @ApiModelProperty("是否审批查询：1是")
    private Integer isCheckQuery;

}

 project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceEvaluateLogVo.java

@@ -1,11 +1,11 @@
package com.project.enforce.domain.vo;

import com.project.common.annotation.Excel;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.math.BigDecimal;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;


/**
@@ -62,4 +62,7 @@
    @ApiModelProperty("备注")
    private String remark;

    @ApiModelProperty("评价问券")
    private EnforceEvaluateVo evaluateVo;

}

 project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceEvaluateVo.java

@@ -15,5 +15,9 @@
@Data
public class EnforceEvaluateVo
{
    private Long orderId;

    private List<EnforceEvaluateQuestion> questionList;

    private String questionRemark;
}

 project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceOrderVo.java

@@ -1,13 +1,13 @@
package com.project.enforce.domain.vo;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.project.common.annotation.Excel;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;
import java.util.Date;


/**
@@ -54,6 +54,10 @@
    @Excel(name = "执法原因")
    @ApiModelProperty("执法原因")
    private String enforceReason;

    @ApiModelProperty("执法类型")
    private String enforceType;

    @Excel(name = "申请人id")
    @ApiModelProperty("申请人id")
    private Long applyId;
@@ -144,4 +148,12 @@
    @ApiModelProperty("评价总得分")
    private BigDecimal totalScore;

    /** æ˜¯å¦æŠ•è¯‰ï¼š0否，1是 */
    @ApiModelProperty("是否投诉：0否，1是")
    private Integer isComplaint;

    /** æŠ•è¯‰å†…容 */
    @ApiModelProperty("投诉内容")
    private String complaintReason;

}

 project-enforce/src/main/java/com/project/enforce/service/impl/CheckServiceImpl.java

@@ -1,7 +1,6 @@
package com.project.enforce.service.impl;

import cn.hutool.core.convert.Convert;
import com.project.common.core.domain.entity.SysRole;
import com.project.common.core.domain.entity.SysUser;
import com.project.common.exception.base.BaseException;
import com.project.common.utils.SecurityUtils;
@@ -20,7 +19,6 @@
import org.springframework.transaction.annotation.Transactional;

import java.util.List;
import java.util.stream.Collectors;

/**
 * åŠŸèƒ½æè¿°ï¼š
@@ -58,8 +56,7 @@
                }
                addCheckLog(company, bo);
                company.setCheckReason(bo.getCheckReason());
                companyService.updateById(company);
                break;
                return companyService.updateById(company);
            case 2:
                EnforceOrder order = orderService.getById(bo.getId());
                if (order==null) {
@@ -80,8 +77,7 @@
                    order.setCheckLevel(order.getCheckLevel()+1);
                }
                order.setCheckReason(bo.getCheckReason());
                orderService.updateById(order);
                break;
                return orderService.updateById(order);
        }
        return false;
    }

 project-enforce/src/main/java/com/project/enforce/service/impl/EnforceEvaluateLogServiceImpl.java

@@ -1,21 +1,23 @@
package com.project.enforce.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import cn.hutool.core.convert.Convert;
import com.project.common.utils.StringUtils;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import org.springframework.transaction.annotation.Transactional;
import com.project.enforce.domain.vo.EnforceEvaluateLogVo;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.project.common.exception.base.BaseException;
import com.project.common.utils.JsonUtils;
import com.project.common.utils.StringUtils;
import com.project.enforce.domain.EnforceEvaluateLog;
import com.project.enforce.domain.bo.editBo.EnforceEvaluateLogBo;
import com.project.enforce.domain.bo.queryBo.EnforceEvaluateLogQueryBo;
import com.project.enforce.domain.EnforceEvaluateLog;
import com.project.enforce.domain.vo.EnforceEvaluateLogVo;
import com.project.enforce.domain.vo.EnforceEvaluateVo;
import com.project.enforce.mapper.EnforceEvaluateLogMapper;
import com.project.enforce.service.IEnforceEvaluateLogService;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.Collection;
import java.util.List;
@@ -43,7 +45,15 @@
    public EnforceEvaluateLogVo queryById(Long id)
    {
        EnforceEvaluateLog db = this.baseMapper.selectById(id);
        return Convert.convert(EnforceEvaluateLogVo.class , db);
        EnforceEvaluateLogVo vo = Convert.convert(EnforceEvaluateLogVo.class, db);
        String questionStatic = vo.getQuestionStatic();
        try {
            EnforceEvaluateVo evaluateVo = JsonUtils.jsonToPojo(questionStatic, EnforceEvaluateVo.class);
            vo.setEvaluateVo(evaluateVo);
        } catch (Exception e) {
            throw new BaseException("评价问券解析异常！");
        }
        return vo;
    }


@@ -52,7 +62,9 @@
    public Boolean insertByBo(EnforceEvaluateLogBo bo)
    {
        EnforceEvaluateLog add = Convert.convert(EnforceEvaluateLog.class, bo);
        validEntityBeforeSave(add);
        validEntityBeforeSave(bo);
        String questionStatic = JsonUtils.objectToJson(bo.getEvaluateVo());
        add.setQuestionStatic(questionStatic);
        return this.save(add);
    }

@@ -61,7 +73,9 @@
    public Boolean updateByBo(EnforceEvaluateLogBo bo)
    {
        EnforceEvaluateLog update = Convert.convert(EnforceEvaluateLog.class, bo);
        validEntityBeforeSave(update);
        validEntityBeforeSave(bo);
        String questionStatic = JsonUtils.objectToJson(bo.getEvaluateVo());
        update.setQuestionStatic(questionStatic);
        return this.updateById(update);
    }

@@ -69,9 +83,7 @@
    @Transactional
    public Boolean deleteByIds(Collection<Long> ids)
    {

        //做一些业务上的校验,判断是否需要校验

        return this.removeByIds(ids);
    }

@@ -79,9 +91,11 @@
//-------------------------------------------------------------------------------------

    //保存前校验
    private void validEntityBeforeSave(EnforceEvaluateLog entity)
    private void validEntityBeforeSave(EnforceEvaluateLogBo bo)
    {
        //做一些数据校验,如唯一约束
        if (bo.getEvaluateVo()==null) {
            throw new BaseException("请上传评价问券内容！");
        }
    }

    //获取查询参数

 project-enforce/src/main/java/com/project/enforce/service/impl/EnforceEvaluateServiceImpl.java

@@ -75,7 +75,7 @@
        return null;
    }

    @Override
    @Override//评价设置详情
    public EnforceEvaluateVo getInfo()
    {
        EnforceEvaluateVo vo = new EnforceEvaluateVo();

 project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java

@@ -53,20 +53,22 @@
    public List<EnforceOrderVo> queryCheckList(EnforceOrderQueryBo bo)
    {
        SysUser loginUser = SecurityUtils.getLoginUser().getUser();
        if (!"01".equals(loginUser.getUserType())) {
            throw new BaseException("您没有审批权限，请重试！");
        if (bo.getIsCheckQuery()!=null && bo.getIsCheckQuery()==1){
            List<String> roleKeys = loginUser.getRoles().stream().map(SysRole::getRoleKey).collect(Collectors.toList());
            if (roleKeys.contains(CheckLevelCodeConstants.CHECK_LEVEL_ONE) && roleKeys.contains(CheckLevelCodeConstants.CHECK_LEVEL_TWO)){
                bo.setCheckLevel(null);
            } else if (roleKeys.contains(CheckLevelCodeConstants.CHECK_LEVEL_ONE)){
                bo.setCheckLevel(0);
            } else if (roleKeys.contains(CheckLevelCodeConstants.CHECK_LEVEL_TWO)) {
                bo.setCheckLevel(1);
            } else {
                throw new BaseException("您没有审批权限，请重试！");
            }
        }
        List<String> roleKeys = loginUser.getRoles().stream().map(SysRole::getRoleKey).collect(Collectors.toList());
        if (roleKeys.contains(CheckLevelCodeConstants.CHECK_LEVEL_ONE) && roleKeys.contains(CheckLevelCodeConstants.CHECK_LEVEL_TWO)){
            bo.setCheckLevel(null);
        } else if (roleKeys.contains(CheckLevelCodeConstants.CHECK_LEVEL_ONE)){
            bo.setCheckLevel(0);
        } else if (roleKeys.contains(CheckLevelCodeConstants.CHECK_LEVEL_TWO)) {
            bo.setCheckLevel(1);
        } else {
            throw new BaseException("您没有审批权限，请重试！");
        }

        bo.setCheckDeptId(deptService.getCheckDeptIdByLoginDeptId(loginUser.getDeptId()));

        bo.setApplyDeptIds(deptService.getApplyDeptIdsByLoginUserId(loginUser.getUserId()));

        return this.baseMapper.selectCheckList(bo);
    }
@@ -133,6 +135,7 @@
        qw.eq(StringUtils.isNotEmpty(bo.getRegionCode()), "region_code", bo.getRegionCode());
        qw.like(StringUtils.isNotEmpty(bo.getRegionName()), "region_name", bo.getRegionName());
        qw.eq(StringUtils.isNotEmpty(bo.getEnforceReason()), "enforce_reason", bo.getEnforceReason());
        qw.eq(StringUtils.isNotEmpty(bo.getEnforceType()), "enforce_type", bo.getEnforceType());
        qw.eq(bo.getApplyId() != null, "apply_id", bo.getApplyId());
        qw.eq(StringUtils.isNotEmpty(bo.getApplyUser()), "apply_user", bo.getApplyUser());
        qw.eq(StringUtils.isNotEmpty(bo.getApplyPhone()), "apply_phone", bo.getApplyPhone());

 project-enforce/src/main/resources/mapper/enforce/EnforceOrderMapper.xml

@@ -16,6 +16,7 @@
        <result property="regionCode"    column="region_code"    />
        <result property="regionName"    column="region_name"    />
        <result property="enforceReason"    column="enforce_reason"    />
        <result property="enforceType"    column="enforce_type"    />
        <result property="applyId"    column="apply_id"    />
        <result property="applyUser"    column="apply_user"    />
        <result property="applyPhone"    column="apply_phone"    />
@@ -81,6 +82,10 @@
                AND check_level = #{checkLevel}
            </if>

            <if test="checkLevel != null ">
                AND apply_dept_id in #{checkLevel}
            </if>

        </where>
    </select>


 project-framework/src/main/java/com/project/framework/web/service/SysLoginService.java

@@ -1,7 +1,5 @@
package com.project.framework.web.service;

import javax.annotation.Resource;

import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.aliyuncs.CommonRequest;
@@ -13,23 +11,13 @@
import com.aliyuncs.profile.DefaultProfile;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.project.common.constant.AliyunSmsConstants;
import com.project.common.exception.base.BaseException;
import com.project.system.domain.bo.editBo.UserPhoneLoginBo;
import com.project.system.mapper.SysUserMapper;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.authentication.BadCredentialsException;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.Authentication;
import org.springframework.stereotype.Component;
import com.project.common.constant.CacheConstants;
import com.project.common.constant.Constants;
import com.project.common.core.domain.entity.SysUser;
import com.project.common.core.domain.model.LoginUser;
import com.project.common.core.redis.RedisCache;
import com.project.common.exception.ServiceException;
import com.project.common.exception.base.BaseException;
import com.project.common.exception.user.CaptchaException;
import com.project.common.exception.user.CaptchaExpireException;
import com.project.common.exception.user.UserPasswordNotMatchException;
@@ -41,8 +29,17 @@
import com.project.framework.manager.AsyncManager;
import com.project.framework.manager.factory.AsyncFactory;
import com.project.framework.security.context.AuthenticationContextHolder;
import com.project.system.domain.bo.editBo.UserPhoneLoginBo;
import com.project.system.mapper.SysUserMapper;
import com.project.system.service.ISysConfigService;
import com.project.system.service.ISysUserService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.authentication.BadCredentialsException;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.Authentication;
import org.springframework.stereotype.Component;

import java.util.Random;
import java.util.concurrent.TimeUnit;
@@ -237,7 +234,7 @@
     * @param code  éªŒè¯ç 
     * @return  æ ¡éªŒç»“æžœ
     */
    private Boolean verifyPhone(String phone, String code)
    public Boolean verifyPhone(String phone, String code)
    {
        String key = getCacheKey(phone);
        if (!redisCache.hasKey(key)) {

 project-system/src/main/java/com/project/system/domain/SysUserDept.java

New file
@@ -0,0 +1,31 @@
package com.project.system.domain;

import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
/**
 * ç”¨æˆ·ä¸Žéƒ¨é—¨å…³è”对象 sys_user_dept
 *
 * @author manton
 */
@Data
@NoArgsConstructor
@Accessors(chain = true)
@TableName("sys_user_dept")
@ApiModel("用户与部门关联实体对象")
public class SysUserDept {

    private static final long serialVersionUID=1L;


    @ApiModelProperty("用户ID")
    private Long userId;


    @ApiModelProperty("部门ID")
    private Long deptId;

}

 project-system/src/main/java/com/project/system/domain/vo/SysCompanyResultVo.java

New file
@@ -0,0 +1,19 @@
package com.project.system.domain.vo;

import io.swagger.annotations.ApiModel;
import lombok.Data;

import java.util.List;


/**
 * ä¼ä¸šä¿¡æ¯è§†å›¾å¯¹è±¡ mall_package
 *
 * @author manton
 */
@Data
@ApiModel("企业信息视图对象")
public class SysCompanyResultVo
{
    private List<SysCompanyVo> voList;
}

 project-system/src/main/java/com/project/system/domain/vo/SysCompanyVo.java

@@ -2,11 +2,13 @@

import com.fasterxml.jackson.annotation.JsonFormat;
import com.project.common.annotation.Excel;
import com.project.common.core.domain.model.ImportError;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;
import java.util.List;


/**
@@ -23,20 +25,20 @@
    @ApiModelProperty("企业id")
    private Long companyId;

    @Excel(name = "企业名")
    @ApiModelProperty("企业名")
    @Excel(name = "企业名(企业全称)")
    @ApiModelProperty("企业名(企业全称)")
    private String companyName;

    @Excel(name = "企业社会编码")
    @ApiModelProperty("企业社会编码")
    @Excel(name = "统一社会信用代码")
    @ApiModelProperty("统一社会信用代码")
    private String companyCode;

    @Excel(name = "企业联系人")
    @ApiModelProperty("企业联系人")
    private String companyUser;

    @Excel(name = "企业联系人电话" , readConverterExp = "è´¦=号")
    @ApiModelProperty("企业联系人电话（账号）")
    @Excel(name = "联系人电话" )
    @ApiModelProperty("联系人电话")
    private String companyPhone;

    @Excel(name = "企业地址")
@@ -67,12 +69,10 @@
    @ApiModelProperty("审批说明")
    private String checkReason;

    @Excel(name = "自定义排序")
    @ApiModelProperty("自定义排序")
    private Integer sortNum;

    /** åˆ›å»ºäºº */
    @Excel(name = "创建人")
    @ApiModelProperty("创建人")
    private String createBy;

@@ -81,16 +81,20 @@
    private Date createTime;

    /** æ›´æ–°äºº */
    @Excel(name = "更新人")
    @ApiModelProperty("更新人")
    private String updateBy;

    @ApiModelProperty("创建时间")
    @ApiModelProperty("更新时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date updateTime;

    /** å¤‡æ³¨ */
    @Excel(name = "备注")
    @ApiModelProperty("备注")
    private String remark;


    @ApiModelProperty("错误信息数据")
    private List<ImportError> errorList;

}

 project-system/src/main/java/com/project/system/domain/vo/SysDocVo.java

@@ -1,10 +1,12 @@
package com.project.system.domain.vo;

import com.project.common.annotation.Excel;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.project.common.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;


/**
@@ -37,4 +39,12 @@
    @ApiModelProperty("备注")
    private String remark;

    /** åˆ›å»ºäºº */
    @ApiModelProperty("创建人")
    private String createBy;

    @ApiModelProperty("创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date createTime;

}

 project-system/src/main/java/com/project/system/mapper/SysDeptMapper.java

@@ -1,8 +1,9 @@
package com.project.system.mapper;

import java.util.List;
import org.apache.ibatis.annotations.Param;
import com.project.common.core.domain.entity.SysDept;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * éƒ¨é—¨ç®¡ç† æ•°æ®å±‚
@@ -115,4 +116,12 @@
     * @return ç»“æžœ
     */
    public int deleteDeptById(Long deptId);

    /**
     * æ ¹æ®ç™»å½•äººid获取管辖机构ids
     * @param userId    ç™»å½•äººid
     * @return  ç®¡è¾–机构ids
     */
    List<Long> getApplyDeptIdsByLoginUserId(Long userId);

}

 project-system/src/main/java/com/project/system/mapper/SysUserDeptMapper.java

New file
@@ -0,0 +1,13 @@
package com.project.system.mapper;

import com.project.system.domain.SysUserDept;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**
 * ç”¨æˆ·ä¸Žéƒ¨é—¨å…³è”Mapper接口
 *
 * @author manton
 */
public interface SysUserDeptMapper extends BaseMapper<SysUserDept> {

}

 project-system/src/main/java/com/project/system/service/ISysCompanyService.java

@@ -1,12 +1,11 @@
package com.project.system.service;

import com.project.common.mybatis.IBaseService;
import com.project.system.domain.SysCompany;
import com.project.system.domain.vo.SysCompanyVo;
import com.project.system.domain.bo.editBo.SysCompanyBo;
import com.project.system.domain.bo.queryBo.SysCompanyQueryBo;
import com.baomidou.mybatisplus.extension.service.IService;
import com.project.common.mybatis.IBaseService;
import cn.hutool.core.convert.Convert;
import com.project.system.domain.vo.SysCompanyResultVo;
import com.project.system.domain.vo.SysCompanyVo;

import java.util.Collection;
import java.util.List;
@@ -52,9 +51,23 @@
    Boolean deleteByIds(Collection<Long> ids);

    /**
     * æ‰¹é‡å¯¼å…¥ä¼ä¸šä¿¡æ¯
     * @param list ä¼ä¸šä¿¡æ¯é›†åˆ
     * @return  true成功 false失败
     * å¤„理导入信息
     * @param list    æ•°æ®
     * @return    ç»“æžœ
     */
    Boolean importList(List<SysCompanyVo> list);
    SysCompanyResultVo doImport(List<SysCompanyVo> list);

    /**
     * æ ¡éªŒå¯¼å…¥ä¿¡æ¯
     * @param resultVo    æ•°æ®
     * @return    ç»“æžœ
     */
    SysCompanyResultVo checkImport(SysCompanyResultVo resultVo);

    /**
     * ä¿å­˜å¯¼å…¥ä¿¡æ¯
     * @param resultVo    æ•°æ®
     * @return    ç»“æžœ
     */
    Boolean saveImport(SysCompanyResultVo resultVo);
}

 project-system/src/main/java/com/project/system/service/ISysDeptService.java

@@ -124,6 +124,17 @@
    public int deleteDeptById(Long deptId);



    /**
     * èŽ·å–对应审批机构id
     * @param deptId    ç™»å½•äººéƒ¨é—¨id
     * @return  å®¡æ‰¹æœºæž„id
     */
    public Long getCheckDeptIdByLoginDeptId(Long deptId);

    /**
     * èŽ·å–对应管辖机构ids
     * @param userId    ç™»å½•äººid
     * @return  ç®¡è¾–机构ids
     */
    List<Long> getApplyDeptIdsByLoginUserId(Long userId);
}

 project-system/src/main/java/com/project/system/service/ISysUserDeptService.java

New file
@@ -0,0 +1,14 @@
package com.project.system.service;

import com.project.common.mybatis.IBaseService;
import com.project.system.domain.SysUserDept;

/**
 * ç”¨æˆ·ä¸Žéƒ¨é—¨å…³è”Service接口
 *
 * @author manton
 */
public interface ISysUserDeptService extends IBaseService<SysUserDept> {


}

 project-system/src/main/java/com/project/system/service/impl/SysCompanyServiceImpl.java

@@ -3,8 +3,10 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.project.common.constant.UserConstants;
import com.project.common.core.domain.entity.SysUser;
import com.project.common.core.domain.model.ImportError;
import com.project.common.exception.base.BaseException;
import com.project.common.utils.SecurityUtils;
import com.project.system.domain.vo.SysCompanyResultVo;
import com.project.system.service.ISysUserService;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
@@ -22,6 +24,7 @@
import com.project.system.mapper.SysCompanyMapper;
import com.project.system.service.ISysCompanyService;

import java.util.ArrayList;
import java.util.Collection;
import java.util.List;

@@ -57,7 +60,7 @@
    public Boolean insertByBo(SysCompanyBo bo)
    {
        SysCompany add = Convert.convert(SysCompany.class, bo);
        validEntityBeforeSave(add, 0);
        validEntityBeforeSave(add);
        boolean save = this.save(add);
        addCompanyUser(add);
        return save;
@@ -76,7 +79,7 @@
            }
            this.addCompanyUser(update);
        }
        validEntityBeforeSave(update, 0);
        validEntityBeforeSave(update);
        return this.updateById(update);
    }

@@ -93,17 +96,47 @@
        return this.removeByIds(ids);
    }

    @Override//导入
    @Transactional
    public Boolean importList(List<SysCompanyVo> list)

    @Override
    public SysCompanyResultVo doImport(List<SysCompanyVo> list)
    {
        if (list==null || list.size()<1){
            throw new BaseException("未获取到导入信息");
            throw new BaseException("未获取到导入信息！");
        }
        List<SysCompany> companies = Convert.toList(SysCompany.class, list);
        companies.forEach(e-> validEntityBeforeSave(e,1));
        boolean b = this.saveOrUpdateBatch(companies);
        SysCompanyResultVo resultVo = new SysCompanyResultVo();
        resultVo.setVoList(list);
        return this.checkImport(resultVo);

    }

    @Override
    public SysCompanyResultVo checkImport(SysCompanyResultVo resultVo)
    {
        if (resultVo==null || StringUtils.isEmpty(resultVo.getVoList())){
            throw new BaseException("未获取到导入信息！");
        }
        for (SysCompanyVo vo : resultVo.getVoList()) {
            List<ImportError> errors = new ArrayList<>();
            validEntityBeforeImport(vo, errors);
            vo.setErrorList(errors);
        }
        return  resultVo;
    }

    @Override
    @Transactional
    public Boolean saveImport(SysCompanyResultVo resultVo)
    {
        if (resultVo==null || StringUtils.isEmpty(resultVo.getVoList())){
            throw new BaseException("未获取到导入信息！");
        }
        resultVo.getVoList().forEach(e-> {
            if (StringUtils.isNotEmpty(e.getErrorList())) {
                throw new BaseException("还有未处理错误信息！");
            }
        });
        List<SysCompany> companies = Convert.toList(SysCompany.class, resultVo.getVoList());
        boolean b = this.saveOrUpdateBatch(companies);
        companies.forEach(this::addCompanyUser);
        return b;
    }
@@ -114,15 +147,12 @@
    /**
     * ä¿å­˜å‰æ ¡éªŒ
     * @param entity    å‚æ•°
     * @param isImport  æ˜¯å¦å¯¼å…¥ï¼š0否，1是
     */
    private void validEntityBeforeSave(SysCompany entity, int isImport)
    private void validEntityBeforeSave(SysCompany entity)
    {
        entity.setIsImport(isImport);
        if (isImport!=1){
            if (StringUtils.isEmpty(entity.getCompanyImg())){
                throw new BaseException(String.format("%1$s，请上传营业执照", entity.getCompanyName()));
            }
        entity.setIsImport(0);
        if (StringUtils.isEmpty(entity.getCompanyImg())){
            throw new BaseException(String.format("%1$s，请上传营业执照", entity.getCompanyName()));
        }
        if (StringUtils.isEmpty(entity.getCompanyCode())){
            throw new BaseException(String.format("%1$s，请填写企业社会编码！", entity.getCompanyName()));
@@ -132,6 +162,9 @@
        }
        if (StringUtils.isEmpty(entity.getCompanyPhone())){
            throw new BaseException(String.format("%1$s，请填写企业联系人电话！", entity.getCompanyName()));
        }
        if (StringUtils.isEmpty(entity.getCompanyAddress())){
            throw new BaseException(String.format("%1$s，请填写企业地址！", entity.getCompanyName()));
        }
        if (StringUtils.isEmpty(entity.getCompanyName())){
            throw new BaseException("请填写企业名！");
@@ -163,12 +196,42 @@
                throw new BaseException(String.format("%1$s，企业联系电话已存在！", entity.getCompanyName()));
            }
        }
        if (isImport==1){
            entity.setCheckStatus(2);
        }
    }


    private void validEntityBeforeImport(SysCompanyVo entity, List<ImportError> errorList)
    {
        entity.setIsImport(1);
        if (StringUtils.isEmpty(entity.getCompanyName())){
            errorList.add(new ImportError(0, "请填写企业名！"));
        }
        if (StringUtils.isEmpty(entity.getCompanyCode())){
            errorList.add(new ImportError(1, "请填写企业社会编码！"));
        }
        if (StringUtils.isEmpty(entity.getCompanyUser())){
            errorList.add(new ImportError(2, "请填写企业联系人！"));
        }
        if (StringUtils.isEmpty(entity.getCompanyPhone())){
            errorList.add(new ImportError(3, "请填写企业联系人电话！"));
        }
        if (StringUtils.isEmpty(entity.getCompanyAddress())){
            errorList.add(new ImportError(4, "请填写企业地址！"));
        }
        int codeCount = this.count(lq().eq(SysCompany::getCompanyCode, entity.getCompanyCode()));
        if (codeCount>0){
            errorList.add(new ImportError(1, "企业社会编码已存在！"));
        }
        int nameCount = this.count(lq().eq(SysCompany::getCompanyName, entity.getCompanyName()));
        if (nameCount>0){
            errorList.add(new ImportError(0, "企业名已存在！"));
        }
        int phoneCount = this.count(lq().eq(SysCompany::getCompanyPhone, entity.getCompanyPhone()));
        if (phoneCount>0){
            errorList.add(new ImportError(3, "企业联系电话已存在！"));
        }
        entity.setCheckStatus(2);
    }

    /**
     * æ·»åŠ ä¼ä¸šç”¨æˆ·
     * @param entity    ä¼ä¸šä¿¡æ¯

 project-system/src/main/java/com/project/system/service/impl/SysDeptServiceImpl.java

@@ -294,11 +294,16 @@
        return deptMapper.deleteDeptById(deptId);
    }

    /**
     * æ ¹æ®ç™»å½•äººéƒ¨é—¨èŽ·å–审批机构id
     * @param deptId    ç™»å½•äººéƒ¨é—¨id
     * @return  å®¡æ‰¹æœºæž„id
     */
    @Override
    public Long getCheckDeptIdByLoginDeptId(Long deptId)
    {
        SysDept loginDept = selectDeptById(deptId);
        if (loginDept.getParentId()==101){
        if (loginDept.getParentId()==100){
            return loginDept.getDeptId();
        } else {
            return getCheckDeptIdByLoginDeptId(loginDept.getParentId());
@@ -306,6 +311,17 @@
    }

    /**
     * æ ¹æ®ç™»å½•äººid获取管辖机构ids
     * @param userId    ç™»å½•äººid
     * @return  å®¡æ‰¹æœºæž„ids
     */
    @Override
    public List<Long> getApplyDeptIdsByLoginUserId(Long userId)
    {
        return deptMapper.getApplyDeptIdsByLoginUserId(userId);
    }

    /**
     * é€’归列表
     */
    private void recursionFn(List<SysDept> list, SysDept t)

 project-system/src/main/java/com/project/system/service/impl/SysUserDeptServiceImpl.java

New file
@@ -0,0 +1,21 @@
package com.project.system.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.project.system.domain.SysUserDept;
import com.project.system.mapper.SysUserDeptMapper;
import com.project.system.service.ISysUserDeptService;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

/**
 * ç”¨æˆ·ä¸Žéƒ¨é—¨å…³è”Service业务层处理
 *
 * @author manton
 */
@Service
@RequiredArgsConstructor(onConstructor_ = @Autowired)
public class SysUserDeptServiceImpl extends ServiceImpl<SysUserDeptMapper, SysUserDept> implements ISysUserDeptService {


}

 project-system/src/main/java/com/project/system/service/impl/SysUserServiceImpl.java

@@ -1,19 +1,7 @@
package com.project.system.service.impl;

import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
import javax.validation.Validator;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.RequiredArgsConstructor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import com.project.common.annotation.DataScope;
import com.project.common.constant.UserConstants;
import com.project.common.core.domain.entity.SysRole;
@@ -26,13 +14,21 @@
import com.project.system.domain.SysPost;
import com.project.system.domain.SysUserPost;
import com.project.system.domain.SysUserRole;
import com.project.system.mapper.SysPostMapper;
import com.project.system.mapper.SysRoleMapper;
import com.project.system.mapper.SysUserMapper;
import com.project.system.mapper.SysUserPostMapper;
import com.project.system.mapper.SysUserRoleMapper;
import com.project.system.mapper.*;
import com.project.system.service.ISysConfigService;
import com.project.system.service.ISysUserService;
import lombok.RequiredArgsConstructor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;

import javax.validation.Validator;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;

/**
 * ç”¨æˆ· ä¸šåŠ¡å±‚处理
@@ -545,7 +541,8 @@
    public int deleteUserByDeptId(Long deptId)
    {
        List<SysUser> sysUsers = userMapper.selectList(new LambdaQueryWrapper<SysUser>().eq(SysUser::getDeptId, deptId));
        return this.deleteUserByIds((Long[]) sysUsers.stream().map(SysUser::getUserId).toArray());
        Long[] ids = sysUsers.stream().map(SysUser::getUserId).toArray(Long[]::new);
        return this.deleteUserByIds(ids);
    }

    @Override

 project-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -156,4 +156,7 @@
        update sys_dept set del_flag = '2' where dept_id = #{deptId}
    </delete>

    <select id="getApplyDeptIdsByLoginUserId" resultType="Long">
        select dept_id from sys_user_dept where user_id = #{userId}
    </select>
</mapper>

 project-system/src/main/resources/mapper/system/SysUserDeptMapper.xml

New file
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.project.system.mapper.SysUserDeptMapper">
    
    <resultMap type="SysUserDept" id="SysUserDeptResult">
        <result property="userId"    column="user_id"    />
        <result property="deptId"    column="dept_id"    />
    </resultMap>



</mapper>