From de60e468277540c771a1be7f33af332066e556d9 Mon Sep 17 00:00:00 2001 From: winter Date: Mon, 5 Aug 2024 15:52:20 +0800 Subject: [PATCH] fix --- .../market/WxFinancePrintController.java | 5 +++ .../domain/vo/print/PrintDataBraidTable.java | 29 ++++++++++++++ .../vo/print/PrintDataBraidTableColumns.java | 15 +++++++ .../PrintDataBraidTableColumnsTrSet.java | 14 +++++++ .../domain/vo/print/PrintDataBraidTxt.java | 39 +++++++++++++++++++ .../mapper/WxFinancePrintTemplateMapper.xml | 2 +- 6 files changed, 103 insertions(+), 1 deletion(-) create mode 100644 mallinkService/src/main/java/com/iformall/domain/vo/print/PrintDataBraidTable.java create mode 100644 mallinkService/src/main/java/com/iformall/domain/vo/print/PrintDataBraidTableColumns.java create mode 100644 mallinkService/src/main/java/com/iformall/domain/vo/print/PrintDataBraidTableColumnsTrSet.java create mode 100644 mallinkService/src/main/java/com/iformall/domain/vo/print/PrintDataBraidTxt.java diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinancePrintController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinancePrintController.java index 908183b9a..c3ab92bf7 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinancePrintController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinancePrintController.java @@ -47,6 +47,11 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +/** + * https://www.lodop.net/index.html +https://github.com/myliuxia/kr-print-designer?tab=readme-ov-file + * @author Administrator + */ @RestController @RequestMapping("print") public class WxFinancePrintController extends BaseController { diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/print/PrintDataBraidTable.java b/mallinkService/src/main/java/com/iformall/domain/vo/print/PrintDataBraidTable.java new file mode 100644 index 000000000..5e96f506d --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/vo/print/PrintDataBraidTable.java @@ -0,0 +1,29 @@ +package com.iformall.domain.vo.print; + +import lombok.Data; +import java.io.Serializable; +import java.util.List; + +@Data +public class PrintDataBraidTable implements Serializable { + + private static final long serialVersionUID = 1L; + + //模板类型 braid-txt / braid-table / braid-html / braid-image / bar-code + private String type="braid-table"; + //是否可编辑 + private Integer isEdit; + //打印项名称 + private String title; + //动态打印项数据名称(对应打印数据 key-name) + private String name; + //打印项内容 + private String value; + //打印项默认内容 + private List defaultValue; + private String tabelHtml; + //表格列 + private List columnsAttr; + //LODOP 默认打印项样式 + //private lodopStyle; +} diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/print/PrintDataBraidTableColumns.java b/mallinkService/src/main/java/com/iformall/domain/vo/print/PrintDataBraidTableColumns.java new file mode 100644 index 000000000..b8433e0e6 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/vo/print/PrintDataBraidTableColumns.java @@ -0,0 +1,15 @@ +package com.iformall.domain.vo.print; + +import lombok.Data; +import java.io.Serializable; +import java.util.List; + +@Data +public class PrintDataBraidTableColumns implements Serializable { + + private static final long serialVersionUID = 1L; + private String title; + private String value; + private String name; + private PrintDataBraidTableColumnsTrSet trSet; +} diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/print/PrintDataBraidTableColumnsTrSet.java b/mallinkService/src/main/java/com/iformall/domain/vo/print/PrintDataBraidTableColumnsTrSet.java new file mode 100644 index 000000000..4f64700a3 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/vo/print/PrintDataBraidTableColumnsTrSet.java @@ -0,0 +1,14 @@ +package com.iformall.domain.vo.print; + +import lombok.Data; +import java.io.Serializable; +import java.util.List; + +@Data +public class PrintDataBraidTableColumnsTrSet implements Serializable { + + private static final long serialVersionUID = 1L; + private String title; + private Integer col; + private String margin; +} diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/print/PrintDataBraidTxt.java b/mallinkService/src/main/java/com/iformall/domain/vo/print/PrintDataBraidTxt.java new file mode 100644 index 000000000..63ba5bd25 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/vo/print/PrintDataBraidTxt.java @@ -0,0 +1,39 @@ +package com.iformall.domain.vo.print; + +import lombok.Data; +import java.io.Serializable; + +@Data +public class PrintDataBraidTxt implements Serializable { + + private static final long serialVersionUID = 1L; + + //模板类型 braid-txt / braid-table / braid-html / braid-image / bar-code + private String type="braid-txt"; + //是否可编辑 + private Integer isEdit; + //打印项名称 + private String title; + //动态打印项数据名称(对应打印数据 key-name) + private String name; + //打印项内容 + private String value; + //打印项默认内容 + private String defaultValue; + +// //是否可拖拽 +// private Boolean dragable; +// //尺寸是否可变 +// private Boolean resizable; +// //打印项宽度(px) +// private BigDecimal width; +// //打印项高度(px) +// private BigDecimal height; +// //左偏移量(px) +// private BigDecimal left; +// //上偏移量(px) +// private BigDecimal top; + + //LODOP 默认打印项样式 + //private lodopStyle; +} diff --git a/mallinkService/src/main/resources/mapper/WxFinancePrintTemplateMapper.xml b/mallinkService/src/main/resources/mapper/WxFinancePrintTemplateMapper.xml index 6f25bf241..3d9482c63 100644 --- a/mallinkService/src/main/resources/mapper/WxFinancePrintTemplateMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxFinancePrintTemplateMapper.xml @@ -14,7 +14,7 @@ - `id`,`tenant_id`,`parent_tenant_id`,`create_time`,`update_time`,`is_del`,`type`,`name`,`price`,`content` + `id`,`tenant_id`,`parent_tenant_id`,`create_time`,`update_time`,`is_del`,`type`,`name`,`content`