From 8e997417832cb0339303391517b10c0d964574f9 Mon Sep 17 00:00:00 2001
From: 354798ggg <1074825718@qq.com>
Date: 星期四, 25 五月 2023 15:42:27 +0800
Subject: [PATCH] 图表发布调整

---
 src/main/java/com/product/server/report/service/GenerateEChartService.java |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/product/server/report/service/GenerateEChartService.java b/src/main/java/com/product/server/report/service/GenerateEChartService.java
index 813c664..c78d530 100644
--- a/src/main/java/com/product/server/report/service/GenerateEChartService.java
+++ b/src/main/java/com/product/server/report/service/GenerateEChartService.java
@@ -17,6 +17,7 @@
 import com.product.core.transfer.Transactional;
 import com.product.server.report.config.CmnConst;
 import com.product.server.report.config.ReportCode;
+import com.product.server.report.config.SystemCode;
 import com.product.server.report.service.idel.IGenerateEChartService;
 import com.product.util.BaseUtil;
 import com.product.util.SystemParamReplace;
@@ -527,8 +528,14 @@
      */
     @Transactional
     @Override
-    public List<String> releaseConfig(FieldSetEntity fse, String module_uuid, String parentCode) {
+    public List<String> releaseConfig(FieldSetEntity fse, String parentModuleUUID) {
 
+    	//鑾峰彇鎸囧畾鍙戝竷鐩綍淇℃伅
+    	FieldSetEntity fseParentModuleData = baseDao.getFieldSetEntity(CmnConst.PRODUCT_SYS_FUNCTIONS, parentModuleUUID, false);
+    	if (fseParentModuleData == null) {
+			throw new BaseException(SystemCode.PUBLISH_REPORT_FAIL_MODULE_NO_EXIST.getValue(), SystemCode.PUBLISH_REPORT_FAIL_MODULE_NO_EXIST.getText());
+		}
+    	
         FieldSetEntity fseReport=baseDao.getFieldSetEntity(CmnConst.PRODUCT_SYS_REPORT_CONFIG, fse.getUUID(), false);
 
         //鍒涘缓MVCC淇濆瓨瀵硅薄
@@ -536,11 +543,10 @@
         fseFunction.setTableName(CmnConst.PRODUCT_SYS_FUNCTIONS);
         //1.鍒涘缓MVC(绯荤粺MVC鐩綍涓�)
         //鐢熸垚鍔熻兘缂栫爜
-        codeService.createCode(fseFunction,CmnConst.PRODUCT_SYS_FUNCTIONS, CmnConst.TRICODE, parentCode);
+        codeService.createCode(fseFunction,CmnConst.PRODUCT_SYS_FUNCTIONS, CmnConst.TRICODE, fseParentModuleData.getString(CmnConst.TRICODE));
         String function_tricode=fseFunction.getString(CmnConst.TRICODE);
         fseFunction.setTableName(CmnConst.PRODUCT_SYS_FUNCTIONS);
         fseFunction.setValue(CmnConst.TRICODE, function_tricode);		//鍔熻兘缂栫爜
-        fseFunction.setValue(CmnConst.MODULE_UUID, module_uuid);	//鎵�灞炴ā鍧桿UID
         fseFunction.setValue(CmnConst.TABLE_UUID, CmnConst.PRODUCT_SYS_REPORT_CONFIG);			//鍔熻兘鍏宠仈琛�
         fseFunction.setValue(CmnConst.FUNCTION_NAME, fseReport.getString(CmnConst.REPORT_NAME));	//鍔熻兘鍚嶇О
         fseFunction.setValue(CmnConst.FUNCTION_DESCRIPTION, fseReport.getString(CmnConst.REPORT_NAME));	//鍔熻兘鎻忚堪
@@ -548,7 +554,7 @@
         fseFunction.setValue(CmnConst.FUNCTION_TYPE_UUID, 1);	//鍔熻兘绫诲瀷-涓氬姟鍔熻兘
         fseFunction.setValue(CmnConst.CLIENT_TYPE_UUID, "web");		//瀹㈡埛绔被鍨�
         fseFunction.setValue(CmnConst.VERSION_UUID, "001"); //鐗堟湰uuid
-        fseFunction.setValue(CmnConst.TRICODE_PARENT, parentCode);
+        fseFunction.setValue(CmnConst.TRICODE_PARENT, fseParentModuleData.getString(CmnConst.TRICODE));
         fseFunction.setValue("data_type", 1); //绫诲瀷  1涓哄姛鑳�
         BaseUtil.createCreatorAndCreationTime(SpringMVCContextHolder.getCurrentUser(), fseFunction);
 

--
Gitblit v1.9.2