diff --git a/src/main/java/com/zhgd/xmgl/modules/exam/mapper/xml/ExamTrainRecordMapper.xml b/src/main/java/com/zhgd/xmgl/modules/exam/mapper/xml/ExamTrainRecordMapper.xml
index fafba6692..28efb2ac5 100644
--- a/src/main/java/com/zhgd/xmgl/modules/exam/mapper/xml/ExamTrainRecordMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/exam/mapper/xml/ExamTrainRecordMapper.xml
@@ -25,13 +25,20 @@
diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityRegionController.java b/src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityRegionController.java
index 1646fe947..fb30ffd37 100644
--- a/src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityRegionController.java
+++ b/src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityRegionController.java
@@ -10,10 +10,7 @@ import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Map;
@@ -114,5 +111,14 @@ public class QualityRegionController {
return Result.success(qualityRegionService.queryById(map));
}
+ @OperLog(operModul = "区域管理", operType = "查询", operDesc = "查询项目子账号绑定的唯一区域")
+ @ApiOperation(value = "查询项目子账号绑定的唯一区域", notes = "查询项目子账号绑定的唯一区域", httpMethod = "GET")
+ @GetMapping(value = "/queryBindRegion")
+ public Result queryBindRegion() {
+ return Result.success(qualityRegionService.queryBindRegion());
+ }
+
+
+
}
diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/entity/QualityRegion.java b/src/main/java/com/zhgd/xmgl/modules/quality/entity/QualityRegion.java
index f89184381..b7cc8fd63 100644
--- a/src/main/java/com/zhgd/xmgl/modules/quality/entity/QualityRegion.java
+++ b/src/main/java/com/zhgd/xmgl/modules/quality/entity/QualityRegion.java
@@ -88,6 +88,8 @@ public class QualityRegion implements Serializable {
private Date createTime;
@ApiModelProperty(value = "祖级列表")
private java.lang.String ancestors;
+ @ApiModelProperty(value = "区域的项目子账号id")
+ private java.lang.Long belongUserId;
@TableField(exist = false)
private List children;
diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/mapper/QualityRegionMapper.java b/src/main/java/com/zhgd/xmgl/modules/quality/mapper/QualityRegionMapper.java
index f14e8ba4d..8b3150ed8 100644
--- a/src/main/java/com/zhgd/xmgl/modules/quality/mapper/QualityRegionMapper.java
+++ b/src/main/java/com/zhgd/xmgl/modules/quality/mapper/QualityRegionMapper.java
@@ -32,4 +32,6 @@ public interface QualityRegionMapper extends BaseMapper {
void updateAncestors(@Param("oldAncestor") String oldAncestor, @Param("newAncestor") String newAncestor, @Param("projectSn") String projectSn, @Param("id") Long id);
List selectBySnAndNumberOneList(@Param("sn") String projectSn, @Param("regionSet") Set regionSet);
+
+ List queryBindRegion(Map map);
}
diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/QualityRegionMapper.xml b/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/QualityRegionMapper.xml
index ae40633db..991ffeeb8 100644
--- a/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/QualityRegionMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/QualityRegionMapper.xml
@@ -90,4 +90,11 @@
group by `region_name`
HAVING COUNT(region_name) = 1
+
+
diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/service/IQualityRegionService.java b/src/main/java/com/zhgd/xmgl/modules/quality/service/IQualityRegionService.java
index 611c32c88..1dd115642 100644
--- a/src/main/java/com/zhgd/xmgl/modules/quality/service/IQualityRegionService.java
+++ b/src/main/java/com/zhgd/xmgl/modules/quality/service/IQualityRegionService.java
@@ -49,4 +49,6 @@ public interface IQualityRegionService extends IService {
* @return
*/
QualityRegion queryById(Map map);
+
+ QualityRegion queryBindRegion();
}
diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityRegionServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityRegionServiceImpl.java
index e33758c9f..5b64ffcf7 100644
--- a/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityRegionServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityRegionServiceImpl.java
@@ -23,6 +23,7 @@ import com.zhgd.xmgl.modules.quality.service.IQualityRegionService;
import com.zhgd.xmgl.modules.video.entity.AiAnalyseHardWareRecord;
import com.zhgd.xmgl.modules.worker.entity.EnterpriseInfo;
import com.zhgd.xmgl.modules.worker.service.impl.EnterpriseInfoServiceImpl;
+import com.zhgd.xmgl.security.util.SecurityUtils;
import com.zhgd.xmgl.util.ListUtils;
import com.zhgd.xmgl.util.MessageUtil;
import org.apache.commons.collections.MapUtils;
@@ -269,6 +270,17 @@ public class QualityRegionServiceImpl extends ServiceImpl map = new HashMap<>();
+ map.put("userId", SecurityUtils.getUser().getUserId());
+ List qualityRegions = baseMapper.queryBindRegion(map);
+ if (qualityRegions.size() > 1) {
+ throw new OpenAlertException("此账号绑定过多区域");
+ }
+ return qualityRegions.size() == 0 ? null : qualityRegions.get(0);
+ }
+
private void deleteRegion(Long id) {
QueryWrapper queryWrapper = new QueryWrapper();
queryWrapper.lambda().eq(QualityRegion::getParentRegion, id);
diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerSafeEducationMapper.java b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerSafeEducationMapper.java
index 61df23d01..74b4bf4f9 100644
--- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerSafeEducationMapper.java
+++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerSafeEducationMapper.java
@@ -2,6 +2,7 @@ package com.zhgd.xmgl.modules.worker.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zhgd.annotation.DataScope;
import com.zhgd.jeecg.common.mybatis.EntityMap;
import com.zhgd.xmgl.modules.worker.entity.WorkerSafeEducation;
import com.zhgd.xmgl.modules.worker.entity.dto.EduTypeCountDTO;
@@ -35,6 +36,7 @@ public interface WorkerSafeEducationMapper extends BaseMapper selectWorkerSafeEducationByIDCardList(Map map);
+ @DataScope(includeTable = "worker_info")
int getProjectSafeEducationPersonToltal(Map map);
List exportExcelWorkerEducation(WorkerSafeEducation workerSafeEducation);
diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java
index 3035aa2c0..8fa20d72d 100644
--- a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java
@@ -2587,6 +2587,7 @@ public class WorkerInfoServiceImpl extends ServiceImpl o2.getDate().compareTo(o1.getDate()));
return rtList;
}
diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/emergency/service/impl/XzEmergencyRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/emergency/service/impl/XzEmergencyRecordServiceImpl.java
index 2654eaacc..9f0955d95 100644
--- a/src/main/java/com/zhgd/xmgl/modules/xz/emergency/service/impl/XzEmergencyRecordServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/xz/emergency/service/impl/XzEmergencyRecordServiceImpl.java
@@ -115,7 +115,7 @@ public class XzEmergencyRecordServiceImpl extends ServiceImpl queryWrapper) {
UserInfo user = SecurityUtils.getUser();
if (Objects.equals(user.getAccountType(), ParamEnum.SystemUserAccountTypeEnum.PROJECT_SUB_ACCOUNT.getValue())) {
- queryWrapper.apply(" ei.id = (select enterprise_id from xz_emergency_push where find_in_set({0},emergency_manager_id))", user.getUserId());
+ queryWrapper.apply(" ei.id in (select enterprise_id from xz_emergency_push where find_in_set({0},emergency_manager_id))", user.getUserId());
}
}
diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzHikvisionSyncServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzHikvisionSyncServiceImpl.java
index d5f1e0bab..f9b3d1319 100644
--- a/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzHikvisionSyncServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzHikvisionSyncServiceImpl.java
@@ -247,20 +247,8 @@ public class XzHikvisionSyncServiceImpl extends ServiceImpl ufaceDevs = ufaceDevMapper.selectList(qw);
ThreadLocalUtil.addInKey(Cts.TL_HK_SYNC_ID, id);
projectUfaceConfigService.buildAndSendOneWorkerAndDevForHk(ufaceDevs, workerInfo, xzHikvisionSync.getOperate(), xzHikvisionSync.getDeviceSn(), projectSn, true);
- String redisKey = Cts.HK_SYNC_AUTH_SUCCESS_KEY + id;
- Object success = redisRepository.get(redisKey);
- redisRepository.del(redisKey);
- //if (!Objects.equals(success,1)) {
- // throw new OpenAlertException("重试失败");
- //}
- //return;
}
}
- //XzHikvisionSync xzHikvisionSync1 = baseMapper.selectById(id);
- //if (!Objects.equals(xzHikvisionSync1.getIsSuccess(), 1)) {
- // throw new OpenAlertException("重试失败");
- //}
-
}
}
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 539a0ef87..06df61900 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,22 +1,34 @@
package com.zhgd.xmgl.modules.xz.special.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zhgd.jeecg.common.api.vo.Result;
+import com.zhgd.xmgl.enums.ParamEnum;
+import com.zhgd.xmgl.modules.worker.service.impl.UserEnterpriseServiceImpl;
+import com.zhgd.xmgl.modules.xz.special.entity.*;
+import com.zhgd.xmgl.modules.xz.special.entity.vo.CountSpecialByFinalStatusVo;
import com.zhgd.xmgl.modules.xz.special.entity.vo.CountSpecialVo;
-import com.zhgd.xmgl.modules.xz.special.service.IXzBlindPlatePlugSafeService;
+import com.zhgd.xmgl.modules.xz.special.service.*;
+import com.zhgd.xmgl.security.util.SecurityUtils;
+import com.zhgd.xmgl.util.NumberUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.MapUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import springfox.documentation.annotations.ApiIgnore;
+import javax.annotation.Resource;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
@RestController
@RequestMapping("/xmgl/xzSpecial")
@@ -24,7 +36,24 @@ import java.util.Map;
@Api(tags = "星纵-特种作业统计Api")
public class CountApiController {
@Autowired
- private IXzBlindPlatePlugSafeService xzBlindPlatePlugSafeService;
+ IXzBlindPlatePlugSafeService xzBlindPlatePlugSafeService;
+ @Resource
+ IXzGroundSafetService iXzGroundSafetService;
+ @Resource
+ IXzHighJobSafeService iXzHighJobSafeService;
+ @Resource
+ IXzHoistSafetyWorkService iXzHoistSafetyWorkService;
+ @Resource
+ IXzLimitSpaceSafeService iXzLimitSpaceSafeService;
+ @Resource
+ IXzOpenCircuitSafeService iXzOpenCircuitSafeService;
+ @Resource
+ IXzSpecialOperationFireSafetyService iXzSpecialOperationFireSafetyService;
+ @Resource
+ IXzTemporaryElectricitySafeService xzTemporaryElectricitySafeService;
+ @Lazy
+ @Autowired
+ private UserEnterpriseServiceImpl userEnterpriseService;
@ApiOperation(value = "统计特殊作业数量", notes = "统计特殊作业数量", httpMethod = "POST")
@ApiImplicitParams({
@@ -35,5 +64,107 @@ public class CountApiController {
return Result.success(xzBlindPlatePlugSafeService.countAllSpecial(param));
}
+ @ApiOperation(value = "统计特殊作业情况", notes = "统计特殊作业情况", httpMethod = "POST")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"),
+ })
+ @PostMapping(value = "/countSpecialByFinalStatus")
+ public Result countSpecialByFinalStatus(@ApiIgnore @RequestBody Map param) {
+ String projectSn = MapUtils.getString(param, "projectSn");
+ List enterpriseIds = userEnterpriseService.getEnterpriseIdsIfSubProject();
+ Integer accountType = SecurityUtils.getUser().getAccountType();
+ boolean isSubAccount = Objects.equals(accountType, ParamEnum.SystemUserAccountTypeEnum.PROJECT_SUB_ACCOUNT.getValue());
+ ArrayList groupByTypes = new ArrayList<>();
+ 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 = iXzSpecialOperationFireSafetyService.list(new LambdaQueryWrapper()
+ .eq(XzSpecialOperationFireSafety::getProjectSn, projectSn)
+ .in(isSubAccount, XzSpecialOperationFireSafety::getJobApplicationUnit, enterpriseIds)
+ );
+ List n8 = xzTemporaryElectricitySafeService.list(new LambdaQueryWrapper()
+ .eq(XzTemporaryElectricitySafe::getProjectSn, projectSn)
+ .in(isSubAccount, XzTemporaryElectricitySafe::getJobApplicationUnit, enterpriseIds)
+ );
+ CountSpecialByFinalStatusVo.GroupByType byType1 = new CountSpecialByFinalStatusVo.GroupByType();
+ byType1.setName("盲板抽堵作业");
+ byType1.setNum((long) n1.size());
+ byType1.setComplete(n1.stream().filter(b -> Objects.equals(b.getFinalAcceptanceStatus(), 2)).count());
+ groupByTypes.add(byType1);
+ CountSpecialByFinalStatusVo.GroupByType byType2 = new CountSpecialByFinalStatusVo.GroupByType();
+ byType2.setName("动土作业");
+ byType2.setNum((long) n2.size());
+ byType2.setComplete(n2.stream().filter(b -> Objects.equals(b.getFinalAcceptanceStatus(), 2)).count());
+ groupByTypes.add(byType2);
+ CountSpecialByFinalStatusVo.GroupByType byType3 = new CountSpecialByFinalStatusVo.GroupByType();
+ byType3.setName("高处作业");
+ byType3.setNum((long) n3.size());
+ byType3.setComplete(n3.stream().filter(b -> Objects.equals(b.getFinalAcceptanceStatus(), 2)).count());
+ groupByTypes.add(byType3);
+ CountSpecialByFinalStatusVo.GroupByType byType4 = new CountSpecialByFinalStatusVo.GroupByType();
+ byType4.setName("吊装安全作业");
+ byType4.setNum((long) n4.size());
+ byType4.setComplete(n4.stream().filter(b -> Objects.equals(b.getFinalAcceptanceStatus(), 2)).count());
+ groupByTypes.add(byType4);
+ CountSpecialByFinalStatusVo.GroupByType byType5 = new CountSpecialByFinalStatusVo.GroupByType();
+ byType5.setName("受限空间作业");
+ byType5.setNum((long) n5.size());
+ byType5.setComplete(n5.stream().filter(b -> Objects.equals(b.getFinalAcceptanceStatus(), 2)).count());
+ groupByTypes.add(byType5);
+ CountSpecialByFinalStatusVo.GroupByType byType6 = new CountSpecialByFinalStatusVo.GroupByType();
+ byType6.setName("断路作业");
+ byType6.setNum((long) n6.size());
+ byType6.setComplete(n6.stream().filter(b -> Objects.equals(b.getFinalAcceptanceStatus(), 2)).count());
+ groupByTypes.add(byType6);
+ CountSpecialByFinalStatusVo.GroupByType byType7 = new CountSpecialByFinalStatusVo.GroupByType();
+ byType7.setName("动火作业");
+ byType7.setNum((long) n7.size());
+ byType7.setComplete(n7.stream().filter(b -> Objects.equals(b.getFinalAcceptanceStatus(), 2)).count());
+ groupByTypes.add(byType7);
+ CountSpecialByFinalStatusVo.GroupByType byType8 = new CountSpecialByFinalStatusVo.GroupByType();
+ byType8.setName("临时用电作业");
+ byType8.setNum((long) n8.size());
+ byType8.setComplete(n8.stream().filter(b -> Objects.equals(b.getFinalAcceptanceStatus(), 2)).count());
+ groupByTypes.add(byType8);
+
+ long sum = groupByTypes.stream().map(CountSpecialByFinalStatusVo.GroupByType::getNum).mapToLong(value -> value).sum();
+ Long running = 0L;
+ Long complete = 0L;
+ for (CountSpecialByFinalStatusVo.GroupByType type : groupByTypes) {
+ type.setRunning(type.getNum() - type.getComplete());
+ running += type.getRunning();
+ complete += type.getComplete();
+ type.setRatio(NumberUtils.occupyRate(type.getNum(), sum, 2));
+ }
+ CountSpecialByFinalStatusVo rtVo = new CountSpecialByFinalStatusVo();
+ CountSpecialByFinalStatusVo.Total total = new CountSpecialByFinalStatusVo.Total();
+ total.setRunning(running);
+ total.setComplete(complete);
+ rtVo.setTotal(total);
+ rtVo.setGroupByType(groupByTypes);
+ return Result.success(rtVo);
+ }
+
}
diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/vo/CountSpecialByFinalStatusVo.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/vo/CountSpecialByFinalStatusVo.java
new file mode 100644
index 000000000..b44f44b58
--- /dev/null
+++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/entity/vo/CountSpecialByFinalStatusVo.java
@@ -0,0 +1,27 @@
+package com.zhgd.xmgl.modules.xz.special.entity.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class CountSpecialByFinalStatusVo {
+ private Total total;
+ private List groupByType;
+
+
+ @Data
+ public static class Total {
+ private Long running;
+ private Long complete;
+ }
+
+ @Data
+ public static class GroupByType {
+ private String name;
+ private Long running;
+ private Long num;
+ private Long complete;
+ private Double ratio;
+ }
+}
diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/IXzBlindPlatePlugSafeService.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/IXzBlindPlatePlugSafeService.java
index f72a3071a..f7288f60d 100644
--- a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/IXzBlindPlatePlugSafeService.java
+++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/IXzBlindPlatePlugSafeService.java
@@ -3,6 +3,7 @@ package com.zhgd.xmgl.modules.xz.special.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.zhgd.xmgl.modules.xz.special.entity.XzBlindPlatePlugSafe;
+import com.zhgd.xmgl.modules.xz.special.entity.vo.CountSpecialByFinalStatusVo;
import com.zhgd.xmgl.modules.xz.special.entity.vo.CountSpecialVo;
import java.util.HashMap;
@@ -71,4 +72,5 @@ public interface IXzBlindPlatePlugSafeService extends IService countAllSpecial(Map param);
+
}
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 1027f7991..9686eb99a 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
@@ -13,6 +13,7 @@ import com.zhgd.xmgl.modules.worker.service.IUserEnterpriseService;
import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityQualityInspectionRecord;
import com.zhgd.xmgl.modules.xz.security.service.IXzSecurityQualityInspectionRecordService;
import com.zhgd.xmgl.modules.xz.special.entity.XzBlindPlatePlugSafe;
+import com.zhgd.xmgl.modules.xz.special.entity.vo.CountSpecialByFinalStatusVo;
import com.zhgd.xmgl.modules.xz.special.entity.vo.CountSpecialVo;
import com.zhgd.xmgl.modules.xz.special.mapper.XzBlindPlatePlugSafeMapper;
import com.zhgd.xmgl.modules.xz.special.mapper.XzGasAnalyzeMapper;
@@ -151,6 +152,7 @@ public class XzBlindPlatePlugSafeServiceImpl extends ServiceImpl