From 22d8b68b19e35bdd2086fd047296abe440639f32 Mon Sep 17 00:00:00 2001
From: 杜洪波 <1074825718@qq.com>
Date: 星期四, 18 九月 2025 15:52:27 +0800
Subject: [PATCH] 代码提交
---
src/main/java/com/product/administration/service/TargetManagerService.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/product/administration/service/TargetManagerService.java b/src/main/java/com/product/administration/service/TargetManagerService.java
index 6823e0d..67762c4 100644
--- a/src/main/java/com/product/administration/service/TargetManagerService.java
+++ b/src/main/java/com/product/administration/service/TargetManagerService.java
@@ -32,6 +32,8 @@
import com.product.core.websocket.service.WebsocketMesssageServiceThread;
import com.product.module.sys.entity.SystemUser;
import com.product.util.BaseUtil;
+import com.product.util.UnifySQLFunction;
+
import org.apache.poi.ss.usermodel.IndexedColors;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -379,7 +381,7 @@
*/
@Override
public DataTableEntity getTargetNameList() throws BaseException {
- return getBaseDao().listTable("SELECT target_name,uuid,'fa fa-users' icon,2 type from product_oa_target_basic", new Object[]{});
+ return getBaseDao().listTable("SELECT target_name,uuid,'fa fa-users' icon,2 as type from product_oa_target_basic", new Object[]{});
}
/**
@@ -494,7 +496,7 @@
sql.append("\n left join product_oa_target_task tm on ts.task_uuid=tm.uuid");
sql.append("\n left join product_sys_users u on ts.user_id=u.user_id");
sql.append("\n left join product_oa_target_basic b on b.uuid=tm.target_uuid");
- sql.append("\n where ifnull(ts.user_id,s.user_id)=?");
+ sql.append("\n where ").append(UnifySQLFunction.ifnull("ts.user_id", "s.user_id")).append(" = ? ");
sql.append("\n) t");
String queryFilter = queryFilterService.getQueryFilter(fse);
if (!StringUtils.isEmpty(fse.getString("filter"))) {
@@ -1615,7 +1617,7 @@
sql.append(" a.target_uuid, ");
sql.append(" main_uuid, ");
sql.append(" a.uuid,a.target_type, ");
- sql.append(" ifnull(b.target_task_name,c.target_name) target_name ");
+ sql.append(UnifySQLFunction.ifnull("b.target_task_name", "c.target_name")).append(" AS target_name ");
sql.append(" FROM ");
sql.append(" product_oa_target_report_config_sub a ");
sql.append(" LEFT JOIN product_oa_target_task b ON a.target_uuid = b.uuid ");
@@ -2611,7 +2613,7 @@
sql.append(" cs.backstepping_time, ");
sql.append(" tt.datetime_range, ");
sql.append(" tt.datetime_range_type, ");
- sql.append(" ifnull(tt.target_task_name,tb.target_name) target_name, ");
+ sql.append(UnifySQLFunction.ifnull("tt.target_task_name", "tb.target_name")).append(" AS target_name, ");
sql.append(" tb.uuid target_uuid, ");
sql.append(" tb.org_value_field, ");
sql.append(" tb.datetime_value_field, ");
--
Gitblit v1.9.2