From 87e07ac8b8f1868eb4302fac73dfc93c5417f977 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 30 七月 2024 11:06:14 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/ForestFirePrevention
---
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlEquipmentServiceImpl.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
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..636bd7e 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.like(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);
@@ -47,6 +51,7 @@
List<SlEquipmentVO> list = slEquipmentVOPageDTO.getList();
for (SlEquipmentVO sl:list){
SlStoreManagement slStoreManagement = slStoreManagementMapper.selectById(sl.getManagementId());
+ sl.setStoreManagementName(slStoreManagement.getStoreManagementName());
sl.setCountyCode(slStoreManagement.getCountyCode());
sl.setProvinceName(slStoreManagement.getProvinceName());
sl.setProvinceCode(slStoreManagement.getProvinceCode());
@@ -67,6 +72,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,13 +95,14 @@
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());
+ slEquipmentVO.setStoreManagementName(slStoreManagement.getStoreManagementName());
slEquipmentVO.setProvinceName(slStoreManagement.getProvinceName());
slEquipmentVO.setProvinceCode(slStoreManagement.getProvinceCode());
slEquipmentVO.setCountyName(slStoreManagement.getCountyName());
--
Gitblit v1.7.1