From 064a3b0b19604f6817705871af6343726c42feff Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期一, 10 十月 2022 15:39:52 +0800
Subject: [PATCH] 部门查询 车俩店铺bug修改
---
ycl-platform/src/main/java/com/ycl/entity/store/StoreInfo.java | 10 ++++++----
ycl-common/src/main/java/com/ycl/controller/depart/DepartController.java | 28 ++++++++++++++++++++++------
ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java | 2 +-
ycl-platform/src/main/java/com/ycl/controller/carManage/CarManageController.java | 4 ++--
4 files changed, 31 insertions(+), 13 deletions(-)
diff --git a/ycl-common/src/main/java/com/ycl/controller/depart/DepartController.java b/ycl-common/src/main/java/com/ycl/controller/depart/DepartController.java
index 0a7d69e..c6a31a8 100644
--- a/ycl-common/src/main/java/com/ycl/controller/depart/DepartController.java
+++ b/ycl-common/src/main/java/com/ycl/controller/depart/DepartController.java
@@ -1,6 +1,7 @@
package com.ycl.controller.depart;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ycl.api.BasePageDTO;
import com.ycl.api.BasePageVO;
@@ -19,7 +20,6 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
-import java.util.Arrays;
import java.util.List;
/**
@@ -64,14 +64,14 @@
}
/**
- * @Description batch deletion departments
- * @Param [ids]
* @return com.ycl.api.CommonResult<java.lang.Void>
+ * @Description batch deletion departments
+ * @Param [ids]
**/
@ApiOperation("鎵瑰鐞�-鍒犻櫎")
@PostMapping(value = "/batch_deletion")
public CommonResult delete(@RequestParam List<Long> ids) {
- if (ids.isEmpty()){
+ if (ids.isEmpty()) {
return CommonResult.failed("bad request parameter");
}
return CommonResult.success(departService.removeBatchByIds(ids));
@@ -108,8 +108,24 @@
@ApiOperation("鏌ヨ鎴戠殑閮ㄩ棬")
@GetMapping(value = "/belongDepart")
public CommonResult<BasePageDTO> belongDepart(BasePageVO params) {
- BasePageDTO basePageDTO= umsAdminDepartService.belongDepart(fetchOperator(request).getOperatorId(), params.getCurrent(), params.getPageSize());
+ BasePageDTO basePageDTO = umsAdminDepartService.belongDepart(fetchOperator(request).getOperatorId(), params.getCurrent(), params.getPageSize());
return CommonResult.success(basePageDTO);
}
-}
+ @ApiOperation("鏌ヨ椤剁骇閮ㄩ棬")
+ @GetMapping(value = "/query_father")
+ public CommonResult search() {
+ Integer fatherId = 0;
+ return CommonResult.success(departService
+ .list(new LambdaQueryWrapper<UmsDepart>()
+ .eq(UmsDepart::getParentId, fatherId)));
+ }
+
+ @ApiOperation("鏌ヨ閮ㄩ棬浜岀骇")
+ @GetMapping(value = "/query_father_children")
+ public CommonResult search(@RequestParam Integer fatherId) {
+ return CommonResult.success(departService
+ .list(new LambdaQueryWrapper<UmsDepart>()
+ .eq(UmsDepart::getParentId, fatherId)));
+ }
+}
\ No newline at end of file
diff --git a/ycl-platform/src/main/java/com/ycl/controller/carManage/CarManageController.java b/ycl-platform/src/main/java/com/ycl/controller/carManage/CarManageController.java
index 69cad1b..17c889f 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/carManage/CarManageController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/carManage/CarManageController.java
@@ -35,7 +35,7 @@
@ApiOperation(value = "鏌ヨ鎵ф硶杞�")
@GetMapping("/query_enforce")
- public CommonResult searchEnforceCar(@RequestParam String carNum,
+ public CommonResult searchEnforceCar(@RequestParam(required = false) String carNum,
@RequestParam Integer size,
@RequestParam Integer current) {
Page<CarEnforcecar> carEnforcecarPage = new Page<>();
@@ -48,7 +48,7 @@
@ApiOperation(value = "鏌ヨ娓ｅ湡杞�")
@GetMapping("/query_slag")
- public CommonResult searchSlagCar(@RequestParam String carNum,
+ public CommonResult searchSlagCar(@RequestParam(required = false) String carNum,
@RequestParam Integer size,
@RequestParam Integer current) {
Page<CarSlagcar> carSlagcarPage = new Page<>();
diff --git a/ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java b/ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java
index 403db6f..b90b616 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java
@@ -84,7 +84,7 @@
}
@ApiOperation(value = "淇敼闂ㄥ簵淇℃伅")
- @RequestMapping(value = "/update", method = RequestMethod.GET)
+ @RequestMapping(value = "/update", method = RequestMethod.PUT)
@ResponseBody
public CommonResult update(@RequestBody StoreInfo storeInfo) {
boolean success = storeInfoService.updateById(storeInfo);
diff --git a/ycl-platform/src/main/java/com/ycl/entity/store/StoreInfo.java b/ycl-platform/src/main/java/com/ycl/entity/store/StoreInfo.java
index 360c80a..84474ea 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/store/StoreInfo.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/store/StoreInfo.java
@@ -8,13 +8,12 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.*;
-
import java.io.Serializable;
import java.math.BigDecimal;
/**
* <p>
- *
+ *
* </p>
*
* @author lyq
@@ -44,6 +43,11 @@
@TableField("store_name")
private String storeName;
+
+ @ApiModelProperty("闂ㄥ簵缂栫爜")
+ @TableField("store_number")
+ private String storeNumber;
+
@ApiModelProperty("鑱旂郴鏂瑰紡")
@TableField("contact")
private String contact;
@@ -63,6 +67,4 @@
@ApiModelProperty("闂ㄥ簵绉垎")
@TableField("store_score")
private BigDecimal storeScore;
-
-
}
--
Gitblit v1.8.0