diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/pdf/template/gsp/Sywzpzjhb.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/pdf/template/gsp/Sywzpzjhb.java index 4c260c5..ec7d164 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/pdf/template/gsp/Sywzpzjhb.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/pdf/template/gsp/Sywzpzjhb.java @@ -41,9 +41,7 @@ public class Sywzpzjhb { * @return */ public String exportDetail(StudyFormPlan studyFormPlan, List studyFormPlanQmxxList, List studyFormPlanJcgjList, String lang, Integer jcgjlx, String localFilePath) { - language = lang; - Document document = null; - FileOutputStream fos = null; + language = lang;Document document = null;FileOutputStream fos = null; String filePath = PdfBaseUtil.getFilePath(localFilePath, "Template"); try { String sign = "hxhq"; @@ -55,16 +53,13 @@ public class Sywzpzjhb { JSONObject bdnr = JSONObject.parseObject(studyFormPlan.getBdnr()); JSONObject zdgxjl = JSONObject.parseObject(StringUtils.isNoneBlank(studyFormPlan.getZdgxjl()) ? studyFormPlan.getZdgxjl() : "{}"); JSONArray fhyjjl = JSONArray.parseArray(StringUtils.isNoneBlank(studyFormPlan.getFhyjjl()) ? studyFormPlan.getFhyjjl() : "[]"); - //region 表单信息 - //试验基本信息 PdfBaseUtil.addUnderlinedTitle(document, getName("试验基本信息"), 10, true); Map formData1 = new LinkedHashMap<>(); formData1.put(getName("试验名称"), studyFormPlan.getStudyMc()); formData1.put(getName("试验编号"), studyFormPlan.getStudySn()); PdfBaseUtil.addFormTableColumns(document, formData1, 2); - PdfBaseUtil.addUnderlinedTitle(document, getName("计划信息"), 10, true); Map formData2 = new LinkedHashMap<>(); formData2.put(getName("领取时间"), (StringUtils.isNoneBlank(bdnr.getString("drawTime")) ? bdnr.getString("drawTime") : "") + TemplateBaseUtil.getCheck("_drawTime", zdgxjl) + TemplateBaseUtil.getFh("_drawTime", fhyjjl)); @@ -110,7 +105,6 @@ public class Sywzpzjhb { } document.add(table); PdfBaseUtil.addUnderlinedTitle(document, getName("备注") + ":" +(StringUtils.isNoneBlank(bdnr.getString("remark")) ? bdnr.getString("remark") : "")+(TemplateBaseUtil.getCheck("_remark",zdgxjl)+TemplateBaseUtil.getFh("_remark",fhyjjl)), 10, false); - //签名信息 TemplateBaseUtil.addQmxxPlan(document, studyFormPlanQmxxList, language); //稽查轨迹