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

提交人：csx 

提交时间：2025年01月07日
提交内容：共享推送优化
This commit is contained in:
1981897232@qq.com 2026-01-14 10:52:48 +08:00
parent 61d4fed580
commit cad567661d
3 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/form/tsgxApiMappingBillPlugin.java
View File

@ -52,9 +52,8 @@ public class tsgxApiMappingBillPlugin extends AbstractBillPlugIn {
QFilter dzhdqFilter = null;
//要推送单据的默认过滤
if (sourcebillnumber.equals("bei_transdetail_cas")) {//交易明细
dzhdqFilter = new QFilter("bankdetailno", QCP.not_equals, null);
dzhdqFilter = new QFilter("company.shkd_sfjcgx", QCP.equals, true);
dzhdqFilter = dzhdqFilter.and(new QFilter("shkd_sfcgtsgx", QCP.equals, false));
dzhdqFilter = dzhdqFilter.and(new QFilter("company.shkd_sfjcgx", QCP.equals, true));
} else if (sourcebillnumber.equals("bei_elecreceipt")) {//电子回单
dzhdqFilter = new QFilter("ismatch", QCP.equals, true);
dzhdqFilter = dzhdqFilter.and(new QFilter("shkd_sfcgtsgx", QCP.equals, false));
@ -81,8 +80,10 @@ public class tsgxApiMappingBillPlugin extends AbstractBillPlugIn {
} catch (ParseException e) {
throw new RuntimeException(e);
}
if (zdyqFilter!=null){
dzhdqFilter = dzhdqFilter.and(zdyqFilter);
}
}
//映射配置过滤条件
QFilter getpeizhiqFilter=getpeizhiqFilter(shkd_apimapping);
if (getpeizhiqFilter!=null){

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

@ -62,6 +62,7 @@ public class InterestBearingRptListPlugin extends AbstractReportListDataPlugin {
FilterItemInfo ejCompanyFilter = filterInfo.getFilterItem("shkd_ejcompany"); //二级公司
FilterItemInfo rzztFilter = filterInfo.getFilterItem("shkd_rzzt"); //融资主体
FilterItemInfo zqrzhFilter = filterInfo.getFilterItem("shkd_zqrzh"); //金融机构（债权人总行）
FilterItemInfo zqrzhFilter1 = filterInfo.getFilterItem("shkd_zqrzh1"); //金融机构（债权人总行）
FilterItemInfo rzpzFilter = filterInfo.getFilterItem("shkd_rzpz"); //融资品种
FilterItemInfo finproductFilter = filterInfo.getFilterItem("shkd_finproduct"); //融资品种明细
FilterItemInfo rzqdFilter = filterInfo.getFilterItem("shkd_rzqd"); //融资渠道
@ -139,6 +140,12 @@ public class InterestBearingRptListPlugin extends AbstractReportListDataPlugin {
if(zqrzhFilter != null && zqrzhFilter.getValue() != null){
whereZqrzh = zqrzhFilter.getValue().toString();
}
if(zqrzhFilter1 != null && zqrzhFilter1.getValue() != null){
DynamicObject zqrzh = (DynamicObject) rzpzFilter.getValue();
if (zqrzh!=null){
whereZqrzh = zqrzh.getString("name");
}
}
//融资品种
if(rzpzFilter != null && rzpzFilter.getValue() != null){
DynamicObjectCollection rzpzColl = (DynamicObjectCollection) rzpzFilter.getValue();
@ -727,6 +734,7 @@ public class InterestBearingRptListPlugin extends AbstractReportListDataPlugin {
"selyearaddamt","selyearyhkamt","selyearnmamt","sumamt","sumzhrzcb","sumzhrzqx","zhrzcb","zhrzqx","guaranteeway","dbwkm","dbwname","lilv","remark",
"selbj2025","sellx2025","selbj2026","sellx2026","selbj2027","sellx2027","selbj2028","sellx2028","selbj2029","sellx2029","selbj2030","sellx2030",
"selbj2031","sellx2031","selbj2032","sellx2032","selbj2033","sellx2033","selbj2034","sellx2034","selbj2035","sellx2035","sumbj","sumlx","yghlx"}).finish();
DataSet dataRes2copy = dataRes2.copy();
String selhxSql = " /*dialect*/ select";
//计算元
if(amtUnit == null || amtUnit.equals("yuan")){
@ -795,7 +803,7 @@ public class InterestBearingRptListPlugin extends AbstractReportListDataPlugin {
if(srcCollection.size() > 0){
selData = buildDataByObjCollection(srcCollection);
}else{
selData = dataRes2;
selData = dataRes2copy;
}
}else if(dataSel.equals("datagp1")){
//融资主体汇总查询

5
sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/task/SharePushTaskPlugin.java
View File

@ -52,9 +52,8 @@ public class SharePushTaskPlugin extends AbstractTask {
QFilter dzhdqFilter = null;
//要推送单据的默认过滤
if (sourcebillnumber.equals("bei_transdetail_cas")) {//交易明细
dzhdqFilter = new QFilter("bankdetailno", QCP.not_equals, null);
dzhdqFilter = new QFilter("company.shkd_sfjcgx", QCP.equals, true);
dzhdqFilter = dzhdqFilter.and(new QFilter("shkd_sfcgtsgx", QCP.equals, false));
dzhdqFilter = dzhdqFilter.and(new QFilter("company.shkd_sfjcgx", QCP.equals, true));
} else if (sourcebillnumber.equals("bei_elecreceipt")) {//电子回单
dzhdqFilter = new QFilter("ismatch", QCP.equals, true);
dzhdqFilter = dzhdqFilter.and(new QFilter("shkd_sfcgtsgx", QCP.equals, false));
@ -81,8 +80,10 @@ public class SharePushTaskPlugin extends AbstractTask {
} catch (ParseException e) {
throw new RuntimeException(e);
}
if (zdyqFilter!=null){
dzhdqFilter = dzhdqFilter.and(zdyqFilter);
}
}
//映射配置过滤条件
QFilter getpeizhiqFilter=getpeizhiqFilter(shkd_apimapping);
if (getpeizhiqFilter!=null){