Merge remote-tracking branch 'origin/master'

construction-ui/src/views/construction/plan/index.vue

@@ -542,7 +542,8 @@ export default {
               return {
                 pipelineId: pipelineId,
                 industryType: this.form.industry,
-                pipelineName: pipeline ? pipeline.name : ''
+                pipelineName: pipeline ? pipeline.name : '',
+                smId: pipeline ? pipeline.smId : null
               };
             });
             this.form.pipelines = pipelines;

src/main/java/com/sooka/sponest/construction/bridge/domain/bo/BridgeAllyCrossPierBO.java

@@ -0,0 +1,21 @@
+package com.sooka.sponest.construction.bridge.domain.bo;
+
+import com.sooka.sponest.construction.bridge.domain.BridgeAllyCrossPier;
+import lombok.*;
+import org.apache.ibatis.type.Alias;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+@Setter
+@Getter
+@AllArgsConstructor
+@NoArgsConstructor
+@ToString
+@Alias("BridgeAllyCrossPierBO")
+public class BridgeAllyCrossPierBO extends BridgeAllyCrossPier {
+    private List<Map<String, Object>> result = new ArrayList<>();
+
+    private Integer type;
+}

src/main/java/com/sooka/sponest/construction/bridge/domain/bo/BridgeCheckDiseaseBO.java

@@ -0,0 +1,21 @@
+package com.sooka.sponest.construction.bridge.domain.bo;
+
+import com.sooka.sponest.construction.bridge.domain.BridgeCheckDisease;
+import lombok.*;
+import org.apache.ibatis.type.Alias;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+@Setter
+@Getter
+@AllArgsConstructor
+@NoArgsConstructor
+@ToString
+@Alias("BridgeCheckDiseaseBO")
+public class BridgeCheckDiseaseBO extends BridgeCheckDisease {
+    private List<Map<String, Object>> result = new ArrayList<>();
+
+    private Integer type;
+}

src/main/java/com/sooka/sponest/construction/bridge/domain/bo/BridgeInfoBO.java

@@ -0,0 +1,21 @@
+package com.sooka.sponest.construction.bridge.domain.bo;
+
+import com.sooka.sponest.construction.bridge.domain.BridgeInfo;
+import lombok.*;
+import org.apache.ibatis.type.Alias;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+@Setter
+@Getter
+@AllArgsConstructor
+@NoArgsConstructor
+@ToString
+@Alias("BridgeInfoBO")
+public class BridgeInfoBO extends BridgeInfo {
+    private List<Map<String, Object>> result = new ArrayList<>();
+
+    private Integer type;
+}

src/main/java/com/sooka/sponest/construction/bridge/domain/bo/BridgeMaintenanceRepairBO.java

@@ -0,0 +1,21 @@
+package com.sooka.sponest.construction.bridge.domain.bo;
+
+import com.sooka.sponest.construction.bridge.domain.BridgeMaintenanceRepair;
+import lombok.*;
+import org.apache.ibatis.type.Alias;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+@Setter
+@Getter
+@AllArgsConstructor
+@NoArgsConstructor
+@ToString
+@Alias("BridgeMaintenanceRepairBO")
+public class BridgeMaintenanceRepairBO extends BridgeMaintenanceRepair {
+    private List<Map<String, Object>> result = new ArrayList<>();
+
+    private Integer type;
+}

src/main/java/com/sooka/sponest/construction/drainage/domain/DrainagePipe.java

@@ -2,7 +2,7 @@ package com.sooka.sponest.construction.drainage.domain;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.ruoyi.common.core.annotation.Excel;
-import com.sooka.sponest.base.domain.BaseBusinessEntity;
+import com.ruoyi.common.datascope.base.domain.BaseBusinessEntity;
 import lombok.Data;
 
 import java.util.Date;

src/main/java/com/sooka/sponest/construction/drainage/domain/bo/DrainageEasyFloodBO.java

@@ -0,0 +1,21 @@
+package com.sooka.sponest.construction.drainage.domain.bo;
+
+import com.sooka.sponest.construction.drainage.domain.DrainageEasyFlood;
+import lombok.*;
+import org.apache.ibatis.type.Alias;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+@Setter
+@Getter
+@AllArgsConstructor
+@NoArgsConstructor
+@ToString
+@Alias("DrainageEasyFloodBO")
+public class DrainageEasyFloodBO extends DrainageEasyFlood {
+    private List<Map<String, Object>> result = new ArrayList<>();
+
+    private Integer type;
+}

src/main/java/com/sooka/sponest/construction/drainage/domain/bo/DrainageEmbankmentBO.java

@@ -0,0 +1,21 @@
+package com.sooka.sponest.construction.drainage.domain.bo;
+
+import com.sooka.sponest.construction.drainage.domain.DrainageEmbankment;
+import lombok.*;
+import org.apache.ibatis.type.Alias;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+@Setter
+@Getter
+@AllArgsConstructor
+@NoArgsConstructor
+@ToString
+@Alias("DrainageEmbankmentBO")
+public class DrainageEmbankmentBO extends DrainageEmbankment {
+    private List<Map<String, Object>> result = new ArrayList<>();
+
+    private String type;
+}

src/main/java/com/sooka/sponest/construction/drainage/domain/bo/DrainageManholeBO.java

@@ -0,0 +1,21 @@
+package com.sooka.sponest.construction.drainage.domain.bo;
+
+import com.sooka.sponest.construction.drainage.domain.DrainageManhole;
+import lombok.*;
+import org.apache.ibatis.type.Alias;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+@Setter
+@Getter
+@AllArgsConstructor
+@NoArgsConstructor
+@ToString
+@Alias("DrainageManholeBO")
+public class DrainageManholeBO extends DrainageManhole {
+    private List<Map<String, Object>> result = new ArrayList<>();
+
+    private Integer type;
+}

src/main/java/com/sooka/sponest/construction/drainage/domain/bo/DrainageOverpassBO.java

@@ -0,0 +1,21 @@
+package com.sooka.sponest.construction.drainage.domain.bo;
+
+import com.sooka.sponest.construction.drainage.domain.DrainageOverpass;
+import lombok.*;
+import org.apache.ibatis.type.Alias;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+@Setter
+@Getter
+@AllArgsConstructor
+@NoArgsConstructor
+@ToString
+@Alias("DrainageOverpassBO")
+public class DrainageOverpassBO extends DrainageOverpass {
+    private List<Map<String, Object>> result = new ArrayList<>();
+
+    private Integer type;
+}

src/main/java/com/sooka/sponest/construction/drainage/domain/bo/DrainagePumpStationBO.java

@@ -0,0 +1,21 @@
+package com.sooka.sponest.construction.drainage.domain.bo;
+
+import com.sooka.sponest.construction.drainage.domain.DrainagePumpingStation;
+import lombok.*;
+import org.apache.ibatis.type.Alias;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+@Setter
+@Getter
+@AllArgsConstructor
+@NoArgsConstructor
+@ToString
+@Alias("DrainagePumpStationBO")
+public class DrainagePumpStationBO extends DrainagePumpingStation {
+    private List<Map<String, Object>> result = new ArrayList<>();
+
+    private Integer type;
+}

src/main/java/com/sooka/sponest/construction/drainage/domain/bo/DrainageRainGaugeStationBO.java

@@ -0,0 +1,21 @@
+package com.sooka.sponest.construction.drainage.domain.bo;
+
+import com.sooka.sponest.construction.drainage.domain.DrainageRainGaugeStation;
+import lombok.*;
+import org.apache.ibatis.type.Alias;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+@Setter
+@Getter
+@AllArgsConstructor
+@NoArgsConstructor
+@ToString
+@Alias("DrainageRainGaugeStationBO")
+public class DrainageRainGaugeStationBO extends DrainageRainGaugeStation {
+    private List<Map<String, Object>> result = new ArrayList<>();
+
+    private Integer type;
+}

src/main/java/com/sooka/sponest/construction/drainage/domain/bo/DrainageSewageTreatmentPlantsBO.java

