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

带息债务统计报表修改

This commit is contained in:
root 2025-12-01 15:35:49 +08:00
parent 08da4a3a6d
commit 4289eebb57
1 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/InterestBearingRptListPlugin.java
View File

@ -382,7 +382,7 @@ public class InterestBearingRptListPlugin extends AbstractReportListDataPlugin {
"INNER JOIN t_cfm_loanbill_e s2 ON s1.fid = s2.FID \n" + "INNER JOIN t_cfm_loanbill_e s2 ON s1.fid = s2.FID \n" +
"WHERE (s2.floantype = 'loan' OR s2.floantype = 'sl' OR s2.floantype = 'bond') \n" + "WHERE (s2.floantype = 'loan' OR s2.floantype = 'sl' OR s2.floantype = 'bond') \n" +
"AND (s1.fdrawtype = 'drawed' OR s1.fdrawtype = 'partpayment') \n" + "AND (s1.fdrawtype = 'drawed' OR s1.fdrawtype = 'partpayment') \n" +
// "AND t1.FBILLNO = s1.FBILLNO \n" + "AND t1.FBILLNO = s1.FBILLNO \n" +
"GROUP BY to_char(s2.fstartintdate,'yyyy') having to_char(s2.fstartintdate,'yyyy') < '"+year+"')"; "GROUP BY to_char(s2.fstartintdate,'yyyy') having to_char(s2.fstartintdate,'yyyy') < '"+year+"')";
//年度新增金额 //年度新增金额
String selYearAddAmt = "(SELECT sum(isnull(s1.fdrawamount,0))\n" + String selYearAddAmt = "(SELECT sum(isnull(s1.fdrawamount,0))\n" +
@ -390,7 +390,7 @@ public class InterestBearingRptListPlugin extends AbstractReportListDataPlugin {
"INNER JOIN t_cfm_loanbill_e s2 ON s1.fid = s2.FID \n" + "INNER JOIN t_cfm_loanbill_e s2 ON s1.fid = s2.FID \n" +
"WHERE (s2.floantype = 'loan' OR s2.floantype = 'sl' OR s2.floantype = 'bond') \n" + "WHERE (s2.floantype = 'loan' OR s2.floantype = 'sl' OR s2.floantype = 'bond') \n" +
"AND (s1.fdrawtype = 'drawed' OR s1.fdrawtype = 'partpayment') \n" + "AND (s1.fdrawtype = 'drawed' OR s1.fdrawtype = 'partpayment') \n" +
// "AND t1.FBILLNO = s1.FBILLNO \n" + "AND t1.FBILLNO = s1.FBILLNO \n" +
"GROUP BY to_char(s2.fstartintdate,'yyyy')having to_char(s2.fstartintdate,'yyyy') = '"+year+"')"; "GROUP BY to_char(s2.fstartintdate,'yyyy')having to_char(s2.fstartintdate,'yyyy') = '"+year+"')";
//年度已还金额 //年度已还金额
String selYearYhkAmt = "(SELECT sum(isnull(s5.frepayamount,0)) sumamt\n" + String selYearYhkAmt = "(SELECT sum(isnull(s5.frepayamount,0)) sumamt\n" +
@ -400,7 +400,7 @@ public class InterestBearingRptListPlugin extends AbstractReportListDataPlugin {
"inner JOIN t_cfm_repaymentbill s6 ON s5.fid = s6.fid\n" + "inner JOIN t_cfm_repaymentbill s6 ON s5.fid = s6.fid\n" +
"WHERE (s2.floantype = 'loan' OR s2.floantype = 'sl' OR s2.floantype = 'bond') \n" + "WHERE (s2.floantype = 'loan' OR s2.floantype = 'sl' OR s2.floantype = 'bond') \n" +
"AND (s1.fdrawtype = 'drawed' OR s1.fdrawtype = 'partpayment') \n" + "AND (s1.fdrawtype = 'drawed' OR s1.fdrawtype = 'partpayment') \n" +
// "AND t1.FBILLNO = s1.FBILLNO \n" + "AND t1.FBILLNO = s1.FBILLNO \n" +
"GROUP BY to_char(s6.fbizdate,'yyyy') having to_char(s6.fbizdate,'yyyy') = '"+year+"')"; "GROUP BY to_char(s6.fbizdate,'yyyy') having to_char(s6.fbizdate,'yyyy') = '"+year+"')";
//年末未还金额 //年末未还金额
String selYearNmAmt = "(SELECT sum(sum(isnull(s1.fnotrepayamount,0)))\n" + String selYearNmAmt = "(SELECT sum(sum(isnull(s1.fnotrepayamount,0)))\n" +
@ -408,7 +408,7 @@ public class InterestBearingRptListPlugin extends AbstractReportListDataPlugin {
"INNER JOIN t_cfm_loanbill_e s2 ON s1.fid = s2.FID \n" + "INNER JOIN t_cfm_loanbill_e s2 ON s1.fid = s2.FID \n" +
"WHERE (s2.floantype = 'loan' OR s2.floantype = 'sl' OR s2.floantype = 'bond') \n" + "WHERE (s2.floantype = 'loan' OR s2.floantype = 'sl' OR s2.floantype = 'bond') \n" +
"AND (s1.fdrawtype = 'drawed' OR s1.fdrawtype = 'partpayment') \n" + "AND (s1.fdrawtype = 'drawed' OR s1.fdrawtype = 'partpayment') \n" +
// "AND t1.FBILLNO = s1.FBILLNO \n" + "AND t1.FBILLNO = s1.FBILLNO \n" +
"GROUP BY to_char(s2.fstartintdate,'yyyy') having to_char(s2.fstartintdate,'yyyy') > '"+year+"')"; "GROUP BY to_char(s2.fstartintdate,'yyyy') having to_char(s2.fstartintdate,'yyyy') > '"+year+"')";
DataSet selData = null; DataSet selData = null;
//业务单元数据集 //业务单元数据集
@ -848,13 +848,14 @@ public class InterestBearingRptListPlugin extends AbstractReportListDataPlugin {
* @return * @return
*/ */
public String selBjAmt(String wheYear) { public String selBjAmt(String wheYear) {
String sql = "(SELECT sum(isnull(t3.fexdrawamount,0))\n" + String sql = "(SELECT sum(isnull(s3.fexdrawamount,0))\n" +
"FROM t_cfm_loanbill t1 \n" + "FROM t_cfm_loanbill s1 \n" +
"INNER JOIN t_cfm_loanbill_e t2 ON t1.fid = t2.FID \n" + "INNER JOIN t_cfm_loanbill_e s2 ON s1.fid = s2.FID \n" +
"LEFT JOIN t_cfm_loanbill_rp_entry t3 ON t1.fid = t3.fid\n" + "LEFT JOIN t_cfm_loanbill_rp_entry s3 ON s1.fid = s3.fid\n" +
"WHERE (t2.floantype = 'loan' OR t2.floantype = 'sl' OR t2.floantype = 'bond') \n" + "WHERE (s2.floantype = 'loan' OR s2.floantype = 'sl' OR s2.floantype = 'bond') \n" +
"AND (t1.fdrawtype = 'drawed' OR t1.fdrawtype = 'partpayment') \n" + "AND (s1.fdrawtype = 'drawed' OR s1.fdrawtype = 'partpayment') \n" +
"and to_char(t3.fexrepaymentdate,'yyyy') "+wheYear+")"; "AND t1.FBILLNO = s1.FBILLNO \n" +
"and to_char(s3.fexrepaymentdate,'yyyy') "+wheYear+")";
return sql; return sql;
} }
@ -863,13 +864,14 @@ public class InterestBearingRptListPlugin extends AbstractReportListDataPlugin {
* @return * @return
*/ */
public String selLxAmt(String wheYear) { public String selLxAmt(String wheYear) {
String sql = "(SELECT sum(isnull(t3.finterestcalamount,0))\n" + String sql = "(SELECT sum(isnull(s3.finterestcalamount,0))\n" +
"FROM t_cfm_loanbill t1 \n" + "FROM t_cfm_loanbill s1 \n" +
"INNER JOIN t_cfm_loanbill_e t2 ON t1.fid = t2.FID \n" + "INNER JOIN t_cfm_loanbill_e s2 ON s1.fid = s2.FID \n" +
"LEFT JOIN t_cfm_loanbill_ic_entry t3 ON t1.fid = t3.fid\n" + "LEFT JOIN t_cfm_loanbill_ic_entry s3 ON s1.fid = s3.fid\n" +
"WHERE (t2.floantype = 'loan' OR t2.floantype = 'sl' OR t2.floantype = 'bond') \n" + "WHERE (s2.floantype = 'loan' OR s2.floantype = 'sl' OR s2.floantype = 'bond') \n" +
"AND (t1.fdrawtype = 'drawed' OR t1.fdrawtype = 'partpayment') \n" + "AND (s1.fdrawtype = 'drawed' OR s1.fdrawtype = 'partpayment') \n" +
"and to_char(t3.finteresdate,'yyyy') "+wheYear+")"; "AND t1.FBILLNO = s1.FBILLNO \n" +
"and to_char(s3.finteresdate,'yyyy') "+wheYear+")";
return sql; return sql;
} }