From f4dd94a2baed24ddcb28a4c2d2bf0f23f47e823a Mon Sep 17 00:00:00 2001
From: 杜洪波 <1074825718@qq.com>
Date: 星期三, 24 九月 2025 17:49:20 +0800
Subject: [PATCH] 代码提交
---
src/main/java/com/product/badge/service/BadgeBorrowService.java | 20 ++++++++++----------
src/main/java/com/product/badge/service/BadgeService.java | 26 +++++++++++++-------------
2 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/product/badge/service/BadgeBorrowService.java b/src/main/java/com/product/badge/service/BadgeBorrowService.java
index 730cb8c..28e76ae 100644
--- a/src/main/java/com/product/badge/service/BadgeBorrowService.java
+++ b/src/main/java/com/product/badge/service/BadgeBorrowService.java
@@ -162,25 +162,25 @@
StringBuilder sql = new StringBuilder();
sql.append("\nselect d.table_uuid,d.uuid,table_name,c.org_level_name org_level_uuid,badge_name,type_name,cp.dict_label badge_type,holder,ifnull(badge_status,'鏈�熷嚭') badge_status,borrow_by,borrow_time,return_date,useful_life ");
sql.append("\nfrom ( ");
- sql.append("\n select '725928d8-a0ed-4f68-9e1d-87f66d899df0' table_uuid,'product_oa_badge_awards' table_name,org_level_uuid,badge_level,badge_type,badge_name,uuid,'鑾峰淇℃伅璇佺珷' type_name,holder,'姘镐箙' useful_life from product_oa_badge_awards ");
+ sql.append("\n select '725928d8-a0ed-4f68-9e1d-87f66d899df0' table_uuid,'product_oa_badge_awards' AS table_name,org_level_uuid,badge_level,badge_type,badge_name,uuid,'鑾峰淇℃伅璇佺珷' type_name,holder,'姘镐箙' useful_life from product_oa_badge_awards ");
sql.append("\n union all ");
- sql.append("\n select '66d5e271-41bc-48c3-a0f5-6d696c70a036' table_uuid,'product_oa_badge_company' table_name,org_level_uuid,badge_level,badge_type,badge_name,uuid,'鍏徃璇佺珷' type_name,holder,'姘镐箙' useful_life from product_oa_badge_company ");
+ sql.append("\n select '66d5e271-41bc-48c3-a0f5-6d696c70a036' table_uuid,'product_oa_badge_company' AS table_name,org_level_uuid,badge_level,badge_type,badge_name,uuid,'鍏徃璇佺珷' type_name,holder,'姘镐箙' useful_life from product_oa_badge_company ");
sql.append("\n union all ");
- sql.append("\n select '6468cd40-c9c9-41ff-b819-d670e3af9cee' table_uuid,'product_oa_badge_company_qualification' table_name,org_level_uuid,badge_level,badge_type,badge_name,uuid,'鍏徃璧勮川璇佺珷' type_name,holder,useful_life from product_oa_badge_company_qualification ");
+ sql.append("\n select '6468cd40-c9c9-41ff-b819-d670e3af9cee' table_uuid,'product_oa_badge_company_qualification' AS table_name,org_level_uuid,badge_level,badge_type,badge_name,uuid,'鍏徃璧勮川璇佺珷' type_name,holder,useful_life from product_oa_badge_company_qualification ");
sql.append("\n union all ");
- sql.append("\n select 'a743e548-7b49-4f45-a072-acc03b873bdd' table_uuid,'product_oa_badge_constructor' table_name,org_level_uuid,badge_level,badge_type,badge_name,uuid,'寤洪�犲笀璇佺珷' type_name,holder,'姘镐箙' useful_life from product_oa_badge_constructor ");
+ sql.append("\n select 'a743e548-7b49-4f45-a072-acc03b873bdd' table_uuid,'product_oa_badge_constructor' AS table_name,org_level_uuid,badge_level,badge_type,badge_name,uuid,'寤洪�犲笀璇佺珷' type_name,holder,'姘镐箙' useful_life from product_oa_badge_constructor ");
sql.append("\n union all ");
- sql.append("\n select 'c07d0bcd-3e2d-43b9-9df0-ae60c6d57577' table_uuid,'product_oa_badge_cost_officer' table_name,org_level_uuid,badge_level,badge_type,badge_name,uuid,'閫犱环浜哄憳璇佺珷' type_name,holder,useful_life from product_oa_badge_cost_officer ");
+ sql.append("\n select 'c07d0bcd-3e2d-43b9-9df0-ae60c6d57577' table_uuid,'product_oa_badge_cost_officer' AS table_name,org_level_uuid,badge_level,badge_type,badge_name,uuid,'閫犱环浜哄憳璇佺珷' type_name,holder,useful_life from product_oa_badge_cost_officer ");
sql.append("\n union all ");
- sql.append("\n select '3d6d8e93-f347-4a07-abb0-c6ec7ccf907b' table_uuid,'product_oa_badge_finance_manage' table_name,org_level_uuid,badge_level,badge_type,badge_name,uuid,'璐㈠姟绠＄悊璇佺珷' type_name,holder,'姘镐箙' useful_life from product_oa_badge_finance_manage ");
+ sql.append("\n select '3d6d8e93-f347-4a07-abb0-c6ec7ccf907b' table_uuid,'product_oa_badge_finance_manage' AS table_name,org_level_uuid,badge_level,badge_type,badge_name,uuid,'璐㈠姟绠＄悊璇佺珷' type_name,holder,'姘镐箙' useful_life from product_oa_badge_finance_manage ");
sql.append("\n union all ");
- sql.append("\n select '4cca65f6-dc58-443a-abb1-222524930d4c' table_uuid,'product_oa_badge_manager' table_name,org_level_uuid,badge_level,badge_type,badge_name,uuid,'绠＄悊浜哄憳璇佺珷' type_name,holder,useful_life from product_oa_badge_manager ");
+ sql.append("\n select '4cca65f6-dc58-443a-abb1-222524930d4c' table_uuid,'product_oa_badge_manager' AS table_name,org_level_uuid,badge_level,badge_type,badge_name,uuid,'绠＄悊浜哄憳璇佺珷' type_name,holder,useful_life from product_oa_badge_manager ");
sql.append("\n union all ");
- sql.append("\n select 'a980ba45-e286-4e5d-ba39-a28d7a0de3dc' table_uuid,'product_oa_badge_safety_officer' table_name,org_level_uuid,badge_level,badge_type,badge_name,uuid,'瀹夊叏浜哄憳璇佺珷' type_name,holder,'姘镐箙' useful_life from product_oa_badge_safety_officer ");
+ sql.append("\n select 'a980ba45-e286-4e5d-ba39-a28d7a0de3dc' table_uuid,'product_oa_badge_safety_officer' AS table_name,org_level_uuid,badge_level,badge_type,badge_name,uuid,'瀹夊叏浜哄憳璇佺珷' type_name,holder,'姘镐箙' useful_life from product_oa_badge_safety_officer ");
sql.append("\n union all ");
- sql.append("\n select '53dc61c1-70d3-493b-b271-b886f723e50d' table_uuid,'product_oa_badge_scene_manage' table_name,org_level_uuid,badge_level,badge_type,badge_name,uuid,'鐜板満绠＄悊璇佺珷' type_name,holder,'姘镐箙' useful_life from product_oa_badge_scene_manage ");
+ sql.append("\n select '53dc61c1-70d3-493b-b271-b886f723e50d' table_uuid,'product_oa_badge_scene_manage' AS table_name,org_level_uuid,badge_level,badge_type,badge_name,uuid,'鐜板満绠＄悊璇佺珷' type_name,holder,'姘镐箙' useful_life from product_oa_badge_scene_manage ");
sql.append("\n union all ");
- sql.append("\n select '0761488e-d10f-4c25-8b57-469114d9b7b4' table_uuid,'product_oa_badge_scene_officer' table_name,org_level_uuid,badge_level,badge_type,badge_name,uuid,'鐜板満宸ヤ汉璇佺珷' type_name,holder,'姘镐箙' useful_life from product_oa_badge_scene_officer ");
+ sql.append("\n select '0761488e-d10f-4c25-8b57-469114d9b7b4' table_uuid,'product_oa_badge_scene_officer' AS table_name,org_level_uuid,badge_level,badge_type,badge_name,uuid,'鐜板満宸ヤ汉璇佺珷' type_name,holder,'姘镐箙' useful_life from product_oa_badge_scene_officer ");
sql.append("\n) d ");
sql.append("\nleft join ( ");
sql.append("\n select b.* from ( ");
diff --git a/src/main/java/com/product/badge/service/BadgeService.java b/src/main/java/com/product/badge/service/BadgeService.java
index 858ad6c..341161c 100644
--- a/src/main/java/com/product/badge/service/BadgeService.java
+++ b/src/main/java/com/product/badge/service/BadgeService.java
@@ -8,6 +8,8 @@
import com.product.core.entity.FieldSetEntity;
import com.product.core.service.support.AbstractBaseService;
import com.product.core.service.support.QueryFilterService;
+import com.product.util.UnifySQLFunction;
+
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -34,18 +36,19 @@
*/
public DataTableEntity listTable(FieldSetEntity fse) {
StringBuilder sql = new StringBuilder(512);
- sql.append("select * from (");
- sql.append("\nselect d.uuid,org_level_uuid,badge_name,badge_level,holder,badge_type,ifnull(badge_status,'鏈�熷嚭') badge_status,borrow_by,borrow_time,return_date,flow_flag");
- sql.append("\nfrom ").append(fse.getTableName()).append(" d");
- sql.append("\nleft join ( ");
- sql.append("\n select b.* from ( ");
+ sql.append("\nselect * from (");
+ sql.append("\n select d.uuid,org_level_uuid,badge_name,badge_level,holder,badge_type,borrow_by,borrow_time,return_date,flow_flag,");
+ sql.append("\n ").append(UnifySQLFunction.ifnull("badge_status", "'鏈�熷嚭'", "badge_status"));
+ sql.append("\n from ").append(fse.getTableName()).append(" d");
+ sql.append("\n left join ( ");
+ sql.append("\n select b.* from ( ");
sql.append("\n select s.uuid,m.created_by borrow_by,m.created_utc_datetime borrow_time,s.return_by,s.return_date,badge_uuid, ");
sql.append("\n case when s.return_by is null or s.return_by='' then '鍊熷嚭' else '褰掕繕' END badge_status ");
sql.append("\n from product_oa_badge_borrow_record m ");
sql.append("\n left join product_oa_badge_borrow_detail s ");
sql.append("\n on m.uuid=s.record_uuid ");
- sql.append("\n ) b ");
- sql.append("\n inner join ( ");
+ sql.append("\n ) b ");
+ sql.append("\n inner join ( ");
sql.append("\n select uuid,max(created_utc_datetime) last_borrow_time ");
sql.append("\n from ( ");
sql.append("\n select s.uuid,m.created_utc_datetime ");
@@ -54,13 +57,10 @@
sql.append("\n on m.uuid=s.record_uuid ");
sql.append("\n ) b ");
sql.append("\n group by uuid ");
- sql.append("\n ) t ");
- sql.append("\n on b.uuid=t.uuid and b.borrow_time=t.last_borrow_time ");
- sql.append("\n) b ");
- sql.append("\non d.uuid=b.badge_uuid ");
+ sql.append("\n ) t ");
+ sql.append("\n on b.uuid=t.uuid and b.borrow_time=t.last_borrow_time ");
+ sql.append("\n ) b on d.uuid=b.badge_uuid ");
sql.append("\n) a ");
-
-
String filter = publicService.getListFilter(fse, 0);
if (!StringUtils.isEmpty(filter)) {
--
Gitblit v1.9.2