From 8b43a416a2bb5188a25bfe0765fa1f42afe8bd23 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期五, 22 三月 2024 10:00:04 +0800
Subject: [PATCH] 设备管理修改

---
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/PrecisionInspection.java                    |    3 +
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/ICalibrationOrderService.java              |   12 ++++
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/CalibrationOrderMapper.xml              |   29 ++++++++-
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceThreeAcceptanceMapper.xml    |    4 +
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PlanChangeApplyController.java          |    4 +
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/CalibrationOrderMapper.java                 |   12 ++++
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/MaintenanceThreeAcceptance.java             |    6 ++
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/CalibrationOrderServiceImpl.java      |   18 ++++++
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/PrecisionInspectionMapper.xml           |    3 
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java         |   72 ++++++++++++++++++++++++
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentMaintenancePlanController.java |    2 
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PrecisionInspectionController.java      |    1 
 12 files changed, 158 insertions(+), 8 deletions(-)

diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java
index dd18a9c..363203b 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java
@@ -1054,6 +1054,78 @@
     }
 
     /**
+     * 宸ユ绾� 涓変繚寤舵湡鏁伴噺
+     * qsw 2024-3-20
+     */
+    @GetMapping("get3MaintenancePostponeCount")
+    public Result<?> get3MaintenancePostponeCount(String productionCode) {
+        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        Integer userType = user.getUserType();
+        List<Map<String, Object>> list = null;
+        if(USER_TYPE_4.equals(userType)){
+            if(StringUtils.isNotBlank(productionCode)){
+                String orgType = calibrationOrderService.findOrgType(productionCode);
+                if(ORG_TYPE_3.equals(orgType)){
+                    Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, productionCode).eq(Area::getType, "3").eq(Area::getDelFlag, 0));
+                    if(area != null){
+                        list = calibrationOrderService.get3MaintenancePostponeCount(area.getId());
+                    }
+                }
+            }
+        }else if(USER_TYPE_3.equals(userType)){
+            if(StringUtils.isNotBlank(productionCode)){
+                Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, productionCode).eq(Area::getType, "3").eq(Area::getDelFlag, 0));
+                if(area != null){
+                    list = calibrationOrderService.get3MaintenancePostponeCount(area.getId());
+                }
+            }
+        }else if(USER_TYPE_2.equals(userType)){
+            String areaProductionCode = calibrationOrderService.findAreaProductionCode(user.getId());
+            Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, areaProductionCode).eq(Area::getType, "3").eq(Area::getDelFlag, 0));
+            if(area != null){
+                list = calibrationOrderService.get3MaintenancePostponeCount(area.getId());
+            }
+        }
+        return Result.ok(list);
+    }
+
+    /**
+     * 宸ユ绾� 涓変繚瓒呮湡鏁伴噺
+     * qsw 2024-3-20
+     */
+    @GetMapping("get3MaintenanceOverdueCount")
+    public Result<?> get3MaintenanceOverdueCount(String productionCode) {
+        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        Integer userType = user.getUserType();
+        List<Map<String, Object>> list = null;
+        if(USER_TYPE_4.equals(userType)){
+            if(StringUtils.isNotBlank(productionCode)){
+                String orgType = calibrationOrderService.findOrgType(productionCode);
+                if(ORG_TYPE_3.equals(orgType)){
+                    Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, productionCode).eq(Area::getType, "3").eq(Area::getDelFlag, 0));
+                    if(area != null){
+                        list = calibrationOrderService.get3MaintenanceOverdueCount(area.getId());
+                    }
+                }
+            }
+        }else if(USER_TYPE_3.equals(userType)){
+            if(StringUtils.isNotBlank(productionCode)){
+                Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, productionCode).eq(Area::getType, "3").eq(Area::getDelFlag, 0));
+                if(area != null){
+                    list = calibrationOrderService.get3MaintenanceOverdueCount(area.getId());
+                }
+            }
+        }else if(USER_TYPE_2.equals(userType)){
+            String areaProductionCode = calibrationOrderService.findAreaProductionCode(user.getId());
+            Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, areaProductionCode).eq(Area::getType, "3").eq(Area::getDelFlag, 0));
+            if(area != null){
+                list = calibrationOrderService.get3MaintenanceOverdueCount(area.getId());
+            }
+        }
+        return Result.ok(list);
+    }
+
+    /**
      *棣栭〉浜屼繚璁″垝灞曠ず
      * qsw 2024-3-15
      */
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentMaintenancePlanController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentMaintenancePlanController.java
index 410cb3d..fbbfa06 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentMaintenancePlanController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentMaintenancePlanController.java
@@ -261,7 +261,7 @@
 		 List<EquipmentMaintenancePlanDetail> equipmentMaintenancePlanDetails = equipmentMaintenancePlanDetailService.selectByMainId(equipmentMaintenancePlan.getId());
          for(EquipmentMaintenancePlanDetail equipmentMaintenancePlanDetail:equipmentMaintenancePlanDetails){
 			 MaintenanceStandard maintenanceStandard = maintenanceStandardService.getById(equipmentMaintenancePlanDetail.getStandardId());
-			 String num = sysIdentityService.getNumByTypeAndLength("DailyMaintenanceOrder",4);
+			 String num = sysIdentityService.getNumByTypeAndLength("MaintenanceOrder",4);
 			 DailyMaintenanceOrder dailyMaintenanceOrder = new DailyMaintenanceOrder();
 			 dailyMaintenanceOrder.setNum(num);
 			 dailyMaintenanceOrder.setEquipmentId(maintenanceStandard.getEquipmentId());
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PlanChangeApplyController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PlanChangeApplyController.java
index ef658b0..7c067b4 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PlanChangeApplyController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PlanChangeApplyController.java
@@ -20,6 +20,7 @@
 import org.jeecg.modules.eam.entity.PlanChangeApply;
 import org.jeecg.modules.eam.service.*;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
@@ -199,6 +200,7 @@
         return super.importExcel(request, response, PlanChangeApply.class);
     }
 	@PostMapping(value = "/addForPlan")
