合同模板修改

adm/src/main/java/com/minpay/guomao/templateexport/action/TemplateExportAction.java

@@ -4,7 +4,9 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.lang.reflect.InvocationTargetException;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -341,7 +343,7 @@ public class TemplateExportAction implements IMINAction {
 		
 		zhongzhiTime = DateUtil.getDifferentTimeByMinute(zhongzhiTime, 0, DateUtil.ZH_DATE_FORMAT_DB);
 		String zhongzhi = zhongzhiTime;
-        RowRenderData header = RowRenderData.build(new TextRenderData("品牌"), new TextRenderData( "规格"), new TextRenderData( "仓库"), new TextRenderData( "数量(吨)"), new TextRenderData( "单价(元/吨)"), new TextRenderData( "总金额(元)"));
+        RowRenderData header = RowRenderData.build(new TextRenderData("品牌"), new TextRenderData( "规格"), new TextRenderData( "仓库"), new TextRenderData( "数量(吨)"), new TextRenderData( "含税单价(元/吨)"), new TextRenderData( "含税总金额(元)"));
         List<RowRenderData> datas = new ArrayList<RowRenderData>();
         
         
@@ -418,8 +420,12 @@ public class TemplateExportAction implements IMINAction {
 		        put("points", points);// 交货地
 		        put("allweight", weightAll);//总重量
 		        put("allamt", amtAll);//总金额
+		        put("allAmtTaxExclusive", CommonUtil.divide(amtAll, "1.13", 2));//不含税总金额
 		        put("chineseNb", chineseNb);//中文大写
 		        put("table", new MiniTableRenderData(header, datas));// 产品表格信息
+		        Date date = new Date();
+		        SimpleDateFormat sb = new SimpleDateFormat("yyyy年/MM月/dd/日");
+		        put("payDate", sb.format(date));//支付日期
 		}});
 		
 		response.setContentType("multipart/form-data");