yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

问题修改

master
God 3 years ago
parent
ad18a74ba6
commit
c53d524de4
2 changed files with 37 additions and 31 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java
  2. 67
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java

1
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java
View File

@ -684,6 +684,7 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
public void sendFinPaymentrecord(BusinessVariables bv, BaseOutsourcingApplication booad, String costTitleKey, String costTitleValue) {
FinPaymentrecordDto finPaymentrecordDto = new FinPaymentrecordDto();
finPaymentrecordDto.setApplySid(bv.getBusinessSid());
finPaymentrecordDto.setCreateBySid(booad.getCreateBySid());
//付款单位sid
finPaymentrecordDto.setPayCompanySid(booad.getUseOrgSid());
//"付款类别，1付款/2退款"

67
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java
View File

@ -366,39 +366,44 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
//获取审批编号
BaseOutsourcingApplicationDetailsVo baseOutsourcingApplicationDetailsVo = baseOutsourcingApplicationFeign.fetchBySid(finPaymentrecord.getApplySid()).getData();
BusVehicleApplyDetailsVo busVehicleApplyDetailsVo = busVehicleApplyFeign.fetchSid(finPaymentrecord.getApplySid()).getData();
if (StringUtils.isNotBlank(baseOutsourcingApplicationDetailsVo.getApplicationCode())) {
dataMap.put("applyCode", baseOutsourcingApplicationDetailsVo.getApplicationCode());
//获取审批记录
FlowRecordVo flowRecordVo = flowTaskFeign.businessFlowRecord(baseOutsourcingApplicationDetailsVo.getProcInstSid()).getData();
List<FlowTask> flowList = flowRecordVo.getFlowList();
List<FinPaymentrecordSourceLCVo> finPaymentrecordSourceLCVos = new ArrayList<>();
for (FlowTask flowTask : flowList) {
FinPaymentrecordSourceLCVo finPaymentrecordSourceLCVo = new FinPaymentrecordSourceLCVo();
finPaymentrecordSourceLCVo.setName(flowTask.getTaskUserInfos().get(0).getAssigneeName());
finPaymentrecordSourceLCVo.setComment(flowTask.getComment().getComment());
finPaymentrecordSourceLCVo.setSpsj(DateUtil.format(flowTask.getFinishTime(), "yyyy-MM-dd"));
finPaymentrecordSourceLCVos.add(finPaymentrecordSourceLCVo);
}
dataMap.put("lcList", finPaymentrecordSourceLCVos);
//获取附件名称（文档类型）
CommonAppendixVo contract = baseOutsourcingApplicationDetailsVo.getContract();
if (contract != null) {
dataMap.put("fileName", contract.getFileName());
if (baseOutsourcingApplicationDetailsVo != null) {
if (StringUtils.isNotBlank(baseOutsourcingApplicationDetailsVo.getApplicationCode())) {
dataMap.put("applyCode", baseOutsourcingApplicationDetailsVo.getApplicationCode());
//获取审批记录
FlowRecordVo flowRecordVo = flowTaskFeign.businessFlowRecord(baseOutsourcingApplicationDetailsVo.getProcInstSid()).getData();
List<FlowTask> flowList = flowRecordVo.getFlowList();
List<FinPaymentrecordSourceLCVo> finPaymentrecordSourceLCVos = new ArrayList<>();
for (FlowTask flowTask : flowList) {
FinPaymentrecordSourceLCVo finPaymentrecordSourceLCVo = new FinPaymentrecordSourceLCVo();
finPaymentrecordSourceLCVo.setName(flowTask.getTaskUserInfos().get(0).getAssigneeName());
finPaymentrecordSourceLCVo.setComment(flowTask.getComment().getComment());
finPaymentrecordSourceLCVo.setSpsj(DateUtil.format(flowTask.getFinishTime(), "yyyy-MM-dd"));
finPaymentrecordSourceLCVos.add(finPaymentrecordSourceLCVo);
}
dataMap.put("lcList", finPaymentrecordSourceLCVos);
//获取附件名称（文档类型）
CommonAppendixVo contract = baseOutsourcingApplicationDetailsVo.getContract();
if (contract != null) {
dataMap.put("fileName", contract.getFileName());
}
}
} else if (StringUtils.isNotBlank(busVehicleApplyDetailsVo.getSid())) {
dataMap.put("applyCode", busVehicleApplyDetailsVo.getApplicationCode());
//获取审批记录
FlowRecordVo flowRecordVo = flowTaskFeign.businessFlowRecord(busVehicleApplyDetailsVo.getProcInstId()).getData();
List<FlowTask> flowList = flowRecordVo.getFlowList();
List<FinPaymentrecordSourceLCVo> finPaymentrecordSourceLCVos = new ArrayList<>();
for (FlowTask flowTask : flowList) {
FinPaymentrecordSourceLCVo finPaymentrecordSourceLCVo = new FinPaymentrecordSourceLCVo();
finPaymentrecordSourceLCVo.setName(flowTask.getTaskUserInfos().get(0).getAssigneeName());
finPaymentrecordSourceLCVo.setComment(flowTask.getComment().getComment());
finPaymentrecordSourceLCVo.setSpsj(DateUtil.format(flowTask.getFinishTime(), "yyyy-MM-dd"));
finPaymentrecordSourceLCVos.add(finPaymentrecordSourceLCVo);
}
if (busVehicleApplyDetailsVo != null) {
if (StringUtils.isNotBlank(busVehicleApplyDetailsVo.getSid())) {
dataMap.put("applyCode", busVehicleApplyDetailsVo.getApplicationCode());
//获取审批记录
FlowRecordVo flowRecordVo = flowTaskFeign.businessFlowRecord(busVehicleApplyDetailsVo.getProcInstId()).getData();
List<FlowTask> flowList = flowRecordVo.getFlowList();
List<FinPaymentrecordSourceLCVo> finPaymentrecordSourceLCVos = new ArrayList<>();
for (FlowTask flowTask : flowList) {
FinPaymentrecordSourceLCVo finPaymentrecordSourceLCVo = new FinPaymentrecordSourceLCVo();
finPaymentrecordSourceLCVo.setName(flowTask.getTaskUserInfos().get(0).getAssigneeName());
finPaymentrecordSourceLCVo.setComment(flowTask.getComment().getComment());
finPaymentrecordSourceLCVo.setSpsj(DateUtil.format(flowTask.getFinishTime(), "yyyy-MM-dd"));
finPaymentrecordSourceLCVos.add(finPaymentrecordSourceLCVo);
}
dataMap.put("lcList", finPaymentrecordSourceLCVos);
}
dataMap.put("lcList", finPaymentrecordSourceLCVos);
}
dataMap.put("createTime", DateUtil.format(finPaymentrecord.getCreateTime(), "yyyy-MM-dd"));
dataMap.put("createByName", createByName);

Write Preview
Loading…
Cancel
Save