+	@Transactional(rollbackFor = {Exception.class})
 	public Result<String> addForPlan(@RequestBody PlanChangeApply planChangeApply) {
     	DailyMaintenanceOrder dailyMaintenanceOrder = dailyMaintenanceOrderService
 				.getOne(new QueryWrapper<DailyMaintenanceOrder>()
@@ -206,7 +208,7 @@
 						.eq("maintenance_order_uda2",planChangeApply.getId()),false);
     	if(ObjectUtils.isNull(dailyMaintenanceOrder)){
     		return Result.error("灏氭湭鐢熸垚宸ュ崟锛屾棤闇�鐢宠");
-		}else if(!dailyMaintenanceOrder.getStatus().equals(CommonConstant.STATUS_1)){
+		}else if(!dailyMaintenanceOrder.getStatus().equals("3")){
             return Result.error("宸ュ崟宸蹭笅杈句笉鍏佽杩涜鍙樻洿");
 		}
 		maintenancePlanDetailService.update(new UpdateWrapper<EquipmentMaintenancePlanDetail>().eq("id",planChangeApply.getId()).set("plan_start_time",planChangeApply.getPlanDelayTime()));
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PrecisionInspectionController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PrecisionInspectionController.java
index 31ca3f5..538437a 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PrecisionInspectionController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PrecisionInspectionController.java
@@ -248,6 +248,7 @@
 			preInspection.setMeetProcessRequire(precisionInspection.getMeetProcessRequire());
 			preInspection.setSparePart(precisionInspection.getSparePart());
 			preInspection.setUseUnitDirectorUser(userId);
+			preInspection.setMeetProcessRequireRemark(precisionInspection.getMeetProcessRequireRemark());
 
 			maintenanceOrder.setPrecisionInspectionStatus("4");
 		}else if("4".equals(precisionInspectionStatus)){
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/MaintenanceThreeAcceptance.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/MaintenanceThreeAcceptance.java
index f548424..cfbc3e5 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/MaintenanceThreeAcceptance.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/MaintenanceThreeAcceptance.java
@@ -53,10 +53,16 @@
 	@Excel(name = "绗竴娆℃", width = 15)
     @ApiModelProperty(value = "绗竴娆℃")
     private java.lang.String firstInspect;
+    @Excel(name = "绗竴娆℃鏈�氳繃鍘熷洜", width = 15)
+    @ApiModelProperty(value = "绗竴娆℃鏈�氳繃鍘熷洜")
+    private java.lang.String firstNotPass;
 	/**绗簩娆℃*/
 	@Excel(name = "绗簩娆℃", width = 15)
     @ApiModelProperty(value = "绗簩娆℃")
     private java.lang.String secondInspect;
+    @Excel(name = "绗簩娆℃鏈�氳繃鍘熷洜", width = 15)
+    @ApiModelProperty(value = "绗簩娆℃鏈�氳繃鍘熷洜")
+    private java.lang.String secondNotPass;
 	/**delFlag*/
 	@Excel(name = "delFlag", width = 15)
     @ApiModelProperty(value = "delFlag")
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/PrecisionInspection.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/PrecisionInspection.java
index 79a45b8..3aa8ed9 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/PrecisionInspection.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/PrecisionInspection.java
@@ -84,6 +84,9 @@
 	@Excel(name = "鑳藉惁婊¤冻鍔犲伐宸ヨ壓瑕佹眰", width = 15)
     @ApiModelProperty(value = "鑳藉惁婊¤冻鍔犲伐宸ヨ壓瑕佹眰")
     private Integer meetProcessRequire;
+    @Excel(name = "鑳藉惁婊¤冻鍔犲伐宸ヨ壓瑕佹眰璇存槑", width = 15)
+    @ApiModelProperty(value = "鑳藉惁婊¤冻鍔犲伐宸ヨ壓瑕佹眰璇存槑")
+    private String meetProcessRequireRemark;
 	/**浣跨敤鍗曚綅鎶�鏈富绠�*/
 	@Excel(name = "浣跨敤鍗曚綅鎶�鏈富绠�", width = 15)
     @ApiModelProperty(value = "浣跨敤鍗曚綅鎶�鏈富绠�")
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/CalibrationOrderMapper.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/CalibrationOrderMapper.java
index aef2081..1d3b23b 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/CalibrationOrderMapper.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/CalibrationOrderMapper.java
@@ -120,6 +120,18 @@
     List<Map<String, Object>> getThisMonthMaintenanceFinishList(@Param("workCenterId")String workCenterId,@Param("areaId")String areaId);
 
     /**
+     *宸ユ绾� 鏈湀涓変繚寤舵湡鏁伴噺
+     * qsw 2024-3-20
+     */
+    List<Map<String, Object>> get3MaintenancePostponeCount(@Param("areaId")String areaId);
+
+    /**
+     *宸ユ绾� 鏈湀涓変繚瓒呮湡鏁伴噺
+     * qsw 2024-3-20
+     */
+    List<Map<String, Object>> get3MaintenanceOverdueCount(@Param("areaId")String areaId);
+
+    /**
      *棣栭〉浜岀骇淇濆吇灞曠ず椤甸潰 鑾峰彇姣忎竴涓腑蹇冧笅浜岀骇淇濆吇璁″垝
      * qsw 2024-3-15
      */
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/CalibrationOrderMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/CalibrationOrderMapper.xml
index aaaeb4b..b0fea68 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/CalibrationOrderMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/CalibrationOrderMapper.xml
@@ -70,8 +70,8 @@
     </select>
 
     <select id="getFactoryThisMonthMaintenanceFinishList"  parameterType="String" resultType="Map">
-        select count(0) as totalCount from 	mom_eam_daily_maintenance_order t1 left join mom_eam_equipment t2 on t1.equipment_id = t2.id
-        where t1.del_flag = '0' and t1.status = '5' and  SUBSTRING(CONVERT(VARCHAR(10), t1.actual_end_time, 120), 1, 7) = SUBSTRING(CONVERT(VARCHAR(10), GETDATE(), 120), 1, 7)
+        select count(0) as totalCount from 	mom_eam_daily_maintenance_order t1 left join mom_eam_equipment t2 on t1.equipment_id = t2.id left join mom_eam_maintenance_cycle t4 on t1.maintenance_cycle_id = t4.id
+        where t1.del_flag = '0' and t1.status = '5' and t4.maintenance_type = '3' and  SUBSTRING(CONVERT(VARCHAR(10), t1.actual_end_time, 120), 1, 7) = SUBSTRING(CONVERT(VARCHAR(10), GETDATE(), 120), 1, 7)
     </select>
 
     <select id="getEquipmentTechnologyStatusList"  parameterType="String" resultType="Map">
@@ -101,8 +101,29 @@
     </select>
 
     <select id="getThisMonthMaintenanceFinishList"  parameterType="String" resultType="Map">
-        select count(0) as totalCount from 	mom_eam_daily_maintenance_order t1 left join mom_eam_equipment t2 on t1.equipment_id = t2.id
-        where t1.del_flag = '0' and t1.status = '5' and  SUBSTRING(CONVERT(VARCHAR(10), t1.actual_end_time, 120), 1, 7) = SUBSTRING(CONVERT(VARCHAR(10), GETDATE(), 120), 1, 7)   <if test="workCenterId != null and workCenterId != ''"> and t2.work_center_id = #{workCenterId} </if> <if test="areaId != null and areaId != ''"> and t2.area_id = #{areaId} </if>
+        select count(0) as totalCount from 	mom_eam_daily_maintenance_order t1 left join mom_eam_equipment t2 on t1.equipment_id = t2.id left join mom_eam_maintenance_cycle t4 on t1.maintenance_cycle_id = t4.id
+        where t1.del_flag = '0' and t1.status = '5' and t4.maintenance_type = '3' and  SUBSTRING(CONVERT(VARCHAR(10), t1.actual_end_time, 120), 1, 7) = SUBSTRING(CONVERT(VARCHAR(10), GETDATE(), 120), 1, 7)   <if test="workCenterId != null and workCenterId != ''"> and t2.work_center_id = #{workCenterId} </if> <if test="areaId != null and areaId != ''"> and t2.area_id = #{areaId} </if>
+    </select>
+
+    <select id="get3MaintenancePostponeCount"  parameterType="String" resultType="Map">
+        select count(0) as totalCount from (select DISTINCT  t2.id  from mom_eam_plan_change_apply t1 left join mom_eam_equipment t2 on t1.equipment_id = t2.id
+        where  SUBSTRING(CONVERT(VARCHAR(10), t2.next_third_maintenance_time, 120), 1, 7) = SUBSTRING(CONVERT(VARCHAR(10), GETDATE(), 120), 1, 7)  and t2.area_id = #{areaId} ) t4
+    </select>
+
+    <select id="get3MaintenanceOverdueCount"  parameterType="String" resultType="Map">
+        SELECT
+            count(0) as totalCount
+        FROM
+            mom_eam_daily_maintenance_order t1
+        LEFT JOIN mom_eam_equipment t2 ON t1.equipment_id = t2.id
+        left join mom_eam_maintenance_cycle t4 on t1.maintenance_cycle_id = t4.id
+        WHERE
+            t1.del_flag = '0'
+            and t1.status = '3'
+            and t4.maintenance_type = '3'
+            and SUBSTRING(CONVERT(VARCHAR(10), t1.plan_start_time, 120), 1, 10) &lt; SUBSTRING(CONVERT(VARCHAR(10), GETDATE(), 120), 1, 10)
+            and SUBSTRING(CONVERT(VARCHAR(10), t2.next_third_maintenance_time, 120), 1, 10) = SUBSTRING(CONVERT(VARCHAR(10), GETDATE(), 120), 1, 10)
+            <if test="areaId != null and areaId != ''"> and t2.area_id = #{areaId} </if>
     </select>
 
     <select id="getCenterTwoMaintenancePlanList"  parameterType="String" resultType="Map">
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceThreeAcceptanceMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceThreeAcceptanceMapper.xml
index 03b3e57..a010f67 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceThreeAcceptanceMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceThreeAcceptanceMapper.xml
@@ -11,7 +11,9 @@
 	        t3.name AS content,
 	        t3.standard,
 	        t4.first_inspect AS firstInspect,
-	        t4.second_inspect AS secondInspect
+	        t4.first_not_pass AS firstNotPass,
+	        t4.second_inspect AS secondInspect,
+            t4.second_not_pass as secondNotPass
         FROM
             mom_eam_daily_maintenance_order_detail t1
             LEFT JOIN mom_eam_maintenance_standard_detail t2 ON t1.maintenance_standard_detail_id = t2.id
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/PrecisionInspectionMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/PrecisionInspectionMapper.xml
index 9d5059c..b00c034 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/PrecisionInspectionMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/PrecisionInspectionMapper.xml
@@ -16,8 +16,9 @@
             ISNULL(t1.each_tolerance,'0') AS eachTolerance,
             ISNULL(t1.part_tolerance,'0')  AS partTolerance,
             ISNULL(t1.process_pass,'0') AS processPass,
-            ISNULL(t1.meet_process_require,'0') AS meetProcessRequire,
             ISNULL(t1.judgment_result,'qualified') AS judgmentResult,
+            t1.meet_process_require AS meetProcessRequire,
+            t1.meet_process_require_remark AS meetProcessRequireRemark,
             t1.remark,
             t8.name AS equipmentName,
             t8.model AS equipmentModel,
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/ICalibrationOrderService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/ICalibrationOrderService.java
index 6cdb187..30afc5e 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/ICalibrationOrderService.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/ICalibrationOrderService.java
@@ -151,6 +151,18 @@
     List<Map<String, Object>> getThisMonthMaintenanceFinishList(String workCenterId,String areaId);
 
     /**
+     *宸ユ绾� 鏈湀涓変繚寤舵湡鏁伴噺
+     * qsw 2024-3-20
+     */
+    List<Map<String, Object>> get3MaintenancePostponeCount(String areaId);
+
+    /**
+     *宸ユ绾� 鏈湀涓変繚瓒呮湡鏁伴噺
+     * qsw 2024-3-20
+     */
+    List<Map<String, Object>> get3MaintenanceOverdueCount(String areaId);
+
+    /**
      *棣栭〉浜屼繚璁″垝灞曠ず
      * qsw 2024-3-15
      */
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/CalibrationOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/CalibrationOrderServiceImpl.java
index 14043df..13ad3d5 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/CalibrationOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/CalibrationOrderServiceImpl.java
@@ -257,6 +257,24 @@
     }
 
     /**
+     *宸ユ绾� 鏈湀涓変繚寤舵湡鏁伴噺
+     * qsw 2024-3-20
+     */
+    @Override
+    public List<Map<String, Object>> get3MaintenancePostponeCount(String areaId) {
+        return this.baseMapper.get3MaintenancePostponeCount(areaId);
+    }
+
+    /**
+     *宸ユ绾� 鏈湀涓変繚瓒呮湡鏁伴噺
+     * qsw 2024-3-20
+     */
+    @Override
+    public List<Map<String, Object>> get3MaintenanceOverdueCount(String areaId) {
+        return this.baseMapper.get3MaintenanceOverdueCount(areaId);
+    }
+
+    /**
      *棣栭〉浜屼繚璁″垝灞曠ず
      * qsw 2024-3-15
      */

--
Gitblit v1.9.3