From 87535054aa610d73e4d041248208f3c0d809f239 Mon Sep 17 00:00:00 2001 From: pengjie <17373303529@163.com> Date: Tue, 13 May 2025 10:50:12 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9E=8D=E9=92=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../car/controller/CarInfoController.java | 15 ++-- .../controller/CountApiController.java | 80 ++++++++++++++++++- .../impl/XzBlindPlatePlugSafeServiceImpl.java | 7 ++ .../impl/XzGroundSafetServiceImpl.java | 7 ++ .../impl/XzHighJobSafeServiceImpl.java | 7 ++ .../impl/XzHoistSafetyWorkServiceImpl.java | 7 ++ .../impl/XzLimitSpaceSafeServiceImpl.java | 7 ++ .../impl/XzOpenCircuitSafeServiceImpl.java | 7 ++ ...cialOperationFireSafetyNewServiceImpl.java | 8 ++ ...SpecialOperationFireSafetyServiceImpl.java | 7 ++ ...XzTemporaryElectricitySafeServiceImpl.java | 7 ++ 11 files changed, 150 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/car/controller/CarInfoController.java b/src/main/java/com/zhgd/xmgl/modules/car/controller/CarInfoController.java index 1fd5ee486..bb5ba3f77 100644 --- a/src/main/java/com/zhgd/xmgl/modules/car/controller/CarInfoController.java +++ b/src/main/java/com/zhgd/xmgl/modules/car/controller/CarInfoController.java @@ -124,13 +124,6 @@ public class CarInfoController { Object alarmPushWorkerId = map.get("alarmPushWorkerId"); String userId = String.valueOf(map.get("enterpriseId")); Object driverWorkerName = map.get("driverWorkerName"); - List carType = new ArrayList<>(); - try { - carType = (List) map.get("carType"); - } catch (Exception e) { - log.error("", e); - carType = Arrays.asList("1787328649423364098"); - } List driverWorkerId = (List) map.get("driverWorkerId"); Integer carModuleType = "临时车辆".equals(MapUtils.getString(map, "carModuleType")) ? 2 : 3; List userIds = (List) map.get("userIds"); @@ -164,7 +157,13 @@ public class CarInfoController { if (carColor != null) { carInfo.setCarColor(String.valueOf(carColor)); } - carInfo.setCarType(Long.valueOf(carType.get(0).toString())); + try { + List carType = (List) map.get("carType"); + carInfo.setCarType(Long.valueOf(carType.get(0).toString())); + } catch (Exception e) { + log.error("", e); + carInfo.setCarType(Long.valueOf("1787328649423364098")); + } carInfo.setDriverTelephone(String.valueOf(map.get("driverTelephone"))); List> carPhotosUrl = (List>) map.get("carPhotosUrl"); List> carPhotosUrls = new ArrayList<>(); diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/CountApiController.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/CountApiController.java index bd58c2e6f..51508afba 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/CountApiController.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/CountApiController.java @@ -1,5 +1,7 @@ package com.zhgd.xmgl.modules.xz.special.controller; +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.xmgl.modules.basicdata.enums.SystemUserAccountTypeEnum; @@ -16,6 +18,7 @@ import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.MapUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.PostMapping; @@ -53,6 +56,10 @@ public class CountApiController { @Lazy @Resource IXzSpecialOperationFireSafetyService iXzSpecialOperationFireSafetyService; + + @Lazy + @Resource + IXzSpecialOperationFireSafetyNewService xzSpecialOperationFireSafetyNewService; @Lazy @Resource IXzTemporaryElectricitySafeService xzTemporaryElectricitySafeService; @@ -174,5 +181,76 @@ public class CountApiController { return Result.success(rtVo); } - + @ApiOperation(value = "统计特殊作业情况", notes = "统计特殊作业情况", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"), + @ApiImplicitParam(name = "startTime", value = "开始时间", paramType = "body", required = true, dataType = "String"), + @ApiImplicitParam(name = "endTime", value = "结束时间", paramType = "body", required = true, dataType = "String"), + }) + @PostMapping(value = "/countSpecialByData") + public Result> countSpecialByData(@ApiIgnore @RequestBody Map param) { + String projectSn = MapUtils.getString(param, "projectSn"); + String startTime = MapUtils.getString(param, "startTime"); + String endTime = MapUtils.getString(param, "endTime"); + List enterpriseIds = userEnterpriseService.getEnterpriseIdsIfSubProject(); + Integer accountType = SecurityUtils.getUser().getAccountType(); + boolean isSubAccount = Objects.equals(accountType, SystemUserAccountTypeEnum.PROJECT_SUB_ACCOUNT.getValue()); + List n1 = xzBlindPlatePlugSafeService.list(new LambdaQueryWrapper() + .eq(XzBlindPlatePlugSafe::getProjectSn, projectSn) + .in(isSubAccount, XzBlindPlatePlugSafe::getJobApplicationUnit, enterpriseIds) + ); + List n2 = iXzGroundSafetService.list(new LambdaQueryWrapper() + .eq(XzGroundSafet::getProjectSn, projectSn) + .in(isSubAccount, XzGroundSafet::getJobApplicationUnit, enterpriseIds) + ); + List n3 = iXzHighJobSafeService.list(new LambdaQueryWrapper() + .eq(XzHighJobSafe::getProjectSn, projectSn) + .in(isSubAccount, XzHighJobSafe::getJobApplicationUnit, enterpriseIds) + ); + List n4 = iXzHoistSafetyWorkService.list(new LambdaQueryWrapper() + .eq(XzHoistSafetyWork::getProjectSn, projectSn) + .in(isSubAccount, XzHoistSafetyWork::getJobApplicationUnit, enterpriseIds) + ); + List n5 = iXzLimitSpaceSafeService.list(new LambdaQueryWrapper() + .eq(XzLimitSpaceSafe::getProjectSn, projectSn) + .in(isSubAccount, XzLimitSpaceSafe::getJobApplicationUnit, enterpriseIds) + ); + List n6 = iXzOpenCircuitSafeService.list(new LambdaQueryWrapper() + .eq(XzOpenCircuitSafe::getProjectSn, projectSn) + .in(isSubAccount, XzOpenCircuitSafe::getJobApplicationUnit, enterpriseIds) + ); + List n7 = xzSpecialOperationFireSafetyNewService.list(new LambdaQueryWrapper() + .eq(XzSpecialOperationFireSafetyNew::getProjectSn, projectSn) + .in(isSubAccount, XzSpecialOperationFireSafetyNew::getJobApplicationUnit, enterpriseIds) + ); + List n8 = xzTemporaryElectricitySafeService.list(new LambdaQueryWrapper() + .eq(XzTemporaryElectricitySafe::getProjectSn, projectSn) + .in(isSubAccount, XzTemporaryElectricitySafe::getJobApplicationUnit, enterpriseIds) + ); + List list = new ArrayList<>(); + long betweenDay = DateUtil.betweenDay(DateUtil.parseDate(startTime), DateUtil.parseDate(endTime), true); + for (int i = 0; i < betweenDay; i++) { + CountSpecialVo vo = new CountSpecialVo(); + DateTime dateTime = DateUtil.offsetDay(DateUtil.parseDate(startTime), i); + vo.setDate(DateUtil.format(dateTime, "MM-dd")); + vo.setXzBlindPlatePlugSafeNum((int) n1.stream().filter(n -> n.getWorkExecutionBeginTime().compareTo(DateUtil.endOfDay(dateTime)) <= 0 + && n.getWorkExecutionEndTime().compareTo(DateUtil.beginOfDay(dateTime)) >= 0).count()); + vo.setXzGroundSafetNum((int) n2.stream().filter(n -> n.getWorkExecutionBeginTime().compareTo(DateUtil.endOfDay(dateTime)) <= 0 + && n.getWorkExecutionEndTime().compareTo(DateUtil.beginOfDay(dateTime)) >= 0).count()); + vo.setXzHighJobSafeNum((int) n3.stream().filter(n -> n.getWorkExecutionBeginTime().compareTo(DateUtil.endOfDay(dateTime)) <= 0 + && n.getWorkExecutionEndTime().compareTo(DateUtil.beginOfDay(dateTime)) >= 0).count()); + vo.setXzHoistSafetyWorkNum((int) n4.stream().filter(n -> n.getWorkExecutionBeginTime().compareTo(DateUtil.endOfDay(dateTime)) <= 0 + && n.getWorkExecutionEndTime().compareTo(DateUtil.beginOfDay(dateTime)) >= 0).count()); + vo.setXzLimitSpaceSafeNum((int) n5.stream().filter(n -> n.getWorkExecutionBeginTime().compareTo(DateUtil.endOfDay(dateTime)) <= 0 + && n.getWorkExecutionEndTime().compareTo(DateUtil.beginOfDay(dateTime)) >= 0).count()); + vo.setXzOpenCircuitSafeNum((int) n6.stream().filter(n -> n.getWorkExecutionBeginTime().compareTo(DateUtil.endOfDay(dateTime)) <= 0 + && n.getWorkExecutionEndTime().compareTo(DateUtil.beginOfDay(dateTime)) >= 0).count()); + vo.setXzSpecialOperationFireSafetyNum((int) n7.stream().filter(n -> n.getHotWorkExecutionBeginTime().compareTo(DateUtil.endOfDay(dateTime)) <= 0 + && n.getHotWorkExecutionEndTime().compareTo(DateUtil.beginOfDay(dateTime)) >= 0).count()); + vo.setXzTemporaryElectricitySafeNum((int) n8.stream().filter(n -> n.getWorkExecutionBeginTime().compareTo(DateUtil.endOfDay(dateTime)) <= 0 + && n.getWorkExecutionEndTime().compareTo(DateUtil.beginOfDay(dateTime)) >= 0).count()); + list.add(vo); + } + return Result.success(list); + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzBlindPlatePlugSafeServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzBlindPlatePlugSafeServiceImpl.java index cecfa3667..a243daf59 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzBlindPlatePlugSafeServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzBlindPlatePlugSafeServiceImpl.java @@ -27,6 +27,8 @@ import com.zhgd.xmgl.security.util.SecurityUtils; import com.zhgd.xmgl.util.MapBuilder; import com.zhgd.xmgl.util.PageUtil; import com.zhgd.xmgl.util.RefUtil; +import org.apache.commons.collections.MapUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -69,6 +71,11 @@ public class XzBlindPlatePlugSafeServiceImpl extends ServiceImpl queryPageList(HashMap paramMap) { QueryWrapper queryWrapper = getQueryWrapper(paramMap); Page page = PageUtil.getPage(paramMap); + String keywords = MapUtils.getString(paramMap, "keywords"); + if (StringUtils.isNotBlank(keywords)) { + queryWrapper.and(wq -> wq.like("t.fire_location_and_fire_part", keywords).or() + .like("su.real_name", keywords)); + } IPage pageList = baseMapper.queryList(page, queryWrapper, paramMap); pageList.setRecords(dealList(pageList.getRecords())); return pageList; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzGroundSafetServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzGroundSafetServiceImpl.java index 864f56174..a4d0686f4 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzGroundSafetServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzGroundSafetServiceImpl.java @@ -27,6 +27,8 @@ import com.zhgd.xmgl.security.util.SecurityUtils; import com.zhgd.xmgl.util.MapBuilder; import com.zhgd.xmgl.util.PageUtil; import com.zhgd.xmgl.util.RefUtil; +import org.apache.commons.collections.MapUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -68,6 +70,11 @@ public class XzGroundSafetServiceImpl extends ServiceImpl queryPageList(HashMap paramMap) { QueryWrapper queryWrapper = getQueryWrapper(paramMap); Page page = PageUtil.getPage(paramMap); + String keywords = MapUtils.getString(paramMap, "keywords"); + if (StringUtils.isNotBlank(keywords)) { + queryWrapper.and(wq -> wq.like("t.fire_location_and_fire_part", keywords).or() + .like("su.real_name", keywords)); + } IPage pageList = baseMapper.queryList(page, queryWrapper, paramMap); pageList.setRecords(dealList(pageList.getRecords())); return pageList; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzHighJobSafeServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzHighJobSafeServiceImpl.java index 1ccc28f31..10638bd60 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzHighJobSafeServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzHighJobSafeServiceImpl.java @@ -27,6 +27,8 @@ import com.zhgd.xmgl.security.util.SecurityUtils; import com.zhgd.xmgl.util.MapBuilder; import com.zhgd.xmgl.util.PageUtil; import com.zhgd.xmgl.util.RefUtil; +import org.apache.commons.collections.MapUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -68,6 +70,11 @@ public class XzHighJobSafeServiceImpl extends ServiceImpl queryPageList(HashMap paramMap) { QueryWrapper queryWrapper = getQueryWrapper(paramMap); Page page = PageUtil.getPage(paramMap); + String keywords = MapUtils.getString(paramMap, "keywords"); + if (StringUtils.isNotBlank(keywords)) { + queryWrapper.and(wq -> wq.like("t.fire_location_and_fire_part", keywords).or() + .like("su.real_name", keywords)); + } IPage pageList = baseMapper.queryList(page, queryWrapper, paramMap); pageList.setRecords(dealList(pageList.getRecords())); return pageList; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzHoistSafetyWorkServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzHoistSafetyWorkServiceImpl.java index 6f2c30299..442eebb4d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzHoistSafetyWorkServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzHoistSafetyWorkServiceImpl.java @@ -27,6 +27,8 @@ import com.zhgd.xmgl.security.util.SecurityUtils; import com.zhgd.xmgl.util.MapBuilder; import com.zhgd.xmgl.util.PageUtil; import com.zhgd.xmgl.util.RefUtil; +import org.apache.commons.collections.MapUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -68,6 +70,11 @@ public class XzHoistSafetyWorkServiceImpl extends ServiceImpl queryPageList(HashMap paramMap) { QueryWrapper queryWrapper = getQueryWrapper(paramMap); Page page = PageUtil.getPage(paramMap); + String keywords = MapUtils.getString(paramMap, "keywords"); + if (StringUtils.isNotBlank(keywords)) { + queryWrapper.and(wq -> wq.like("t.fire_location_and_fire_part", keywords).or() + .like("su.real_name", keywords)); + } IPage pageList = baseMapper.queryList(page, queryWrapper, paramMap); pageList.setRecords(dealList(pageList.getRecords())); return pageList; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzLimitSpaceSafeServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzLimitSpaceSafeServiceImpl.java index 3469705b1..d93feec78 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzLimitSpaceSafeServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzLimitSpaceSafeServiceImpl.java @@ -27,6 +27,8 @@ import com.zhgd.xmgl.security.util.SecurityUtils; import com.zhgd.xmgl.util.MapBuilder; import com.zhgd.xmgl.util.PageUtil; import com.zhgd.xmgl.util.RefUtil; +import org.apache.commons.collections.MapUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -68,6 +70,11 @@ public class XzLimitSpaceSafeServiceImpl extends ServiceImpl queryPageList(HashMap paramMap) { QueryWrapper queryWrapper = getQueryWrapper(paramMap); Page page = PageUtil.getPage(paramMap); + String keywords = MapUtils.getString(paramMap, "keywords"); + if (StringUtils.isNotBlank(keywords)) { + queryWrapper.and(wq -> wq.like("t.fire_location_and_fire_part", keywords).or() + .like("su.real_name", keywords)); + } IPage pageList = baseMapper.queryList(page, queryWrapper, paramMap); pageList.setRecords(dealList(pageList.getRecords())); return pageList; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzOpenCircuitSafeServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzOpenCircuitSafeServiceImpl.java index 072307b2e..02c4cdda1 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzOpenCircuitSafeServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzOpenCircuitSafeServiceImpl.java @@ -27,6 +27,8 @@ import com.zhgd.xmgl.security.util.SecurityUtils; import com.zhgd.xmgl.util.MapBuilder; import com.zhgd.xmgl.util.PageUtil; import com.zhgd.xmgl.util.RefUtil; +import org.apache.commons.collections.MapUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -68,6 +70,11 @@ public class XzOpenCircuitSafeServiceImpl extends ServiceImpl queryPageList(HashMap paramMap) { QueryWrapper queryWrapper = getQueryWrapper(paramMap); Page page = PageUtil.getPage(paramMap); + String keywords = MapUtils.getString(paramMap, "keywords"); + if (StringUtils.isNotBlank(keywords)) { + queryWrapper.and(wq -> wq.like("t.fire_location_and_fire_part", keywords).or() + .like("su.real_name", keywords)); + } IPage pageList = baseMapper.queryList(page, queryWrapper, paramMap); pageList.setRecords(dealList(pageList.getRecords())); return pageList; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzSpecialOperationFireSafetyNewServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzSpecialOperationFireSafetyNewServiceImpl.java index 58ea09cc0..cffb15237 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzSpecialOperationFireSafetyNewServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzSpecialOperationFireSafetyNewServiceImpl.java @@ -27,8 +27,11 @@ import com.zhgd.xmgl.modules.xz.special.service.IXzSpecialOperationFireSafetyNew import com.zhgd.xmgl.security.entity.UserInfo; import com.zhgd.xmgl.security.util.SecurityUtils; import com.zhgd.xmgl.util.MapBuilder; +import com.zhgd.xmgl.util.MapUtil; import com.zhgd.xmgl.util.PageUtil; import com.zhgd.xmgl.util.RefUtil; +import org.apache.commons.collections.MapUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -70,6 +73,11 @@ public class XzSpecialOperationFireSafetyNewServiceImpl extends ServiceImpl queryPageList(HashMap paramMap) { QueryWrapper queryWrapper = getQueryWrapper(paramMap); Page page = PageUtil.getPage(paramMap); + String keywords = MapUtils.getString(paramMap, "keywords"); + if (StringUtils.isNotBlank(keywords)) { + queryWrapper.and(wq -> wq.like("t.fire_location_and_fire_part", keywords).or() + .like("su.real_name", keywords)); + } IPage pageList = baseMapper.queryList(page, queryWrapper, paramMap); pageList.setRecords(dealList(pageList.getRecords())); return pageList; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzSpecialOperationFireSafetyServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzSpecialOperationFireSafetyServiceImpl.java index 02f6b82e1..e9a904552 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzSpecialOperationFireSafetyServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzSpecialOperationFireSafetyServiceImpl.java @@ -28,6 +28,8 @@ import com.zhgd.xmgl.security.util.SecurityUtils; import com.zhgd.xmgl.util.MapBuilder; import com.zhgd.xmgl.util.PageUtil; import com.zhgd.xmgl.util.RefUtil; +import org.apache.commons.collections.MapUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -69,6 +71,11 @@ public class XzSpecialOperationFireSafetyServiceImpl extends ServiceImpl queryPageList(HashMap paramMap) { QueryWrapper queryWrapper = getQueryWrapper(paramMap); Page page = PageUtil.getPage(paramMap); + String keywords = MapUtils.getString(paramMap, "keywords"); + if (StringUtils.isNotBlank(keywords)) { + queryWrapper.and(wq -> wq.like("t.fire_location_and_fire_part", keywords).or() + .like("su.real_name", keywords)); + } IPage pageList = baseMapper.queryList(page, queryWrapper, paramMap); pageList.setRecords(dealList(pageList.getRecords())); return pageList; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzTemporaryElectricitySafeServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzTemporaryElectricitySafeServiceImpl.java index a397536eb..328af5104 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzTemporaryElectricitySafeServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzTemporaryElectricitySafeServiceImpl.java @@ -27,6 +27,8 @@ import com.zhgd.xmgl.security.util.SecurityUtils; import com.zhgd.xmgl.util.MapBuilder; import com.zhgd.xmgl.util.PageUtil; import com.zhgd.xmgl.util.RefUtil; +import org.apache.commons.collections.MapUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -68,6 +70,11 @@ public class XzTemporaryElectricitySafeServiceImpl extends ServiceImpl queryPageList(HashMap paramMap) { QueryWrapper queryWrapper = getQueryWrapper(paramMap); Page page = PageUtil.getPage(paramMap); + String keywords = MapUtils.getString(paramMap, "keywords"); + if (StringUtils.isNotBlank(keywords)) { + queryWrapper.and(wq -> wq.like("t.fire_location_and_fire_part", keywords).or() + .like("su.real_name", keywords)); + } IPage pageList = baseMapper.queryList(page, queryWrapper, paramMap); pageList.setRecords(dealList(pageList.getRecords())); return pageList;