diff --git a/pom.xml b/pom.xml index 919c21f28..59da46ecd 100644 --- a/pom.xml +++ b/pom.xml @@ -995,7 +995,7 @@ wflow-server-1.0-SNAPSHOT.jar - 60A68722EAEE1CC58E0366E3D87B356BD41D8CD98F00B204E9800998ECF8427ED41D8CD98F00B204E9800998ECF8427E + FDFF6B62C763367247882109F8D84B45D41D8CD98F00B204E9800998ECF8427ED41D8CD98F00B204E9800998ECF8427E diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java index fe244eb7f..80a62aadf 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java @@ -1618,6 +1618,9 @@ public class SystemUserServiceImpl extends ServiceImpl carType = (List) map.get("carType"); List driverWorkerId = (List) map.get("driverWorkerId"); Integer carModuleType = "临时车辆".equals(MapUtils.getString(map, "carModuleType")) ? 2 : 3; List userIds = (List) map.get("userIds"); @@ -158,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/car/service/impl/CarInfoServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/car/service/impl/CarInfoServiceImpl.java index d278633c5..ff2968463 100644 --- a/src/main/java/com/zhgd/xmgl/modules/car/service/impl/CarInfoServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/car/service/impl/CarInfoServiceImpl.java @@ -422,7 +422,7 @@ public class CarInfoServiceImpl extends ServiceImpl impl BeanUtils.copyProperties(carInfo, carDelRecord); carDelRecord.setId(null); carDelRecord.setCreateTime(new Date()); - carDelRecord.setCreateBy(SecurityUtils.getUser() == null ? SecurityUtils.getUser().getUserId() : 0); + carDelRecord.setCreateBy(SecurityUtils.getUser() != null ? SecurityUtils.getUser().getUserId() : 0); carDelRecordMapper.insert(carDelRecord); } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzRiskPredictionController.java b/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzRiskPredictionController.java index 5594c3e44..d3e197b35 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzRiskPredictionController.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzRiskPredictionController.java @@ -90,6 +90,9 @@ public class XzRiskPredictionController { XzSecurityQualityInspectionRecordController securityQualityInspectionRecordController; @Lazy @Autowired + SafetyInspectionStandardBigScreenController safetyInspectionStandardBigScreenController; + @Lazy + @Autowired private IWorkerInfoService workerInfoService; @Lazy @Autowired @@ -142,7 +145,13 @@ public class XzRiskPredictionController { .eq(WorkerInfo::getInserviceType, 1)); resultMap.put("total", list.size()); // 高龄人员 - long ageCount = list.stream().filter(l -> StringUtils.isNotBlank(l.getBirthday()) && DateUtil.ageOfNow(l.getBirthday()) >= 50).count(); + long ageCount = list.stream().filter(l -> { + try { + return StringUtils.isNotBlank(l.getBirthday()) && DateUtil.ageOfNow(l.getBirthday()) >= 50; + } catch (Exception e) { + return false; + } + }).count(); resultMap.put("age", list.size() == 0 ? null : new BigDecimal(ageCount).divide(new BigDecimal(list.size()), 2, BigDecimal.ROUND_HALF_UP)); // 特殊工种人数 WorkerType workerType = workerTypeService.getOne(Wrappers.lambdaQuery() @@ -462,8 +471,11 @@ public class XzRiskPredictionController { long specialNotCount = inspectionRecords.stream().filter(r -> r.getStatus() != 5 && r.getType() != null && r.getType() != 1).count(); long specialCount = inspectionRecords.stream().filter(r -> r.getType() != null && r.getType() != 1).count(); o.setTotalSpecialOperationsRiskRate(NumberUtils.div(specialNotCount, specialCount, 2)); - JSONObject ssJo = BeanUtil.toBean(securityQualityInspectionRecordController.getStatScore(projectSn), JSONObject.class); - o.setMonthlySafetyScoreRate(NumberUtils.subtract(1D, NumberUtils.div(ssJo.getJSONObject("result").getDouble("total"), 100D, 2), 2)); + JSONObject ssJo = BeanUtil.toBean(safetyInspectionStandardBigScreenController.getFiveScores(new MapBuilder() + .put("projectSn", projectSn) + .build()), JSONObject.class); +// JSONObject ssJo = BeanUtil.toBean(securityQualityInspectionRecordController.getStatScore(projectSn), JSONObject.class); + o.setMonthlySafetyScoreRate(NumberUtils.subtract(1D, NumberUtils.div(ssJo.getJSONObject("result").getDouble("monthScore"), 100D, 2), 2)); long inspectionCount = inspectionRecords.stream().filter(r -> true).count(); long inspectionNotCount = inspectionRecords.stream().filter(r -> r.getStatus() != 5).count(); o.setUnclosedHiddenDangersRate(NumberUtils.div(inspectionNotCount, inspectionCount, 2)); 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; diff --git a/src/main/resources/lib/wflow-server-1.0-SNAPSHOT.jar b/src/main/resources/lib/wflow-server-1.0-SNAPSHOT.jar index 5030dc573..89a6e1f8c 100644 Binary files a/src/main/resources/lib/wflow-server-1.0-SNAPSHOT.jar and b/src/main/resources/lib/wflow-server-1.0-SNAPSHOT.jar differ