From 4f2c9b54c8d0f358f3b7c6821f091a493b24e006 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 02 十二月 2025 11:16:53 +0800
Subject: [PATCH] 配置新增以及bug修改
---
ycl-server/src/main/java/com/ycl/platform/mapper/DemeritRecordMapper.java | 12 +++
ycl-server/src/main/java/com/ycl/calculate/MonitorQualifyCalculation.java | 11 +-
ycl-server/src/main/resources/mapper/zgyw/DemeritRecordMapper.xml | 6 +
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java | 76 +++++++++++++++++-
ycl-server/src/main/resources/application-dev.yml | 18 +++
ycl-server/src/main/java/com/ycl/task/UYTask.java | 4 +
ycl-server/src/main/java/com/ycl/platform/mapper/DailyMonitorDemeritRecordMapper.java | 12 +-
ycl-server/src/main/java/com/ycl/platform/service/impl/CheckTemplateServiceImpl.java | 15 +++
ycl-server/src/main/java/com/ycl/platform/service/impl/DailyMonitorDemeritRecordServiceImpl.java | 4
ycl-server/src/main/resources/mapper/zgyw/DailyMonitorDemeritRecordMapper.xml | 10 ++
ycl-server/src/main/java/com/ycl/task/DemeritRecordTask.java | 24 +++--
11 files changed, 157 insertions(+), 35 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/calculate/MonitorQualifyCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/MonitorQualifyCalculation.java
index 0ccc36b..256f498 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/MonitorQualifyCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/MonitorQualifyCalculation.java
@@ -10,10 +10,8 @@
import utils.DateUtils;
import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
/**
* 璁＄畻涓�鏈轰竴妗ｅ悎鏍肩巼
@@ -39,8 +37,11 @@
@Override
public void calculate(List<MonitorQualifyResult> list) {
+ List<MonitorQualifyResult> validList = list.stream()
+ .filter(Objects::nonNull) // 杩囨护闆嗗悎涓殑 null 鍏冪礌
+ .collect(Collectors.toList());
//鑾峰彇鍒嗗尯鍩熺殑鎸囨爣鏁伴噺
- Map<String, MonitorQualifyCalculation.AreaStats> areaStatsMap = getAreaStatsMap(list,Boolean.TRUE);
+ Map<String, MonitorQualifyCalculation.AreaStats> areaStatsMap = getAreaStatsMap(validList,Boolean.TRUE);
if (areaStatsMap == null) return;
// 鏌ヨ鏄惁index琛ㄥ凡缁忓瓨鍦ㄤ粖鏃ユ暟鎹�
diff --git a/ycl-server/src/main/java/com/ycl/system/mapper/DailyMonitorDemeritRecordMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/DailyMonitorDemeritRecordMapper.java
similarity index 60%
rename from ycl-server/src/main/java/com/ycl/system/mapper/DailyMonitorDemeritRecordMapper.java
rename to ycl-server/src/main/java/com/ycl/platform/mapper/DailyMonitorDemeritRecordMapper.java
index 2fb8ddf..88fad05 100644
--- a/ycl-server/src/main/java/com/ycl/system/mapper/DailyMonitorDemeritRecordMapper.java
+++ b/ycl-server/src/main/java/com/ycl/platform/mapper/DailyMonitorDemeritRecordMapper.java
@@ -1,12 +1,12 @@
-package com.ycl.system.mapper;
+package com.ycl.platform.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ycl.platform.domain.entity.DailyMonitorDemeritRecord;
-import com.ycl.platform.domain.form.DailyMonitorDemeritRecordForm;
-import com.ycl.system.Result;
-import jakarta.servlet.http.HttpServletResponse;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
/**
* zgyw
@@ -16,6 +16,8 @@
**/
@Mapper
public interface DailyMonitorDemeritRecordMapper extends BaseMapper<DailyMonitorDemeritRecord> {
-
+ int deleteByDailyRecord(@Param("startTime") Date startTime,
+ @Param("endTime") Date endTime
+ );
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/DemeritRecordMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/DemeritRecordMapper.java
index baf2934..8b0a15b 100644
--- a/ycl-server/src/main/java/com/ycl/platform/mapper/DemeritRecordMapper.java
+++ b/ycl-server/src/main/java/com/ycl/platform/mapper/DemeritRecordMapper.java
@@ -8,8 +8,20 @@
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
+import java.util.Date;
+
@Mapper
public interface DemeritRecordMapper extends BaseMapper<DemeritRecord> {
IPage<DemeritRecordVO> getPage(@Param("query") DemeritRecordQuery query, IPage<DemeritRecordVO> page);
+
+ /**
+ * 鎸夋椂闂存鐗╃悊鍒犻櫎璁板綍锛堝垎鎵癸級
+ * @param startTime 寮�濮嬫椂闂�
+ * @param endTime 缁撴潫鏃堕棿
+ * @return 鍒犻櫎鐨勮褰曟暟
+ */
+ int deleteByTimeRange(@Param("startTime") Date startTime,
+ @Param("endTime") Date endTime
+ );
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckTemplateServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckTemplateServiceImpl.java
index 1deba5d..5e6cbe2 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckTemplateServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckTemplateServiceImpl.java
@@ -166,7 +166,18 @@
checkTemplateMapper.updateCheckTemplate(checkTemplate);
return i;
}
-
+ public static BigDecimal safeConvert(String str) {
+ // 澶勭悊绌哄��/绌哄瓧绗︿覆
+ if (str == null || str.trim().isEmpty()) {
+ return BigDecimal.ZERO;
+ }
+ try {
+ return new BigDecimal(str.trim());
+ } catch (NumberFormatException e) {
+ System.out.println("瀛楃涓叉牸寮忛潪娉曪紝鏃犳硶杞负BigDecimal锛�" + str);
+ return BigDecimal.ZERO;
+ }
+ }
/**
* 淇敼鑰冩牳妯℃澘
*
@@ -178,6 +189,8 @@
public AjaxResult updateCheckTemplate(CheckTemplateQuery checkTemplateDTO) throws SchedulerException, TaskException {
CheckTemplate checkTemplate = new CheckTemplate();
BeanUtils.copyProperties(checkTemplateDTO, checkTemplate);
+ BigDecimal bigDecimal = safeConvert(checkTemplateDTO.getAlarmScore());
+ checkTemplate.setAlarmScore(bigDecimal);
checkTemplate.setUpdateUserName(SecurityUtils.getUsername());
List<Integer> deptId = checkTemplateDTO.getDeptId();
Collections.sort(deptId);
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/DailyMonitorDemeritRecordServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/DailyMonitorDemeritRecordServiceImpl.java
index c3e93de..8f96017 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/DailyMonitorDemeritRecordServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/DailyMonitorDemeritRecordServiceImpl.java
@@ -6,12 +6,10 @@
import com.ycl.platform.domain.entity.DailyMonitorDemeritRecord;
import com.ycl.platform.domain.entity.DemeritRecord;
-import com.ycl.platform.domain.entity.MonitorConstruction;
import com.ycl.platform.domain.excel.DailyMonitorDemeritRecordExp;
import com.ycl.platform.service.IDailyMonitorDemeritRecordService;
import com.ycl.platform.service.IDemeritRecordService;
-import com.ycl.platform.service.IMonitorConstructionService;
-import com.ycl.system.mapper.DailyMonitorDemeritRecordMapper;
+import com.ycl.platform.mapper.DailyMonitorDemeritRecordMapper;
import com.ycl.utils.DateUtils;
import enumeration.ConstructionTypeEnum;
import enumeration.general.AreaDeptEnum;
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
index b076099..67a7431 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
@@ -150,14 +150,76 @@
List<String> serialNumberList = workOrderList.stream().map(WorkOrder::getSerialNumber).collect(Collectors.toList());
// 鏌ュ嚭鏁版嵁搴撲腑鍥芥爣鐮佸搴旂殑鏈畬鎴愮殑宸ュ崟
List<WorkOrder> inDatabaseWorkOrderList = baseMapper.getNotFinishedWorkOrders(serialNumberList);
- inDatabaseWorkOrderList.stream().forEach(item -> {
- if (StringUtils.hasText(item.getErrorType())) {
- item.setErrorTypeList(List.of(item.getErrorType().split(",")));
+ log.info("鎵撳嵃鍑篿nDatabaseWorkOrderList:{}",inDatabaseWorkOrderList);
+
+ // 2. 鎸� serialNumber 鍒嗙粍锛屽悎骞堕敊璇被鍨�
+ Map<String, WorkOrder> mergedWorkOrders = new LinkedHashMap<>();
+
+ for (WorkOrder order : inDatabaseWorkOrderList) {
+ String serialNumber = order.getSerialNumber();
+
+ if (mergedWorkOrders.containsKey(serialNumber)) {
+ // 濡傛灉搴忓垪鍙峰凡瀛樺湪锛屽悎骞堕敊璇被鍨�
+ WorkOrder existingOrder = mergedWorkOrders.get(serialNumber);
+ //鍒ゆ柇鏃堕棿鍏堝悗
+ boolean isExistingNewer = existingOrder.getCreateTime() != null &&
+ order.getCreateTime() != null &&
+ existingOrder.getCreateTime().after(order.getCreateTime());
+
+ WorkOrder latestOrder = isExistingNewer ? existingOrder : order;
+ WorkOrder olderOrder = isExistingNewer ? order : existingOrder;
+
+ List<String> latestErrorTypes = latestOrder.getErrorTypeList() != null
+ ? new ArrayList<>(latestOrder.getErrorTypeList())
+ : new ArrayList<>();
+
+ if (StringUtils.hasText(olderOrder.getErrorType())) {
+ List<String> olderErrorTypes = Arrays.asList(olderOrder.getErrorType().split(","));
+ latestErrorTypes.addAll(olderErrorTypes);
+ }
+
+ // 鍘婚噸骞舵洿鏂伴敊璇被鍨�
+ List<String> uniqueErrorTypes = latestErrorTypes.stream()
+ .distinct()
+ .collect(Collectors.toList());
+
+ latestOrder.setErrorTypeList(uniqueErrorTypes);
+ latestOrder.setErrorType(String.join(",", uniqueErrorTypes));
+
+ // 鏇存柊Map涓殑宸ュ崟涓烘渶鏂扮殑宸ュ崟
+ mergedWorkOrders.put(serialNumber, latestOrder);
+
+
+
} else {
- item.setErrorTypeList(new ArrayList<>(1));
+ // 濡傛灉搴忓垪鍙蜂笉瀛樺湪锛屽垵濮嬪寲閿欒绫诲瀷鍒楄〃骞舵坊鍔犲埌Map
+ if (StringUtils.hasText(order.getErrorType())) {
+ order.setErrorTypeList(Arrays.asList(order.getErrorType().split(",")));
+ } else {
+ order.setErrorTypeList(new ArrayList<>(1));
+ }
+ mergedWorkOrders.put(serialNumber, order);
}
- });
- Map<String, WorkOrder> mapping = inDatabaseWorkOrderList.stream().collect((Collectors.toMap(WorkOrder::getSerialNumber, workOrder -> workOrder)));
+ }
+ log.info("鎵撳嵃鍑簃ergedWorkOrders鍚堝苟鍚�:{}",inDatabaseWorkOrderList);
+// 3. 鑾峰彇鍚堝苟鍚庣殑宸ュ崟鍒楄〃锛堜繚鎸侀『搴忥級
+// List<WorkOrder> finalWorkOrderList = new ArrayList<>(mergedWorkOrders.values());
+
+
+// Map<String, WorkOrder> mapping = null;
+// try {
+// mapping = finalWorkOrderList.stream()
+// .collect(Collectors.toMap(WorkOrder::getSerialNumber, workOrder -> workOrder));
+// } catch (IllegalStateException e) {
+// // 鎹曡幏閿噸澶嶅紓甯�
+// System.err.println("閿欒锛氬彂鐜伴噸澶嶇殑搴忓垪鍙凤紝鏃犳硶鍒涘缓鏄犲皠");
+// System.err.println("寮傚父璇︽儏锛�" + e.getMessage());
+//
+// // 鍙�夛細浣犲彲浠ュ湪杩欓噷澶勭悊寮傚父锛屾瘮濡傝繑鍥炰竴涓┖Map鎴栬�呬娇鐢ㄥ鐢ㄧ瓥鐣�
+// // 鏂规1锛氳繑鍥炵┖Map
+// mapping = new HashMap<>(); // Java 9+
+//
+// }
List<WorkOrder> waitAddList = new ArrayList<>(48);
List<WorkOrderErrorType> waitAddErrorTypeList = new ArrayList<>(48);
Integer updateNum = 0;
@@ -169,7 +231,7 @@
// 鍗冲皢瑕佹坊鍔犵殑閿欒绫诲瀷
List<WorkOrderErrorType> willAddErrorType = new ArrayList<>(96);
for (WorkOrder workOrder : workOrderList) {
- WorkOrder databaseWorkOrder = mapping.get(workOrder.getSerialNumber());
+ WorkOrder databaseWorkOrder = mergedWorkOrders.get(workOrder.getSerialNumber());
if (Objects.nonNull(databaseWorkOrder)) {
//鍒ゆ柇鏄惁鏄粖澶╃殑宸ュ崟
if (!isSameDay(databaseWorkOrder.getCreateTime(), now)) {
diff --git a/ycl-server/src/main/java/com/ycl/task/DemeritRecordTask.java b/ycl-server/src/main/java/com/ycl/task/DemeritRecordTask.java
index 65b5892..80ebda0 100644
--- a/ycl-server/src/main/java/com/ycl/task/DemeritRecordTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/DemeritRecordTask.java
@@ -9,6 +9,7 @@
import com.ycl.platform.domain.entity.MonitorConstruction;
import com.ycl.platform.domain.entity.Report;
import com.ycl.platform.domain.result.UY.RecordMetaDSumResult;
+import com.ycl.platform.mapper.DailyMonitorDemeritRecordMapper;
import com.ycl.platform.mapper.DemeritRecordMapper;
import com.ycl.platform.mapper.IMonitorConstructionMapper;
import com.ycl.platform.mapper.ReportMapper;
@@ -56,7 +57,11 @@
private final IMonitorConstructionMapper monitorConstructionMapper;
- private final IDailyMonitorDemeritRecordService dailyMonitorDemeritRecordService;
+ private final DailyMonitorDemeritRecordMapper dailyMonitorDemeritRecordMapper;
+
+ private final DemeritRecordMapper demeritRecordMapper;
+
+
private static final ExecutorService executorService = new ThreadPoolExecutor(16,
128,
@@ -373,19 +378,16 @@
}
//澶勭悊瀹屾暟鎹彃鍏ユ暟鎹簱涓�
- //鍏堝垹闄ら渶瑕佹彃鍏ユ椂闂存槸鍚﹀瓨鍦ㄦ暟鎹�
- LambdaQueryWrapper<DemeritRecord> demeritRecordLambdaQueryWrapper = new LambdaQueryWrapper<>();
- demeritRecordLambdaQueryWrapper.ge(DemeritRecord::getCreateTime,DateUtils.getDayStart(today))
- .le(DemeritRecord::getCreateTime,DateUtils.getDayEnd(today));
- demeritRecordService.remove(demeritRecordLambdaQueryWrapper);
+ demeritRecordMapper.deleteByTimeRange(DateUtils.getDayStart(today),DateUtils.getDayEnd(today));
+ // 鐗╃悊鍒犻櫎
+
demeritRecordService.saveBatch(demeritRecords);
log.info("缁撴潫璁＄畻姣忔棩鎵ｅ垎璁板綍鎯呭喌锛氭彃鍏ユ暟鎹噺{},鏁版嵁淇℃伅:{}",demeritRecords.size(),demeritRecords);
- //濉厖璁惧褰曞儚鎯呭喌鎵ｅ垎璇︽儏缁撴灉
- LambdaQueryWrapper<DailyMonitorDemeritRecord> dailyMonitorDemeritRecordLambdaQueryWrapper = new LambdaQueryWrapper<>();
- dailyMonitorDemeritRecordLambdaQueryWrapper.ge(DailyMonitorDemeritRecord::getCreateTime,DateUtils.getDayStart(today))
- .le(DailyMonitorDemeritRecord::getCreateTime,DateUtils.getDayEnd(today));
- iDailyMonitorDemeritRecordService.remove(dailyMonitorDemeritRecordLambdaQueryWrapper);
+
+ dailyMonitorDemeritRecordMapper.deleteByDailyRecord(DateUtils.getDayStart(today),DateUtils.getDayEnd(today));
+ // 鐗╃悊鍒犻櫎
+
iDailyMonitorDemeritRecordService.saveBatch(dailyMonitorDemeritRecords);
log.info("缁撴潫璁＄畻姣忔棩鎵ｅ垎璁板綍璇︽儏鎯呭喌锛氭彃鍏ユ暟鎹噺{},鏁版嵁淇℃伅:{}",dailyMonitorDemeritRecords.size(),dailyMonitorDemeritRecords);
diff --git a/ycl-server/src/main/java/com/ycl/task/UYTask.java b/ycl-server/src/main/java/com/ycl/task/UYTask.java
index 295ecff..a8cd560 100644
--- a/ycl-server/src/main/java/com/ycl/task/UYTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/UYTask.java
@@ -194,6 +194,10 @@
}
// 鍏堟煡鍑鸿澶嘔P闆嗗悎,鍓旈櫎鎺夊湪绾挎儏鍐垫槸鏈煡鐨�,骞朵笖鍙娴嬫鍦ㄨ�冩牳鐨勮澶囬伩鍏嶅浣欏伐鍗�
+ // Todo
+ // 1.涓埆褰曞儚涓嶅瓨鍦ㄦ槸鍚︽槸鍥犲洜涓虹偣浣嶅悓姝ヤ紭浜戝悗锛屼竴閮ㄥ垎鐐逛綅琚敼涓轰簡鏈湪杩愯惀鑼冨洿鐨勫師鍥狅紝
+ // 2.瀵艰嚧pingOnline鏃舵煡璇㈣繍缁寸偣浣嶈幏寰梚p鏃朵笉鍖呭惈鍦ㄥ唴锛屽鑷存病鏈夊搴旇澶囩殑鏁版嵁
+ // 3.褰撳墠闂鏆傛棤鑳借В鍐崇殑鏂规硶锛�
List<TMonitorResult> monitorList = monitorMapper.getDistinctIP();
//琛ュ厖閿欒鏃堕棿鐐�
Query onlineQuery = new Query(Criteria.where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
diff --git a/ycl-server/src/main/resources/application-dev.yml b/ycl-server/src/main/resources/application-dev.yml
index 0d3752e..226682f 100644
--- a/ycl-server/src/main/resources/application-dev.yml
+++ b/ycl-server/src/main/resources/application-dev.yml
@@ -37,15 +37,26 @@
spring:
# 鏁版嵁婧愰厤缃�
datasource:
-# url: jdbc:mysql://101.35.247.188:3306/zgyw?useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&rewriteBatchedStatements=true&allowMultiQueries=true&allowPublicKeyRetrieval=true
+ # url: jdbc:mysql://101.35.247.188:3306/zgyw?useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&rewriteBatchedStatements=true&allowMultiQueries=true&allowPublicKeyRetrieval=true
# username: root
# password: ycl@202466
- url: jdbc:mysql://localhost:3306/zgyw?useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&rewriteBatchedStatements=true&allowMultiQueries=true&allowPublicKeyRetrieval=true
+ url: jdbc:mysql://localhost:3306/zgyw?useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&rewriteBatchedStatements=true&allowMultiQueries=true&allowPublicKeyRetrieval=true&connectTimeout=60000&socketTimeout=120000&keepAlive=true&keepAliveInterval=60000
username: root
password: 123456
type: com.alibaba.druid.pool.DruidDataSource
driver-class-name: com.mysql.cj.jdbc.Driver
+ druid:
+ initial-size: 5 # 鍒濆鍖栬繛鎺ユ暟
+ min-idle: 5 # 鏈�灏忕┖闂茶繛鎺ユ暟
+ max-active: 20 # 鏈�澶ф椿璺冭繛鎺ユ暟
+ max-wait: 60000 # 鑾峰彇杩炴帴鐨勬渶澶х瓑寰呮椂闂�(ms)
+ time-between-eviction-runs-millis: 60000
+ min-evictable-idle-time-millis: 300000
+ validation-query: SELECT 1
+ test-while-idle: true
+ test-on-borrow: true
+ test-on-return: false
jpa:
show-sql: true
generate-ddl: true
@@ -85,7 +96,8 @@
# 绔彛锛岄粯璁や负6379
port: 6379
# password: ycl2018
- password: 123456
+# password: 123456
+ password:
# 鏁版嵁搴撶储寮�
database: 0
# 瀵嗙爜(濡傛病鏈夊瘑鐮佽娉ㄩ噴鎺�)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/DailyMonitorDemeritRecordMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/DailyMonitorDemeritRecordMapper.xml
new file mode 100644
index 0000000..3ef2028
--- /dev/null
+++ b/ycl-server/src/main/resources/mapper/zgyw/DailyMonitorDemeritRecordMapper.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ycl.platform.mapper.DailyMonitorDemeritRecordMapper">
+
+ <delete id="deleteByDailyRecord">
+ DELETE FROM t_daily_monitor_demerit_record
+ WHERE create_time BETWEEN #{startTime} AND #{endTime}
+ </delete>
+
+</mapper>
diff --git a/ycl-server/src/main/resources/mapper/zgyw/DemeritREcordMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/DemeritRecordMapper.xml
similarity index 92%
rename from ycl-server/src/main/resources/mapper/zgyw/DemeritREcordMapper.xml
rename to ycl-server/src/main/resources/mapper/zgyw/DemeritRecordMapper.xml
index 47a10cd..9878142 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/DemeritREcordMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/DemeritRecordMapper.xml
@@ -11,6 +11,12 @@
<result property="constructionType" column="construction_type"/>
</resultMap>
+ <delete id="deleteByTimeRange">
+ DELETE FROM t_demerit_record
+ WHERE create_time BETWEEN #{startTime} AND #{endTime}
+ </delete>
+
+
<select id="getPage" resultMap="baseResult">
select
--
Gitblit v1.8.0