Browse Source

处理发票bug和应收应付导出bug

yujia 7 years ago
parent
commit
aeb708f753

+ 1 - 1
src/main/java/com/uas/platform/b2c/fa/payment/model/BankTransfer.java

@@ -34,7 +34,7 @@ public class BankTransfer {
 	private String banktranssn;
 
 	/**
-	 * 转账类型(转账给卖家,转账给平台)
+	 * 转账类型(转账给卖家,转账给平台, 平台代付
 	 */
 	@Column(name = "banktf_type")
 	private String type;

+ 3 - 1
src/main/java/com/uas/platform/b2c/fa/settlement/service/impl/BillSubmitServiceImpl.java

@@ -338,8 +338,10 @@ public class BillSubmitServiceImpl implements BillSubmitService {
             SimpleExpression orderids = new SimpleExpression("orderids", keyword, CriterionExpression.Operator.LIKE);
             SimpleExpression invoicetitle = new SimpleExpression("invoicetitle", keyword, CriterionExpression.Operator.LIKE);
             SimpleExpression receiverName = new SimpleExpression("receiverName", keyword, CriterionExpression.Operator.LIKE);
+            SimpleExpression submiterName = new SimpleExpression("submiter.userName", keyword, CriterionExpression.Operator.LIKE);
+            SimpleExpression submitEnterpriseName = new SimpleExpression("submitEnterprise.enName", keyword, CriterionExpression.Operator.LIKE);
             SimpleExpression recTel = new SimpleExpression("recTel", keyword, CriterionExpression.Operator.LIKE);
-            SimpleExpression[] simpleExpressions = new SimpleExpression[]{sellername, orderids, invoicetitle, receiverName, recTel};
+            SimpleExpression[] simpleExpressions = new SimpleExpression[]{sellername, orderids, invoicetitle, receiverName, recTel, submiterName, submitEnterpriseName};
             LogicalExpression logicalExpression = PredicateUtils.or(simpleExpressions);
             pageInfo.expression(logicalExpression);
         }

BIN
src/main/resources/jxls-tpl/trade/bankTransfer.xls


BIN
src/main/resources/jxls-tpl/trade/payRecord.xls