diff --git a/os-ems/src/main/java/com/os/ems/info/service/ICommonClearService.java b/os-ems/src/main/java/com/os/ems/info/service/ICommonClearService.java index ea90507..e96c31d 100644 --- a/os-ems/src/main/java/com/os/ems/info/service/ICommonClearService.java +++ b/os-ems/src/main/java/com/os/ems/info/service/ICommonClearService.java @@ -15,13 +15,4 @@ public interface ICommonClearService * @return 删除的记录数 */ public int clearTableData(String tableName); - - /** - * 清空指定表的所有数据（支持级联删除） - * - * @param tableName 主表名 - * @param moduleKey 业务模块标识 - * @return 删除的记录数 - */ - public int clearTableDataWithCascade(String tableName, String moduleKey); } \ No newline at end of file diff --git a/os-ems/src/main/java/com/os/ems/info/service/impl/CommonClearServiceImpl.java b/os-ems/src/main/java/com/os/ems/info/service/impl/CommonClearServiceImpl.java index 4ab012b..928fcf9 100644 --- a/os-ems/src/main/java/com/os/ems/info/service/impl/CommonClearServiceImpl.java +++ b/os-ems/src/main/java/com/os/ems/info/service/impl/CommonClearServiceImpl.java @@ -33,36 +33,4 @@ public class CommonClearServiceImpl implements ICommonClearService // 表名已在Controller层通过白名单验证，这里直接执行 return commonClearMapper.clearTableData(tableName); } - - /** - * 清空指定表的所有数据（支持级联删除） - * 使用事务确保数据一致性 - * - * @param tableName 主表名 - * @param moduleKey 业务模块标识 - * @return 删除的记录数 - */ - @Override - @Transactional(rollbackFor = Exception.class) - public int clearTableDataWithCascade(String tableName, String moduleKey) - { - int totalDeleted = 0; - - // 根据模块标识进行特殊处理 - if ("sparePartsInventory".equals(moduleKey)) { - // 备件库记录：先删除明细表，再删除主表 - // 1. 删除备件盘点记录明细表 - int detailDeleted = commonClearMapper.clearTableData("spare_parts_inventory_check"); - totalDeleted += detailDeleted; - - // 2. 删除备件库记录主表 - int mainDeleted = commonClearMapper.clearTableData("spare_parts_inventory"); - totalDeleted += mainDeleted; - - return totalDeleted; - } else { - // 其他模块使用普通删除 - return commonClearMapper.clearTableData(tableName); - } - } } \ No newline at end of file diff --git a/os-ems/src/main/resources/mapper/ems/info/DailyFaultRecordMapper.xml b/os-ems/src/main/resources/mapper/ems/info/DailyFaultRecordMapper.xml index 75affb3..7360347 100644 --- a/os-ems/src/main/resources/mapper/ems/info/DailyFaultRecordMapper.xml +++ b/os-ems/src/main/resources/mapper/ems/info/DailyFaultRecordMapper.xml @@ -26,7 +26,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - and fault_date like concat('%', #{faultDate}, '%') + + + + + + and STR_TO_DATE(fault_date, '%Y/%m/%d') BETWEEN STR_TO_DATE(#{params.beginDate}, '%Y/%m/%d') AND STR_TO_DATE(#{params.endDate}, '%Y/%m/%d') + + + and STR_TO_DATE(fault_date, '%Y/%m/%d') >= STR_TO_DATE(#{params.beginDate}, '%Y/%m/%d') + + + and STR_TO_DATE(fault_date, '%Y/%m/%d') <= STR_TO_DATE(#{params.endDate}, '%Y/%m/%d') + + + + + + and fault_date = #{faultDate} + + + and fault_location like concat('%', #{faultLocation}, '%') and handling_personnel like concat('%', #{handlingPersonnel}, '%') and fault_phenomenon_and_cause like concat('%', #{faultPhenomenonAndCause}, '%') @@ -36,6 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and main_components_repaired like concat('%', #{mainComponentsRepaired}, '%') and remarks = #{remarks} + order by STR_TO_DATE(fault_date, '%Y/%m/%d') desc, id desc - and date like concat('%', #{date}, '%') + + + + + + and STR_TO_DATE(date, '%Y/%m/%d') BETWEEN STR_TO_DATE(#{params.beginDate}, '%Y/%m/%d') AND STR_TO_DATE(#{params.endDate}, '%Y/%m/%d') + + + and STR_TO_DATE(date, '%Y/%m/%d') >= STR_TO_DATE(#{params.beginDate}, '%Y/%m/%d') + + + and STR_TO_DATE(date, '%Y/%m/%d') <= STR_TO_DATE(#{params.endDate}, '%Y/%m/%d') + + + + + + and date = #{date} + + + and spare_parts_name like concat('%', #{sparePartsName}, '%') and waste_quantity like concat('%', #{wasteQuantity}, '%') and storage_location like concat('%', #{storageLocation}, '%') @@ -32,6 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and remarks = #{remarks} and spare_part_model like concat('%', #{sparePartModel}, '%') + order by STR_TO_DATE(date, '%Y/%m/%d') desc, objid desc - and date like concat('%', #{date}, '%') + + + + + + and STR_TO_DATE(date, '%Y/%m/%d') BETWEEN STR_TO_DATE(#{params.beginDate}, '%Y/%m/%d') AND STR_TO_DATE(#{params.endDate}, '%Y/%m/%d') + + + and STR_TO_DATE(date, '%Y/%m/%d') >= STR_TO_DATE(#{params.beginDate}, '%Y/%m/%d') + + + and STR_TO_DATE(date, '%Y/%m/%d') <= STR_TO_DATE(#{params.endDate}, '%Y/%m/%d') + + + + + + and date = #{date} + + + and job_category like concat('%', #{jobCategory}, '%') and job_unit like concat('%', #{jobUnit}, '%') and job_name like concat('%', #{jobName}, '%') @@ -48,6 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and is_work_order_closed_loop like concat('%', #{isWorkOrderClosedLoop}, '%') and remarks like concat('%', #{remarks}, '%') + order by STR_TO_DATE(date, '%Y/%m/%d') desc, id desc - and date = #{date} + + + + + + and STR_TO_DATE(date, '%Y/%m/%d') BETWEEN STR_TO_DATE(#{params.beginDate}, '%Y/%m/%d') AND STR_TO_DATE(#{params.endDate}, '%Y/%m/%d') + + + and STR_TO_DATE(date, '%Y/%m/%d') >= STR_TO_DATE(#{params.beginDate}, '%Y/%m/%d') + + + and STR_TO_DATE(date, '%Y/%m/%d') <= STR_TO_DATE(#{params.endDate}, '%Y/%m/%d') + + + + + + and date = #{date} + + + and spare_part_name like concat('%', #{sparePartName}, '%') and spare_part_model like concat('%', #{sparePartModel}, '%') and quantity_used like concat('%', #{quantityUsed}, '%') @@ -40,6 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and department_warehouse like concat('%', #{departmentWarehouse}, '%') and remarks like concat('%', #{remarks}, '%') + order by STR_TO_DATE(date, '%Y/%m/%d') desc, id desc