From 34d15381438d5afafb1b42b0a61be9e2720211dc Mon Sep 17 00:00:00 2001
From: 杜洪波 <1074825718@qq.com>
Date: 星期三, 24 九月 2025 17:55:21 +0800
Subject: [PATCH] 代码提交
---
src/main/java/com/product/server/report/service/ReportConfigService.java | 108 ++++++++++++++++++++++++++++++------------------------
1 files changed, 60 insertions(+), 48 deletions(-)
diff --git a/src/main/java/com/product/server/report/service/ReportConfigService.java b/src/main/java/com/product/server/report/service/ReportConfigService.java
index c8d2df6..99fe3c4 100644
--- a/src/main/java/com/product/server/report/service/ReportConfigService.java
+++ b/src/main/java/com/product/server/report/service/ReportConfigService.java
@@ -23,7 +23,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import javax.xml.crypto.Data;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -52,10 +51,10 @@
List<Object> paramList = Lists.newArrayList();
StringBuilder sql = new StringBuilder(512);
- sql.append("\nSELECT a.uuid,a.type_uuid,a.is_valid,a.org_level_uuid,a.report_name,b.type_name,b.type_group")
- .append("\nFROM product_sys_report_config a")
- .append("\nLEFT JOIN product_sys_report_type_config b ON a.type_uuid = b.uuid")
- .append("\nwhere (function_uuid is null or function_uuid='') ");
+ sql.append("\nSELECT a.uuid,a.type_uuid,a.is_valid,a.org_level_uuid,a.report_name,b.type_name,b.type_group");
+ sql.append("\nFROM product_sys_report_config a");
+ sql.append("\nLEFT JOIN product_sys_report_type_config b ON a.type_uuid = b.uuid");
+ sql.append("\nWHERE (function_uuid is null or function_uuid='') ");
if (!StringUtils.isEmpty(fse.getString(CmnConst.TYPE_UUID))) {
sql.append("\nand b.type_group=?");
paramList.add(fse.getString(CmnConst.TYPE_UUID));
@@ -304,7 +303,7 @@
fseFunction.setValue(CmnConst.FUNCTION_NAME, fseReport.getString(CmnConst.REPORT_NAME)); //鍔熻兘鍚嶇О
fseFunction.setValue(CmnConst.FUNCTION_DESCRIPTION, fseReport.getString(CmnConst.REPORT_NAME)); //鍔熻兘鎻忚堪
fseFunction.setValue(CmnConst.STATUS_UUID, 1); //鏄惁鍚敤
- fseFunction.setValue(CmnConst.FUNCTION_TYPE_UUID, 1); //鍔熻兘绫诲瀷-涓氬姟鍔熻兘
+ fseFunction.setValue(CmnConst.FUNCTION_TYPE_UUID, 5); //鍔熻兘绫诲瀷-涓氬姟鍚庡彴绠＄悊 绠＄悊鍛樺拰鏅�氱敤鎴烽兘鑳藉垎閰嶈鎶ヨ〃鐨勬潈闄�
fseFunction.setValue(CmnConst.CLIENT_TYPE_UUID, "Web"); //瀹㈡埛绔被鍨�
fseFunction.setValue(CmnConst.VERSION_UUID, "001");
fseFunction.setValue(CmnConst.DATA_TYPE, 1);// 鏁版嵁绫诲瀷
@@ -371,11 +370,11 @@
// 鎻愬彇鍙戝竷鐨勮鑹茬浉鍏虫暟鎹�
List<String> roleUUIDList = Lists.newArrayList();
List<String> clientUUIDList = Lists.newArrayList();
- String[] singleRoleInfoArr;
+ clientUUIDList.add(SpringMVCContextHolder.getCurrentUser().getClientUuid());
+// String[] singleRoleInfoArr;
for (String singleRoleInfo : fse.getString(CmnConst.ROLE_UUID).split("#")) {
- singleRoleInfoArr = singleRoleInfo.split(",");
- roleUUIDList.add(singleRoleInfoArr[2]);
- clientUUIDList.add(singleRoleInfoArr[0]);
+// singleRoleInfoArr = singleRoleInfo.split(",");
+ roleUUIDList.add(singleRoleInfo);
}
// 2.缁戝畾瑙掕壊(缁欐煇涓�瑙掕壊璧嬩簣璇ュ姛鑳�)
@@ -476,18 +475,24 @@
* @return
*/
public JSONArray getReportReleaseInfo() {
- StringBuilder sql = new StringBuilder(256);
DataTableEntity aimDte = new DataTableEntity();
DataTableEntity dte;
Object[] arr;
String filter;
- sql.append("select distinct null pid,uuid sid,client_name name FROM product_sys_clients c")
- .append("\ninner join (")
- .append("\n select client_uuid pid,uuid sid,org_level_name FROM product_sys_org_levels where org_level_status=0 order by org_level_code")
- .append("\n) o on o.pid=c.uuid")
- .append("\ninner join (")
- .append("\n select org_level_uuid pid,uuid sid,role_name FROM product_sys_role where is_used=1")
- .append("\n) r on r.pid=o.sid");
+ StringBuilder sql = new StringBuilder(256);
+ sql.append("\nSELECT distinct null pid,uuid sid,client_name name ");
+ sql.append("\nFROM product_sys_clients c");
+ sql.append("\nINNER JOIN (");
+ sql.append("\n SELECT client_uuid pid,uuid sid,org_level_name ");
+ sql.append("\n FROM product_sys_org_levels ");
+ sql.append("\n WHERE org_level_status=0 ");
+ sql.append("\n ORDER BY org_level_code");
+ sql.append("\n) o ON o.pid=c.uuid");
+ sql.append("\nINNER JOIN (");
+ sql.append("\n SELECT org_level_uuid pid,uuid sid,role_name ");
+ sql.append("\n FROM product_sys_role ");
+ sql.append("\n WHERE is_used=1");
+ sql.append("\n) r ON r.pid=o.sid");
// 鍘绘帀admin鎵�灞炲鎴�
// .append("\nwhere c.uuid!='4d4679ed-c4c3-41b8-abfe-451a66fd4043'");
dte = baseDao.listTable(sql.toString(), new Object[]{});
@@ -497,14 +502,19 @@
arr = dte.getFieldAllValues("sid");
filter = BaseUtil.buildQuestionMarkFilter("client_uuid", arr.length, true);
sql.setLength(0);
- sql.append("\nselect distinct o.* from (")
- .append("\n select client_uuid pid,uuid sid,org_level_name name FROM product_sys_org_levels where org_level_status=0")
- .append("\n and ").append(filter)
- .append("\n order by org_level_code")
- .append("\n) o")
- .append("\ninner join (")
- .append("\n select org_level_uuid pid,uuid sid,role_name FROM product_sys_role where is_used=1")
- .append("\n) r on r.pid=o.sid");
+ sql.append("\nSELECT distinct o.* ");
+ sql.append("\nFROM (");
+ sql.append("\n SELECT client_uuid pid,uuid sid,org_level_name name ");
+ sql.append("\n FROM product_sys_org_levels ");
+ sql.append("\n WHERE org_level_status=0");
+ sql.append("\n AND ").append(filter);
+ sql.append("\n ORDER BY org_level_code");
+ sql.append("\n) o");
+ sql.append("\nINNER JOIN (");
+ sql.append("\n SELECT org_level_uuid pid,uuid sid,role_name ");
+ sql.append("\n FROM product_sys_role ");
+ sql.append("\n WHERE is_used=1");
+ sql.append("\n) r ON r.pid=o.sid");
dte = baseDao.listTable(sql.toString(), arr);
aimDte.addFieldSetEntity(dte);
@@ -566,28 +576,30 @@
public DataTableEntity releasedListReportConfig(FieldSetEntity fse) {
String filter = queryFilterService.getQueryFilter(fse);
StringBuilder sql = new StringBuilder(256);
-// sql.append("select * from ( ");
- sql.append("\n select rc.uuid,rc.report_name,rtc.type_name,t1.role_info,mp.menu_name tricode_parent,m.menu_icon,m.menu_name ");
- sql.append("\n FROM product_sys_report_config rc ");
- sql.append("\n inner join ( ");
- sql.append("\n select function_uuid,group_concat(role_info separator ',') role_info ");
- sql.append("\n from ( ");
- sql.append("\n select function_uuid,concat(c.client_name,'/',o.org_level_name,'/',role_name) role_info ");
- sql.append("\n FROM product_sys_clients c ");
- sql.append("\n inner join product_sys_org_levels o on o.client_uuid=c.uuid ");
- sql.append("\n inner join ( ");
- sql.append("\n select function_uuid,org_level_uuid,uuid role_uuid,role_name ");
- sql.append("\n FROM product_sys_role r ");
- sql.append("\n inner join ( ");
- sql.append("\n select function_uuid,role_uuid FROM product_sys_function_permission ");
- sql.append("\n ) p on r.uuid=p.role_uuid ");
- sql.append("\n ) r1 on o.uuid=r1.org_level_uuid ");
- sql.append("\n ) t ");
- sql.append("\n group by function_uuid ");
- sql.append("\n ) t1 on rc.function_uuid=t1.function_uuid ");
- sql.append("\n inner join product_sys_menus m on rc.function_uuid=m.function_uuid ");
- sql.append("\n inner join product_sys_report_type_config rtc on rc.type_uuid=rtc.uuid ");
- sql.append("\n inner join product_sys_menus mp on m.tricode_parent=mp.tricode ");
+ sql.append("\nSELECT rc.uuid,rc.report_name,rtc.type_name,mp.menu_name tricode_parent,m.menu_icon,m.menu_name ");
+// sql.append("\nselect rc.uuid,rc.report_name,rtc.type_name,t1.role_info,mp.menu_name tricode_parent,m.menu_icon,m.menu_name ");
+ sql.append("\nFROM product_sys_report_config rc ");
+ sql.append("\nINNER JOIN ( ");
+// sql.append("\n select function_uuid,group_concat(role_info separator ',') role_info "); //璇硶瑙ｆ瀽澶辫触
+ sql.append("\n SELECT function_uuid ");
+ sql.append("\n FROM ( ");
+// sql.append("\n select function_uuid,concat(c.client_name,'/',o.org_level_name,'/',role_name) role_info ");
+ sql.append("\n SELECT function_uuid ");
+ sql.append("\n FROM product_sys_clients c ");
+ sql.append("\n INNER JOIN product_sys_org_levels o ON o.client_uuid=c.uuid ");
+ sql.append("\n INNER JOIN ( ");
+ sql.append("\n SELECT function_uuid,org_level_uuid,uuid role_uuid,role_name ");
+ sql.append("\n FROM product_sys_role r ");
+ sql.append("\n INNER JOIN ( ");
+ sql.append("\n SELECT function_uuid,role_uuid FROM product_sys_function_permission ");
+ sql.append("\n ) p ON r.uuid=p.role_uuid ");
+ sql.append("\n ) r1 ON o.uuid=r1.org_level_uuid ");
+ sql.append("\n ) t ");
+ sql.append("\n GROUP BY function_uuid ");
+ sql.append("\n) t1 ON rc.function_uuid = t1.function_uuid ");
+ sql.append("\nINNER JOIN product_sys_menus m on rc.function_uuid=m.function_uuid ");
+ sql.append("\nINNER JOIN product_sys_report_type_config rtc on rc.type_uuid=rtc.uuid ");
+ sql.append("\nINNER JOIN product_sys_menus mp on m.tricode_parent=mp.tricode ");
// sql.append("\n) t2 ");
if (!StringUtils.isEmpty(filter)) {
sql.append(" WHERE " + filter);
--
Gitblit v1.9.2