|
|
|
@ -29,6 +29,7 @@ import cn.hutool.core.bean.BeanUtil; |
|
|
|
import cn.hutool.core.date.DateUtil; |
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage; |
|
|
|
import com.google.common.util.concurrent.ThreadFactoryBuilder; |
|
|
|
import com.yxt.anrui.base.api.basemanufactorsubscription.BaseManufUpdateDto; |
|
|
|
import com.yxt.anrui.base.api.basemanufactorsubscription.BaseManufactorSubscriptionFeign; |
|
|
|
import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicationDetailsVo; |
|
|
|
@ -41,10 +42,14 @@ import com.yxt.anrui.base.api.basevehicleactualpay.BaseVehicleActualPay; |
|
|
|
import com.yxt.anrui.base.api.basevehicleactualpay.BaseVehicleActualPayFeign; |
|
|
|
import com.yxt.anrui.base.api.basevehicleactualsales.BaseVehicleActualSalesDetailsVo; |
|
|
|
import com.yxt.anrui.base.api.basevehicleactualsales.BaseVehicleActualSalesFeign; |
|
|
|
import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateDto; |
|
|
|
import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateEnum; |
|
|
|
import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyDetailsVo; |
|
|
|
import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyFeign; |
|
|
|
import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo; |
|
|
|
import com.yxt.anrui.base.common.enums.DictCommonEnum; |
|
|
|
import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.BusDeliveredApplyDetails; |
|
|
|
import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo; |
|
|
|
import com.yxt.anrui.fin.api.finpaymentapply.FinPaymentapply; |
|
|
|
import com.yxt.anrui.fin.api.finpaymentrecord.*; |
|
|
|
import com.yxt.anrui.fin.api.kingdee.appaybill.ApPayBill; |
|
|
|
@ -60,6 +65,7 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; |
|
|
|
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo; |
|
|
|
import com.yxt.anrui.portal.api.sysuser.SysUserFeign; |
|
|
|
import com.yxt.anrui.portal.api.sysuser.SysUserVo; |
|
|
|
import com.yxt.anrui.portal.api.sysuser.UserQuery; |
|
|
|
import com.yxt.common.base.config.component.FileUploadComponent; |
|
|
|
import com.yxt.common.base.service.MybatisBaseService; |
|
|
|
import com.yxt.common.base.utils.ConstantUtils; |
|
|
|
@ -71,10 +77,12 @@ import com.yxt.common.core.vo.PagerVo; |
|
|
|
import com.yxt.messagecenter.api.message.AppScmMessageFlowableQuery; |
|
|
|
import com.yxt.messagecenter.api.message.Message; |
|
|
|
import com.yxt.messagecenter.api.message.MessageFeign; |
|
|
|
import com.yxt.messagecenter.api.message.PushMessageQuery; |
|
|
|
import com.yxt.messagecenter.api.messagelist.MessageList; |
|
|
|
import com.yxt.messagecenter.api.messagelist.MessageListFeign; |
|
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
|
import org.apache.tomcat.util.threads.ThreadPoolExecutor; |
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
|
|
|
|
@ -83,6 +91,7 @@ import java.io.IOException; |
|
|
|
import java.io.InputStream; |
|
|
|
import java.text.NumberFormat; |
|
|
|
import java.util.*; |
|
|
|
import java.util.concurrent.*; |
|
|
|
import java.util.stream.Collectors; |
|
|
|
|
|
|
|
import static java.util.Comparator.comparing; |
|
|
|
@ -276,6 +285,9 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord |
|
|
|
if (sidState.contains(3)) { |
|
|
|
return rb.setMsg("处理的数据包含已作废的记录"); |
|
|
|
} |
|
|
|
if (sidState.contains(2)) { |
|
|
|
return rb.setMsg("处理的数据中包含已通过的记录"); |
|
|
|
} |
|
|
|
} |
|
|
|
List<String> list = new ArrayList<>(); |
|
|
|
for (int i = 0; i < sids.size(); i++) { |
|
|
|
@ -286,6 +298,13 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord |
|
|
|
String payFile = payFiles.stream().map(v -> v.replace(fileUploadComponent.getUrlPrefix(), "")).collect(Collectors.joining(",")); |
|
|
|
finPaymentrecord.setPayFile(payFile); |
|
|
|
} |
|
|
|
//推送金蝶付款单
|
|
|
|
try { |
|
|
|
ApPayBill apb = createApPayBill(finPaymentrecord); |
|
|
|
ResultBean resultBean1 = apPayBillService.draftApPayBill(apb); |
|
|
|
} catch (Exception e) { |
|
|
|
log.error(e.getMessage()); |
|
|
|
} |
|
|
|
baseMapper.updateById(finPaymentrecord); |
|
|
|
//更新付款申请中的状态
|
|
|
|
FinPaymentapply finPaymentapply = finPaymentapplyService.fetchBySid(finPaymentrecord.getApplySid()); |
|
|
|
@ -300,16 +319,8 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord |
|
|
|
baseManufUpdateDto.setState("1"); |
|
|
|
ResultBean resultBean = baseManufactorSubscriptionFeign.updatePaymentState(baseManufUpdateDto); |
|
|
|
} |
|
|
|
|
|
|
|
//推送金蝶付款单
|
|
|
|
try { |
|
|
|
ApPayBill apb = createApPayBill(finPaymentrecord); |
|
|
|
ResultBean resultBean1 = apPayBillService.draftApPayBill(apb); |
|
|
|
} catch (Exception e) { |
|
|
|
log.error(e.getMessage()); |
|
|
|
} |
|
|
|
//给外采或排产申请人系统消息提醒
|
|
|
|
AppScmMessageFlowableQuery query = new AppScmMessageFlowableQuery(); |
|
|
|
/*AppScmMessageFlowableQuery query = new AppScmMessageFlowableQuery(); |
|
|
|
ArrayList<String> recipientSidList = new ArrayList<>(); |
|
|
|
String costTypeKey = finPaymentrecord.getCostTypeKey(); |
|
|
|
if ("002".equals(costTypeKey)) { |
|
|
|
@ -344,6 +355,55 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord |
|
|
|
query.setModuleSid("98ff0724-5df4-4fc7-ab6d-3996e7706acd"); |
|
|
|
query.setName("财务管理"); |
|
|
|
messageFeign.sendMessage(query); |
|
|
|
}*/ |
|
|
|
String costTypeKey = finPaymentrecord.getCostTypeKey(); |
|
|
|
try { |
|
|
|
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder() |
|
|
|
.setNameFormat("demo-pool-%d").build(); |
|
|
|
ExecutorService pool = new ThreadPoolExecutor(1, 10, |
|
|
|
1000, TimeUnit.MILLISECONDS, |
|
|
|
new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); |
|
|
|
|
|
|
|
int finalI = i; |
|
|
|
if ("005".equals(costTypeKey)) { |
|
|
|
Future future6 = pool.submit(() -> { |
|
|
|
List<String> recipientSidList = new ArrayList<>(); |
|
|
|
BusVehicleApplyDetailsVo busVehicleApplyDetailsVo = busVehicleApplyFeign.fetchSid(finPaymentrecord.getApplySid()).getData(); |
|
|
|
String createBySid = busVehicleApplyDetailsVo.getCreateBySid(); |
|
|
|
recipientSidList.add(createBySid); |
|
|
|
PushMessageQuery pushMessageQuery = new PushMessageQuery(); |
|
|
|
pushMessageQuery.setReceivedSids(recipientSidList); |
|
|
|
pushMessageQuery.setModuleName("财务管理"); |
|
|
|
pushMessageQuery.setMsgContent("您的付款申请已确认通过"); |
|
|
|
pushMessageQuery.setApp_type("2"); |
|
|
|
pushMessageQuery.setModuleSid("98ff0724-5df4-4fc7-ab6d-3996e7706acd"); |
|
|
|
pushMessageQuery.setMsgTitle("付款确认通知"); |
|
|
|
pushMessageQuery.setBusinessSid(sids.get(finalI)); |
|
|
|
// 消息推送
|
|
|
|
messageFeign.pushNoUriMessage(pushMessageQuery); |
|
|
|
}); |
|
|
|
} else if ("002".equals(costTypeKey)) { |
|
|
|
Future future6 = pool.submit(() -> { |
|
|
|
List<String> recipientSidList = new ArrayList<>(); |
|
|
|
BaseOutsourcingApplicationDetailsVo baseOutsourcingApplicationDetailsVo = baseOutsourcingApplicationFeign.fetchBySid(finPaymentrecord.getApplySid()).getData(); |
|
|
|
String createBySid = baseOutsourcingApplicationDetailsVo.getCreateBySid(); |
|
|
|
recipientSidList.add(createBySid); |
|
|
|
PushMessageQuery pushMessageQuery = new PushMessageQuery(); |
|
|
|
pushMessageQuery.setReceivedSids(recipientSidList); |
|
|
|
pushMessageQuery.setModuleName("财务管理"); |
|
|
|
pushMessageQuery.setMsgContent("您的付款申请已确认通过"); |
|
|
|
pushMessageQuery.setApp_type("2"); |
|
|
|
pushMessageQuery.setModuleSid("98ff0724-5df4-4fc7-ab6d-3996e7706acd"); |
|
|
|
pushMessageQuery.setMsgTitle("付款确认通知"); |
|
|
|
pushMessageQuery.setBusinessSid(sids.get(finalI)); |
|
|
|
// 消息推送
|
|
|
|
messageFeign.pushNoUriMessage(pushMessageQuery); |
|
|
|
}); |
|
|
|
} |
|
|
|
} catch (Exception e) { |
|
|
|
e.printStackTrace(); |
|
|
|
log.error("推送数据失败=========================" + e.getMessage()); |
|
|
|
return rb.setMsg("推送数据失败"); |
|
|
|
} |
|
|
|
} |
|
|
|
return rb.success(); |
|
|
|
@ -511,7 +571,7 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord |
|
|
|
BusVehicleApplyDetailsVo busVehicleApplyDetailsVo = busVehicleApplyFeign.fetchSid(finPaymentrecord.getApplySid()).getData(); |
|
|
|
BaseVehicleActualPay baseVehicleActualPay = baseVehicleActualPayFeign.fetchBySid(finPaymentrecord.getApplySid()).getData(); |
|
|
|
BaseVehicleActualSalesDetailsVo baseVehicleActualSalesDetailsVo = null; |
|
|
|
if (baseVehicleActualPay != null){ |
|
|
|
if (baseVehicleActualPay != null) { |
|
|
|
baseVehicleActualSalesDetailsVo = baseVehicleActualSalesFeign.details(baseVehicleActualPay.getVehicleActualSid()).getData(); |
|
|
|
} |
|
|
|
if (baseOutsourcingApplicationDetailsVo != null) { |
|
|
|
@ -521,10 +581,10 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord |
|
|
|
List<PCHistTaskListAndCommentList> flowRecordVo = flowableFeign.flowRecordAndComment(baseOutsourcingApplicationDetailsVo.getProcInstSid(), "1").getData(); |
|
|
|
List<FinPaymentrecordSourceLCVo> finPaymentrecordSourceLCVos = new ArrayList<>(); |
|
|
|
for (PCHistTaskListAndCommentList flowTask : flowRecordVo) { |
|
|
|
if (flowTask.getFlowableRecordVo() != null){ |
|
|
|
if (flowTask.getFlowableRecordVo() != null) { |
|
|
|
Map<String, Object> flowableRecordVo = flowTask.getFlowableRecordVo(); |
|
|
|
FinPaymentrecordSourceLCVo finPaymentrecordSourceLCVo = new FinPaymentrecordSourceLCVo(); |
|
|
|
List<Map<String, Object>> taskUserInfos = ConstantUtils.getListData(flowableRecordVo,"taskUserInfos"); |
|
|
|
List<Map<String, Object>> taskUserInfos = ConstantUtils.getListData(flowableRecordVo, "taskUserInfos"); |
|
|
|
Map<String, Object> comment = ConstantUtils.getMap(flowableRecordVo, "comment"); |
|
|
|
String assigneeName = (String) taskUserInfos.get(0).get("assigneeName"); |
|
|
|
String comment1 = (String) comment.get("comment"); |
|
|
|
@ -532,7 +592,7 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord |
|
|
|
finPaymentrecordSourceLCVo.setComment(comment1); |
|
|
|
finPaymentrecordSourceLCVo.setSpsj(flowableRecordVo.get("finishTime").toString()); |
|
|
|
finPaymentrecordSourceLCVos.add(finPaymentrecordSourceLCVo); |
|
|
|
}else { |
|
|
|
} else { |
|
|
|
Map<String, Object> processCommentVo = flowTask.getProcessCommentVo(); |
|
|
|
FinPaymentrecordSourceLCVo finPaymentrecordSourceLCVo = new FinPaymentrecordSourceLCVo(); |
|
|
|
finPaymentrecordSourceLCVo.setName(processCommentVo.get("title").toString()); |
|
|
|
@ -542,19 +602,19 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord |
|
|
|
} |
|
|
|
} |
|
|
|
List<Message> messages = messageFeign.selectByBusinessSid(baseOutsourcingApplicationDetailsVo.getSid()).getData(); |
|
|
|
if (messages.size() > 0){ |
|
|
|
if (messages.size() > 0) { |
|
|
|
for (Message message : messages) { |
|
|
|
FinPaymentrecordSourceLCVo finPaymentrecordSourceLCVo = new FinPaymentrecordSourceLCVo(); |
|
|
|
String receiverNames = ""; |
|
|
|
List<MessageList> messageLists = messageListFeign.fetchByMainSid(message.getSid()).getData(); |
|
|
|
if (messageLists.size() > 0){ |
|
|
|
if (messageLists.size() > 0) { |
|
|
|
for (MessageList messageList : messageLists) { |
|
|
|
receiverNames = receiverNames + messageList.getReceiverName() + "，"; |
|
|
|
} |
|
|
|
} |
|
|
|
finPaymentrecordSourceLCVo.setName("系统"); |
|
|
|
finPaymentrecordSourceLCVo.setComment("抄送 " + receiverNames.substring(0,receiverNames.lastIndexOf("，"))); |
|
|
|
finPaymentrecordSourceLCVo.setSpsj(DateUtil.format(message.getCreateTime(),"yyyy-MM-dd HH:mm:ss")); |
|
|
|
finPaymentrecordSourceLCVo.setComment("抄送 " + receiverNames.substring(0, receiverNames.lastIndexOf("，"))); |
|
|
|
finPaymentrecordSourceLCVo.setSpsj(DateUtil.format(message.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); |
|
|
|
finPaymentrecordSourceLCVos.add(finPaymentrecordSourceLCVo); |
|
|
|
} |
|
|
|
} |
|
|
|
@ -578,10 +638,10 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord |
|
|
|
List<PCHistTaskListAndCommentList> flowRecordVo = flowableFeign.flowRecordAndComment(busVehicleApplyDetailsVo.getProcInstId(), "1").getData(); |
|
|
|
List<FinPaymentrecordSourceLCVo> finPaymentrecordSourceLCVos = new ArrayList<>(); |
|
|
|
for (PCHistTaskListAndCommentList flowTask : flowRecordVo) { |
|
|
|
if (flowTask.getFlowableRecordVo() != null){ |
|
|
|
if (flowTask.getFlowableRecordVo() != null) { |
|
|
|
Map<String, Object> flowableRecordVo = flowTask.getFlowableRecordVo(); |
|
|
|
FinPaymentrecordSourceLCVo finPaymentrecordSourceLCVo = new FinPaymentrecordSourceLCVo(); |
|
|
|
List<Map<String, Object>> taskUserInfos = ConstantUtils.getListData(flowableRecordVo,"taskUserInfos"); |
|
|
|
List<Map<String, Object>> taskUserInfos = ConstantUtils.getListData(flowableRecordVo, "taskUserInfos"); |
|
|
|
Map<String, Object> comment = ConstantUtils.getMap(flowableRecordVo, "comment"); |
|
|
|
String assigneeName = (String) taskUserInfos.get(0).get("assigneeName"); |
|
|
|
String comment1 = (String) comment.get("comment"); |
|
|
|
@ -589,7 +649,7 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord |
|
|
|
finPaymentrecordSourceLCVo.setComment(comment1); |
|
|
|
finPaymentrecordSourceLCVo.setSpsj(flowableRecordVo.get("finishTime").toString()); |
|
|
|
finPaymentrecordSourceLCVos.add(finPaymentrecordSourceLCVo); |
|
|
|
}else { |
|
|
|
} else { |
|
|
|
Map<String, Object> processCommentVo = flowTask.getProcessCommentVo(); |
|
|
|
FinPaymentrecordSourceLCVo finPaymentrecordSourceLCVo = new FinPaymentrecordSourceLCVo(); |
|
|
|
finPaymentrecordSourceLCVo.setName(processCommentVo.get("title").toString()); |
|
|
|
@ -599,19 +659,19 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord |
|
|
|
} |
|
|
|
} |
|
|
|
List<Message> messages = messageFeign.selectByBusinessSid(busVehicleApplyDetailsVo.getSid()).getData(); |
|
|
|
if (messages.size() > 0){ |
|
|
|
if (messages.size() > 0) { |
|
|
|
for (Message message : messages) { |
|
|
|
FinPaymentrecordSourceLCVo finPaymentrecordSourceLCVo = new FinPaymentrecordSourceLCVo(); |
|
|
|
String receiverNames = ""; |
|
|
|
List<MessageList> messageLists = messageListFeign.fetchByMainSid(message.getSid()).getData(); |
|
|
|
if (messageLists.size() > 0){ |
|
|
|
if (messageLists.size() > 0) { |
|
|
|
for (MessageList messageList : messageLists) { |
|
|
|
receiverNames = receiverNames + messageList.getReceiverName() + "，"; |
|
|
|
} |
|
|
|
} |
|
|
|
finPaymentrecordSourceLCVo.setName("系统"); |
|
|
|
finPaymentrecordSourceLCVo.setComment("抄送 " + receiverNames.substring(0,receiverNames.lastIndexOf("，"))); |
|
|
|
finPaymentrecordSourceLCVo.setSpsj(DateUtil.format(message.getCreateTime(),"yyyy-MM-dd HH:mm:ss")); |
|
|
|
finPaymentrecordSourceLCVo.setComment("抄送 " + receiverNames.substring(0, receiverNames.lastIndexOf("，"))); |
|
|
|
finPaymentrecordSourceLCVo.setSpsj(DateUtil.format(message.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); |
|
|
|
finPaymentrecordSourceLCVos.add(finPaymentrecordSourceLCVo); |
|
|
|
} |
|
|
|
} |
|
|
|
@ -625,10 +685,10 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord |
|
|
|
List<PCHistTaskListAndCommentList> flowRecordVo = flowableFeign.flowRecordAndComment(baseVehicleActualSalesDetailsVo.getProcInstId(), "1").getData(); |
|
|
|
List<FinPaymentrecordSourceLCVo> finPaymentrecordSourceLCVos = new ArrayList<>(); |
|
|
|
for (PCHistTaskListAndCommentList flowTask : flowRecordVo) { |
|
|
|
if (flowTask.getFlowableRecordVo() != null){ |
|
|
|
if (flowTask.getFlowableRecordVo() != null) { |
|
|
|
Map<String, Object> flowableRecordVo = flowTask.getFlowableRecordVo(); |
|
|
|
FinPaymentrecordSourceLCVo finPaymentrecordSourceLCVo = new FinPaymentrecordSourceLCVo(); |
|
|
|
List<Map<String, Object>> taskUserInfos = ConstantUtils.getListData(flowableRecordVo,"taskUserInfos"); |
|
|
|
List<Map<String, Object>> taskUserInfos = ConstantUtils.getListData(flowableRecordVo, "taskUserInfos"); |
|
|
|
Map<String, Object> comment = ConstantUtils.getMap(flowableRecordVo, "comment"); |
|
|
|
String assigneeName = (String) taskUserInfos.get(0).get("assigneeName"); |
|
|
|
String comment1 = (String) comment.get("comment"); |
|
|
|
@ -636,7 +696,7 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord |
|
|
|
finPaymentrecordSourceLCVo.setComment(comment1); |
|
|
|
finPaymentrecordSourceLCVo.setSpsj(flowableRecordVo.get("finishTime").toString()); |
|
|
|
finPaymentrecordSourceLCVos.add(finPaymentrecordSourceLCVo); |
|
|
|
}else { |
|
|
|
} else { |
|
|
|
Map<String, Object> processCommentVo = flowTask.getProcessCommentVo(); |
|
|
|
FinPaymentrecordSourceLCVo finPaymentrecordSourceLCVo = new FinPaymentrecordSourceLCVo(); |
|
|
|
finPaymentrecordSourceLCVo.setName(processCommentVo.get("title").toString()); |
|
|
|
@ -646,19 +706,19 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord |
|
|
|
} |
|
|
|
} |
|
|
|
List<Message> messages = messageFeign.selectByBusinessSid(baseVehicleActualSalesDetailsVo.getSid()).getData(); |
|
|
|
if (messages.size() > 0){ |
|
|
|
if (messages.size() > 0) { |
|
|
|
for (Message message : messages) { |
|
|
|
FinPaymentrecordSourceLCVo finPaymentrecordSourceLCVo = new FinPaymentrecordSourceLCVo(); |
|
|
|
String receiverNames = ""; |
|
|
|
List<MessageList> messageLists = messageListFeign.fetchByMainSid(message.getSid()).getData(); |
|
|
|
if (messageLists.size() > 0){ |
|
|
|
if (messageLists.size() > 0) { |
|
|
|
for (MessageList messageList : messageLists) { |
|
|
|
receiverNames = receiverNames + messageList.getReceiverName() + "，"; |
|
|
|
} |
|
|
|
} |
|
|
|
finPaymentrecordSourceLCVo.setName("系统"); |
|
|
|
finPaymentrecordSourceLCVo.setComment("抄送 " + receiverNames.substring(0,receiverNames.lastIndexOf("，"))); |
|
|
|
finPaymentrecordSourceLCVo.setSpsj(DateUtil.format(message.getCreateTime(),"yyyy-MM-dd HH:mm:ss")); |
|
|
|
finPaymentrecordSourceLCVo.setComment("抄送 " + receiverNames.substring(0, receiverNames.lastIndexOf("，"))); |
|
|
|
finPaymentrecordSourceLCVo.setSpsj(DateUtil.format(message.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); |
|
|
|
finPaymentrecordSourceLCVos.add(finPaymentrecordSourceLCVo); |
|
|
|
} |
|
|
|
} |
|
|
|
@ -669,7 +729,7 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord |
|
|
|
dataMap.put("createByName", createByName); |
|
|
|
dataMap.put("createByDeptName", deptName); |
|
|
|
dataMap.put("createOrgName", createOrgName); |
|
|
|
if(baseVehicleActualSalesDetailsVo != null){ |
|
|
|
if (baseVehicleActualSalesDetailsVo != null) { |
|
|
|
dataMap.put("remarks", "买断：" + baseVehicleActualSalesDetailsVo.getReason()); |
|
|
|
//车架号拼接
|
|
|
|
List<BaseVehicleActualDetails> baseVehicleActualDetails = baseVehicleActualDetailsFeign.fetchByMainSid(baseVehicleActualSalesDetailsVo.getSid()).getData(); |
|
|
|
@ -679,21 +739,21 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord |
|
|
|
for (BaseVehicleActualDetails baseVehicleActualDetail : baseVehicleActualDetails) { |
|
|
|
vinNo = vinNo + baseVehicleActualDetail.getVinNo() + "(" + baseVehicleActualDetail.getActualMoney().toString() + "元" + ")" + "、"; |
|
|
|
} |
|
|
|
vinNo = vinNo.substring(0,vinNo.lastIndexOf("、")); |
|
|
|
vinNo = vinNo.substring(0, vinNo.lastIndexOf("、")); |
|
|
|
//付款备注拼接
|
|
|
|
List<BaseVehicleActualPay> baseVehicleActualPays = baseVehicleActualPayFeign.fetchByMainSid(baseVehicleActualSalesDetailsVo.getSid()).getData(); |
|
|
|
if (baseVehicleActualPays.size() > 0){ |
|
|
|
if (baseVehicleActualPays.size() > 0) { |
|
|
|
for (BaseVehicleActualPay vehicleActualPay : baseVehicleActualPays) { |
|
|
|
remark = remark + "(" + vehicleActualPay.getActualPay() + ")" + vehicleActualPay.getPayRemark() + " "; |
|
|
|
} |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(remark)){ |
|
|
|
if (StringUtils.isNotBlank(remark)) { |
|
|
|
vinRemark = vinNo + "；" + remark; |
|
|
|
}else { |
|
|
|
} else { |
|
|
|
vinRemark = vinNo; |
|
|
|
} |
|
|
|
dataMap.put("payRemark", vinRemark); |
|
|
|
}else { |
|
|
|
} else { |
|
|
|
dataMap.put("remarks", finPaymentrecord.getRemarks()); |
|
|
|
dataMap.put("payRemark", finPaymentrecord.getPayRemark()); |
|
|
|
} |
|
|
|
|
dimengzhe
2 years ago