@@ -0,0 +1,21 @@
+package com.sooka.sponest.construction.drainage.domain.bo;
+
+import com.sooka.sponest.construction.drainage.domain.DrainageSewageTreatmentPlants;
+import lombok.*;
+import org.apache.ibatis.type.Alias;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+@Setter
+@Getter
+@AllArgsConstructor
+@NoArgsConstructor
+@ToString
+@Alias("DrainageSewageTreatmentPlantsBO")
+public class DrainageSewageTreatmentPlantsBO extends DrainageSewageTreatmentPlants {
+    private List<Map<String, Object>> result = new ArrayList<>();
+
+    private Integer type;
+}

src/main/java/com/sooka/sponest/construction/drainage/domain/bo/DrainageStorageFacilitiesBO.java

@@ -0,0 +1,21 @@
+package com.sooka.sponest.construction.drainage.domain.bo;
+
+import com.sooka.sponest.construction.drainage.domain.DrainageStorageFacilities;
+import lombok.*;
+import org.apache.ibatis.type.Alias;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+@Setter
+@Getter
+@AllArgsConstructor
+@NoArgsConstructor
+@ToString
+@Alias("DrainageStorageFacilitiesBO")
+public class DrainageStorageFacilitiesBO extends DrainageStorageFacilities {
+    private List<Map<String, Object>> result = new ArrayList<>();
+
+    private Integer type;
+}

src/main/java/com/sooka/sponest/construction/drainage/service/impl/DrainagePipeServiceImpl.java

@@ -1,10 +1,13 @@
 package com.sooka.sponest.construction.drainage.service.impl;
 
+import com.ruoyi.common.core.utils.SpringUtils;
 import com.ruoyi.common.datascope.annotation.DataScopeMutiDept;
+import com.ruoyi.common.datascope.base.service.BaseService;
 import com.sooka.sponest.base.service.impl.BaseServiceImpl;
 import com.sooka.sponest.construction.drainage.domain.DrainagePipe;
 import com.sooka.sponest.construction.drainage.mapper.DrainagePipeMapper;
 import com.sooka.sponest.construction.drainage.service.IDrainagePipeService;
+import org.apache.commons.collections4.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -18,7 +21,7 @@ import java.util.Map;
  * @date 2025-10-11
  */
 @Service
