wip:出口报关明细报表
This commit is contained in:
parent
3f669694c9
commit
a6691b4d9b
@ -21,6 +21,7 @@ import java.math.BigDecimal;
|
||||
import java.math.RoundingMode;
|
||||
import java.util.*;
|
||||
|
||||
import static com.yem.rf.utils.RFUtils.formatDate;
|
||||
import static com.yem.rf.utils.RFUtils.getBaseQFilter;
|
||||
|
||||
/**
|
||||
@ -38,18 +39,6 @@ public class ExportDeclarationDetailsReportPlugin extends AbstractReportListData
|
||||
public DataSet query(ReportQueryParam param, Object o) throws Throwable {
|
||||
|
||||
FilterInfo filter = param.getFilter();
|
||||
Date fshipdate_start = filter.getDate("yem_fshipdate_start");//发货日期
|
||||
Date fshipdate_end = filter.getDate("yem_fshipdate_end");//发货日期
|
||||
|
||||
Date fexportdate_start = filter.getDate("yem_fexportdate_start");//出口日期
|
||||
Date fexportdate_end = filter.getDate("yem_fexportdate_end");//出口日期
|
||||
|
||||
String fcontactno = filter.getString("yem_fcontactno");//合同号
|
||||
|
||||
Long fcustomer = filter.getLong("yem_fcustomer");//客户
|
||||
|
||||
String fladingno = filter.getString("yem_fladingno");//提单号
|
||||
|
||||
|
||||
DataSet declaredocx = queryDeclareDocx(param);
|
||||
|
||||
@ -97,8 +86,34 @@ public class ExportDeclarationDetailsReportPlugin extends AbstractReportListData
|
||||
|
||||
StringBuilder sb = new StringBuilder();
|
||||
|
||||
Date fexportdate_start = filter.getDate("yem_fexportdate_start");//出口日期
|
||||
Date fexportdate_end = filter.getDate("yem_fexportdate_end");//出口日期
|
||||
|
||||
return dataSet;
|
||||
String fcontactno = filter.getString("yem_fcontactno");//合同号
|
||||
|
||||
Long fcustomer = filter.getLong("yem_fcustomer");//客户
|
||||
|
||||
String fladingno = filter.getString("yem_fladingno");//提单号
|
||||
|
||||
|
||||
sb.append("1=1");
|
||||
if (YEM.isNotEmpty(fexportdate_start)) {
|
||||
sb.append(" AND TO_DATE(yem_exportdate, 'yyyy-MM-dd') >= ").append(String.format("TO_DATE('%s','yyyy-MM-dd')", formatDate(fexportdate_start)));
|
||||
}
|
||||
if (YEM.isNotEmpty(fexportdate_end)) {
|
||||
sb.append(" AND TO_DATE(yem_exportdate, 'yyyy-MM-dd') <= ").append(String.format("TO_DATE('%s','yyyy-MM-dd')", formatDate(fexportdate_end)));
|
||||
}
|
||||
if (YEM.isNotEmpty(fcontactno)) {
|
||||
sb.append(" AND yem_contactno LIKE '%").append(fcontactno.trim()).append("%'");
|
||||
}
|
||||
if (YEM.isNotEmpty(fcustomer)) {
|
||||
sb.append(" AND yem_customer = ").append(fcustomer);
|
||||
}
|
||||
if (YEM.isNotEmpty(fladingno)) {
|
||||
sb.append(" AND yem_ladingno LIKE '%").append(fladingno.trim()).append("%'");
|
||||
}
|
||||
|
||||
return dataSet.where(sb.toString());
|
||||
}
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user