内部报验-资料下载

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

@@ -8,6 +8,7 @@ import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.core.util.ZipUtil;
+import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -26,9 +27,12 @@ import com.rongwei.bsentity.dto.project.node.ProjectNodeStateBo;
 import com.rongwei.bsentity.dto.project.node.UnItpNodeStateBo;
 import com.rongwei.bsentity.vo.ZhcxInsideInspectionVo;
 import com.rongwei.commonservice.serial.service.SysSerialNumberService;
+import com.rongwei.rwadmincommon.system.domain.PagePartDo;
 import com.rongwei.rwadmincommon.system.domain.SysRoleDo;
 import com.rongwei.rwadmincommon.system.domain.SysUserDo;
+import com.rongwei.rwadmincommon.system.service.PagePartService;
 import com.rongwei.rwadmincommon.system.service.SysGeneralCRUDService;
+import com.rongwei.rwadmincommon.system.service.SysModulePagePartRelService;
 import com.rongwei.rwadmincommon.system.service.SysUserService;
 import com.rongwei.rwadmincommon.system.vo.SysUserVo;
 import com.rongwei.rwcommon.base.exception.CustomException;
@@ -90,7 +94,8 @@ public class ZhcxInsideInspectionServiceImpl extends ServiceImpl<ZhcxInsideInspe
     @Autowired
     private SysFileItemService sysFileItemService;
 
-
+    @Autowired
+    private PagePartService pagePartService;
     @Autowired
     private ZhcxItpProjectNodeStateService itpProjectNodeStateService;
 
@@ -669,9 +674,16 @@ public class ZhcxInsideInspectionServiceImpl extends ServiceImpl<ZhcxInsideInspe
 
             //模板处理
             ExcelFormData excelData = exportReq.getExcelData();
-            if(ObjectUtil.isNotEmpty(excelData.getTemplateId())) {
+            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)) {
                 excelData.setExcelName(fileFullName+".pdf");
-                SysFileItemDo sysFileItemDo = sysFileItemService.getById(excelData.getTemplateId());
+                SysFileItemDo sysFileItemDo = sysFileItemService.getById(excelTemplateFileId);
                 FormData formData = zhcxCommon.parseExcelPage2Data(excelData, sysFileItemDo);
                 zhcxCommon.parseTemplateByAspose(sysFileItemDo, excelData, temp, formData);
             }
@@ -701,9 +713,10 @@ public class ZhcxInsideInspectionServiceImpl extends ServiceImpl<ZhcxInsideInspe
                         });
                     }
                 }
-            } else {
+            }
+            else {
                 //没有附件且模板为空时
-                if(ObjectUtil.isEmpty(excelData.getTemplateId())) {
+                if(ObjectUtil.isEmpty(excelTemplateFileId)) {
                     return 0;
                 }
             }