-public class DrainagePipeServiceImpl extends BaseServiceImpl implements IDrainagePipeService {
+public class DrainagePipeServiceImpl extends BaseService implements IDrainagePipeService {
     @Autowired
     private DrainagePipeMapper drainagePipeMapper;
 
@@ -43,6 +46,9 @@ public class DrainagePipeServiceImpl extends BaseServiceImpl implements IDrainag
     @Override
     public List<DrainagePipe> selectDrainagePipeList(DrainagePipe drainagePipe) {
         setSookaDataBase(drainagePipe);
+
+        Map<String, Object> params = drainagePipe.getParams();
+        String dataScope = MapUtils.getString(params, "dataScope");
         return drainagePipeMapper.selectDrainagePipeList(drainagePipe);
     }
 

src/main/java/com/sooka/sponest/construction/gas/domain/GasManhole.java

@@ -1,8 +1,7 @@
 package com.sooka.sponest.construction.gas.domain;
 
 import com.ruoyi.common.core.annotation.Excel;
-import com.ruoyi.common.core.web.domain.BaseEntity;
-import com.sooka.sponest.base.domain.BaseBusinessEntity;
+import com.ruoyi.common.datascope.base.domain.BaseBusinessEntity;
 import lombok.Data;
 
 import java.math.BigDecimal;

src/main/java/com/sooka/sponest/construction/gas/domain/bo/GasManholeBO.java

@@ -0,0 +1,21 @@
+package com.sooka.sponest.construction.gas.domain.bo;
+
+import com.sooka.sponest.construction.gas.domain.GasManhole;
+import lombok.*;
+import org.apache.ibatis.type.Alias;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+@Setter
+@Getter
+@AllArgsConstructor
+@NoArgsConstructor
+@ToString
+@Alias("GasManholeBO")
+public class GasManholeBO extends GasManhole {
+    private List<Map<String, Object>> result = new ArrayList<>();
+
+    private Integer type;
+}

src/main/java/com/sooka/sponest/construction/gas/domain/bo/GasRepairRecordBO.java

@@ -0,0 +1,21 @@
+package com.sooka.sponest.construction.gas.domain.bo;
+
+import com.sooka.sponest.construction.gas.domain.GasRepairRecord;
+import lombok.*;
+import org.apache.ibatis.type.Alias;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+@Setter
+@Getter
+@AllArgsConstructor
+@NoArgsConstructor
+@ToString
+@Alias("GasRepairRecordBO")
+public class GasRepairRecordBO extends GasRepairRecord {
+    private List<Map<String, Object>> result = new ArrayList<>();
+
+    private Integer type;
+}

src/main/java/com/sooka/sponest/construction/gas/domain/bo/GasStationBO.java

@@ -0,0 +1,21 @@
+package com.sooka.sponest.construction.gas.domain.bo;
+
+import com.sooka.sponest.construction.gas.domain.GasStation;
+import lombok.*;
+import org.apache.ibatis.type.Alias;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+@Setter
+@Getter
+@AllArgsConstructor
+@NoArgsConstructor
+@ToString
+@Alias("GasStationBO")
+public class GasStationBO extends GasStation {
+    private List<Map<String, Object>> result = new ArrayList<>();
+
+    private Integer type;
+}

src/main/java/com/sooka/sponest/construction/gas/service/impl/GasManholeServiceImpl.java

@@ -1,6 +1,7 @@
 package com.sooka.sponest.construction.gas.service.impl;
 
 import com.ruoyi.common.datascope.annotation.DataScopeMutiDept;
+import com.ruoyi.common.datascope.base.service.BaseService;
 import com.sooka.sponest.base.service.impl.BaseServiceImpl;
 import com.sooka.sponest.construction.gas.domain.GasManhole;
 import com.sooka.sponest.construction.gas.mapper.GasManholeMapper;
@@ -17,7 +18,7 @@ import java.util.List;
  * @date 2025-10-11
  */
 @Service
-public class GasManholeServiceImpl extends BaseServiceImpl implements IGasManholeService {
+public class GasManholeServiceImpl extends BaseService implements IGasManholeService {
     @Autowired
     private GasManholeMapper gasManholeMapper;
 

src/main/java/com/sooka/sponest/construction/heating/domain/bo/HeatingHeatExchangeStationBO.java

@@ -0,0 +1,21 @@
+package com.sooka.sponest.construction.heating.domain.bo;
+
+import com.sooka.sponest.construction.heating.domain.HeatingHeatExchangeStation;
+import lombok.*;
+import org.apache.ibatis.type.Alias;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+@Setter
+@Getter
+@AllArgsConstructor
+@NoArgsConstructor
+@ToString
+@Alias("HeatingHeatExchangeStationBO")
+public class HeatingHeatExchangeStationBO extends HeatingHeatExchangeStation {
+    private List<Map<String, Object>> result = new ArrayList<>();
+
+    private Integer type;
+}

src/main/java/com/sooka/sponest/construction/heating/domain/bo/HeatingManholeBO.java

@@ -0,0 +1,21 @@
+package com.sooka.sponest.construction.heating.domain.bo;
+
+import com.sooka.sponest.construction.heating.domain.HeatingManhole;
+import lombok.*;
+import org.apache.ibatis.type.Alias;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+@Setter
+@Getter
+@AllArgsConstructor
+@NoArgsConstructor
+@ToString
+@Alias("HeatingManholeBO")
+public class HeatingManholeBO extends HeatingManhole {
+    private List<Map<String, Object>> result = new ArrayList<>();
+
+    private Integer type;
+}

src/main/java/com/sooka/sponest/construction/heating/domain/bo/HeatingSourcePlantBO.java

@@ -0,0 +1,21 @@
+package com.sooka.sponest.construction.heating.domain.bo;
+
+import com.sooka.sponest.construction.heating.domain.HeatingSourcePlant;
+import lombok.*;
+import org.apache.ibatis.type.Alias;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+@Setter
+@Getter
+@AllArgsConstructor
+@NoArgsConstructor
+@ToString
+@Alias("HeatingSourcePlantBO")
+public class HeatingSourcePlantBO extends HeatingSourcePlant {
+    private List<Map<String, Object>> result = new ArrayList<>();
+
+    private Integer type;
+}

src/main/java/com/sooka/sponest/construction/utilityTunnel/domain/UtilityTunnelBodyInformation.java

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;
+import com.ruoyi.common.datascope.base.domain.BaseBusinessEntity;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -20,7 +21,7 @@ import java.util.Date;
  */
 @Data
 @AllArgsConstructor
-public class UtilityTunnelBodyInformation extends BaseEntity {
+public class UtilityTunnelBodyInformation extends BaseBusinessEntity {
     private static final long serialVersionUID = 1L;
 
     /**
@@ -29,6 +30,11 @@ public class UtilityTunnelBodyInformation extends BaseEntity {
     private Long id;
 
     /**
+     * id号
+     */
+    private Long smId;
+
+    /**
      * 管廊编码
      */
     @Excel(name = "管廊编码")

src/main/java/com/sooka/sponest/construction/utilityTunnel/domain/UtilityTunnelHiddendanger.java

@@ -2,6 +2,7 @@ package com.sooka.sponest.construction.utilityTunnel.domain;
 
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;
+import com.ruoyi.common.datascope.base.domain.BaseBusinessEntity;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -17,7 +18,7 @@ import java.math.BigDecimal;
  */
 @Data
 @AllArgsConstructor
-public class UtilityTunnelHiddendanger extends BaseEntity {
+public class UtilityTunnelHiddendanger extends BaseBusinessEntity {
     private static final long serialVersionUID = 1L;
 
     /**

src/main/java/com/sooka/sponest/construction/utilityTunnel/domain/UtilityTunnelMaintenancerepair.java

@@ -3,6 +3,7 @@ package com.sooka.sponest.construction.utilityTunnel.domain;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;
+import com.ruoyi.common.datascope.base.domain.BaseBusinessEntity;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -21,7 +22,7 @@ import java.util.Date;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-public class UtilityTunnelMaintenancerepair extends BaseEntity {
+public class UtilityTunnelMaintenancerepair extends BaseBusinessEntity {
     private static final long serialVersionUID = 1L;
 
     /**

src/main/java/com/sooka/sponest/construction/utilityTunnel/domain/UtilityTunnelManhole.java

@@ -3,6 +3,7 @@ package com.sooka.sponest.construction.utilityTunnel.domain;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;
+import com.ruoyi.common.datascope.base.domain.BaseBusinessEntity;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -19,7 +20,7 @@ import java.math.BigDecimal;
  */
 @Data
 @AllArgsConstructor
-public class UtilityTunnelManhole extends BaseEntity {
+public class UtilityTunnelManhole extends BaseBusinessEntity {
     private static final long serialVersionUID = 1L;
 
     /**

src/main/java/com/sooka/sponest/construction/utilityTunnel/domain/bo/UtilityTunnelBodyInformationBO.java

@@ -0,0 +1,21 @@
+package com.sooka.sponest.construction.utilityTunnel.domain.bo;
+
+import com.sooka.sponest.construction.utilityTunnel.domain.UtilityTunnelBodyInformation;
+import lombok.*;
+import org.apache.ibatis.type.Alias;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+@Setter
+@Getter
+@AllArgsConstructor
+@NoArgsConstructor
+@ToString
+@Alias("UtilityTunnelBodyInformationBO")
+public class UtilityTunnelBodyInformationBO extends UtilityTunnelBodyInformation {
+    private List<Map<String, Object>> result = new ArrayList<>();
+
+    private Integer type;
+}

src/main/java/com/sooka/sponest/construction/utilityTunnel/domain/bo/UtilityTunnelFacilityBO.java

@@ -0,0 +1,21 @@
+package com.sooka.sponest.construction.utilityTunnel.domain.bo;
+
+import com.sooka.sponest.construction.utilityTunnel.domain.UtilityTunnelManhole;
+import lombok.*;
+import org.apache.ibatis.type.Alias;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+@Setter
+@Getter
+@AllArgsConstructor
+@NoArgsConstructor
+@ToString
+@Alias("UtilityTunnelFacilityBO")
+public class UtilityTunnelFacilityBO extends UtilityTunnelManhole {
+    private List<Map<String, Object>> result = new ArrayList<>();
+
+    private Integer type;
+}

src/main/java/com/sooka/sponest/construction/utilityTunnel/domain/bo/UtilityTunnelHiddendangerBO.java

@@ -0,0 +1,21 @@
+package com.sooka.sponest.construction.utilityTunnel.domain.bo;
+
+import com.sooka.sponest.construction.utilityTunnel.domain.UtilityTunnelHiddendanger;
+import lombok.*;
+import org.apache.ibatis.type.Alias;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+@Setter
+@Getter
+@AllArgsConstructor
+@NoArgsConstructor
+@ToString
+@Alias("UtilityTunnelHiddendangerBO")
+public class UtilityTunnelHiddendangerBO extends UtilityTunnelHiddendanger {
+    private List<Map<String, Object>> result = new ArrayList<>();
+
+    private Integer type;
+}

src/main/java/com/sooka/sponest/construction/utilityTunnel/domain/bo/UtilityTunnelMaintenanceRepairBO.java

@@ -0,0 +1,21 @@
+package com.sooka.sponest.construction.utilityTunnel.domain.bo;
+
+import com.sooka.sponest.construction.utilityTunnel.domain.UtilityTunnelMaintenancerepair;
+import lombok.*;
+import org.apache.ibatis.type.Alias;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+@Setter
+@Getter
+@AllArgsConstructor
+@NoArgsConstructor
+@ToString
+@Alias("UtilityTunnelMaintenanceRepairBO")
+public class UtilityTunnelMaintenanceRepairBO extends UtilityTunnelMaintenancerepair {
+    private List<Map<String, Object>> result = new ArrayList<>();
+
+    private Integer type;
+}

src/main/java/com/sooka/sponest/construction/view/database/controller/ViewController.java

@@ -2,6 +2,7 @@ package com.sooka.sponest.construction.view.database.controller;
 
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.sooka.sponest.construction.view.database.domain.bo.DashboardBO;
 import com.sooka.sponest.construction.view.database.service.IViewService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -102,12 +103,12 @@ public class ViewController extends BaseController {
     /**
      * 数据看板接口，查询各个行业基本信息统计数据
      *
-     * @param type 行业类型：1-燃气，2-供热，3-供水，4-排水，5-桥梁，6-管廊，不传默认查所有行业的数据
+     * ：1-燃气，2-供热，3-供水，4-排水，5-桥梁，6-管廊，不传默认查所有行业的数据
      * @return 各行业基本信息统计数据
      */
     @GetMapping("/dashboard")
-    public AjaxResult getDashboardData(@RequestParam(value = "type", required = false) Integer type) {
-        return viewService.getDashboardData(type);
+    public AjaxResult getDashboardData(DashboardBO bo) {
+        return viewService.getDashboardData(bo);
     }
 
     /**
@@ -132,4 +133,6 @@ public class ViewController extends BaseController {
         return viewService.getPipeMaterialCount(type);
     }
 
+
+
 }

src/main/java/com/sooka/sponest/construction/view/database/domain/bo/DashboardBO.java

@@ -0,0 +1,46 @@
+package com.sooka.sponest.construction.view.database.domain.bo;
+
+import com.ruoyi.common.datascope.base.domain.BaseBusinessEntity;
+import lombok.*;
+import org.apache.ibatis.type.Alias;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 数据看板查询参数BO
+ */
+@Setter
+@Getter
+@AllArgsConstructor
+@NoArgsConstructor
+@ToString
+@Alias("DashboardBO")
+public class DashboardBO extends BaseBusinessEntity {
+    private List<Map<String, Object>> result = new ArrayList<>();
+    /**
+     * 行业类型：1-燃气，2-供热，3-供水，4-排水，5-桥梁，6-管廊
+     */
+    private Integer type;
+
+    private Long deptId;
+
+    /**
+     * 获取部门ID
+     *
+     * @return 部门ID
+     */
+    public Long getDeptId() {
+        return this.getDataDeptId();
+    }
+
+    /**
+     * 设置部门ID
+     *
+     * @param deptId 部门ID
+     */
+    public void setDeptId(Long deptId) {
+        this.setDataDeptId(deptId);
+    }
+}

src/main/java/com/sooka/sponest/construction/view/database/mapper/ViewMapper.java

@@ -1,15 +1,43 @@
 package com.sooka.sponest.construction.view.database.mapper;
 
 import com.sooka.sponest.construction.drainage.domain.DrainagePumpingStation;
+import com.sooka.sponest.construction.gas.domain.GasManhole;
 import com.sooka.sponest.construction.gas.domain.GasPipe;
 import com.sooka.sponest.construction.gas.domain.GasStation;
+import com.sooka.sponest.construction.gas.domain.bo.GasManholeBO;
+import com.sooka.sponest.construction.gas.domain.bo.GasRepairRecordBO;
+import com.sooka.sponest.construction.gas.domain.bo.GasStationBO;
 import com.sooka.sponest.construction.heating.domain.HeatingHeatExchangeStation;
+import com.sooka.sponest.construction.view.database.domain.bo.DashboardBO;
 import com.sooka.sponest.construction.waterSupply.domain.WaterSupplyPipe;
 import com.sooka.sponest.construction.drainage.domain.DrainagePipe;
 import com.sooka.sponest.construction.heating.domain.HeatingPipe;
 import com.sooka.sponest.construction.utilityTunnel.domain.UtilityTunnelBodyInformation;
 import com.sooka.sponest.construction.bridge.domain.BridgeInfo;
 import com.sooka.sponest.construction.waterSupply.domain.WaterSupplyPumpStation;
+import com.sooka.sponest.construction.waterSupply.domain.bo.WaterSupplyManholeBO;
+import com.sooka.sponest.construction.drainage.domain.bo.DrainageManholeBO;
+import com.sooka.sponest.construction.heating.domain.bo.HeatingManholeBO;
+import com.sooka.sponest.construction.bridge.domain.bo.BridgeInfoBO;
+import com.sooka.sponest.construction.utilityTunnel.domain.bo.UtilityTunnelBodyInformationBO;
+import com.sooka.sponest.construction.waterSupply.domain.bo.WaterSupplyPumpStationBO;
+import com.sooka.sponest.construction.drainage.domain.bo.DrainagePumpStationBO;
+import com.sooka.sponest.construction.heating.domain.bo.HeatingHeatExchangeStationBO;
+import com.sooka.sponest.construction.bridge.domain.bo.BridgeMaintenanceRepairBO;
+import com.sooka.sponest.construction.utilityTunnel.domain.bo.UtilityTunnelFacilityBO;
+import com.sooka.sponest.construction.waterSupply.domain.bo.WaterSupplyProjectRepositoryBO;
+import com.sooka.sponest.construction.waterSupply.domain.bo.WaterSupplyRepairOrderBO;
+import com.sooka.sponest.construction.drainage.domain.bo.DrainageOverpassBO;
+import com.sooka.sponest.construction.drainage.domain.bo.DrainageEasyFloodBO;
+import com.sooka.sponest.construction.drainage.domain.bo.DrainageRainGaugeStationBO;
+import com.sooka.sponest.construction.drainage.domain.bo.DrainageSewageTreatmentPlantsBO;
+import com.sooka.sponest.construction.drainage.domain.bo.DrainageEmbankmentBO;
+import com.sooka.sponest.construction.drainage.domain.bo.DrainageStorageFacilitiesBO;
+import com.sooka.sponest.construction.heating.domain.bo.HeatingSourcePlantBO;
+import com.sooka.sponest.construction.utilityTunnel.domain.bo.UtilityTunnelHiddendangerBO;
+import com.sooka.sponest.construction.utilityTunnel.domain.bo.UtilityTunnelMaintenanceRepairBO;
+import com.sooka.sponest.construction.bridge.domain.bo.BridgeAllyCrossPierBO;
+import com.sooka.sponest.construction.bridge.domain.bo.BridgeCheckDiseaseBO;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
@@ -56,6 +84,8 @@ public interface ViewMapper {
      */
     List<Map<String, Object>> selectWaterSupplyPipeLengthStats(WaterSupplyPipe waterSupplyPipe);
 
+
+
     /**
      * 按行政区划统计供水管线长度
      *
@@ -81,6 +111,14 @@ public interface ViewMapper {
     List<Map<String, Object>> selectDrainagePipeLengthStats(DrainagePipe drainagePipe);
 
     /**
+     * 统计供热管线长度
+     *
+     * @param heatingPipe 供热管线查询条件
+     * @return 排水管线长度统计结果
+     */
+    List<Map<String, Object>> calculateHeatingPipeLength(HeatingPipe heatingPipe);
+
+    /**
      * 按行政区划统计排水管线长度
      *
      * @param drainagePipe 排水管线查询条件
@@ -105,14 +143,6 @@ public interface ViewMapper {
     List<Map<String, Object>> selectGasPipeLengthByCategory(GasPipe gasPipe);
 
     /**
-     * 按类别统计供水管线长度
-     *
-     * @param waterSupplyPipe 供水管线查询条件
-     * @return 按类别统计的供水管线长度结果
-     */
-    List<Map<String, Object>> selectWaterSupplyPipeLengthByCategory(WaterSupplyPipe waterSupplyPipe);
-
-    /**
      * 按类别统计排水管线长度
      *
      * @param drainagePipe 排水管线查询条件
@@ -161,6 +191,14 @@ public interface ViewMapper {
     List<Map<String, Object>> selectManholeCountByInstallDateAndIndustry(Integer type);
 
     /**
+     * 按类别统计供水管线长度
+     *
+     * @param waterSupplyPipe 供水管线查询条件
+     * @return 按类别统计的供水管线长度结果
+     */
+    List<Map<String, Object>> selectWaterSupplyPipeLengthByCategory(WaterSupplyPipe waterSupplyPipe);
+
+    /**
      * 按区划名称和出厂日期统计燃气场站数量
      *
      * @param gasStation 燃气场站查询条件
@@ -197,105 +235,105 @@ public interface ViewMapper {
      *
      * @return 燃气窨井数量统计结果
      */
-    List<Map<String, Object>> selectGasManholeCount();
+    List<Map<String, Object>> selectGasManholeCount(DashboardBO bo);
 
     /**
      * 统计燃气维修台账数量
      *
      * @return 燃气维修台账数量统计结果
      */
-    List<Map<String, Object>> selectGasMaintenanceCount();
+    List<Map<String, Object>> selectGasMaintenanceCount(DashboardBO bo);
 
     /**
      * 统计燃气场站数量
      *
      * @return 燃气场站数量统计结果
      */
-    List<Map<String, Object>> selectGasStationCount();
+    List<Map<String, Object>> selectGasStationCount(DashboardBO bo);
 
     /**
      * 统计供水窨井数量
      *
      * @return 供水窨井数量统计结果
      */
-    List<Map<String, Object>> selectWaterSupplyManholeCount();
+    List<Map<String, Object>> selectWaterSupplyManholeCount(DashboardBO bo);
 
     /**
      * 统计供水泵站数量
      *
      * @return 供水泵站数量统计结果
      */
-    List<Map<String, Object>> selectWaterSupplyPumpStationCount();
+    List<Map<String, Object>> selectWaterSupplyPumpStationCount(DashboardBO bo);
 
     /**
      * 统计供水维修记录数量
      *
      * @return 供水维修记录数量统计结果
      */
-    List<Map<String, Object>> selectWaterSupplyMaintenanceCount();
+    List<Map<String, Object>> selectWaterSupplyMaintenanceCount(DashboardBO bo);
 
     /**
      * 统计供水项目库数量
      *
      * @return 供水项目库数量统计结果
      */
-    List<Map<String, Object>> selectWaterSupplyProjectCount();
+    List<Map<String, Object>> selectWaterSupplyProjectCount(DashboardBO bo);
 
     /**
      * 统计排水窨井数量
      *
      * @return 排水窨井数量统计结果
      */
-    List<Map<String, Object>> selectDrainageManholeCount();
+    List<Map<String, Object>> selectDrainageManholeCount(DashboardBO bo);
 
     /**
      * 统计排水泵站数量
      *
      * @return 排水泵站数量统计结果
      */
-    List<Map<String, Object>> selectDrainagePumpStationCount();
+    List<Map<String, Object>> selectDrainagePumpStationCount(DashboardBO bo);
 
     /**
      * 统计下穿立交数量
      *
      * @return 下穿立交数量统计结果
      */
-    List<Map<String, Object>> selectUnderpassCount();
+    List<Map<String, Object>> selectUnderpassCount(DashboardBO bo);
 
     /**
      * 统计易涝点数量
      *
      * @return 易涝点数量统计结果
      */
-    List<Map<String, Object>> selectFloodPointCount();
+    List<Map<String, Object>> selectFloodPointCount(DashboardBO bo);
 
     /**
      * 统计雨量站数量
      *
      * @return 雨量站数量统计结果
      */
-    List<Map<String, Object>> selectRainfallStationCount();
+    List<Map<String, Object>> selectRainfallStationCount(DashboardBO bo);
 
     /**
      * 统计污水处理厂数量
      *
      * @return 污水处理厂数量统计结果
      */
-    List<Map<String, Object>> selectSewageTreatmentPlantCount();
+    List<Map<String, Object>> selectSewageTreatmentPlantCount(DashboardBO bo);
 
     /**
      * 统计堤防信息数量
      *
      * @return 堤防信息数量统计结果
      */
-    List<Map<String, Object>> selectDikeInfoCount();
+    List<Map<String, Object>> selectDikeInfoCount(DashboardBO bo);
 
     /**
      * 统计调蓄设施数量
      *
      * @return 调蓄设施数量统计结果
      */
-    List<Map<String, Object>> selectStorageFacilityCount();
+    List<Map<String, Object>> selectStorageFacilityCount(DashboardBO bo);
 
     /**
      * 统计供热管线总长度
@@ -310,77 +348,77 @@ public interface ViewMapper {
      *
      * @return 换热站数量统计结果
      */
-    List<Map<String, Object>> selectHeatingHeatExchangeStationCount();
+    List<Map<String, Object>> selectHeatingHeatExchangeStationCount(DashboardBO bo);
 
     /**
      * 统计热源厂数量
      *
      * @return 热源厂数量统计结果
      */
-    List<Map<String, Object>> selectHeatingHeatSourceFactoryCount();
+    List<Map<String, Object>> selectHeatingHeatSourceFactoryCount(DashboardBO bo);
 
     /**
      * 统计供热窨井数量
      *
      * @return 供热窨井数量统计结果
      */
-    List<Map<String, Object>> selectHeatingManholeCount();
+    List<Map<String, Object>> selectHeatingManholeCount(DashboardBO bo);
 
     /**
      * 统计桥梁基本信息数量
      *
      * @return 桥梁基本信息数量统计结果
      */
-    List<Map<String, Object>> selectBridgeInfoCount();
+    List<Map<String, Object>> selectBridgeInfoCount(DashboardBO bo);
 
     /**
      * 统计连跨数量
      *
      * @return 连跨数量统计结果
      */
-    List<Map<String, Object>> selectContinuousSpanCount();
+    List<Map<String, Object>> selectContinuousSpanCount(DashboardBO bo);
 
     /**
      * 统计检查病害数量
      *
      * @return 检查病害数量统计结果
      */
-    List<Map<String, Object>> selectInspectionDiseaseCount();
+    List<Map<String, Object>> selectInspectionDiseaseCount(DashboardBO bo);
 
     /**
      * 统计桥梁养护维修数量
      *
      * @return 桥梁养护维修数量统计结果
      */
-    List<Map<String, Object>> selectBridgeMaintenanceRepairCount();
+    List<Map<String, Object>> selectBridgeMaintenanceRepairCount(DashboardBO bo);
 
     /**
      * 统计管廊本体数量
      *
      * @return 管廊本体数量统计结果
      */
-    List<Map<String, Object>> selectUtilityTunnelBodyCount();
+    List<Map<String, Object>> selectUtilityTunnelBodyCount(DashboardBO bo);
 
     /**
      * 统计管廊设施数量
      *
      * @return 管廊设施数量统计结果
      */
-    List<Map<String, Object>> selectUtilityTunnelFacilityCount();
+    List<Map<String, Object>> selectUtilityTunnelFacilityCount(DashboardBO bo);
 
     /**
      * 统计管廊隐患信息数量
      *
      * @return 管廊隐患信息数量统计结果
      */
-    List<Map<String, Object>> selectUtilityTunnelRiskCount();
+    List<Map<String, Object>> selectUtilityTunnelRiskCount(DashboardBO bo);
 
     /**
      * 统计管廊养护维修数量
      *
      * @return 管廊养护维修数量统计结果
      */
-    List<Map<String, Object>> selectUtilityTunnelMaintenanceCount();
+    List<Map<String, Object>> selectUtilityTunnelMaintenanceCount(DashboardBO bo);
 
     /**
      * 按建设年份统计燃气管道数量

src/main/java/com/sooka/sponest/construction/view/database/service/IViewService.java

@@ -1,8 +1,7 @@
 package com.sooka.sponest.construction.view.database.service;
 
 import com.ruoyi.common.core.web.domain.AjaxResult;
-
-import java.util.Map;
+import com.sooka.sponest.construction.view.database.domain.bo.DashboardBO;
 
 /**
  * 统计视图服务接口
@@ -71,11 +70,11 @@ public interface IViewService {
     /**
      * 数据看板接口，查询各个行业基本信息统计数据
      *
-     * @param type 行业类型：1-燃气，2-供热，3-供水，4-排水，5-桥梁，6-管廊，不传默认查所有行业的数据
+     * @param bo DashboardBO对象，包含行业类型等信息
      * @return 各行业基本信息统计数据
      */
-    public AjaxResult getDashboardData(Integer type);
-    
+    public AjaxResult getDashboardData(DashboardBO bo);
+
     /**
      * 按年份统计各个行业的管道数量，用于柱状图展示
      *
@@ -91,5 +90,5 @@ public interface IViewService {
      * @return 管线材质数量统计结果
      */
     public AjaxResult getPipeMaterialCount(Integer type);
-    
+
 }

src/main/java/com/sooka/sponest/construction/view/plan/service/impl/PipelineServiceImpl.java

@@ -78,6 +78,7 @@ public class PipelineServiceImpl implements IPipelineService {
                     Map<String, Object> pipeline = new HashMap<>();
                     pipeline.put("id", pipe.getId());
                     pipeline.put("name", pipe.getPipelineCode() != null ? pipe.getPipelineCode() : "未知热力管线");
+                    pipeline.put("smId", pipe.getSmId());
                     dataList.add(pipeline);
                 }
                 break;
@@ -90,6 +91,7 @@ public class PipelineServiceImpl implements IPipelineService {
                     Map<String, Object> pipeline = new HashMap<>();
                     pipeline.put("id", pipe.getId());
                     pipeline.put("name", pipe.getPipelineCode() != null ? pipe.getPipelineCode() : "未知排水管线");
+                    pipeline.put("smId", pipe.getSmId());
                     dataList.add(pipeline);
                 }
                 break;
@@ -114,6 +116,7 @@ public class PipelineServiceImpl implements IPipelineService {
                     Map<String, Object> pipeline = new HashMap<>();
                     pipeline.put("id", tunnel.getId());
                     pipeline.put("name", tunnel.getTunnelCode() != null ? tunnel.getTunnelCode() : "未知管廊");
+                    pipeline.put("smId", tunnel.getSmId());
                     dataList.add(pipeline);
                 }
                 break;
@@ -126,6 +129,7 @@ public class PipelineServiceImpl implements IPipelineService {
                     Map<String, Object> pipeline = new HashMap<>();
                     pipeline.put("id", pipe.getId());
                     pipeline.put("name", pipe.getPipeCode() != null ? pipe.getPipeCode() : "未知燃气管线");
+                    pipeline.put("smId", pipe.getSmId());
                     dataList.add(pipeline);
                 }
                 break;
@@ -138,6 +142,7 @@ public class PipelineServiceImpl implements IPipelineService {
                     Map<String, Object> pipeline = new HashMap<>();
                     pipeline.put("id", pipe.getId());
                     pipeline.put("name", pipe.getPipeCode() != null ? pipe.getPipeCode() : "未知供水管线");
+                    pipeline.put("smId", pipe.getSmId());
                     dataList.add(pipeline);
                 }
                 break;

src/main/java/com/sooka/sponest/construction/waterSupply/domain/bo/WaterSupplyManholeBO.java

@@ -0,0 +1,21 @@
+package com.sooka.sponest.construction.waterSupply.domain.bo;
+
+import com.sooka.sponest.construction.waterSupply.domain.WaterSupplyManhole;
+import lombok.*;
+import org.apache.ibatis.type.Alias;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+@Setter
+@Getter
+@AllArgsConstructor
+@NoArgsConstructor
+@ToString
+@Alias("WaterSupplyManholeBO")
+public class WaterSupplyManholeBO extends WaterSupplyManhole {
+    private List<Map<String, Object>> result = new ArrayList<>();
+
+    private Integer type;
+}

src/main/java/com/sooka/sponest/construction/waterSupply/domain/bo/WaterSupplyProjectRepositoryBO.java

@@ -0,0 +1,21 @@
+package com.sooka.sponest.construction.waterSupply.domain.bo;
+
+import com.sooka.sponest.construction.waterSupply.domain.WaterSupplyProjectRepository;
+import lombok.*;
+import org.apache.ibatis.type.Alias;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+@Setter
+@Getter
+@AllArgsConstructor
+@NoArgsConstructor
+@ToString
+@Alias("WaterSupplyProjectRepositoryBO")
+public class WaterSupplyProjectRepositoryBO extends WaterSupplyProjectRepository {
+    private List<Map<String, Object>> result = new ArrayList<>();
+
+    private Integer type;
+}

src/main/java/com/sooka/sponest/construction/waterSupply/domain/bo/WaterSupplyPumpStationBO.java

@@ -0,0 +1,21 @@
+package com.sooka.sponest.construction.waterSupply.domain.bo;
+
+import com.sooka.sponest.construction.waterSupply.domain.WaterSupplyPumpStation;
+import lombok.*;
+import org.apache.ibatis.type.Alias;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+@Setter
+@Getter
+@AllArgsConstructor
+@NoArgsConstructor
+@ToString
+@Alias("WaterSupplyPumpStationBO")
+public class WaterSupplyPumpStationBO extends WaterSupplyPumpStation {
+    private List<Map<String, Object>> result = new ArrayList<>();
+
+    private Integer type;
+}

src/main/java/com/sooka/sponest/construction/waterSupply/domain/bo/WaterSupplyRepairOrderBO.java

@@ -0,0 +1,21 @@
+package com.sooka.sponest.construction.waterSupply.domain.bo;
+
+import com.sooka.sponest.construction.waterSupply.domain.WaterSupplyRepairOrder;
+import lombok.*;
+import org.apache.ibatis.type.Alias;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+@Setter
+@Getter
+@AllArgsConstructor
+@NoArgsConstructor
+@ToString
+@Alias("WaterSupplyRepairOrderBO")
+public class WaterSupplyRepairOrderBO extends WaterSupplyRepairOrder {
+    private List<Map<String, Object>> result = new ArrayList<>();
+
+    private Integer type;
+}

src/main/resources/mapper/construction/drainage/DrainagePipeMapper.xml

@@ -43,6 +43,7 @@
 
     <sql id="selectDrainagePipeVo">
         select a.id,
+               a.sm_id,
                a.pipeline_code,
                a.pipeline_category,
                a.city_code,

src/main/resources/mapper/construction/utilityTunnel/UtilityTunnelBodyInformationMapper.xml

@@ -37,6 +37,7 @@
         <result property="pipeLength" column="pipe_length"/>
         <result property="yId" column="y_id"/>
         <result property="yName" column="y_name"/>
+        <result property="smId" column="sm_id"/>
     </resultMap>
 
     <sql id="selectUtilityTunnelBodyInformationVo">
@@ -71,7 +72,8 @@
                latitude,
                pipe_length,
                y_id,
-               y_name
+               y_name,
+               sm_id
         from utility_tunnel_body_information
     </sql>
 
@@ -245,6 +247,7 @@
             <if test="pipeLength != null">pipe_length,</if>
             <if test="yId != null">y_id,</if>
             <if test="yName != null">y_name,</if>
+            <if test="smId != null">sm_id,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="tunnelCode != null and tunnelCode != ''">#{tunnelCode},</if>
@@ -278,6 +281,7 @@
             <if test="pipeLength != null">#{pipeLength},</if>
             <if test="yId != null">#{yId},</if>
             <if test="yName != null">#{yName},</if>
+            <if test="smId != null">#{smId},</if>
         </trim>
     </insert>
 
@@ -315,6 +319,7 @@
             <if test="pipeLength != null">pipe_length = #{pipeLength},</if>
             <if test="yId != null">y_id = #{yId},</if>
             <if test="yName != null">y_name = #{yName},</if>
+            <if test="smId != null">sm_id = #{smId},</if>
         </trim>
         where id = #{id}
     </update>

src/main/resources/mapper/construction/view/ViewMapper.xml

@@ -68,6 +68,21 @@
         </where>
     </select>
 
+    <!-- 统计供热管线长度 -->
+    <select id="calculateHeatingPipeLength" parameterType="HeatingPipe" resultType="map">
+        SELECT
+            COALESCE(SUM(CAST(length AS DECIMAL(20,2))), 0) AS totalLength
+        FROM heating_pipe
+        <where>
+            <if test="deptId != null and deptId != ''">
+                AND dept_id = #{deptId}
+            </if>
+            <if test="regionalName != null and regionalName != ''">
+                AND regional_name LIKE CONCAT('%', #{regionalName}, '%')
+            </if>
+        </where>
+    </select>
+
     <!-- 按行政区划统计供水管线长度 -->
     <select id="selectWaterSupplyPipeLengthByDistrict" parameterType="WaterSupplyPipe" resultType="map">
         SELECT 
@@ -459,78 +474,174 @@
     </select>
     
     <!-- 统计燃气窨井数量 -->
-    <select id="selectGasManholeCount" resultType="map">
-        SELECT COUNT(*) AS count FROM gas_manhole
+    <select id="selectGasManholeCount" parameterType="DashboardBO" resultType="map">
+        SELECT COUNT(*) AS count FROM gas_manhole a
+        left join ${database_system}.sys_dept d on a.dept_id = d.dept_id
+       <where>
+           ${params.dataScope}
+       </where>
+    </select>
+    
+    <!-- 统计供水窨井数量 -->
+    <select id="selectWaterSupplyManholeCount" parameterType="WaterSupplyManholeBO" resultType="map">
+        SELECT COUNT(*) AS count FROM water_supply_manhole a
+        left join ${database_system}.sys_dept d on a.dept_id = d.dept_id
+       <where>
+           ${params.dataScope}
+       </where>
+    </select>
+    
+    <!-- 统计排水窨井数量 -->
+    <select id="selectDrainageManholeCount" parameterType="DrainageManholeBO" resultType="map">
+        SELECT COUNT(*) AS count FROM drainage_manhole a
+        left join ${database_system}.sys_dept d on a.dept_id = d.dept_id
+       <where>
+           ${params.dataScope}
+       </where>
+    </select>
+    
+    <!-- 统计供热窨井数量 -->
+    <select id="selectHeatingManholeCount" parameterType="HeatingManholeBO" resultType="map">
+        SELECT COUNT(*) AS count FROM heating_manhole a
+        left join ${database_system}.sys_dept d on a.dept_id = d.dept_id
+       <where>
+           ${params.dataScope}
+       </where>
     </select>
     
     <!-- 统计燃气维修台账数量 -->
-    <select id="selectGasMaintenanceCount" resultType="map">
-        SELECT COUNT(*) AS count FROM gas_repair_record
+    <select id="selectGasMaintenanceCount" parameterType="GasRepairRecordBO" resultType="map">
+        SELECT COUNT(*) AS count FROM gas_repair_record a
+        left join ${database_system}.sys_dept d on a.dept_id = d.dept_id
+       <where>
+           ${params.dataScope}
+       </where>
     </select>
     
     <!-- 统计燃气场站数量 -->
-    <select id="selectGasStationCount" resultType="map">
-        SELECT COUNT(*) AS count FROM gas_station
+    <select id="selectGasStationCount" parameterType="GasStationBO" resultType="map">
+        SELECT COUNT(*) AS count FROM gas_station a
+        left join ${database_system}.sys_dept d on a.dept_id = d.dept_id
+       <where>
+           ${params.dataScope}
+       </where>
     </select>
     
-    <!-- 统计供水窨井数量 -->
-    <select id="selectWaterSupplyManholeCount" resultType="map">
-        SELECT COUNT(*) AS count FROM water_supply_manhole
+    <!-- 统计供水泵站数量 -->
+    <select id="selectWaterSupplyPumpStationCount" parameterType="WaterSupplyPumpStationBO" resultType="map">
+        SELECT COUNT(*) AS count FROM water_supply_pump_station a
+        left join ${database_system}.sys_dept d on a.dept_id = d.dept_id
+       <where>
+           ${params.dataScope}
+       </where>
     </select>
     
-    <!-- 统计供水泵站数量 -->
-    <select id="selectWaterSupplyPumpStationCount" resultType="map">
-        SELECT COUNT(*) AS count FROM water_supply_pump_station
+    <!-- 统计排水泵站数量 -->
+    <select id="selectDrainagePumpStationCount" parameterType="DrainagePumpStationBO" resultType="map">
+        SELECT COUNT(*) AS count FROM drainage_pumping_station a
+        left join ${database_system}.sys_dept d on a.dept_id = d.dept_id
+       <where>
+           ${params.dataScope}
+       </where>
     </select>
     
-    <!-- 统计供水维修记录数量 -->
-    <select id="selectWaterSupplyMaintenanceCount" resultType="map">
-        SELECT COUNT(*) AS count FROM water_supply_repair_order
+    <!-- 统计换热站数量 -->
+    <select id="selectHeatingHeatExchangeStationCount" parameterType="HeatingHeatExchangeStationBO" resultType="map">
+        SELECT COUNT(*) AS count FROM heating_heat_exchange_station a
+        left join ${database_system}.sys_dept d on a.dept_id = d.dept_id
+       <where>
+           ${params.dataScope}
+       </where>
     </select>
     
-    <!-- 统计供水项目库数量 -->
-    <select id="selectWaterSupplyProjectCount" resultType="map">
-        SELECT COUNT(*) AS count FROM water_supply_project_repository
+    <!-- 统计桥梁养护维修数量 -->
+    <select id="selectBridgeMaintenanceRepairCount" parameterType="BridgeMaintenanceRepairBO" resultType="map">
+        SELECT COUNT(*) AS count FROM bridge_maintenance_repair a
+        left join ${database_system}.sys_dept d on a.dept_id = d.dept_id
+       <where>
+           ${params.dataScope}
+       </where>
     </select>
     
-    <!-- 统计排水窨井数量 -->
-    <select id="selectDrainageManholeCount" resultType="map">
-        SELECT COUNT(*) AS count FROM drainage_manhole
+    <!-- 统计管廊设施数量 -->
+    <select id="selectUtilityTunnelFacilityCount" parameterType="UtilityTunnelFacilityBO" resultType="map">
+        SELECT COUNT(*) AS count FROM utility_tunnel_manhole a
+        left join ${database_system}.sys_dept d on a.dept_id = d.dept_id
+       <where>
+           ${params.dataScope}
+       </where>
     </select>
     
-    <!-- 统计排水泵站数量 -->
-    <select id="selectDrainagePumpStationCount" resultType="map">
-        SELECT COUNT(*) AS count FROM drainage_pumping_station
+    <!-- 统计供水维修记录数量 -->
+    <select id="selectWaterSupplyMaintenanceCount" parameterType="WaterSupplyRepairOrderBO" resultType="map">
+        SELECT COUNT(*) AS count FROM water_supply_repair_order a
+        left join ${database_system}.sys_dept d on a.dept_id = d.dept_id
+       <where>
+           ${params.dataScope}
+       </where>
+    </select>
+    
+    <!-- 统计供水项目库数量 -->
+    <select id="selectWaterSupplyProjectCount" parameterType="WaterSupplyProjectRepositoryBO" resultType="map">
+        SELECT COUNT(*) AS count FROM water_supply_project_repository a
+        left join ${database_system}.sys_dept d on a.dept_id = d.dept_id
+       <where>
+           ${params.dataScope}
+       </where>
     </select>
     
     <!-- 统计下穿立交数量 -->
-    <select id="selectUnderpassCount" resultType="map">
-        SELECT COUNT(*) AS count FROM drainage_overpass
+    <select id="selectUnderpassCount" parameterType="DrainageOverpassBO" resultType="map">
+        SELECT COUNT(*) AS count FROM drainage_overpass a
+        left join ${database_system}.sys_dept d on a.dept_id = d.dept_id
+       <where>
+           ${params.dataScope}
+       </where>
     </select>
     
     <!-- 统计易涝点数量 -->
-    <select id="selectFloodPointCount" resultType="map">
-        SELECT COUNT(*) AS count FROM drainage_easy_flood
+    <select id="selectFloodPointCount" parameterType="DrainageEasyFloodBO" resultType="map">
+        SELECT COUNT(*) AS count FROM drainage_easy_flood a
+        left join ${database_system}.sys_dept d on a.dept_id = d.dept_id
+       <where>
+           ${params.dataScope}
+       </where>
     </select>
     
     <!-- 统计雨量站数量 -->
-    <select id="selectRainfallStationCount" resultType="map">
-        SELECT COUNT(*) AS count FROM drainage_rain_gauge_station
+    <select id="selectRainfallStationCount" parameterType="DrainageRainGaugeStationBO" resultType="map">
+        SELECT COUNT(*) AS count FROM drainage_rain_gauge_station a
+        left join ${database_system}.sys_dept d on a.dept_id = d.dept_id
+       <where>
+           ${params.dataScope}
+       </where>
     </select>
     
     <!-- 统计污水处理厂数量 -->
-    <select id="selectSewageTreatmentPlantCount" resultType="map">
-        SELECT COUNT(*) AS count FROM drainage_sewage_treatment_plants
+    <select id="selectSewageTreatmentPlantCount" parameterType="DrainageSewageTreatmentPlantsBO" resultType="map">
+        SELECT COUNT(*) AS count FROM drainage_sewage_treatment_plants a
+        left join ${database_system}.sys_dept d on a.dept_id = d.dept_id
+       <where>
+           ${params.dataScope}
+       </where>
     </select>
     
     <!-- 统计堤防信息数量 -->
-    <select id="selectDikeInfoCount" resultType="map">
-        SELECT COUNT(*) AS count FROM drainage_embankment
+    <select id="selectDikeInfoCount" parameterType="DrainageEmbankmentBO" resultType="map">
+        SELECT COUNT(*) AS count FROM drainage_embankment a
+        left join ${database_system}.sys_dept d on a.dept_id = d.dept_id
+       <where>
+           ${params.dataScope}
+       </where>
     </select>
     
     <!-- 统计调蓄设施数量 -->
-    <select id="selectStorageFacilityCount" resultType="map">
-        SELECT COUNT(*) AS count FROM drainage_storage_facilities
+    <select id="selectStorageFacilityCount" parameterType="DrainageStorageFacilitiesBO" resultType="map">
+        SELECT COUNT(*) AS count FROM drainage_storage_facilities a
+        left join ${database_system}.sys_dept d on a.dept_id = d.dept_id
+       <where>
+           ${params.dataScope}
+       </where>
     </select>
     
     <!-- 统计供热管线总长度 -->
@@ -548,59 +659,67 @@
         </where>
     </select>
     
-    <!-- 统计换热站数量 -->
-    <select id="selectHeatingHeatExchangeStationCount" resultType="map">
-        SELECT COUNT(*) AS count FROM heating_heat_exchange_station
-    </select>
-    
     <!-- 统计热源厂数量 -->
-    <select id="selectHeatingHeatSourceFactoryCount" resultType="map">
-        SELECT COUNT(*) AS count FROM heating_source_plant
-    </select>
-    
-    <!-- 统计供热窨井数量 -->
-    <select id="selectHeatingManholeCount" resultType="map">
-        SELECT COUNT(*) AS count FROM heating_manhole
+    <select id="selectHeatingHeatSourceFactoryCount" parameterType="HeatingSourcePlantBO" resultType="map">
+        SELECT COUNT(*) AS count FROM heating_source_plant a
+        left join ${database_system}.sys_dept d on a.dept_id = d.dept_id
+       <where>
+           ${params.dataScope}
+       </where>
     </select>
     
     <!-- 统计桥梁基本信息数量 -->
-    <select id="selectBridgeInfoCount" resultType="map">
-        SELECT COUNT(*) AS count FROM bridge_info
+    <select id="selectBridgeInfoCount" parameterType="BridgeInfoBO" resultType="map">
+        SELECT COUNT(*) AS count FROM bridge_info a
+        left join ${database_system}.sys_dept d on a.dept_id = d.dept_id
+       <where>
+           ${params.dataScope}
+       </where>
     </select>
     
     <!-- 统计连跨数量 -->
-    <select id="selectContinuousSpanCount" resultType="map">
-        SELECT COUNT(*) AS count FROM bridge_ally_cross_pier
+    <select id="selectContinuousSpanCount" parameterType="BridgeAllyCrossPierBO" resultType="map">
+        SELECT COUNT(*) AS count FROM bridge_ally_cross_pier a
+        left join ${database_system}.sys_dept d on a.dept_id = d.dept_id
+       <where>
+           ${params.dataScope}
+       </where>
     </select>
     
     <!-- 统计检查病害数量 -->
-    <select id="selectInspectionDiseaseCount" resultType="map">
-        SELECT COUNT(*) AS count FROM bridge_check_disease
-    </select>
-    
-    <!-- 统计桥梁养护维修数量 -->
-    <select id="selectBridgeMaintenanceRepairCount" resultType="map">
-        SELECT COUNT(*) AS count FROM bridge_maintenance_repair
+    <select id="selectInspectionDiseaseCount" parameterType="BridgeCheckDiseaseBO" resultType="map">
+        SELECT COUNT(*) AS count FROM bridge_check_disease a
+        left join ${database_system}.sys_dept d on a.dept_id = d.dept_id
+       <where>
+           ${params.dataScope}
+       </where>
     </select>
     
     <!-- 统计管廊本体数量 -->
-    <select id="selectUtilityTunnelBodyCount" resultType="map">
-        SELECT COUNT(*) AS count FROM utility_tunnel_body_information
-    </select>
-    
-    <!-- 统计管廊设施数量 -->
-    <select id="selectUtilityTunnelFacilityCount" resultType="map">
-        SELECT COUNT(*) AS count FROM utility_tunnel_manhole
+    <select id="selectUtilityTunnelBodyCount" parameterType="UtilityTunnelBodyInformationBO" resultType="map">
+        SELECT COUNT(*) AS count FROM utility_tunnel_body_information a
+        left join ${database_system}.sys_dept d on a.dept_id = d.dept_id
+       <where>
+           ${params.dataScope}
+       </where>
     </select>
     
     <!-- 统计管廊隐患信息数量 -->
-    <select id="selectUtilityTunnelRiskCount" resultType="map">
-        SELECT COUNT(*) AS count FROM utility_tunnel_hiddendanger
+    <select id="selectUtilityTunnelRiskCount" parameterType="UtilityTunnelHiddendangerBO" resultType="map">
+        SELECT COUNT(*) AS count FROM utility_tunnel_hiddendanger a
+        left join ${database_system}.sys_dept d on a.dept_id = d.dept_id
+       <where>
+           ${params.dataScope}
+       </where>
     </select>
     
     <!-- 统计管廊养护维修数量 -->
-    <select id="selectUtilityTunnelMaintenanceCount" resultType="map">
-        SELECT COUNT(*) AS count FROM utility_tunnel_maintenance_repair
+    <select id="selectUtilityTunnelMaintenanceCount" parameterType="UtilityTunnelMaintenanceRepairBO" resultType="map">
+        SELECT COUNT(*) AS count FROM utility_tunnel_maintenancerepair a
+        left join ${database_system}.sys_dept d on a.dept_id = d.dept_id
+       <where>
+           ${params.dataScope}
+       </where>
     </select>
     
     <!-- 按建设年份统计燃气管道数量 -->

src/main/resources/mapper/construction/view/plan/AnnualPlanMapper.xml

@@ -21,13 +21,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <result property="pipelineId" column="related_pipeline_id"/>
             <result property="industryType" column="industry_type"/>
             <result property="pipelineName" column="pipeline_name"/>
+            <result property="smId" column="sm_id"/>
             <result property="createTime" column="pipeline_create_time"/>
         </collection>
     </resultMap>
 
     <sql id="selectAnnualPlanVo">
         select ap.id, ap.annual_title, ap.start_time, ap.end_time, ap.industry, ap.ttachment_url, ap.dept_id, ap.dept_name, ap.remark, ap.status,
-               app.id as pipeline_id, app.pipeline_id as related_pipeline_id, app.industry_type, app.pipeline_name, app.create_time as pipeline_create_time
+               app.id as pipeline_id, app.pipeline_id as related_pipeline_id, app.industry_type, app.pipeline_name, app.sm_id, app.create_time as pipeline_create_time
         from annual_plan ap
         left join annual_plan_pipeline app on ap.id = app.annual_plan_id
     </sql>

src/main/resources/mapper/construction/view/plan/AnnualPlanPipelineMapper.xml

@@ -40,7 +40,7 @@
             <if test="annualPlanId != null">annual_plan_id,</if>
             <if test="pipelineId != null">pipeline_id,</if>
             <if test="industryType != null">industry_type,</if>
-            <if test="pipelineName != null">pipeline_name,</if>
+            <if test="pipelineName != null and pipelineName != ''">pipeline_name,</if>
             <if test="smId != null">sm_id,</if>
             create_time,
         </trim>
@@ -49,7 +49,7 @@
             <if test="annualPlanId != null">#{annualPlanId},</if>
             <if test="pipelineId != null">#{pipelineId},</if>
             <if test="industryType != null">#{industryType},</if>
-            <if test="pipelineName != null">#{pipelineName},</if>
+            <if test="pipelineName != null and pipelineName != ''">#{pipelineName},</if>
             <if test="smId != null">#{smId},</if>
             sysdate(),
         </trim>