Преглед на файлове

fix(query): 优化锅炉连接记录报告的主项目查询逻辑

- 当isMainProject参数为"true"时查询数据库值"1"
- 当isMainProject参数为"false"时查询数据库值"0"或null
- 解决了原始字符串直接匹配导致的数据查询不准确问题
- 添加了对空值数据的正确处理逻辑
xuzhancheng преди 1 седмица
родител
ревизия
a533455fdf

+ 9 - 1
tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/dal/mysql/boilerconnectrecordreport/BoilerConnectRecordReportMapper.java

@@ -61,7 +61,15 @@ public interface BoilerConnectRecordReportMapper extends BaseMapperX<BoilerConne
         }
 
         if (StrUtil.isNotEmpty(reqVO.getIsMainProject())) {
-            recordDOMPJLambdaWrapper.eq(BoilerConnectRecordReportDO::getIsMainProject, reqVO.getIsMainProject());
+            if (reqVO.getIsMainProject().equals("true")){
+                recordDOMPJLambdaWrapper.eq(BoilerConnectRecordReportDO::getIsMainProject, "1");
+            }else if (reqVO.getIsMainProject().equals("false")){
+                // 有些数据为空,查询非主项目(包括 "0" 和 null)
+                recordDOMPJLambdaWrapper.and(w -> w.eq(BoilerConnectRecordReportDO::getIsMainProject, "0")
+                        .or()
+                        .isNull(BoilerConnectRecordReportDO::getIsMainProject));
+            }
+//            recordDOMPJLambdaWrapper.eq(BoilerConnectRecordReportDO::getIsMainProject, reqVO.getIsMainProject());
         }
 
         if (StrUtil.isNotEmpty(reqVO.getRecordTemplateCode())) {