parent
6c583ea512
commit
2b3144aca9
|
|
@ -48,8 +48,8 @@ public class PlanReportPlugin extends AbstractReportListDataPlugin {
|
|||
private static final String DANGYUE_SELECT = "fbillno," +
|
||||
"fstartdate_yyyyMM as dangyueqijian," +
|
||||
"fbankcateid as fbankcateid1," +
|
||||
"total_fdetailext12 as shkd_cljrzwye," +
|
||||
"total_fdetailext13 as shkd_yxsx," +
|
||||
"detailext12 as shkd_cljrzwye," +
|
||||
"detailext13 as shkd_yxsx," +
|
||||
"total_fdetailext15 as shkd_dytqhk," +
|
||||
"total_fdetailext16 as shkd_dydqhk," +
|
||||
"total_fdetailext17 as shkd_dyxd," +
|
||||
|
|
@ -105,7 +105,21 @@ public class PlanReportPlugin extends AbstractReportListDataPlugin {
|
|||
|
||||
StringBuilder dangyuesqlBuilder=getsql(id,zdm,dangyue,shkd_km);
|
||||
DataSet dangyueres = DB.queryDataSet(this.getClass().getSimpleName(), DBRoute.of("fi"), dangyuesqlBuilder.toString());//财务云
|
||||
dangyueres= dangyueres.select(DANGYUE_SELECT);
|
||||
|
||||
DataSet dataSet_sum = DB.queryDataSet(this.getClass().getSimpleName(), DBRoute.of("fi"),
|
||||
"SELECT\n" +
|
||||
"fbankcateid AS bankcate,\n" +
|
||||
"SUM(fdetailext12) AS detailext12,\n" +
|
||||
"SUM(fdetailext13) AS detailext13\n" +
|
||||
"FROM\n" +
|
||||
"t_fpm_reportdatadetail\n" +
|
||||
"WHERE\n" +
|
||||
"fid = "+id+"\n" +
|
||||
"GROUP BY\n" +
|
||||
"fbankcateid");//财务云
|
||||
JoinDataSet join1 = dangyueres.join(dataSet_sum, JoinType.LEFT);
|
||||
DataSet finish1 = join1.on("fbankcateid", "bankcate").select(dangyueres.getRowMeta().getFieldNames(),new String[]{"detailext12", "detailext13"}).finish();
|
||||
dangyueres= finish1.select(DANGYUE_SELECT);
|
||||
|
||||
StringBuilder xiayueyuesqlBuilder=getsql(id,zdm,xiayueyue,shkd_km);
|
||||
DataSet xiayueyueres = DB.queryDataSet(this.getClass().getSimpleName(), DBRoute.of("fi"), xiayueyuesqlBuilder.toString());//财务云
|
||||
|
|
|
|||
Loading…
Reference in New Issue