bug修改

无关风月

昨天 7cab5bda99ca42188bc15b2dae7d1fa4d1833fd9

 ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/WorkerProcessController.java

@@ -4,10 +4,17 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.admin.entity.MasterWorker;
import com.ruoyi.admin.entity.WorkerProcess;
import com.ruoyi.admin.service.MasterWorkerService;
import com.ruoyi.admin.service.WorkerProcessService;
import com.ruoyi.common.core.constant.Constants;
import com.ruoyi.common.core.domain.BaseEntity;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.security.annotation.RequiresPermissions;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.system.api.model.LoginUser;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -15,6 +22,7 @@
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
@@ -34,6 +42,20 @@

    @Resource
    private WorkerProcessService workerProcessService;
    @Resource
    private MasterWorkerService masterWorkerService;
    @Resource
    private TokenService tokenService;

    @ApiOperation(value = "师傅下拉框", tags = {"后台-下拉框"})
    @GetMapping(value = "/select")

    public R<List<MasterWorker>> select(String workerName) {

        return R.ok(masterWorkerService.lambdaQuery().like(workerName!=null,MasterWorker::getRealName,workerName).eq(BaseEntity::getIsDelete, 0).eq(MasterWorker::getIsEnable, 1).list());
    }



    /**
     * 师傅入驻审核分页列表
@@ -41,23 +63,44 @@
     * @param pageNum  页码
     * @param pageSize 每页显示条数
     */
    @RequiresPermissions("master_worker_process")
    @ApiOperation(value = "师傅入驻审核分页查询列表", tags = {"后台-师傅管理-师傅入驻审核管理"})
    @GetMapping(value = "/page")
    @ApiImplicitParams({
            @ApiImplicitParam(value = "用户ID", name = "userNumber", dataType = "String"),
            @ApiImplicitParam(value = "真实姓名", name = "workerName", dataType = "String"),
            @ApiImplicitParam(value = "用户ID", name = "id", dataType = "String"),
            @ApiImplicitParam(value = "真实姓名", name = "realName", dataType = "String"),
            @ApiImplicitParam(value = "所属城市", name = "city", dataType = "String"),
            @ApiImplicitParam(value = "当前状态(0:待审核 1:已通过 2:已驳回)", name = "state", dataType = "Integer"),
            @ApiImplicitParam(value = "页码", name = "pageNum", dataType = "Integer", required = true),
            @ApiImplicitParam(value = "每页条数", name = "pageSize", dataType = "Integer", required = true)
    })
    public R<IPage<WorkerProcess>> queryPageList(String userNumber, String workerName, String city, Integer state,
    public R<IPage<WorkerProcess>> queryPageList(String id, String realName, String city, Integer state,
                                                 @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
                                                 @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
        LoginUser loginUser = tokenService.getLoginUser();
        if (null == loginUser) {
            return R.loginExpire("登录失效！");
        }
        List<String> cityList = new ArrayList<>();
        if (loginUser.getIsFranchisee()) {
            cityList = loginUser.getCityList();
        }
        // 构建初始条件
        LambdaQueryChainWrapper<WorkerProcess> wrapper = workerProcessService.lambdaQuery();
        wrapper = StringUtils.isNotBlank(workerName) ? wrapper.like(WorkerProcess::getRealName, workerName) : wrapper;
        wrapper = StringUtils.isNotBlank(id) ? wrapper.like(WorkerProcess::getId, id) : wrapper;
        wrapper = StringUtils.isNotBlank(realName) ? wrapper.like(WorkerProcess::getRealName, realName) : wrapper;
        wrapper = StringUtils.isNotBlank(city) ? wrapper.like(WorkerProcess::getCity, city) : wrapper;
        wrapper = null != state ? wrapper.eq(WorkerProcess::getState, state) : wrapper;
        // 管辖城市
        for (int i = 0; i < cityList.size(); i++) {
            // 最后一跳城市不匹配or条件
            String s = cityList.get(i);
            if (cityList.size() - 1 == i) {
                wrapper.like(WorkerProcess::getCityCode, s);
            } else {
                wrapper.like(WorkerProcess::getCityCode, s).or();
            }
        }
        return R.ok(wrapper.eq(WorkerProcess::getIsDelete, 0)
                .orderByDesc(WorkerProcess::getCreateTime).page(Page.of(pageNum, pageSize)));
    }
@@ -67,6 +110,7 @@
     *
     * @param id 师傅入驻审核id
     */
    @RequiresPermissions("worker_process_detail")
    @ApiOperation(value = "师傅入驻审核详情", tags = {"后台-师傅管理-师傅入驻审核管理"})
    @GetMapping(value = "/detail")
    @ApiImplicitParams({
@@ -81,9 +125,11 @@
     *
     * @param prize 师傅入驻审核信息
     */
    @RequiresPermissions("worker_process_delete")
    @ApiOperation(value = "新增师傅入驻审核", tags = {"后台-师傅管理-师傅入驻审核管理"})
    @PostMapping(value = "/save")
    public R<String> save(@RequestBody WorkerProcess prize) {
        prize.setState(Constants.ZERO);
        return workerProcessService.save(prize) ? R.ok() : R.fail();
    }

@@ -92,6 +138,7 @@
     *
     * @param ids 师傅入驻审核id拼接
     */
    @RequiresPermissions("worker_process_delete")
    @ApiOperation(value = "批量删除师傅入驻审核", tags = {"后台-师傅管理-师傅入驻审核管理"})
    @GetMapping(value = "/batchDelete")
    @ApiImplicitParams({
@@ -109,6 +156,7 @@
     *
     * @param id 师傅入驻审核id
     */
    @RequiresPermissions("worker_process_audit")
    @ApiOperation(value = "师傅入驻审核", tags = {"后台-师傅管理-师傅入驻审核管理"})
    @GetMapping(value = "/examine")
    @ApiImplicitParams({