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

- 优化资金计划科目逻辑 

--s
This commit is contained in:
weiyunlong 2025-04-21 15:30:55 +08:00
parent 575aa39092
commit 95c9ab67e4
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
main/java/shjh/jhzj7/fi/fi/plugin/operate/PayApplySaveOperation.java
View File

@ -142,13 +142,19 @@ public class PayApplySaveOperation extends AbstractOperationServicePlugIn implem
//是否充值类 //是否充值类
boolean shjhWhetherrechargecateg = bill.getBoolean("shjh_whetherrechargecateg"); boolean shjhWhetherrechargecateg = bill.getBoolean("shjh_whetherrechargecateg");
QFilter q2 = new QFilter("shjh_czl", QCP.equals, shjhWhetherrechargecateg); if (shjhWhetherrechargecateg) {
qFilter = qFilter.and(q2); QFilter q2 = new QFilter("shjh_czl", QCP.equals, shjhWhetherrechargecateg);
qFilter = qFilter.and(q2);
}
//是否自行采购 //是否自行采购
boolean shjhZxcg = bill.getBoolean("shjh_zxcg"); boolean shjhZxcg = bill.getBoolean("shjh_zxcg");
QFilter q3 = new QFilter("shjh_zxcg", QCP.equals, shjhZxcg); if (shjhZxcg) {
qFilter = qFilter.and(q3); QFilter q3 = new QFilter("shjh_zxcg", QCP.equals, shjhZxcg);
qFilter = qFilter.and(q3);
}
//事业部_多选基础资料,通过申请单的二级部门去映射表查询(shjh_ejbm_syb) //事业部_多选基础资料,通过申请单的二级部门去映射表查询(shjh_ejbm_syb)
DynamicObject shjhSecondarydept = bill.getDynamicObject("shjh_secondarydept"); DynamicObject shjhSecondarydept = bill.getDynamicObject("shjh_secondarydept");
@ -265,7 +271,8 @@ public class PayApplySaveOperation extends AbstractOperationServicePlugIn implem
DynamicObject[] accounts = BusinessDataServiceHelper.load("shjh_request_account", "id,shjh_membersubject", qFilter.toArray()); DynamicObject[] accounts = BusinessDataServiceHelper.load("shjh_request_account", "id,shjh_membersubject", qFilter.toArray());
if (accounts.length > 1) { if (accounts.length > 1) {
// 根据生效日期,失效日期区间,判断当前时间满足的数据 // 根据生效日期,失效日期区间,判断当前时间满足的数据
Date currentDate = new Date(); // Date currentDate = new Date();
Date currentDate = bill.getDate("applydate");//申请日期
QFilter startDateFilter = new QFilter("shjh_begindate", QCP.less_equals, currentDate); QFilter startDateFilter = new QFilter("shjh_begindate", QCP.less_equals, currentDate);
QFilter endDateFilter = new QFilter("shjh_enddate", QCP.large_equals, currentDate); QFilter endDateFilter = new QFilter("shjh_enddate", QCP.large_equals, currentDate);
QFilter newFilter = qFilter.and(startDateFilter).and(endDateFilter); QFilter newFilter = qFilter.and(startDateFilter).and(endDateFilter);

3
main/java/shjh/jhzj7/fi/fi/plugin/operate/PayBillSaveOperation.java
View File

@ -184,7 +184,8 @@ public class PayBillSaveOperation extends AbstractOperationServicePlugIn impleme
DynamicObject[] accounts = BusinessDataServiceHelper.load("shjh_pay_account", "id,shjh_membersubject", qFilter.toArray()); DynamicObject[] accounts = BusinessDataServiceHelper.load("shjh_pay_account", "id,shjh_membersubject", qFilter.toArray());
if (accounts.length > 1) { if (accounts.length > 1) {
// 根据生效日期,失效日期区间,判断当前时间满足的数据 // 根据生效日期,失效日期区间,判断当前时间满足的数据
Date currentDate = new Date(); // Date currentDate = new Date();
Date currentDate = bill.getDate("bizdate");//业务日期
QFilter startDateFilter = new QFilter("shjh_begindate", QCP.less_equals, currentDate); QFilter startDateFilter = new QFilter("shjh_begindate", QCP.less_equals, currentDate);
QFilter endDateFilter = new QFilter("shjh_enddate", QCP.large_equals, currentDate); QFilter endDateFilter = new QFilter("shjh_enddate", QCP.large_equals, currentDate);
QFilter newFilter = qFilter.and(startDateFilter).and(endDateFilter); QFilter newFilter = qFilter.and(startDateFilter).and(endDateFilter);