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 | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 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 c6b5a34..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,9 +4,12 @@
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;
@@ -40,7 +43,19 @@
@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());
+ }
+
+
/**
* 师傅入驻审核分页列表
@@ -81,9 +96,9 @@
// 最后一跳城市不匹配or条件
String s = cityList.get(i);
if (cityList.size() - 1 == i) {
- wrapper.like(WorkerProcess::getCity, s);
+ wrapper.like(WorkerProcess::getCityCode, s);
} else {
- wrapper.like(WorkerProcess::getCity, s).or();
+ wrapper.like(WorkerProcess::getCityCode, s).or();
}
}
return R.ok(wrapper.eq(WorkerProcess::getIsDelete, 0)
@@ -95,7 +110,7 @@
*
* @param id 师傅入驻审核id
*/
- @RequiresPermissions("master_worker_process")
+ @RequiresPermissions("worker_process_detail")
@ApiOperation(value = "师傅入驻审核详情", tags = {"后台-师傅管理-师傅入驻审核管理"})
@GetMapping(value = "/detail")
@ApiImplicitParams({
@@ -110,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) {
@@ -123,7 +138,7 @@
*
* @param ids 师傅入驻审核id拼接
*/
- @RequiresPermissions("master_worker_process")
+ @RequiresPermissions("worker_process_delete")
@ApiOperation(value = "批量删除师傅入驻审核", tags = {"后台-师傅管理-师傅入驻审核管理"})
@GetMapping(value = "/batchDelete")
@ApiImplicitParams({
@@ -141,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