From 9b56961674315ed8741ebf51fd4b6f2f4840f6f9 Mon Sep 17 00:00:00 2001 From: winter Date: Mon, 5 Aug 2024 19:10:23 +0800 Subject: [PATCH] fix --- .../java/com/iformall/print/PrintDataHandler.java | 8 ++++++++ .../print/entity/component/html/PrintHtml.java | 13 +++++++++++++ .../service/impl/WxFinancePrintServiceImpl.java | 9 +++++---- 3 files changed, 26 insertions(+), 4 deletions(-) create mode 100644 mallinkService/src/main/java/com/iformall/print/entity/component/html/PrintHtml.java diff --git a/mallinkService/src/main/java/com/iformall/print/PrintDataHandler.java b/mallinkService/src/main/java/com/iformall/print/PrintDataHandler.java index ad909a732..88ff429d7 100644 --- a/mallinkService/src/main/java/com/iformall/print/PrintDataHandler.java +++ b/mallinkService/src/main/java/com/iformall/print/PrintDataHandler.java @@ -13,6 +13,7 @@ import com.alibaba.fastjson.JSONObject; import com.iformall.domain.po.WxFinancePrintData; import com.iformall.enums.EnumYesOrNo; import com.iformall.print.entity.PrintComponent; +import com.iformall.print.entity.component.html.PrintHtml; import com.iformall.print.entity.component.table.PrintBraidTable; import com.iformall.print.entity.component.table.PrintBraidTableColumns; import com.iformall.print.entity.component.table.PrintBraidTableColumnsTrSet; @@ -66,6 +67,13 @@ public class PrintDataHandler implements Serializable { } table.setColumnsAttr(columnsAttr); return table; + }else if ("braid-html".equals(data.getPrintDataType())) { + PrintHtml html = new PrintHtml(); + html.setTitle(data.getName()); + html.setIsEdit(data.getIsEdit()); + html.setName("html"); + html.setValue(dataJson.getString("html")); + return html; } return null; } diff --git a/mallinkService/src/main/java/com/iformall/print/entity/component/html/PrintHtml.java b/mallinkService/src/main/java/com/iformall/print/entity/component/html/PrintHtml.java new file mode 100644 index 000000000..9e78a09ec --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/print/entity/component/html/PrintHtml.java @@ -0,0 +1,13 @@ +package com.iformall.print.entity.component.html; + +import lombok.Data; +import com.iformall.print.entity.PrintComponent; + +@Data +public class PrintHtml extends PrintComponent { + + private static final long serialVersionUID = 1L; + private String type="braid-html"; + //打印项默认内容 + private String defaultValue; +} diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java index fca793bcb..dd64bf454 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java @@ -61,13 +61,10 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService { boolean isGenarated = false; if (StringUtils.isBlank(record.getContent())) { Map map = new HashMap(); - map.put("title", record.getName()); - map.put("type", record.getType()); map.put("width", 770); map.put("height", 500); map.put("pageWidth", 215); map.put("pageHeight", 140); - map.put("id", String.valueOf(record.getId())); map.put("defaultValue", 0); record.setContent(JSON.toJSONString(map)); isGenarated = true; @@ -79,8 +76,10 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService { record.setCreateTime(date); record.setUpdateTime(date); JSONObject o = record.getContentJson(); + o.put("id", String.valueOf(record.getId())); o.put("defaultValue", 0); o.put("title", record.getName()); + o.put("type", record.getType()); record.setContent(JSON.toJSONString(o)); try { wxFinancePrintTemplateMapper.insert(record); @@ -91,8 +90,10 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService { } else { if (null != record.getContentJson()) { JSONObject o = record.getContentJson(); + o.put("id", String.valueOf(record.getId())); o.put("defaultValue", 0); o.put("title", record.getName()); + o.put("type", record.getType()); record.setContent(JSON.toJSONString(o)); } record.setUpdateTime(date); @@ -108,7 +109,7 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService { @Override public List parseTemplateData(String tenantId, Integer type, List dataIds) { - EnumFinancePrintDataType printDatatype = EnumFinancePrintDataType.getEnum(type); +// EnumFinancePrintDataType printDatatype = EnumFinancePrintDataType.getEnum(type); // //付款单 // if (printDatatype.getCode().intValue() == EnumFinancePrintDataType.FINANCE_RECEIVE.getCode()) { // TenantEntity tenantEntity = new TenantEntity();