winter пре 1 година
родитељ
комит
9b56961674
3 измењених фајлова са 26 додато и 4 уклоњено
  1. +8
    -0
      mallinkService/src/main/java/com/iformall/print/PrintDataHandler.java
  2. +13
    -0
      mallinkService/src/main/java/com/iformall/print/entity/component/html/PrintHtml.java
  3. +5
    -4
      mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java

+ 8
- 0
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.domain.po.WxFinancePrintData;
import com.iformall.enums.EnumYesOrNo; import com.iformall.enums.EnumYesOrNo;
import com.iformall.print.entity.PrintComponent; 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.PrintBraidTable;
import com.iformall.print.entity.component.table.PrintBraidTableColumns; import com.iformall.print.entity.component.table.PrintBraidTableColumns;
import com.iformall.print.entity.component.table.PrintBraidTableColumnsTrSet; import com.iformall.print.entity.component.table.PrintBraidTableColumnsTrSet;
@@ -66,6 +67,13 @@ public class PrintDataHandler implements Serializable {
} }
table.setColumnsAttr(columnsAttr); table.setColumnsAttr(columnsAttr);
return table; 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; return null;
} }


+ 13
- 0
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;
}

+ 5
- 4
mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java Прегледај датотеку

@@ -61,13 +61,10 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService {
boolean isGenarated = false; boolean isGenarated = false;
if (StringUtils.isBlank(record.getContent())) { if (StringUtils.isBlank(record.getContent())) {
Map map = new HashMap(); Map map = new HashMap();
map.put("title", record.getName());
map.put("type", record.getType());
map.put("width", 770); map.put("width", 770);
map.put("height", 500); map.put("height", 500);
map.put("pageWidth", 215); map.put("pageWidth", 215);
map.put("pageHeight", 140); map.put("pageHeight", 140);
map.put("id", String.valueOf(record.getId()));
map.put("defaultValue", 0); map.put("defaultValue", 0);
record.setContent(JSON.toJSONString(map)); record.setContent(JSON.toJSONString(map));
isGenarated = true; isGenarated = true;
@@ -79,8 +76,10 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService {
record.setCreateTime(date); record.setCreateTime(date);
record.setUpdateTime(date); record.setUpdateTime(date);
JSONObject o = record.getContentJson(); JSONObject o = record.getContentJson();
o.put("id", String.valueOf(record.getId()));
o.put("defaultValue", 0); o.put("defaultValue", 0);
o.put("title", record.getName()); o.put("title", record.getName());
o.put("type", record.getType());
record.setContent(JSON.toJSONString(o)); record.setContent(JSON.toJSONString(o));
try { try {
wxFinancePrintTemplateMapper.insert(record); wxFinancePrintTemplateMapper.insert(record);
@@ -91,8 +90,10 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService {
} else { } else {
if (null != record.getContentJson()) { if (null != record.getContentJson()) {
JSONObject o = record.getContentJson(); JSONObject o = record.getContentJson();
o.put("id", String.valueOf(record.getId()));
o.put("defaultValue", 0); o.put("defaultValue", 0);
o.put("title", record.getName()); o.put("title", record.getName());
o.put("type", record.getType());
record.setContent(JSON.toJSONString(o)); record.setContent(JSON.toJSONString(o));
} }
record.setUpdateTime(date); record.setUpdateTime(date);
@@ -108,7 +109,7 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService {


@Override @Override
public List<Map> parseTemplateData(String tenantId, Integer type, List<Long> dataIds) { public List<Map> parseTemplateData(String tenantId, Integer type, List<Long> dataIds) {
EnumFinancePrintDataType printDatatype = EnumFinancePrintDataType.getEnum(type);
// EnumFinancePrintDataType printDatatype = EnumFinancePrintDataType.getEnum(type);
// //付款单 // //付款单
// if (printDatatype.getCode().intValue() == EnumFinancePrintDataType.FINANCE_RECEIVE.getCode()) { // if (printDatatype.getCode().intValue() == EnumFinancePrintDataType.FINANCE_RECEIVE.getCode()) {
// TenantEntity tenantEntity = new TenantEntity(); // TenantEntity tenantEntity = new TenantEntity();


Loading…
Откажи
Сачувај