Commit 0a5f7a78 authored by hongguangwu's avatar hongguangwu

Merge remote-tracking branch 'origin/MVP1.7.17' into MVP1.7.17

parents 17607b8d 228a30b7
......@@ -810,7 +810,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
//1.9.17公积金自动化校验逻辑
if (employeeRegistrationPre.getServerItem().contains("公积金")) {
//根据身份证号码和项目编号查询公积金
TEmployeeAutoRegistCheckVo cardVo = new TEmployeeAutoRegistCheckVo();
/*TEmployeeAutoRegistCheckVo cardVo = new TEmployeeAutoRegistCheckVo();
cardVo.setEmpIdcard(employeeRegistrationPre.getEmpIdcard());
R<Boolean> fundFlag = socialDaprUtils.selectExitEmpFund(cardVo);
//是否已购买为是需要判断公积金是否在用或者流程中
......@@ -839,7 +839,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
}else {
return R.other(CommonConstants.TWO_INT,null,"获取公积金配置信息失败!");
}
}
}*/
//(公积金待办为在途在保)流程中的公积金数据不能修改
//查已购买公积金明细
if (null != employeeRegistrationPre.getDispatchInfoFundPreVo()
......
......@@ -645,8 +645,9 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
initFundPreInfo(preVo, preVo.getDispatchInfoFundPreVo(), user, empPreId);
}
//如果页面传承为不修改则不更新数据
if (null != preVo && null != preVo.getFundUpdateFlag()
&& preVo.getFundUpdateFlag().booleanValue()){
if (null != preVo && (null == preVo.getFundUpdateFlag()
|| (null != preVo.getFundUpdateFlag()
&& preVo.getFundUpdateFlag().booleanValue()))){
socialDaprUtils.saveFundPreInfo(preVo);
}
}
......
......@@ -625,13 +625,15 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
bizContent.setLanguage("zh_CN");
//指令包序列号:系统产生,一个集团永远不能重复
bizContent.setfSeqNo(seqNo);
//报文压缩标识:1:压缩rd区;空/0:不压缩 不压缩的话单次最多200笔;压缩的话单词最多5000笔
bizContent.setZipFlag("0");
//入账方式:0:逐笔记账;2:并笔记账
bizContent.setSettleMode("2");
bizContent.setSettleMode("0");
//总笔数
bizContent.setInstrCount(1);
//总金额:以分为单位
bizContent.setTotalAmount(1L);
//报文压缩内容:zip算法压缩rd区后再BASE64编码,约定取第一个文件
bizContent.setZip("");
List<MybankEnterprisePayPayentRequestV2.MybankEnterprisePayPayentRequestRdV2> rd = new ArrayList<>();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment