From a2131c16e062dce2a1fd73d954bb281f85c03823 Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Mon, 24 Mar 2025 13:49:11 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=9E=8D=E9=92=A2?= =?UTF-8?q?=E5=8A=A0=E5=AF=86jar=E5=AF=86=E9=92=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From b6f534ab44ea6cf6f68f4644ad794c5adf684613 Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Wed, 2 Apr 2025 09:30:54 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E9=9E=8D=E9=92=A2bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/xz/controller/XzRiskPredictionController.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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..bbe851c99 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 @@ -142,7 +142,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() From bbc47c627f3a27b8a6c025f6ea403bc4eb71617f Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Wed, 2 Apr 2025 09:49:33 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E9=9E=8D=E9=92=A2bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xz/controller/XzRiskPredictionController.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) 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 bbe851c99..87e321882 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 @@ -448,6 +448,10 @@ public class XzRiskPredictionController { return new BigDecimal(35); } + @Lazy + @Autowired + SafetyInspectionStandardBigScreenController safetyInspectionStandardBigScreenController; + @ApiOperation(value = "总包（含下面分包）事故风险预测趋势by项目", notes = "总包（含下面分包）事故风险预测趋势by项目", httpMethod = "POST") @ApiImplicitParams({ @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"), @@ -468,8 +472,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)); From 9b70e4419c5b8fc62cb9ef0d62241c7b102b8788 Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Wed, 2 Apr 2025 09:51:14 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E9=9E=8D=E9=92=A2bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/xz/controller/XzRiskPredictionController.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) 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 87e321882..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 @@ -448,10 +451,6 @@ public class XzRiskPredictionController { return new BigDecimal(35); } - @Lazy - @Autowired - SafetyInspectionStandardBigScreenController safetyInspectionStandardBigScreenController; - @ApiOperation(value = "总包（含下面分包）事故风险预测趋势by项目", notes = "总包（含下面分包）事故风险预测趋势by项目", httpMethod = "POST") @ApiImplicitParams({ @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"), From 39064fd837ff6f49be86cf43f3f291bcd5e1a6cf Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Thu, 3 Apr 2025 09:21:26 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E9=9E=8D=E9=92=A2=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E8=BD=A6=E8=BE=86=E7=B1=BB=E5=9E=8B=E9=BB=98=E8=AE=A4=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xmgl/modules/car/controller/CarInfoController.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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 ad2019d71..1fd5ee486 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,7 +124,13 @@ public class CarInfoController { Object alarmPushWorkerId = map.get("alarmPushWorkerId"); String userId = String.valueOf(map.get("enterpriseId")); Object driverWorkerName = map.get("driverWorkerName"); - List carType = (List) map.get("carType"); + 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"); From 3e7665e394389c641da732cb47e7a7172a43c644 Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Tue, 8 Apr 2025 18:11:28 +0800 Subject: [PATCH 6/9] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/basicdata/service/impl/SystemUserServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) 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 Date: Mon, 14 Apr 2025 17:05:23 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E9=9E=8D=E9=92=A2=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=B5=81jar?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lib/wflow-server-1.0-SNAPSHOT.jar | Bin 508972 -> 508444 bytes 1 file changed, 0 insertions(+), 0 deletions(-) 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 5030dc5737f68982b5a22f5786319487d0c57ece..89a6e1f8cba9ec3f963a3f62e2b9fc5e96ed0a5f 100644 GIT binary patch delta 16698 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 From 786f404a8333c63a75a7e887511e8c313a019e02 Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Sun, 27 Apr 2025 18:18:57 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E9=9E=8D=E9=92=A2bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zhgd/xmgl/modules/car/service/impl/CarInfoServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); } 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 9/9] =?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;