Merge remote-tracking branch 'origin/angang-deploy-new' into angang-deploy-new

pom.xml

@@ -995,7 +995,7 @@
                     <libjars>wflow-server-1.0-SNAPSHOT.jar</libjars>
                     <code>
                         <!--鞍钢-->
-                        60A68722EAEE1CC58E0366E3D87B356BD41D8CD98F00B204E9800998ECF8427ED41D8CD98F00B204E9800998ECF8427E
+                        FDFF6B62C763367247882109F8D84B45D41D8CD98F00B204E9800998ECF8427ED41D8CD98F00B204E9800998ECF8427E
                         <!--A31D41A090AA235D29A0DB728D50AEDFD41D8CD98F00B204E9800998ECF8427ED41D8CD98F00B204E9800998ECF8427E&lt;!&ndash;-->
                         <!--中科安信-->
                         <!--A6F449ECD7E1024F703F37F2294AC8F2D41D8CD98F00B204E9800998ECF8427ED41D8CD98F00B204E9800998ECF8427E-->

src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java

@@ -1618,6 +1618,9 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
         } catch (AuthenticationException e) {
             log.error("error：", e);
             throw new CustomException("Invalid username/password supplied", HttpStatus.UNPROCESSABLE_ENTITY);
+        } catch (Exception e) {
+            log.error("error：", e);
+            throw new OpenAlertException("");
         }
     }
 

src/main/java/com/zhgd/xmgl/modules/car/controller/CarInfoController.java

