From d1bf6cf8234a9010a901131787344a6f9b10373b Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期六, 20 七月 2024 21:52:49 +0800
Subject: [PATCH] 森林防火 供应商管理
---
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/SlGoodsShelfVO.java | 4
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlStoreManagement.java | 7 ++
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlGoodsShelfController.java | 13 +++-
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlEquipmentController.java | 4
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlGoodsMaterialsServiceImpl.java | 4 +
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/GoodsShelfDTO.java | 3 +
ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlRegionMapper.xml | 18 +-----
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlGoodsShelfService.java | 4 +
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlStoreManagementServiceImpl.java | 12 +++
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlGoodsMaterialsController.java | 6 +-
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlStoreManagementController.java | 6 +-
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlGoodsShelfServiceImpl.java | 40 +++++++++++-
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlEquipmentServiceImpl.java | 15 +++-
13 files changed, 95 insertions(+), 41 deletions(-)
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlEquipmentController.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlEquipmentController.java
index 1fdd5c6..76d2d7c 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlEquipmentController.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlEquipmentController.java
@@ -28,7 +28,7 @@
*/
@RestController
@RequestMapping("/sl-equipment")
-@Api(value = "设备管理接口", tags = "设备管理接口", description = "设备管理接口")
+@Api(value = "设备管理", tags = "设备管理", description = "设备管理")
public class SlEquipmentController {
@Resource
@@ -49,7 +49,7 @@
@ApiOperation("删除设备管理")
@DeleteMapping("/{id}")
public R<?> delSlEquipment(
- @ApiParam(name = "id", value = "设备管理id", required = true) @PathVariable("id") Integer id) {
+ @ApiParam(name = "id", value = "设备管理id", required = true) @PathVariable("id") Long id) {
slEquipmentService.removeById(id);
return R.ok();
}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlGoodsMaterialsController.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlGoodsMaterialsController.java
index f553ded..09157f8 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlGoodsMaterialsController.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlGoodsMaterialsController.java
@@ -48,14 +48,14 @@
@ApiOperation("删除物资管理")
@DeleteMapping("/{id}")
public R<?> delStoreManagement(
- @ApiParam(name = "id", value = "货架管理id", required = true) @PathVariable("id") Integer id) {
+ @ApiParam(name = "id", value = "货架管理id", required = true) @PathVariable("id") Long id) {
slGoodsMaterialsService.removeById(id);
return R.ok();
}
- @PostMapping("/getGoodSmaterialsOne")
+ @GetMapping("/getGoodSmaterialsOne/{id}")
@ApiOperation(value = "物资管理詳情")
- public R<SlGoodsMaterials> getGoodSmaterialsOne(@ApiParam(name = "id", value = "物资管理id", required = true) @PathVariable("id") Integer id) {
+ public R<SlGoodsMaterials> getGoodSmaterialsOne(@ApiParam(name = "id", value = "物资管理id", required = true) @PathVariable("id") Long id) {
return R.ok(slGoodsMaterialsService.getById(id));
}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlGoodsShelfController.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlGoodsShelfController.java
index c9b1d0e..70eed4f 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlGoodsShelfController.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlGoodsShelfController.java
@@ -3,6 +3,7 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.page.PageDTO;
+import com.ruoyi.management.domain.SlGoodsMaterials;
import com.ruoyi.management.domain.SlGoodsShelf;
import com.ruoyi.management.domain.SlStoreManagement;
import com.ruoyi.management.domain.SlStoreManagementImg;
@@ -27,7 +28,7 @@
*/
@RestController
@RequestMapping("/sl-goods-shelf")
-@Api(value = "货架接口", tags = "货架接口", description = "货架接口")
+@Api(value = "货架管理", tags = "货架管理", description = "货架管理")
public class SlGoodsShelfController {
@Resource
@@ -46,10 +47,16 @@
return R.ok();
}
+ @GetMapping("/SlGoodsShelf/{id}")
+ @ApiOperation(value = "货架管理详情")
+ public R<SlGoodsShelfVO> getSlGoodsShelfOne(@ApiParam(name = "id", value = "货架管理id", required = true) @PathVariable("id") Long id) {
+ return R.ok(slGoodsShelfService.getSlGoodsShelfOne(id));
+ }
+
@ApiOperation("删除货架")
@DeleteMapping("/{id}")
public R<?> delStoreManagement(
- @ApiParam(name = "id", value = "货架管理id", required = true) @PathVariable("id") Integer id) {
+ @ApiParam(name = "id", value = "货架管理id", required = true) @PathVariable("id") Long id) {
slGoodsShelfService.removeById(id);
return R.ok();
}
@@ -68,7 +75,7 @@
}
@PostMapping("/getStoreManagementimgSheif")
- @ApiOperation(value = "获取仓库管理平面圖的仓库")
+ @ApiOperation(value = "获取仓库管理平面圖的货架")
public R<List<SlGoodsShelf>> getStoreManagementimgSheif(@RequestBody GoodsShelfDTO goodsShelfDTO) {
return R.ok(slGoodsShelfService.getStoreManagementimgSheif(goodsShelfDTO));
}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlStoreManagementController.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlStoreManagementController.java
index 2e424a3..7404f81 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlStoreManagementController.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlStoreManagementController.java
@@ -47,14 +47,14 @@
@ApiOperation("删除仓库管理")
@DeleteMapping("/{id}")
public R<?> delStoreManagement(
- @ApiParam(name = "id", value = "仓库管理id", required = true) @PathVariable("id") Integer id) {
+ @ApiParam(name = "id", value = "仓库管理id", required = true) @PathVariable("id") Long id) {
slStoreManagementService.removeById(id);
return R.ok();
}
- @PostMapping("/getStoreManagementOne")
+ @GetMapping("/getStoreManagementOne/{id}")
@ApiOperation(value = "仓库管理詳情")
- public R<SlStoreManagement> getStoreManagementOne( @ApiParam(name = "id", value = "仓库管理id", required = true) @PathVariable("id") Integer id) {
+ public R<SlStoreManagement> getStoreManagementOne( @ApiParam(name = "id", value = "仓库管理id", required = true) @PathVariable("id") Long id) {
return R.ok(slStoreManagementService.getById(id));
}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlStoreManagement.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlStoreManagement.java
index 0e448db..3cc4ffb 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlStoreManagement.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlStoreManagement.java
@@ -45,14 +45,17 @@
/** 所属省名称 */
@TableField("province_name")
+ @ApiModelProperty("所属省名称")
private String provinceName;
/** 所属省code */
@TableField("province_code")
+ @ApiModelProperty("所属省code")
private String provinceCode;
/** 城市名称 */
@TableField("city_name")
+ @ApiModelProperty("城市名称")
private String cityName;
/** 城市code */
@@ -61,18 +64,22 @@
/** 所属区县名称 */
@TableField("county_name")
+ @ApiModelProperty("所属区县名称")
private String countyName;
/** 所属区县code */
@TableField("county_code")
+ @ApiModelProperty("所属区县code")
private String countyCode;
/** 所属街道名称 */
@TableField("town_name")
+ @ApiModelProperty("所属街道名称")
private String townName;
/** 所属街道code */
@TableField("town_code")
+ @ApiModelProperty("所属街道code")
private String townCode;
@ApiModelProperty("主任id-仓库管理员选择的多个逗号隔各开")
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/GoodsShelfDTO.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/GoodsShelfDTO.java
index 040953c..103866d 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/GoodsShelfDTO.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/GoodsShelfDTO.java
@@ -18,4 +18,7 @@
@ApiModelProperty("仓库在图片坐标y轴")
private String zbY;
+
+ @ApiModelProperty("仓库层数 1代表一层，2代表两层，3代表三层")
+ private Integer storeManagementNumber;
}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/SlGoodsShelfVO.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/SlGoodsShelfVO.java
index b7a4076..a16f7dd 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/SlGoodsShelfVO.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/SlGoodsShelfVO.java
@@ -12,11 +12,11 @@
@ApiModel(value = "货架视图对象", description = "货架视图对象")
public class SlGoodsShelfVO {
@ApiModelProperty("数据id")
- private Integer id;
+ private Long id;
@ApiModelProperty("仓库id")
@JsonInclude(JsonInclude.Include.ALWAYS)
- private Integer storeManagementId;
+ private Long storeManagementId;
@ApiModelProperty("仓库名称")
@JsonInclude(JsonInclude.Include.ALWAYS)
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlGoodsShelfService.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlGoodsShelfService.java
index 3db1c8a..ad87ae9 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlGoodsShelfService.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlGoodsShelfService.java
@@ -8,6 +8,8 @@
import com.ruoyi.management.domain.dto.SlGoodsShelfDTO;
import com.ruoyi.management.domain.dto.SlGoodsShelfQuery;
import com.ruoyi.management.domain.vo.SlGoodsShelfVO;
+import io.swagger.annotations.ApiParam;
+import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import java.util.List;
@@ -25,6 +27,8 @@
void addSlGoodsShelf(@RequestBody SlGoodsShelfDTO slGoodsShelfDTO);
+ SlGoodsShelfVO getSlGoodsShelfOne( Long id);
+
List<SlGoodsShelf> wfanzGoodsShelfList(@RequestBody GoodsShelfQuery goodsShelfQuery);
void fanzGoodsShelfList(@RequestBody GoodsShelfDTO goodsShelfDTO);
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlEquipmentServiceImpl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlEquipmentServiceImpl.java
index f765094..2a04f95 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlEquipmentServiceImpl.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlEquipmentServiceImpl.java
@@ -38,8 +38,12 @@
public PageDTO<SlEquipmentVO> getSlEquipmentList(SlEquipmentQuery slEquipmentQuery) {
Page<SlEquipment> page = new Page<>(slEquipmentQuery.getPageCurr(), slEquipmentQuery.getPageSize());
LambdaQueryWrapper< SlEquipment> wrapper= Wrappers.lambdaQuery();
- wrapper.eq(SlEquipment::getEquipmentName,slEquipmentQuery.getEquipmentName());
+ if(slEquipmentQuery.getEquipmentName()!=null&&slEquipmentQuery.getEquipmentName()!=""){
+ wrapper.eq(SlEquipment::getEquipmentName,slEquipmentQuery.getEquipmentName());
+ }
+ if(slEquipmentQuery.getEquipmentName()!=null&&slEquipmentQuery.getType()!=0){
wrapper.eq(SlEquipment::getType,slEquipmentQuery.getType());
+ }
wrapper.eq( SlEquipment::getDelFlag,0);
wrapper.orderByDesc(SlEquipment::getCreateTime);
Page<SlEquipment> page1 = this.page(page, wrapper);
@@ -67,6 +71,7 @@
slEquipment.setEquipmentNum(slEquipmentDTO.getEquipmentNum());
slEquipment.setType(slEquipmentDTO.getType());
slEquipment.setManagementId(slEquipmentDTO.getManagementId());
+ this.save(slEquipment);
}else{
SlEquipment byId = this.getById(slEquipmentDTO.getId());
if (slEquipmentDTO.getEquipmentName()!=null){
@@ -89,10 +94,10 @@
public SlEquipmentVO getSlEquipmentOne(SlEquipmentDTO slEquipmentDTO) {
SlEquipment byId = this.getById(slEquipmentDTO.getId());
SlEquipmentVO slEquipmentVO=new SlEquipmentVO();
- slEquipmentVO.setEquipmentName(slEquipmentDTO.getEquipmentName());
- slEquipmentVO.setEquipmentNum(slEquipmentDTO.getEquipmentNum());
- slEquipmentVO.setType(slEquipmentDTO.getType());
- slEquipmentVO.setManagementId(slEquipmentDTO.getManagementId());
+ slEquipmentVO.setEquipmentName(byId.getEquipmentName());
+ slEquipmentVO.setEquipmentNum(byId.getEquipmentNum());
+ slEquipmentVO.setType(byId.getType());
+ slEquipmentVO.setManagementId(byId.getManagementId());
SlStoreManagement slStoreManagement = slStoreManagementMapper.selectById(byId.getManagementId());
slEquipmentVO.setCountyCode(slStoreManagement.getCountyCode());
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlGoodsMaterialsServiceImpl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlGoodsMaterialsServiceImpl.java
index 434d07f..9b7cb78 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlGoodsMaterialsServiceImpl.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlGoodsMaterialsServiceImpl.java
@@ -83,7 +83,9 @@
public PageDTO<SlGoodsMaterialsVO> getGoodSmaterialsList(SlGoodsMaterialsQuery slGoodsMaterialsQuery) {
Page<SlGoodsMaterials> page = new Page<>(slGoodsMaterialsQuery.getPageCurr(), slGoodsMaterialsQuery.getPageSize());
LambdaQueryWrapper< SlGoodsMaterials> wrapper= Wrappers.lambdaQuery();
- wrapper.eq(SlGoodsMaterials::getGoodsMaterialsName,slGoodsMaterialsQuery.getGoodsMaterialsName());
+ if (slGoodsMaterialsQuery.getGoodsMaterialsName()!=null&&slGoodsMaterialsQuery.getGoodsMaterialsName()!=""){
+ wrapper.eq(SlGoodsMaterials::getGoodsMaterialsName,slGoodsMaterialsQuery.getGoodsMaterialsName());
+ }
if (slGoodsMaterialsQuery.getIsConsume()!=0){
wrapper.eq(SlGoodsMaterials::getIsConsume,slGoodsMaterialsQuery.getIsConsume());
}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlGoodsShelfServiceImpl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlGoodsShelfServiceImpl.java
index 202a013..64b2e2b 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlGoodsShelfServiceImpl.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlGoodsShelfServiceImpl.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.utils.page.BeanUtils;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.management.domain.SlGoodsShelf;
@@ -21,6 +22,7 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
@@ -49,7 +51,7 @@
SysUser data = sysUserClient.getSysUser(userid).getData();
LambdaQueryWrapper<SlStoreManagement> wrapper= Wrappers.lambdaQuery();
- if(slGoodsShelfQuery.getStoreManagementName()!=null){
+ if(slGoodsShelfQuery.getStoreManagementName()!=null&&slGoodsShelfQuery.getStoreManagementName()!=""){
wrapper.eq(SlStoreManagement::getStoreManagementName,slGoodsShelfQuery.getStoreManagementName());
}
if (slGoodsShelfQuery.getStoreManagementNumber()!=0 && slGoodsShelfQuery.getStoreManagementNumber()!=null){
@@ -66,8 +68,14 @@
Page<SlGoodsShelf> page = new Page<>(slGoodsShelfQuery.getPageCurr(), slGoodsShelfQuery.getPageSize());
LambdaQueryWrapper< SlGoodsShelf> wrapper1= Wrappers.lambdaQuery();
wrapper1.like(SlGoodsShelf::getGoodsShelfName,slGoodsShelfQuery.getGoodsShelfName());
- if (slStoreManagementIdList.size()>0){
- wrapper1.in(SlGoodsShelf::getStoreManagementId,slStoreManagementIdList);
+ if(slGoodsShelfQuery.getStoreManagementName()!=null&&slGoodsShelfQuery.getStoreManagementName()!="") {
+ if (slStoreManagementIdList.size() > 0) {
+ wrapper1.in(SlGoodsShelf::getStoreManagementId, slStoreManagementIdList);
+ } else {
+ slStoreManagementIdList=new HashSet<>();
+ slStoreManagementIdList.add(0L);
+ wrapper1.in(SlGoodsShelf::getStoreManagementId, slStoreManagementIdList);
+ }
}
wrapper1.eq( SlGoodsShelf::getDelFlag,0);
wrapper1.orderByDesc(SlGoodsShelf::getCreateTime);
@@ -110,14 +118,36 @@
if (slGoodsShelfDTO.getStoreManagementNumber()!=null){
slGoodsShelf.setStoreManagementNumber(slGoodsShelfDTO.getStoreManagementNumber());
}
- if (slGoodsShelfDTO.getGoodsShelfName()!=null){
- slGoodsShelf.setStoreManagementNumber(slGoodsShelfDTO.getStoreManagementNumber());
+ if (slGoodsShelfDTO.getStoreManagementId()!=null){
+ slGoodsShelf.setStoreManagementId(slGoodsShelfDTO.getStoreManagementId());
}
this.updateById(slGoodsShelf);
}
}
@Override
+ public SlGoodsShelfVO getSlGoodsShelfOne(Long id) {
+ SlGoodsShelf byId1 = this.getById(id);
+ SlGoodsShelfVO slGoodsShelfVO=new SlGoodsShelfVO();
+ BeanUtils.copyProperties(byId1,slGoodsShelfVO.getClass());
+
+ SlStoreManagement byId = SlStoreManagementService.getById(byId1.getStoreManagementId());
+ slGoodsShelfVO.setStoreManagementId(byId1.getStoreManagementId());
+ slGoodsShelfVO.setStoreManagementName(byId.getStoreManagementName());
+ slGoodsShelfVO.setStoreManagementNumber(byId.getStoreManagementNumber());
+ slGoodsShelfVO.setProvinceName(byId.getProvinceName());
+ slGoodsShelfVO.setProvinceCode(byId.getProvinceCode());
+ slGoodsShelfVO.setCityName(byId.getCityName());
+ slGoodsShelfVO.setCityCode(byId.getCityCode());
+ slGoodsShelfVO.setCountyName(byId.getCountyName());
+ slGoodsShelfVO.setCountyCode(byId.getCountyCode());
+ slGoodsShelfVO.setTownCode(byId.getTownCode());
+ slGoodsShelfVO.setTownName(byId.getTownName());
+
+ return slGoodsShelfVO;
+ }
+
+ @Override
public List<SlGoodsShelf> wfanzGoodsShelfList(GoodsShelfQuery goodsShelfQuery) {
LambdaQueryWrapper< SlGoodsShelf> wrapper1= Wrappers.lambdaQuery();
wrapper1.eq(SlGoodsShelf::getStoreManagementId,goodsShelfQuery.getStoreManagementId());
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlStoreManagementServiceImpl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlStoreManagementServiceImpl.java
index 318a981..9e9587c 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlStoreManagementServiceImpl.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlStoreManagementServiceImpl.java
@@ -41,8 +41,12 @@
public PageDTO<SlStoreManagement> getStoreManagementList(StoreManagementQuery storeManagementQuery) {
Page<SlStoreManagement> page = new Page<>(storeManagementQuery.getPageCurr(), storeManagementQuery.getPageSize());
LambdaQueryWrapper< SlStoreManagement> wrapper= Wrappers.lambdaQuery();
- wrapper.eq(SlStoreManagement::getStoreManagementName,storeManagementQuery.getStoreManagementName());
- wrapper.eq(SlStoreManagement::getStoreManagementNo,storeManagementQuery.getStoreManagementNo());
+ if (storeManagementQuery.getStoreManagementName()!=null&&storeManagementQuery.getStoreManagementName()!=""){
+ wrapper.eq(SlStoreManagement::getStoreManagementName,storeManagementQuery.getStoreManagementName());
+ }
+ if(storeManagementQuery.getStoreManagementNo()!=null&&storeManagementQuery.getStoreManagementNo()!=""){
+ wrapper.eq(SlStoreManagement::getStoreManagementNo,storeManagementQuery.getStoreManagementNo());
+ }
if (storeManagementQuery.getStoreManagementGrade()!=0 && storeManagementQuery.getStoreManagementGrade()!=null){
wrapper.eq(SlStoreManagement::getStoreManagementGrade,storeManagementQuery.getStoreManagementGrade());
}
@@ -135,8 +139,12 @@
@Override
public List<SlStoreManagement> QueryStoreManagementList(QStoreManagementQuery StoreManagementQuery) {
LambdaQueryWrapper< SlStoreManagement> wrapper= Wrappers.lambdaQuery();
+ if (StoreManagementQuery.getCityCode()!="" && StoreManagementQuery.getCityCode()!=null){
wrapper.eq(SlStoreManagement::getCityCode,StoreManagementQuery.getCityCode());
+ }
+ if (StoreManagementQuery.getCountyCode()!="" && StoreManagementQuery.getCountyCode()!=null){
wrapper.eq(SlStoreManagement::getCountyCode,StoreManagementQuery.getCountyCode());
+ }
if (StoreManagementQuery.getStoreManagementGrade()!=0 && StoreManagementQuery.getStoreManagementGrade()!=null){
wrapper.eq(SlStoreManagement::getStoreManagementGrade,StoreManagementQuery.getStoreManagementGrade());
}
diff --git a/ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlRegionMapper.xml b/ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlRegionMapper.xml
index fc487a9..084c7ff 100644
--- a/ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlRegionMapper.xml
+++ b/ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlRegionMapper.xml
@@ -1,23 +1,11 @@
<?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.rouyi.management.mapper.SlRegionMapper">
+<mapper namespace="com.ruoyi.management.mapper.SlRegionMapper">
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.management.domain.SlRegion">
- <id column="id" property="id" />
- <result column="name" property="name" />
- <result column="code" property="code" />
- <result column="citycode" property="citycode" />
- <result column="parent_id" property="parentId" />
- <result column="english" property="english" />
- <result column="level" property="level" />
- <result column="hierarchy" property="hierarchy" />
- <result column="all_name" property="allName" />
- </resultMap>
<select id="listRegionVo" resultType="com.ruoyi.management.domain.vo.RegionVo">
- SELECT tr.id id, tr.parent_id parentId, tr.level level, tr.code value, tr.name label
- FROM t_region tr
+ SELECT tr.id id, tr.parent_id parentId, tr.level level, tr.code code, tr.name label
+ FROM sl_region tr
</select>
</mapper>
--
Gitblit v1.7.1