zgty/zt-qms
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix:报告接口微调

Browse Source
This commit is contained in:
FCL
2025-12-31 10:12:31 +08:00
parent f5fc940f54
commit 5e71453113
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/admin/ReportDocumentFileController.java
View File

@@ -110,7 +110,9 @@ public class ReportDocumentFileController extends AbstractFileUploadController i
version = mainDO.getDocumentVersion(); version = mainDO.getDocumentVersion();
} }
ReportDocumentFileDO entity = reportDocumentFileService.getByMainIdAndVersion(mainId, version); ReportDocumentFileDO entity = reportDocumentFileService.getByMainIdAndVersion(mainId, version);
if(entity == null){
return CommonResult.success(null);
}
Long fileId = entity.getFileId(); Long fileId = entity.getFileId();
CommonResult<FileRespDTO> fileRet = fileApi.getFile(fileId); CommonResult<FileRespDTO> fileRet = fileApi.getFile(fileId);
FileRespDTO file = fileRet.getData(); FileRespDTO file = fileRet.getData();

9
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentDataServiceImpl.java
View File

@@ -411,7 +411,10 @@ public class ReportDocumentDataServiceImpl implements ReportDocumentDataService
String colKey = parseNumToString(colIndex, 2); String colKey = parseNumToString(colIndex, 2);
t.put(colPrefix + colKey, fieldName); t.put(colPrefix + colKey, fieldName);
//查询当前字段的检出限 //查询当前字段的检出限
JSONObject fieldObj = firstData.getJSONObject(field); JSONObject fieldObj = null;
if(firstData != null && !ObjectUtils.isEmpty(field)){
fieldObj = firstData.getJSONObject(field);
}
String rangeVal = ""; String rangeVal = "";
if (fieldObj != null) { if (fieldObj != null) {
rangeVal = fieldObj.getString(rangeKey); rangeVal = fieldObj.getString(rangeKey);
@@ -516,7 +519,9 @@ public class ReportDocumentDataServiceImpl implements ReportDocumentDataService
if (FIELD_FIXED.equals(fieldType)) //这里只处理动态列。固定列在 addDataToRowList 处理 if (FIELD_FIXED.equals(fieldType)) //这里只处理动态列。固定列在 addDataToRowList 处理
continue; continue;
String field = fieldDO.getField(); String field = fieldDO.getField();
JSONObject fieldObj = s.getJSONObject(field); JSONObject fieldObj = new JSONObject();
if(s != null)
fieldObj = s.getJSONObject(field);
String fieldValue = ""; String fieldValue = "";
if (fieldObj != null) if (fieldObj != null)
fieldValue = fieldObj.getString("fieldValue"); fieldValue = fieldObj.getString("fieldValue");