Browse Source

fix

release_toaliyun_real
winter 1 year ago
parent
commit
de60e46827
6 changed files with 103 additions and 1 deletions
  1. +5
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinancePrintController.java
  2. +29
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/print/PrintDataBraidTable.java
  3. +15
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/print/PrintDataBraidTableColumns.java
  4. +14
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/print/PrintDataBraidTableColumnsTrSet.java
  5. +39
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/print/PrintDataBraidTxt.java
  6. +1
    -1
      mallinkService/src/main/resources/mapper/WxFinancePrintTemplateMapper.xml

+ 5
- 0
mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinancePrintController.java View File

@@ -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 {


+ 29
- 0
mallinkService/src/main/java/com/iformall/domain/vo/print/PrintDataBraidTable.java View File

@@ -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<Object> defaultValue;
private String tabelHtml;
//表格列
private List<PrintDataBraidTableColumns> columnsAttr;
//LODOP 默认打印项样式
//private lodopStyle;
}

+ 15
- 0
mallinkService/src/main/java/com/iformall/domain/vo/print/PrintDataBraidTableColumns.java View File

@@ -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;
}

+ 14
- 0
mallinkService/src/main/java/com/iformall/domain/vo/print/PrintDataBraidTableColumnsTrSet.java View File

@@ -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;
}

+ 39
- 0
mallinkService/src/main/java/com/iformall/domain/vo/print/PrintDataBraidTxt.java View File

@@ -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;
}

+ 1
- 1
mallinkService/src/main/resources/mapper/WxFinancePrintTemplateMapper.xml View File

@@ -14,7 +14,7 @@
</resultMap>

<sql id="allColumns">
`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`
</sql>

<sql id="dynamicWhereConditions">


Loading…
Cancel
Save