wenlukang1
/
CTSK_DEV
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: wenlukang1:1cf45149026bb23c2c350996a18bc8bd6a75caad
Branches Tags
wenlukang1:main
..
compare: wenlukang1:ebab00177dab6211375993cf0c1388034e6f8730
Branches Tags
wenlukang1:main

No commits in common. "1cf45149026bb23c2c350996a18bc8bd6a75caad" and "ebab00177dab6211375993cf0c1388034e6f8730" have entirely different histories.
1cf4514902 ... ebab00177d

1 changed files with 3 additions and 17 deletions
Show Stats Expand all files Collapse all files

20
sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/PlanReportPlugin.java
View File

@ -48,8 +48,8 @@ public class PlanReportPlugin extends AbstractReportListDataPlugin {
private static final String DANGYUE_SELECT = "fbillno," +
"fstartdate_yyyyMM as dangyueqijian," +
"fbankcateid as fbankcateid1," +
"detailext12 as shkd_cljrzwye," +
"detailext13 as shkd_yxsx," +
"total_fdetailext12 as shkd_cljrzwye," +
"total_fdetailext13 as shkd_yxsx," +
"total_fdetailext15 as shkd_dytqhk," +
"total_fdetailext16 as shkd_dydqhk," +
"total_fdetailext17 as shkd_dyxd," +
@ -105,21 +105,7 @@ 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());//财务云
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);
dangyueres= dangyueres.select(DANGYUE_SELECT);
StringBuilder xiayueyuesqlBuilder=getsql(id,zdm,xiayueyue,shkd_km);
DataSet xiayueyueres = DB.queryDataSet(this.getClass().getSimpleName(), DBRoute.of("fi"), xiayueyuesqlBuilder.toString());//财务云