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
2026-03-11 10:51:20 +08:00
parent fe44b27539
commit 5e907c9fd4
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -294,6 +294,7 @@ public class ReportDocumentDataServiceImpl implements ReportDocumentDataService
铜精矿综合样：方法名显示为/ 铜精矿综合样：方法名显示为/
* */ * */
private JSONObject assembleResultData(ReportDocumentMainDO mainData, JSONArray rows, ReportDocumentDataDO firstDataDO){ private JSONObject assembleResultData(ReportDocumentMainDO mainData, JSONArray rows, ReportDocumentDataDO firstDataDO){
// String emptyImgBase64 = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAAeCAIAAACubtl7AAAACXBIWXMAAA7EAAAOxAGVKw4bAAABF0lEQVQ4jWP8//8/A+mAiQw9g1jb32ebe2ec+kqitp+XV214LavMSZK2f+/2rbysE+4izESKtj/3Nmz85hqqxw4TIErb15OrjkgHecsww0WI0Pbv+fa1Dy3CrHmRxAhr+3V17Q5W3yBVFmRBQtr+vT+w8rxmqIsIqkIC2v4+3Ljho1OYIQeaOH5t30+vOiwW5CvLjC6BT9u/FzvW3DMNt+XDlMKj7ff19dsZvILVWbDI4db28dCqM6rhbqJYVeDS9vfh5vVvHUONOLFL49D24/zqA8IBvgoYYYFP27/Xu1beMgqz58ehCbu2P7fWbvvvGaTJilMXNm2fj6w6oxjiIYEvbjDl/n74rRwWYYojLKCAcbTAG1htAK4eXQ1h4qkRAAAAAElFTkSuQmCC";
String formData = mainData.getFormData(); String formData = mainData.getFormData();
String signatureData = mainData.getDocumentSignature(); String signatureData = mainData.getDocumentSignature();
String signatureJsonStr = assembleSignature(signatureData); String signatureJsonStr = assembleSignature(signatureData);
@@ -301,8 +302,8 @@ public class ReportDocumentDataServiceImpl implements ReportDocumentDataService
if(!ObjectUtils.isEmpty(formData)) if(!ObjectUtils.isEmpty(formData))
formDataJson = JSONObject.parseObject(formData); formDataJson = JSONObject.parseObject(formData);
JSONObject signatureJson = new JSONObject(); JSONObject signatureJson = new JSONObject();
if(!ObjectUtils.isEmpty(signatureData)) if(!ObjectUtils.isEmpty(signatureJsonStr))
signatureJson = JSONObject.parseObject(signatureData); signatureJson = JSONObject.parseObject(signatureJsonStr);
JSONObject resultData = new JSONObject(); JSONObject resultData = new JSONObject();
JSONObject headerData = new JSONObject(); JSONObject headerData = new JSONObject();
JSONObject firstRow = rows.getJSONObject(0); JSONObject firstRow = rows.getJSONObject(0);
@@ -349,6 +350,7 @@ public class ReportDocumentDataServiceImpl implements ReportDocumentDataService
opinion.replace("signTime", ""); opinion.replace("signTime", "");
opinion.replace("signatureId", ""); opinion.replace("signatureId", "");
opinion.replace("userName", "/"); opinion.replace("userName", "/");
opinion.replace("signatureIdBase64", "");
opinion.replace("userId", ""); opinion.replace("userId", "");
} }
} }