内部报验-资料下载

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxInsideInspectionServiceImpl.java

@@ -674,16 +674,16 @@ public class ZhcxInsideInspectionServiceImpl extends ServiceImpl<ZhcxInsideInspe
 
             //模板处理
             ExcelFormData excelData = exportReq.getExcelData();
-            String pagepartId = excelData.getPagepartId();
-            PagePartDo pagePartDo = pagePartService.getById(pagepartId);
-            String roption = pagePartDo.getRoption();
-            cn.hutool.json.JSONObject globalConfigJo = JSONUtil.parseObj(roption);
-            cn.hutool.json.JSONObject global = globalConfigJo.getJSONObject("global");
-            cn.hutool.json.JSONObject base = global.getJSONObject("base");
-            String excelTemplateFileId = base.getStr("excelTemplateFileId", "");
-            if(ObjectUtil.isNotEmpty(excelTemplateFileId)) {
+//            String pagepartId = excelData.getPagepartId();
+//            PagePartDo pagePartDo = pagePartService.getById(pagepartId);
+//            String roption = pagePartDo.getRoption();
+//            cn.hutool.json.JSONObject globalConfigJo = JSONUtil.parseObj(roption);
+//            cn.hutool.json.JSONObject global = globalConfigJo.getJSONObject("global");
+//            cn.hutool.json.JSONObject base = global.getJSONObject("base");
+//            String excelTemplateFileId = base.getStr("excelTemplateFileId", "");
+            if(ObjectUtil.isNotEmpty(excelData.getTemplateId())) {
                 excelData.setExcelName(fileFullName+".pdf");
-                SysFileItemDo sysFileItemDo = sysFileItemService.getById(excelTemplateFileId);
+                SysFileItemDo sysFileItemDo = sysFileItemService.getById(excelData.getTemplateId());
                 FormData formData = zhcxCommon.parseExcelPage2Data(excelData, sysFileItemDo);
                 zhcxCommon.parseTemplateByAspose(sysFileItemDo, excelData, temp, formData);
             }
@@ -716,7 +716,7 @@ public class ZhcxInsideInspectionServiceImpl extends ServiceImpl<ZhcxInsideInspe
             }
             else {
                 //没有附件且模板为空时
-                if(ObjectUtil.isEmpty(excelTemplateFileId)) {
+                if(ObjectUtil.isEmpty(excelData.getTemplateId())) {
                     return 0;
                 }
             }