From ecca9ab70a9a87bcb60977c92fbf81053b8fc1bb Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 04 九月 2024 09:17:55 +0800
Subject: [PATCH] 新增优化
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/WorkerProcessController.java | 47 +++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 43 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/WorkerProcessController.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/WorkerProcessController.java
index c40f934..2fa3981 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/WorkerProcessController.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/WorkerProcessController.java
@@ -4,12 +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;
@@ -17,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;
@@ -36,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());
+ }
+
+
/**
* 师傅入驻审核分页列表
@@ -57,11 +77,30 @@
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(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)));
}
@@ -71,7 +110,7 @@
*
* @param id 师傅入驻审核id
*/
- @RequiresPermissions("master_worker_process")
+ @RequiresPermissions("worker_process_detail")
@ApiOperation(value = "师傅入驻审核详情", tags = {"后台-师傅管理-师傅入驻审核管理"})
@GetMapping(value = "/detail")
@ApiImplicitParams({
@@ -86,7 +125,7 @@
*
* @param prize 师傅入驻审核信息
*/
- @RequiresPermissions("master_worker_process")
+ @RequiresPermissions("worker_process_delete")
@ApiOperation(value = "新增师傅入驻审核", tags = {"后台-师傅管理-师傅入驻审核管理"})
@PostMapping(value = "/save")
public R<String> save(@RequestBody WorkerProcess prize) {
@@ -99,7 +138,7 @@
*
* @param ids 师傅入驻审核id拼接
*/
- @RequiresPermissions("master_worker_process")
+ @RequiresPermissions("worker_process_delete")
@ApiOperation(value = "批量删除师傅入驻审核", tags = {"后台-师傅管理-师傅入驻审核管理"})
@GetMapping(value = "/batchDelete")
@ApiImplicitParams({
@@ -117,7 +156,7 @@
*
* @param id 师傅入驻审核id
*/
- @RequiresPermissions("master_worker_process")
+ @RequiresPermissions("worker_process_audit")
@ApiOperation(value = "师傅入驻审核", tags = {"后台-师傅管理-师傅入驻审核管理"})
@GetMapping(value = "/examine")
@ApiImplicitParams({
--
Gitblit v1.7.1