yuxueliang0813
/
shjh
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.付款申请接口返回值优化 

--s
This commit is contained in:
weiyunlong 2025-04-03 16:40:46 +08:00
parent dfc9bd99aa
commit afd416e4b5
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
main/java/shjh/jhzj7/fi/fi/plugin/report/StrongSharingQueryPlugin.java
View File

@ -72,15 +72,15 @@ public class StrongSharingQueryPlugin extends AbstractReportListDataPlugin imple
.finish(); .finish();
// 再次根据银行编码分组 求和余额 // 再次根据银行编码分组 求和余额
DataSet finish1 = result.groupBy(new String[]{"banknumber"}).sum("shjh_amountjz").finish(); result1 = result.groupBy(new String[]{"shjh_orgnumber", "shjh_orgname", "shjh_bankname","banknumber"}).sum("shjh_amountjz").finish();
// 分组后和源集合联表:除银行编码,余额的其他字段进行组合返回前台 // // 分组后和源集合联表:除银行编码,余额的其他字段进行组合返回前台
result1 = result.join(finish1) // result1 = result.join(finish1)
.on("banknumber","banknumber") // .on("banknumber","banknumber")
.on("shjh_amountjz","shjh_amountjz") // .on("shjh_amountjz","shjh_amountjz")
.select(new String[]{"shjh_billno", "shjh_orgnumber", "shjh_orgname", "shjh_bankname", "banknumber", // .select(new String[]{"shjh_billno", "shjh_orgnumber", "shjh_orgname", "shjh_bankname", "banknumber",
"shjh_biztime", "shjh_amountjz","accountbankid"}) // "shjh_biztime", "shjh_amountjz","accountbankid"})
.finish(); // .finish();
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
@ -140,15 +140,15 @@ public class StrongSharingQueryPlugin extends AbstractReportListDataPlugin imple
.finish(); .finish();
// 再次根据银行编码分组 求和余额 // 再次根据银行编码分组 求和余额
DataSet finish1 = result.groupBy(new String[]{"banknumber"}).sum("shjh_amounttn").finish(); result2 = result.groupBy(new String[]{"shjh_orgnumber", "shjh_orgname", "shjh_bankname","banknumber"}).sum("shjh_amounttn").finish();
// 分组后和源集合联表:除银行编码,余额的其他字段进行组合返回前台 // // 分组后和源集合联表:除银行编码,余额的其他字段进行组合返回前台
result2 = result.join(finish1) // result2 = result.join(finish1)
.on("banknumber","banknumber") // .on("banknumber","banknumber")
.on("shjh_amounttn","shjh_amounttn") // .on("shjh_amounttn","shjh_amounttn")
.select(new String[]{"shjh_billno", "shjh_orgnumber", "shjh_orgname", "shjh_bankname", "banknumber", // .select(new String[]{"shjh_billno", "shjh_orgnumber", "shjh_orgname", "shjh_bankname", "banknumber",
"shjh_biztime", "shjh_amounttn","accountbankid"}) // "shjh_biztime", "shjh_amounttn","accountbankid"})
.finish(); // .finish();
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
@ -177,8 +177,8 @@ public class StrongSharingQueryPlugin extends AbstractReportListDataPlugin imple
.on("shjh_orgname", "shjh_orgname") .on("shjh_orgname", "shjh_orgname")
.on("shjh_bankname", "shjh_bankname") .on("shjh_bankname", "shjh_bankname")
.on("shjh_orgnumber", "shjh_orgnumber") .on("shjh_orgnumber", "shjh_orgnumber")
.select(new String[]{"shjh_billno", "shjh_orgnumber", "shjh_orgname", "shjh_bankname", "banknumber", .select(new String[]{"shjh_orgnumber", "shjh_orgname", "shjh_bankname", "banknumber",
"shjh_biztime", "shjh_amountjz", "shjh_amounttn"}) "shjh_amountjz", "shjh_amounttn"})
.finish(); .finish();
finalResult.print(true); finalResult.print(true);

2
main/java/shjh/jhzj7/fi/fi/webapi/ApplyBillControler.java
View File

@ -297,7 +297,7 @@ public class ApplyBillControler {
handleError("同步失败,费控单据编号:" + fkBillNum + "的结算方式为空", fkBillNum, Apimenthod,jsonBodyString); handleError("同步失败,费控单据编号:" + fkBillNum + "的结算方式为空", fkBillNum, Apimenthod,jsonBodyString);
return handleErrorAndReturn(apiResultExt,"结算方式为空"); return handleErrorAndReturn(apiResultExt,"结算方式为空");
} }
QFilter Q6 = new QFilter("name", QCP.equals, settlementtype); QFilter Q6 = new QFilter("number", QCP.equals, settlementtype);
DynamicObject settlement = BusinessDataServiceHelper.loadSingle(BD_SETTLEMENTTYPE, new QFilter[]{Q6}); DynamicObject settlement = BusinessDataServiceHelper.loadSingle(BD_SETTLEMENTTYPE, new QFilter[]{Q6});
if (null == settlement) { if (null == settlement) {
handleError("同步失败,费控单据编号:" + fkBillNum + "的结算方式不存在", fkBillNum, Apimenthod,jsonBodyString); handleError("同步失败,费控单据编号:" + fkBillNum + "的结算方式不存在", fkBillNum, Apimenthod,jsonBodyString);