yonyou
/
tkjt
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
mzr 2024-12-26 10:52:10 +08:00
parent 6be0134d26 fa8e6321b7
commit e29c23d9fa
1 changed files with 47 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
ssctp/src/client/nccloud/web/ssctp/sscbd/ssctask/action/SSCTaskHandleQueryAction.java
View File

@ -235,11 +235,56 @@ public class SSCTaskHandleQueryAction
} }
whereSql.append(" ) "); whereSql.append(" ) ");
} }
//젬꿴 마운데、澗운데、寮괩饋데、寮썼운데 愷蠟데綾
whereSql.append(" or task.pk_bill in ( "); whereSql.append(" or task.pk_bill in ( ");
whereSql.append(" SELECT task.pk_bill FROM ssctp_task task LEFT JOIN AR_GATHERITEM bill on task.busiid = bill.pk_gatherbill LEFT JOIN BD_BALATYPE bala on bala.pk_balatype = bill.pk_balatype"); whereSql.append(" SELECT " +
" pk_bill " +
"FROM " +
" ( " +
" SELECT " +
" task.pk_bill, " +
" bala.name " +
" FROM " +
" ssctp_task task " +
" INNER JOIN AR_GATHERITEM bill ON task.busiid = bill.pk_gatherbill " +
" INNER JOIN BD_BALATYPE bala ON bala.pk_balatype = bill.pk_balatype " +
// " WHERE " +
// " task.pk_billtype = '0000Z3000000000000F2' " +
" UNION " +
" SELECT " +
" task.pk_bill, " +
" bala.name " +
" FROM " +
" ssctp_task task " +
" INNER JOIN ap_paybill bill ON task.busiid = bill.pk_paybill " +
" INNER JOIN AP_PAYITEM item ON item.pk_paybill = bill.pk_paybill " +
" LEFT JOIN BD_BALATYPE bala ON bala.pk_balatype = item.pk_balatype " +
// " WHERE " +
// " task.pk_billtype = '0000Z3000000000000F3' " +
" UNION " +
" SELECT " +
" task.pk_bill, " +
" bala.name " +
" FROM " +
" ssctp_task task " +
" INNER JOIN er_bxzb bill ON task.busiid = bill.pk_jkbx " +
" INNER JOIN BD_BALATYPE bala ON bala.pk_balatype = bill.jsfs " +
// " WHERE " +
// " task.pk_billtype = '0000Z30000000000264X' " +
" UNION " +
" SELECT " +
" task.pk_bill, " +
" bala.name " +
" FROM " +
" ssctp_task task " +
" INNER JOIN er_jkzb bill ON task.busiid = bill.pk_jkbx " +
" INNER JOIN BD_BALATYPE bala ON bala.pk_balatype = bill.jsfs " +
// " WHERE " +
// " task.pk_billtype = '0000Z30000000000263X' " +
" ) pk_type ");
whereSql.append(" where "); whereSql.append(" where ");
for (int i = 0; i < vas.size(); i++) { for (int i = 0; i < vas.size(); i++) {
whereSql.append(" bala.name LIKE '%").append(vas.get(i)).append("%'"); whereSql.append(" pk_type.name LIKE '%").append(vas.get(i)).append("%'");
if (i < vas.size() - 1) { if (i < vas.size() - 1) {
whereSql.append(" OR "); whereSql.append(" OR ");
} }