@@ -124,7 +124,6 @@ public class CarInfoController {
             Object alarmPushWorkerId = map.get("alarmPushWorkerId");
             String userId = String.valueOf(map.get("enterpriseId"));
             Object driverWorkerName = map.get("driverWorkerName");
-            List<String> carType = (List<String>) map.get("carType");
             List<String> driverWorkerId = (List<String>) map.get("driverWorkerId");
             Integer carModuleType = "临时车辆".equals(MapUtils.getString(map, "carModuleType")) ? 2 : 3;
             List<String> userIds = (List<String>) 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<String> carType = (List<String>) 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<Map<String, Object>> carPhotosUrl = (List<Map<String, Object>>) map.get("carPhotosUrl");
             List<Map<String, Object>> carPhotosUrls = new ArrayList<>();

src/main/java/com/zhgd/xmgl/modules/car/service/impl/CarInfoServiceImpl.java

@@ -422,7 +422,7 @@ public class CarInfoServiceImpl extends ServiceImpl<CarInfoMapper, CarInfo> 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);
     }
 

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.<WorkerType>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);
+        JSONObject ssJo = BeanUtil.toBean(safetyInspectionStandardBigScreenController.getFiveScores(new MapBuilder<String, Object>()
-        o.setMonthlySafetyScoreRate(NumberUtils.subtract(1D, NumberUtils.div(ssJo.getJSONObject("result").getDouble("total"), 100D, 2), 2));
+                .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));

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<List<CountSpecialVo>> countSpecialByData(@ApiIgnore @RequestBody Map<String, Object> param) {
+        String projectSn = MapUtils.getString(param, "projectSn");
+        String startTime = MapUtils.getString(param, "startTime");
+        String endTime = MapUtils.getString(param, "endTime");
+        List<String> enterpriseIds = userEnterpriseService.getEnterpriseIdsIfSubProject();
+        Integer accountType = SecurityUtils.getUser().getAccountType();
+        boolean isSubAccount = Objects.equals(accountType, SystemUserAccountTypeEnum.PROJECT_SUB_ACCOUNT.getValue());
+        List<XzBlindPlatePlugSafe> n1 = xzBlindPlatePlugSafeService.list(new LambdaQueryWrapper<XzBlindPlatePlugSafe>()
+                .eq(XzBlindPlatePlugSafe::getProjectSn, projectSn)
+                .in(isSubAccount, XzBlindPlatePlugSafe::getJobApplicationUnit, enterpriseIds)
+        );
+        List<XzGroundSafet> n2 = iXzGroundSafetService.list(new LambdaQueryWrapper<XzGroundSafet>()
+                .eq(XzGroundSafet::getProjectSn, projectSn)
+                .in(isSubAccount, XzGroundSafet::getJobApplicationUnit, enterpriseIds)
+        );
+        List<XzHighJobSafe> n3 = iXzHighJobSafeService.list(new LambdaQueryWrapper<XzHighJobSafe>()
+                .eq(XzHighJobSafe::getProjectSn, projectSn)
+                .in(isSubAccount, XzHighJobSafe::getJobApplicationUnit, enterpriseIds)
+        );
+        List<XzHoistSafetyWork> n4 = iXzHoistSafetyWorkService.list(new LambdaQueryWrapper<XzHoistSafetyWork>()
+                .eq(XzHoistSafetyWork::getProjectSn, projectSn)
+                .in(isSubAccount, XzHoistSafetyWork::getJobApplicationUnit, enterpriseIds)
+        );
+        List<XzLimitSpaceSafe> n5 = iXzLimitSpaceSafeService.list(new LambdaQueryWrapper<XzLimitSpaceSafe>()
+                .eq(XzLimitSpaceSafe::getProjectSn, projectSn)
+                .in(isSubAccount, XzLimitSpaceSafe::getJobApplicationUnit, enterpriseIds)
+        );
+        List<XzOpenCircuitSafe> n6 = iXzOpenCircuitSafeService.list(new LambdaQueryWrapper<XzOpenCircuitSafe>()
+                .eq(XzOpenCircuitSafe::getProjectSn, projectSn)
+                .in(isSubAccount, XzOpenCircuitSafe::getJobApplicationUnit, enterpriseIds)
+        );
+        List<XzSpecialOperationFireSafetyNew> n7 = xzSpecialOperationFireSafetyNewService.list(new LambdaQueryWrapper<XzSpecialOperationFireSafetyNew>()
+                .eq(XzSpecialOperationFireSafetyNew::getProjectSn, projectSn)
+                .in(isSubAccount, XzSpecialOperationFireSafetyNew::getJobApplicationUnit, enterpriseIds)
+        );
+        List<XzTemporaryElectricitySafe> n8 = xzTemporaryElectricitySafeService.list(new LambdaQueryWrapper<XzTemporaryElectricitySafe>()
+                .eq(XzTemporaryElectricitySafe::getProjectSn, projectSn)
+                .in(isSubAccount, XzTemporaryElectricitySafe::getJobApplicationUnit, enterpriseIds)
+        );
+        List<CountSpecialVo> 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);
+    }
 }

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<XzBlindPlatePlu
     public IPage<XzBlindPlatePlugSafe> queryPageList(HashMap<String, Object> paramMap) {
         QueryWrapper<XzBlindPlatePlugSafe> queryWrapper = getQueryWrapper(paramMap);
         Page<XzBlindPlatePlugSafe> 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<XzBlindPlatePlugSafe> pageList = baseMapper.queryList(page, queryWrapper, paramMap);
         pageList.setRecords(dealList(pageList.getRecords()));
         return pageList;

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<XzGroundSafetMapper, X
     public IPage<XzGroundSafet> queryPageList(HashMap<String, Object> paramMap) {
         QueryWrapper<XzGroundSafet> queryWrapper = getQueryWrapper(paramMap);
         Page<XzGroundSafet> 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<XzGroundSafet> pageList = baseMapper.queryList(page, queryWrapper, paramMap);
         pageList.setRecords(dealList(pageList.getRecords()));
         return pageList;

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<XzHighJobSafeMapper, X
     public IPage<XzHighJobSafe> queryPageList(HashMap<String, Object> paramMap) {
         QueryWrapper<XzHighJobSafe> queryWrapper = getQueryWrapper(paramMap);
         Page<XzHighJobSafe> 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<XzHighJobSafe> pageList = baseMapper.queryList(page, queryWrapper, paramMap);
         pageList.setRecords(dealList(pageList.getRecords()));
         return pageList;

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<XzHoistSafetyWorkM
     public IPage<XzHoistSafetyWork> queryPageList(HashMap<String, Object> paramMap) {
         QueryWrapper<XzHoistSafetyWork> queryWrapper = getQueryWrapper(paramMap);
         Page<XzHoistSafetyWork> 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<XzHoistSafetyWork> pageList = baseMapper.queryList(page, queryWrapper, paramMap);
         pageList.setRecords(dealList(pageList.getRecords()));
         return pageList;

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<XzLimitSpaceSafeMap
     public IPage<XzLimitSpaceSafe> queryPageList(HashMap<String, Object> paramMap) {
         QueryWrapper<XzLimitSpaceSafe> queryWrapper = getQueryWrapper(paramMap);
         Page<XzLimitSpaceSafe> 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<XzLimitSpaceSafe> pageList = baseMapper.queryList(page, queryWrapper, paramMap);
         pageList.setRecords(dealList(pageList.getRecords()));
         return pageList;

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<XzOpenCircuitSafeM
     public IPage<XzOpenCircuitSafe> queryPageList(HashMap<String, Object> paramMap) {
         QueryWrapper<XzOpenCircuitSafe> queryWrapper = getQueryWrapper(paramMap);
         Page<XzOpenCircuitSafe> 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<XzOpenCircuitSafe> pageList = baseMapper.queryList(page, queryWrapper, paramMap);
         pageList.setRecords(dealList(pageList.getRecords()));
         return pageList;

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<XzSp
     public IPage<XzSpecialOperationFireSafetyNew> queryPageList(HashMap<String, Object> paramMap) {
         QueryWrapper<XzSpecialOperationFireSafetyNew> queryWrapper = getQueryWrapper(paramMap);
         Page<XzSpecialOperationFireSafetyNew> 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<XzSpecialOperationFireSafetyNew> pageList = baseMapper.queryList(page, queryWrapper, paramMap);
         pageList.setRecords(dealList(pageList.getRecords()));
         return pageList;

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<XzSpeci
     public IPage<XzSpecialOperationFireSafety> queryPageList(HashMap<String, Object> paramMap) {
         QueryWrapper<XzSpecialOperationFireSafety> queryWrapper = getQueryWrapper(paramMap);
         Page<XzSpecialOperationFireSafety> 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<XzSpecialOperationFireSafety> pageList = baseMapper.queryList(page, queryWrapper, paramMap);
         pageList.setRecords(dealList(pageList.getRecords()));
         return pageList;

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<XzTempora
     public IPage<XzTemporaryElectricitySafe> queryPageList(HashMap<String, Object> paramMap) {
         QueryWrapper<XzTemporaryElectricitySafe> queryWrapper = getQueryWrapper(paramMap);
         Page<XzTemporaryElectricitySafe> 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<XzTemporaryElectricitySafe> pageList = baseMapper.queryList(page, queryWrapper, paramMap);
         pageList.setRecords(dealList(pageList.getRecords()));
         return pageList;