From cb46d99ac8c302334e8c39600de0d9a4ffbf5533 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期二, 29 十月 2024 09:39:48 +0800 Subject: [PATCH] 1、删除global模块中Contant中的一些无用代码; 2、删除global模块中一些无用的备份; 3、一些有继承关系并注解有@Data的类中增加注解@EqualsAndHashCode(callSuper=false),防止编译时警告 --- pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOnHourReportHistoryMapper.xml | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOnHourReportHistoryMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOnHourReportHistoryMapper.xml index 9616580..d950234 100644 --- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOnHourReportHistoryMapper.xml +++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOnHourReportHistoryMapper.xml @@ -205,8 +205,8 @@ <if test="intakeId != null and intakeId >0"> AND oh.intake_id = #{intakeId} </if> - <if test = "intakeName != null and intakeName !=''"> - AND inta.name LIKE CONCAT('%',#{intakeName},'%') + <if test = "intakeName != null and intakeNum !=''"> + AND inta.name LIKE CONCAT('%',#{intakeNum},'%') </if> <if test = "rtuAddr != null and rtuAddr !=''"> AND oh.rtu_addr LIKE CONCAT('%',#{rtuAddr},'%') -- Gitblit v1.8.0