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

提交人：陈绍鑫 

日期：2025/5/9 16：30
内容:上划下拨汇总表开户行字段修改
This commit is contained in:
陈绍鑫 2025-05-09 16:41:10 +08:00
parent bdf7472d44
commit 1ceccc179b
3 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/operation/domain/NewBankAcctCloseSubmitValidator.java
View File

@ -5,6 +5,12 @@
package shkd.sys.sys.plugin.operation.domain; package shkd.sys.sys.plugin.operation.domain;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import kd.bos.dataentity.entity.DynamicObject; import kd.bos.dataentity.entity.DynamicObject;
import kd.bos.dataentity.entity.DynamicObjectCollection; import kd.bos.dataentity.entity.DynamicObjectCollection;
import kd.bos.entity.ExtendedDataEntity; import kd.bos.entity.ExtendedDataEntity;
@ -14,17 +20,12 @@ import kd.bos.orm.util.CollectionUtils;
import kd.bos.servicehelper.BusinessDataServiceHelper; import kd.bos.servicehelper.BusinessDataServiceHelper;
import kd.tmc.am.common.helper.AmParameterHelper; import kd.tmc.am.common.helper.AmParameterHelper;
import kd.tmc.am.common.helper.BankAcctHelper; import kd.tmc.am.common.helper.BankAcctHelper;
import kd.tmc.am.common.helper.BankAcctManageHelp;
import kd.tmc.am.common.resource.AmBizResource; import kd.tmc.am.common.resource.AmBizResource;
import kd.tmc.fbp.business.validate.AbstractTmcBizOppValidator; import kd.tmc.fbp.business.validate.AbstractTmcBizOppValidator;
import kd.tmc.fbp.common.helper.CasBusinessHelper; import kd.tmc.fbp.common.helper.CasBusinessHelper;
import kd.tmc.fbp.common.util.EmptyUtil; import kd.tmc.fbp.common.util.EmptyUtil;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
public class NewBankAcctCloseSubmitValidator extends AbstractTmcBizOppValidator { public class NewBankAcctCloseSubmitValidator extends AbstractTmcBizOppValidator {
public NewBankAcctCloseSubmitValidator() { public NewBankAcctCloseSubmitValidator() {
} }
@ -64,9 +65,10 @@ public class NewBankAcctCloseSubmitValidator extends AbstractTmcBizOppValidator
DynamicObject company = bankAcct.getDynamicObject("company"); DynamicObject company = bankAcct.getDynamicObject("company");
List<String> errorMsgList = new ArrayList(5); List<String> errorMsgList = new ArrayList(5);
if (company != null) { if (company != null) {
boolean isNeedCheck = AmParameterHelper.getAppBoolParameter(company.getLong("id"), "bankacctclosectrl"); // boolean isNeedCheck = AmParameterHelper.getAppBoolParameter(company.getLong("id"), "bankacctclosectrl");
if (true) { if (true) {
String checkBillList = AmParameterHelper.getAppStringParameter(company.getLong("id"), "bankacctclosectrlitem"); // String checkBillList = AmParameterHelper.getAppStringParameter(company.getLong("id"), "bankacctclosectrlitem");
String checkBillList = ",pay,rec,agent,cashmgtinit,journalcheck,";
long bankAcctId = bankAcct.getLong("id"); long bankAcctId = bankAcct.getLong("id");
AmBizResource amBizResource = new AmBizResource(); AmBizResource amBizResource = new AmBizResource();
if (!EmptyUtil.isEmpty(checkBillList)) { if (!EmptyUtil.isEmpty(checkBillList)) {

4
sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/transbillreportnewFormPlugin.java
View File

@ -37,8 +37,8 @@ import kd.tmc.fca.common.enums.StatisCycleEnum;
public class transbillreportnewFormPlugin extends AbstractReportFormPlugin implements HyperLinkClickListener { public class transbillreportnewFormPlugin extends AbstractReportFormPlugin implements HyperLinkClickListener {
private static final String[] BANK_DIMENSION = new String[]{"sumlevel", "parentorg", "parentorgid", "bank", "bankid", "sonorg", "sonorgid","shkd_zzhkhh", "shkd_subacct", "shkd_subacctnumber","statcurrency", "shkd_nckyye","shkd_bnupamount","shkd_bndownamount","shkd_bndifferenceamount","shkd_qckyye", "upamount", "downamount", "differenceamount","shkd_qmkyye","shkd_hightlight"}; private static final String[] BANK_DIMENSION = new String[]{"sumlevel", "parentorg", "parentorgid", "bank", "bankid", "shkd_mzhkhh","sonorg", "sonorgid","shkd_zzhkhh", "shkd_subacct", "shkd_subacctnumber","statcurrency", "shkd_nckyye","shkd_bnupamount","shkd_bndownamount","shkd_bndifferenceamount","shkd_qckyye", "upamount", "downamount", "differenceamount","shkd_qmkyye","shkd_hightlight"};
private static final String[] SON_ORG_DIMENSION = new String[]{"sumlevel", "parentorg", "parentorgid", "sonorg", "sonorgid", "bank", "bankid","shkd_zzhkhh" , "shkd_subacct", "shkd_subacctnumber","statcurrency", "shkd_nckyye","shkd_bnupamount","shkd_bndownamount","shkd_bndifferenceamount","shkd_qckyye", "upamount", "downamount", "differenceamount","shkd_qmkyye","shkd_hightlight"}; private static final String[] SON_ORG_DIMENSION = new String[]{"sumlevel", "parentorg", "parentorgid", "sonorg", "sonorgid", "bank", "bankid","shkd_mzhkhh","shkd_zzhkhh" , "shkd_subacct", "shkd_subacctnumber","statcurrency", "shkd_nckyye","shkd_bnupamount","shkd_bndownamount","shkd_bndifferenceamount","shkd_qckyye", "upamount", "downamount", "differenceamount","shkd_qmkyye","shkd_hightlight"};
@Override @Override
public void hyperLinkClick(HyperLinkClickEvent evt) { public void hyperLinkClick(HyperLinkClickEvent evt) {
String field = evt.getFieldName(); String field = evt.getFieldName();

22
sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/transbillreportnewPlugin.java
View File

@ -58,8 +58,8 @@ public class transbillreportnewPlugin extends AbstractTmcTreeReportDataPlugin {
private static final String DOWN_SON_ORG_SELECT = "company.name as parentorg, company.id as parentorgid, entrys.e_useorg.name as sonorg, entrys.e_useorg.id as sonorgid, currency, 0 as upamount, entrys.transamt as downamount"; private static final String DOWN_SON_ORG_SELECT = "company.name as parentorg, company.id as parentorgid, entrys.e_useorg.name as sonorg, entrys.e_useorg.id as sonorgid, currency, 0 as upamount, entrys.transamt as downamount";
private static final String BANK_SELECT = "parentorg, parentorgid, bank, bankid, upamount_report as upamount, downamount_report as downamount"; private static final String BANK_SELECT = "parentorg, parentorgid, bank, bankid, upamount_report as upamount, downamount_report as downamount";
private static final String SON_ORG_SELECT = "parentorg, parentorgid, sonorg, sonorgid, upamount_report as upamount, downamount_report as downamount"; private static final String SON_ORG_SELECT = "parentorg, parentorgid, sonorg, sonorgid, upamount_report as upamount, downamount_report as downamount";
private static final String[] BANK_GROUP_SELECT = new String[]{"parentorg", "parentorgid", "bank", "bankid","sonorg","sonorgid","shkd_subacct","shkd_zzhkhh"}; private static final String[] BANK_GROUP_SELECT = new String[]{"parentorg", "parentorgid", "bank", "bankid","sonorg","sonorgid","shkd_subacct","shkd_zzhkhh","shkd_mzhkhh"};
private static final String[] SON_ORG_GROUP_SELECT = new String[]{"parentorg", "parentorgid", "sonorg","sonorgid","bank", "bankid","shkd_subacct","shkd_zzhkhh"}; private static final String[] SON_ORG_GROUP_SELECT = new String[]{"parentorg", "parentorgid", "sonorg","sonorgid","bank", "bankid","shkd_subacct","shkd_zzhkhh","shkd_mzhkhh"};
private List<String> sumAmountFieldList; private List<String> sumAmountFieldList;
private String sumNameField; private String sumNameField;
private boolean isCompute = true; private boolean isCompute = true;
@ -79,15 +79,15 @@ public class transbillreportnewPlugin extends AbstractTmcTreeReportDataPlugin {
// groupSelect = BANK_GROUP_SELECT; // groupSelect = BANK_GROUP_SELECT;
// this.setSumNameField("bank"); // this.setSumNameField("bank");
upSelect = "company.name as parentorg, company.id as parentorgid, bank.name as bank, bank.id as bankid, entrys.subacct_company.name as sonorg, entrys.subacct_company.id as sonorgid, currency, entrys.transamt as upamount, 0 as downamount,entrys.subacct.id as shkd_subacct,entrys.subacct.bank.bank_cate as shkd_zzhkhh"; upSelect = "company.name as parentorg, company.id as parentorgid, bank.name as bank, bank.id as bankid, entrys.subacct_company.name as sonorg, entrys.subacct_company.id as sonorgid, currency, entrys.transamt as upamount, 0 as downamount,entrys.subacct.id as shkd_subacct,entrys.subacct.bank.bank_cate as shkd_zzhkhh,bank.bank_cate as shkd_mzhkhh";
downSelect = "company.name as parentorg, company.id as parentorgid, bank.name as bank, bank.id as bankid, entrys.subacct_company.name as sonorg, entrys.subacct_company.id as sonorgid, currency, 0 as upamount, entrys.transamt as downamount,entrys.subacct.id as shkd_subacct,entrys.subacct.bank.bank_cate as shkd_zzhkhh"; downSelect = "company.name as parentorg, company.id as parentorgid, bank.name as bank, bank.id as bankid, entrys.subacct_company.name as sonorg, entrys.subacct_company.id as sonorgid, currency, 0 as upamount, entrys.transamt as downamount,entrys.subacct.id as shkd_subacct,entrys.subacct.bank.bank_cate as shkd_zzhkhh,bank.bank_cate as shkd_mzhkhh";
select = "parentorg, parentorgid, bank, bankid, sonorg, sonorgid, upamount_report as upamount, downamount_report as downamount,shkd_subacct,shkd_zzhkhh"; select = "parentorg, parentorgid, bank, bankid, sonorg, sonorgid, upamount_report as upamount, downamount_report as downamount,shkd_subacct,shkd_zzhkhh,shkd_mzhkhh";
groupSelect = BANK_GROUP_SELECT; groupSelect = BANK_GROUP_SELECT;
this.setSumNameField("bank"); this.setSumNameField("bank");
} else {//不走 } else {//不走
upSelect = "company.name as parentorg, company.id as parentorgid, entrys.subacct_company.name as sonorg, entrys.subacct_company.id as sonorgid, bank.name as bank, bank.id as bankid, currency, entrys.transamt as upamount, 0 as downamount,entrys.subacct.id as shkd_subacct,entrys.subacct.bank.bank_cate as shkd_zzhkhh"; upSelect = "company.name as parentorg, company.id as parentorgid, entrys.subacct_company.name as sonorg, entrys.subacct_company.id as sonorgid, bank.name as bank, bank.id as bankid, currency, entrys.transamt as upamount, 0 as downamount,entrys.subacct.id as shkd_subacct,entrys.subacct.bank.bank_cate as shkd_zzhkhh,bank.bank_cate as shkd_mzhkhh";
downSelect = "company.name as parentorg, company.id as parentorgid, entrys.subacct_company.name as sonorg, entrys.subacct_company.id as sonorgid, bank.name as bank, bank.id as bankid, currency, 0 as upamount, entrys.transamt as downamount,entrys.subacct.id as shkd_subacct,entrys.subacct.bank.bank_cate as shkd_zzhkhh"; downSelect = "company.name as parentorg, company.id as parentorgid, entrys.subacct_company.name as sonorg, entrys.subacct_company.id as sonorgid, bank.name as bank, bank.id as bankid, currency, 0 as upamount, entrys.transamt as downamount,entrys.subacct.id as shkd_subacct,entrys.subacct.bank.bank_cate as shkd_zzhkhh,bank.bank_cate as shkd_mzhkhh";
select = "parentorg, parentorgid,sonorg, sonorgid, bank, bankid, upamount_report as upamount, downamount_report as downamount,shkd_subacct,shkd_zzhkhh"; select = "parentorg, parentorgid,sonorg, sonorgid, bank, bankid, upamount_report as upamount, downamount_report as downamount,shkd_subacct,shkd_zzhkhh,shkd_mzhkhh";
groupSelect = SON_ORG_GROUP_SELECT; groupSelect = SON_ORG_GROUP_SELECT;
this.setSumNameField("sonorg"); this.setSumNameField("sonorg");
} }
@ -124,7 +124,7 @@ public class transbillreportnewPlugin extends AbstractTmcTreeReportDataPlugin {
JoinDataSet join = dataSet.join(getqc, JoinType.LEFT);//连接 JoinDataSet join = dataSet.join(getqc, JoinType.LEFT);//连接
dataSet = join.on("shkd_subacct","shkd_subacct") dataSet = join.on("shkd_subacct","shkd_subacct")
.select(new String[]{"parentorg", "parentorgid", "bank", "bankid", "sonorg", "sonorgid","shkd_nckyye","shkd_qckyye","shkd_bnupamount","shkd_bndownamount", "upamount", "downamount","shkd_subacct","differenceamount","shkd_qmkyye","shkd_zzhkhh"}).finish(); .select(new String[]{"parentorg", "parentorgid", "bank", "bankid", "sonorg", "sonorgid","shkd_nckyye","shkd_qckyye","shkd_bnupamount","shkd_bndownamount", "upamount", "downamount","shkd_subacct","differenceamount","shkd_qmkyye","shkd_zzhkhh","shkd_mzhkhh"}).finish();
dataSet = dataSet.addField("shkd_bnupamount - shkd_bndownamount", "shkd_bndifferenceamount"); dataSet = dataSet.addField("shkd_bnupamount - shkd_bndownamount", "shkd_bndifferenceamount");
dataSet = dataSet.addField("case when shkd_qmkyye<>shkd_qckyye+differenceamount then 1 else 0 end","shkd_hightlight"); dataSet = dataSet.addField("case when shkd_qmkyye<>shkd_qckyye+differenceamount then 1 else 0 end","shkd_hightlight");
Object statCurrency = ((DynamicObject)paramMap.get("filter_statcurrency")).getPkValue(); Object statCurrency = ((DynamicObject)paramMap.get("filter_statcurrency")).getPkValue();
@ -446,7 +446,7 @@ public class transbillreportnewPlugin extends AbstractTmcTreeReportDataPlugin {
List<String> groupFields = this.groupFields(); List<String> groupFields = this.groupFields();
List<String> groupFields1; List<String> groupFields1;
if ("bank".equals(paramMap.get("filter_dimension"))) { if ("bank".equals(paramMap.get("filter_dimension"))) {
groupFields1 =Arrays.asList("parentorg","parentorgid","bank","bankid"); groupFields1 =Arrays.asList("parentorg","parentorgid","bank","bankid","shkd_mzhkhh");
}else { }else {
groupFields1 =Arrays.asList("parentorg","parentorgid","sonorg","sonorgid"); groupFields1 =Arrays.asList("parentorg","parentorgid","sonorg","sonorgid");
} }
@ -459,7 +459,7 @@ public class transbillreportnewPlugin extends AbstractTmcTreeReportDataPlugin {
bizDs = bizDs.union(subDs).orderBy((String[])this.orderByFields().toArray(new String[0])); bizDs = bizDs.union(subDs).orderBy((String[])this.orderByFields().toArray(new String[0]));
List<String> orderByFields1 ; List<String> orderByFields1 ;
if ("bank".equals(paramMap.get("filter_dimension"))) { if ("bank".equals(paramMap.get("filter_dimension"))) {
orderByFields1 =Arrays.asList("parentorg","parentorgid","shkd_px","bank","bankid","sumlevel"); orderByFields1 =Arrays.asList("parentorg","parentorgid","shkd_px","bank","bankid","shkd_mzhkhh","sumlevel");
}else { }else {
orderByFields1 =Arrays.asList("parentorg","parentorgid","shkd_px","sonorg","sonorgid","sumlevel"); orderByFields1 =Arrays.asList("parentorg","parentorgid","shkd_px","sonorg","sonorgid","sumlevel");
} }