报表优化修改
diff --git a/src/main/java/com/supwisdom/dlpay/atte/controller/CustAtteController.java b/src/main/java/com/supwisdom/dlpay/atte/controller/CustAtteController.java
index c51b312..ce8948d 100644
--- a/src/main/java/com/supwisdom/dlpay/atte/controller/CustAtteController.java
+++ b/src/main/java/com/supwisdom/dlpay/atte/controller/CustAtteController.java
@@ -1271,8 +1271,10 @@
er.setP3(getState(at.getP3()));
er.setA4(getState(at.getA4()));
er.setP4(getState(at.getP4()));
- er.setA6(getState(at.getA5()));
- er.setP6(getState(at.getP5()));
+ er.setA5(getState(at.getA5()));
+ er.setP5(getState(at.getP5()));
+ er.setA6(getState(at.getA6()));
+ er.setP6(getState(at.getP6()));
er.setA7(getState(at.getA7()));
er.setP7(getState(at.getP7()));
er.setA8(getState(at.getA8()));
diff --git a/src/main/resources/templates/atte/newreport/index.html b/src/main/resources/templates/atte/newreport/index.html
index 1163d3f..ce97309 100644
--- a/src/main/resources/templates/atte/newreport/index.html
+++ b/src/main/resources/templates/atte/newreport/index.html
@@ -894,7 +894,7 @@
var opercode=that.oper.opercode;
var dtcode=that.preportform.dtcode;
var url = encodeURI('[[@{/atte/excel/excelnewreport?startdate=}]]' + startdate + '&enddate=' + enddate + '&custtypeid=' + custtypeid + '&custname=' + custname+"&cardno="+cardno+"&opercode="+opercode+"&dtcode="+dtcode);
- window.open(url);
+ window.location.href=url;
}