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-22 14:13:26 +08:00
parent 8977be538d
commit dd63f9e1dc
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,6 +30,7 @@ import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid; import jakarta.validation.Valid;
import lombok.extern.slf4j.Slf4j;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@@ -46,6 +47,7 @@ import static com.zt.plat.module.qms.enums.ErrorCodeConstants.REPORT_DOCUMENT_TY
@RestController @RestController
@RequestMapping("/qms/report-document-main") @RequestMapping("/qms/report-document-main")
@Validated @Validated
@Slf4j
@FileUploadController(source = "qms.reportdocumentmain") @FileUploadController(source = "qms.reportdocumentmain")
public class ReportDocumentMainController extends AbstractFileUploadController implements BusinessControllerMarker{ public class ReportDocumentMainController extends AbstractFileUploadController implements BusinessControllerMarker{

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

@@ -120,7 +120,10 @@ public class ReportDocumentAssistService {
String templateContent = templateDO.getFormContent(); String templateContent = templateDO.getFormContent();
JSONObject templateData = new JSONObject(); JSONObject templateData = new JSONObject();
JSONArray tableList = data.getJSONArray(0); JSONArray tableList = data.getJSONArray(0);
templateData.put("headerData", tableList.getJSONObject(0).clone()); JSONObject headerData = new JSONObject();
if(tableList != null && !tableList.isEmpty())
headerData = tableList.getJSONObject(0).clone();
templateData.put("headerData", headerData);
templateData.put("tableList", tableList); templateData.put("tableList", tableList);
templateData.put("formData", mainDO.getFormData()); templateData.put("formData", mainDO.getFormData());
templateData.put("signatureData", mainDO.getDocumentSignature()); templateData.put("signatureData", mainDO.getDocumentSignature());