From cea22ec0f78fdc87b3d8260717847695313f6dbd Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Mon, 19 Jan 2026 14:47:59 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A[=E8=AF=95=E9=AA=8C=E7=AE=A1?= =?UTF-8?q?=E7=90=86]=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/StudyFormFillController.java | 10 +- .../hxhq/business/utils/pdf/resource/Dosage.java | 6 +- .../com/hxhq/business/utils/pdf/resource/Drug.java | 6 +- .../hxhq/business/utils/pdf/template/SP001.java | 131 -------------------- .../utils/pdf/template/TemplateBaseUtil.java | 8 +- .../hxhq/business/utils/pdf/template/sp/SP001.java | 135 +++++++++++++++++++++ 6 files changed, 146 insertions(+), 150 deletions(-) delete mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/pdf/template/SP001.java create mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/pdf/template/sp/SP001.java diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyFormFillController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyFormFillController.java index e41e938..88c49a8 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyFormFillController.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyFormFillController.java @@ -101,15 +101,7 @@ public class StudyFormFillController extends BaseController { studyFormFillQmxx.setFormId(form.getFormId()); List studyFormFillQmxxList = studyFormFillQmxxService.queryList(studyFormFillQmxx); StudyFormFill studyFormFill=studyFormFillService.queryInfo(form.getFormId()); - return AjaxResult.success(localFilePrefix + PdfExportUtil.export( - studyFormFill.getTemplateExportClass(), - studyFormFill.getTemplateExportMethod(), - studyFormFill, - studyFormFillQmxxList, - studyFormFillJcgjList, - form.getLang(), - localFilePath)); - + return AjaxResult.success(localFilePrefix + PdfExportUtil.export(studyFormFill.getTemplateExportClass(), studyFormFill.getTemplateExportMethod(),studyFormFill,studyFormFillQmxxList,studyFormFillJcgjList,form.getLang(),form.getJcgjlx(),localFilePath)); } /** diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/pdf/resource/Dosage.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/pdf/resource/Dosage.java index fc18581..83a49c4 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/pdf/resource/Dosage.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/pdf/resource/Dosage.java @@ -159,7 +159,7 @@ public class Dosage { if (node.get("name") != null) { String name = node.get("name").asText(); String value = node.get("value").asText(); - result.add(name + ":" + value); + result.add(name + "：" + value); } } } @@ -172,7 +172,7 @@ public class Dosage { if (node.get("name") != null) { String name = node.get("name").asText(); String value = node.get("value").asText(); - result.add(name + ":" + value); + result.add(name + "：" + value); } } } @@ -180,7 +180,7 @@ public class Dosage { if (StringUtils.isNoneBlank(jcgj.getRemark())) { result.add(getName("备注")+"：" + jcgj.getRemark()); } - if (StringUtils.isNoneBlank(jcgj.getRemark())) { + if (StringUtils.isNoneBlank(jcgj.getQmrMc())) { result.add(getName("签名人")+"：" + jcgj.getQmrMc()); } PdfBaseUtil.addUnderlinedTitle(document, result.toString(), 10, false); diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/pdf/resource/Drug.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/pdf/resource/Drug.java index 8627225..b0fd093 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/pdf/resource/Drug.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/pdf/resource/Drug.java @@ -158,7 +158,7 @@ public class Drug { if (node.get("name") != null) { String name = node.get("name").asText(); String value = node.get("value").asText(); - result.add(name + ":" + value); + result.add(name + "：" + value); } } } @@ -171,7 +171,7 @@ public class Drug { if (node.get("name") != null) { String name = node.get("name").asText(); String value = node.get("value").asText(); - result.add(name + ":" + value); + result.add(name + "：" + value); } } } @@ -179,7 +179,7 @@ public class Drug { if (StringUtils.isNoneBlank(jcgj.getRemark())) { result.add(getName("备注")+"：" + jcgj.getRemark()); } - if (StringUtils.isNoneBlank(jcgj.getRemark())) { + if (StringUtils.isNoneBlank(jcgj.getQmrMc())) { result.add(getName("签名人")+"：" + jcgj.getQmrMc()); } PdfBaseUtil.addUnderlinedTitle(document, result.toString(), 10, false); diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/pdf/template/SP001.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/pdf/template/SP001.java deleted file mode 100644 index 0f09f07..0000000 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/pdf/template/SP001.java +++ /dev/null @@ -1,131 +0,0 @@ -package com.hxhq.business.utils.pdf.template; - -import com.alibaba.fastjson2.JSONObject; -import com.hxhq.business.domain.*; -import com.hxhq.business.utils.pdf.PdfBaseUtil; -import com.hxhq.business.utils.pdf.PdfExportUtil; -import com.hxhq.common.core.utils.StringUtils; -import com.hxhq.common.security.utils.SecurityUtils; -import com.hxhq.system.api.model.LoginUser; -import com.itextpdf.text.*; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.io.FileOutputStream; -import java.io.IOException; -import java.util.*; -import java.util.List; - -/** - * 色谱-生物样品分析溶液配制表 - * - * @author tanfei - */ -public class SP001 { - private static final Logger logger = LoggerFactory.getLogger(SP001.class.getName()); - public String language = "zh"; - - /** - * 导出 - * - * @param studyFormFill - * @return - */ - public String exportDetail(StudyFormFill studyFormFill, List studyFormFillQmxxList, List studyFormFillJcgjList, String lang, String localFilePath) { - language = lang; - Document document = null; - FileOutputStream fos = null; - String filePath = PdfBaseUtil.getFilePath(localFilePath,"SP001"); - try { - String sign = "hxhq"; - LoginUser loginUser = SecurityUtils.getLoginUser(); - if (loginUser != null) { - sign = loginUser.getSysUser().getNickName(); - } - document = PdfBaseUtil.init(document, fos, filePath, sign +PdfExportUtil.parseDateToStr(new Date()), "en".equals(language)?studyFormFill.getTemplateMcEn():studyFormFill.getTemplateMc(),false); - // 基本信息 - - JSONObject bdnr = JSONObject.parseObject(studyFormFill.getBdnr()); - PdfBaseUtil.addUnderlinedTitle(document, getName("试验基本信息"), 10, true); - Map formData1 = new LinkedHashMap<>(); - formData1.put(getName("试验名称"), studyFormFill.getStudyMc()); - formData1.put(getName("试验编号"), studyFormFill.getStudySn()); - formData1.put(getName("方法编号"), (StringUtils.isNoneBlank(bdnr.getString("methodCode"))? bdnr.getString("methodCode"):"")); - formData1.put(getName("版本号"), (StringUtils.isNoneBlank(bdnr.getString("methodCode"))? bdnr.getString("methodCode"):"")); - PdfBaseUtil.addFormTableColumns(document, formData1, 2); - - PdfBaseUtil.addUnderlinedTitle(document, getName("试验配置条件"), 10, true); - Map formData2 = new LinkedHashMap<>(); - formData2.put(getName("预填"),(StringUtils.isNoneBlank(bdnr.getString("pre"))? bdnr.getString("pre"):"") + (StringUtils.isNoneBlank(bdnr.getString("preOther")) ? bdnr.getString("preOther") : "")); - formData2.put(getName("实际"),(StringUtils.isNoneBlank(bdnr.getString("act"))? bdnr.getString("act"):"") + (StringUtils.isNoneBlank(bdnr.getString("actOther")) ? bdnr.getString("actOther") : "")); - PdfBaseUtil.addFormTableColumns(document, formData2, 2); - - PdfBaseUtil.addUnderlinedTitle(document, getName("配置时间"), 10, true); - Map formData3 = new LinkedHashMap<>(); - formData3.put(getName("开始时间"), studyFormFill.getStartDate() != null ? PdfExportUtil.parseDateToStr(studyFormFill.getStartDate()) : ""); - formData3.put(getName("结束时间"), studyFormFill.getEndDate() != null ? PdfExportUtil.parseDateToStr(studyFormFill.getEndDate()) : ""); - PdfBaseUtil.addFormTableColumns(document, formData3, 2); - - // 签名信息 - PdfBaseUtil.addUnderlinedTitle(document, getName("试验试剂信息"), 10, true); - TemplateBaseUtil.addResource(document, studyFormFill.getResource(),language); - - PdfBaseUtil.addUnderlinedTitle(document, getName("仪器使用信息"), 10, true); - TemplateBaseUtil.addInstrument(document, "",language); - - PdfBaseUtil.addUnderlinedTitle(document, getName("存储条件"), 10, true); - - Map formData4 = new LinkedHashMap<>(); - formData4.put(getName("存储条件"), bdnr.getString("storageCondition") + (StringUtils.isNoneBlank(bdnr.getString("storageConditionOther")) ? bdnr.getString("storageConditionOther") : "")); - PdfBaseUtil.addFormTableColumns(document, formData4, 1); - - PdfBaseUtil.addUnderlinedTitle(document, getName("操作步骤"), 10, true); - Map formData5 = new LinkedHashMap<>(); - formData5.put(getName("目标溶液名称"), bdnr.getString("targetName")); - formData5.put(getName("目标溶液编号"), bdnr.getString("targetCode") + bdnr.getString("targetCodeSn")); - formData5.put(getName("目标溶液预计浓度"), bdnr.getString("targetPreConcentration") + bdnr.getString("targetPreConcentrationUnit")); - formData5.put(getName("目标溶液实际浓度"), bdnr.getString("targetActConcentration") + bdnr.getString("targetPreConcentrationUnit")); - formData5.put(getName("目标溶液预计体积"), bdnr.getString("targetPreVolume") + bdnr.getString("targetPreVolumeUnit")); - formData5.put(getName("目标溶液实际体积"), bdnr.getString("targetActVolume") + bdnr.getString("targetActVolumeUnit")); - formData5.put(getName("有效周期"), bdnr.getString("effectivePeriod") + bdnr.getString("effectivePeriodUnit")); - formData5.put(getName("失效日"), bdnr.getString("sxrq")); - PdfBaseUtil.addFormTableColumns(document, formData5, 2); - PdfBaseUtil.addUnderlinedTitle(document, getName("备注") + "：" +(StringUtils.isNoneBlank(bdnr.getString("remark")) ? bdnr.getString("remark") : ""), 10, false); - - // 签名信息 - PdfBaseUtil.addUnderlinedTitle(document, getName("签名信息"), 10, true); - TemplateBaseUtil.addQmxx(document, studyFormFillQmxxList,language); - //稽查轨迹 - PdfBaseUtil.addUnderlinedTitle(document, getName("稽查轨迹"), 10, true); - TemplateBaseUtil.addJcgj(document, studyFormFillJcgjList,language); - logger.info("生成成功：{}", filePath); - } catch (Exception e) { - logger.error("生成失败", e); - throw new RuntimeException("生成失败: " + e.getMessage()); - } finally { - if (document != null) { - document.close(); - } - if (fos != null) { - try { - fos.close(); - } catch (IOException e) { - logger.error("关闭文件流失败", e); - } - } - } - return filePath; - } - - - /** - * 获取名称 - * - * @param name - * @return - */ - public String getName(String name) { - return TemplateBaseUtil.getNameByLanguage(name,language); - } - -} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/pdf/template/TemplateBaseUtil.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/pdf/template/TemplateBaseUtil.java index ca33687..68a85ba 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/pdf/template/TemplateBaseUtil.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/pdf/template/TemplateBaseUtil.java @@ -39,7 +39,7 @@ public class TemplateBaseUtil { * @throws DocumentException */ public static void addResource(Document document, String resource, String lang) throws IOException, DocumentException { -// [{"mc":"布洛芬","bh":"BLF260115-0014","ph":"","nd":"18ng/mL","source":"ELN配制","ndz":18,"nddw":"ng/mL","kc":1190,"kcdw":"3","syl":"4","syldw":"3","yxzq":360,"yxzqdw":"days"}] +// [{"mc"："布洛芬","bh"："BLF260115-0014","ph"："","nd"："18ng/mL","source"："ELN配制","ndz":18,"nddw"："ng/mL","kc":1190,"kcdw"："3","syl"："4","syldw"："3","yxzq":360,"yxzqdw"："days"}] language = lang; // 9. 表头 BaseFont bfChinese = BaseFont.createFont("STSong-Light", "UniGB-UCS2-H", BaseFont.NOT_EMBEDDED); @@ -190,7 +190,7 @@ public class TemplateBaseUtil { if (node.get("name") != null) { String name = node.get("name").asText(); String value = node.get("value") != null ? node.get("value").asText() : ""; - result.add(name + ":" + value); + result.add(name + "：" + value); } } } @@ -203,7 +203,7 @@ public class TemplateBaseUtil { if (node.get("name") != null) { String name = node.get("name").asText(); String value = node.get("value") != null ? node.get("value").asText() : ""; - result.add(name + ":" + value); + result.add(name + "：" + value); } } } @@ -212,7 +212,7 @@ public class TemplateBaseUtil { if (StringUtils.isNoneBlank(jcgj.getRemark())) { result.add(getName("备注") + "：" + jcgj.getRemark()); } - if (StringUtils.isNoneBlank(jcgj.getRemark())) { + if (StringUtils.isNoneBlank(jcgj.getQmrMc())) { result.add(getName("签名人") + "：" + jcgj.getQmrMc()); } PdfBaseUtil.addUnderlinedTitle(document, result.toString(), 10, false); diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/pdf/template/sp/SP001.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/pdf/template/sp/SP001.java new file mode 100644 index 0000000..debd4f5 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/pdf/template/sp/SP001.java @@ -0,0 +1,135 @@ +package com.hxhq.business.utils.pdf.template.sp; + +import com.alibaba.fastjson2.JSONObject; +import com.hxhq.business.domain.*; +import com.hxhq.business.utils.pdf.PdfBaseUtil; +import com.hxhq.business.utils.pdf.PdfExportUtil; +import com.hxhq.business.utils.pdf.template.TemplateBaseUtil; +import com.hxhq.common.core.utils.StringUtils; +import com.hxhq.common.security.utils.SecurityUtils; +import com.hxhq.system.api.model.LoginUser; +import com.itextpdf.text.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.FileOutputStream; +import java.io.IOException; +import java.util.*; +import java.util.List; + +/** + * 色谱-生物样品分析溶液配制表 + * + * @author tanfei + */ +public class SP001 { + private static final Logger logger = LoggerFactory.getLogger(SP001.class.getName()); + public String language = "zh"; + + /** + * 导出 + * + * @param studyFormFill + * @return + */ + public String exportDetail(StudyFormFill studyFormFill, List studyFormFillQmxxList, List studyFormFillJcgjList, String lang,Integer jcgjlx, String localFilePath) { + language = lang; + Document document = null; + FileOutputStream fos = null; + String filePath = PdfBaseUtil.getFilePath(localFilePath,"SP001"); + try { + String sign = "hxhq"; + LoginUser loginUser = SecurityUtils.getLoginUser(); + if (loginUser != null) { + sign = loginUser.getSysUser().getNickName(); + } + document = PdfBaseUtil.init(document, fos, filePath, sign +PdfExportUtil.parseDateToStr(new Date()), "en".equals(language)?studyFormFill.getTemplateMcEn():studyFormFill.getTemplateMc(),false); + // 基本信息 + + JSONObject bdnr = JSONObject.parseObject(studyFormFill.getBdnr()); + PdfBaseUtil.addUnderlinedTitle(document, getName("试验基本信息"), 10, true); + Map formData1 = new LinkedHashMap<>(); + formData1.put(getName("试验名称"), studyFormFill.getStudyMc()); + formData1.put(getName("试验编号"), studyFormFill.getStudySn()); + formData1.put(getName("方法编号"), (StringUtils.isNoneBlank(bdnr.getString("methodCode"))? bdnr.getString("methodCode"):"")); + formData1.put(getName("版本号"), (StringUtils.isNoneBlank(bdnr.getString("methodCode"))? bdnr.getString("methodCode"):"")); + PdfBaseUtil.addFormTableColumns(document, formData1, 2); + + PdfBaseUtil.addUnderlinedTitle(document, getName("试验配置条件"), 10, true); + Map formData2 = new LinkedHashMap<>(); + formData2.put(getName("预填"),(StringUtils.isNoneBlank(bdnr.getString("pre"))? bdnr.getString("pre"):"") + (StringUtils.isNoneBlank(bdnr.getString("preOther")) ? bdnr.getString("preOther") : "")); + formData2.put(getName("实际"),(StringUtils.isNoneBlank(bdnr.getString("act"))? bdnr.getString("act"):"") + (StringUtils.isNoneBlank(bdnr.getString("actOther")) ? bdnr.getString("actOther") : "")); + PdfBaseUtil.addFormTableColumns(document, formData2, 2); + + PdfBaseUtil.addUnderlinedTitle(document, getName("配置时间"), 10, true); + Map formData3 = new LinkedHashMap<>(); + formData3.put(getName("开始时间"), studyFormFill.getStartDate() != null ? PdfExportUtil.parseDateToStr(studyFormFill.getStartDate()) : ""); + formData3.put(getName("结束时间"), studyFormFill.getEndDate() != null ? PdfExportUtil.parseDateToStr(studyFormFill.getEndDate()) : ""); + PdfBaseUtil.addFormTableColumns(document, formData3, 2); + + // 签名信息 + PdfBaseUtil.addUnderlinedTitle(document, getName("试验试剂信息"), 10, true); + TemplateBaseUtil.addResource(document, studyFormFill.getResource(),language); + + PdfBaseUtil.addUnderlinedTitle(document, getName("仪器使用信息"), 10, true); + TemplateBaseUtil.addInstrument(document, "",language); + + PdfBaseUtil.addUnderlinedTitle(document, getName("存储条件"), 10, true); + + Map formData4 = new LinkedHashMap<>(); + formData4.put(getName("存储条件"), bdnr.getString("storageCondition") + (StringUtils.isNoneBlank(bdnr.getString("storageConditionOther")) ? bdnr.getString("storageConditionOther") : "")); + PdfBaseUtil.addFormTableColumns(document, formData4, 1); + + PdfBaseUtil.addUnderlinedTitle(document, getName("操作步骤"), 10, true); + Map formData5 = new LinkedHashMap<>(); + formData5.put(getName("目标溶液名称"), bdnr.getString("targetName")); + formData5.put(getName("目标溶液编号"), bdnr.getString("targetCode") + bdnr.getString("targetCodeSn")); + formData5.put(getName("目标溶液预计浓度"), bdnr.getString("targetPreConcentration") + bdnr.getString("targetPreConcentrationUnit")); + formData5.put(getName("目标溶液实际浓度"), bdnr.getString("targetActConcentration") + bdnr.getString("targetPreConcentrationUnit")); + formData5.put(getName("目标溶液预计体积"), bdnr.getString("targetPreVolume") + bdnr.getString("targetPreVolumeUnit")); + formData5.put(getName("目标溶液实际体积"), bdnr.getString("targetActVolume") + bdnr.getString("targetActVolumeUnit")); + formData5.put(getName("有效周期"), bdnr.getString("effectivePeriod") + bdnr.getString("effectivePeriodUnit")); + formData5.put(getName("失效日"), bdnr.getString("sxrq")); + PdfBaseUtil.addFormTableColumns(document, formData5, 2); + PdfBaseUtil.addUnderlinedTitle(document, getName("备注") + "：" +(StringUtils.isNoneBlank(bdnr.getString("remark")) ? bdnr.getString("remark") : ""), 10, false); + + // 签名信息 + PdfBaseUtil.addUnderlinedTitle(document, getName("签名信息"), 10, true); + TemplateBaseUtil.addQmxx(document, studyFormFillQmxxList,language); + //稽查轨迹 + Integer jcgjlxMark=999; + if(!jcgjlx.equals(jcgjlxMark)){ + PdfBaseUtil.addUnderlinedTitle(document, getName("稽查轨迹"), 10, true); + TemplateBaseUtil.addJcgj(document, studyFormFillJcgjList,language); + } + logger.info("生成成功：{}", filePath); + } catch (Exception e) { + logger.error("生成失败", e); + throw new RuntimeException("生成失败: " + e.getMessage()); + } finally { + if (document != null) { + document.close(); + } + if (fos != null) { + try { + fos.close(); + } catch (IOException e) { + logger.error("关闭文件流失败", e); + } + } + } + return filePath; + } + + + /** + * 获取名称 + * + * @param name + * @return + */ + public String getName(String name) { + return TemplateBaseUtil.getNameByLanguage(name,language); + } + +}