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

修改月还计提推凭证

master
fanzongzhe0036 3 months ago
parent
7967d28004
commit
307b399067
2 changed files with 94 additions and 83 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 90
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyService.java
  2. 87
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyService.java

90
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyService.java
View File

@ -22,7 +22,6 @@ import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.FinUncollectedR
import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
import com.yxt.anrui.fin.api.kingdee.bdcustomer.BdCustomer; import com.yxt.anrui.fin.api.kingdee.bdcustomer.BdCustomer;
import com.yxt.anrui.fin.api.kingdee.voucher.GeneralVoucher; import com.yxt.anrui.fin.api.kingdee.voucher.GeneralVoucher;
import com.yxt.anrui.fin.api.kingdee.voucher.SceneCodeEnum;
import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.FlowableFeign;
import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
import com.yxt.anrui.flowable.api.flow2.FlowDelegateQuery; import com.yxt.anrui.flowable.api.flow2.FlowDelegateQuery;
@ -33,7 +32,8 @@ import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo;
import com.yxt.anrui.flowable.api.utils.ProcDefEnum; import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
import com.yxt.anrui.portal.api.flow.PCHistTaskListAndCommentList; import com.yxt.anrui.portal.api.flow.PCHistTaskListAndCommentList;
import com.yxt.anrui.portal.api.sysorganization.*; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
@ -1269,9 +1269,9 @@ public class LoanBuckleApplyService extends MybatisBaseService<LoanBuckleApplyMa
List<Map<String, Object>> newList = new ArrayList<>(); List<Map<String, Object>> newList = new ArrayList<>();
LoanBuckleApply data = fetchBySid(sid); LoanBuckleApply data = fetchBySid(sid);
if (null != data) { if (null != data) {
if (!data.getNodeState().equals("已办结")) { // if (!data.getNodeState().equals("已办结")) {
return rb.setMsg("无法下载没有办结的审批记录。"); // return rb.setMsg("无法下载没有办结的审批记录。");
} // }
List<LoanFile> files = loanFileService.selectByLinkSid(data.getSid(), LoanFileEnum.BUCKLE_APPLY.getAttachType()); List<LoanFile> files = loanFileService.selectByLinkSid(data.getSid(), LoanFileEnum.BUCKLE_APPLY.getAttachType());
if (!files.isEmpty()) { if (!files.isEmpty()) {
List<String> stringList = new ArrayList<>(); List<String> stringList = new ArrayList<>();
@ -1306,50 +1306,56 @@ public class LoanBuckleApplyService extends MybatisBaseService<LoanBuckleApplyMa
dataMap.put("filePath", filePath); dataMap.put("filePath", filePath);
} }
//获取审批记录 //获取审批记录
if (StringUtils.isNotBlank(data.getProcInstId())) { if (data.getNodeState().equals("已办结")) {
List<PCHistTaskListAndCommentList> flowRecordVo = flowableFeignPro.flowRecordAndComment(data.getProcInstId(), "1").getData(); if (StringUtils.isNotBlank(data.getProcInstId())) {
List<MonthlyAccrualSourceLCVo> sourceLCVos = new ArrayList<>(); List<PCHistTaskListAndCommentList> flowRecordVo = flowableFeignPro.flowRecordAndComment(data.getProcInstId(), "1").getData();
for (PCHistTaskListAndCommentList flowTask : flowRecordVo) { List<MonthlyAccrualSourceLCVo> sourceLCVos = new ArrayList<>();
if (flowTask.getFlowableRecordVo() != null) { for (PCHistTaskListAndCommentList flowTask : flowRecordVo) {
Map<String, Object> flowableRecordVo = flowTask.getFlowableRecordVo(); if (flowTask.getFlowableRecordVo() != null) {
MonthlyAccrualSourceLCVo sourceLCVo = new MonthlyAccrualSourceLCVo(); Map<String, Object> flowableRecordVo = flowTask.getFlowableRecordVo();
List<Map<String, Object>> taskUserInfos = ConstantUtils.getListData(flowableRecordVo, "taskUserInfos"); MonthlyAccrualSourceLCVo sourceLCVo = new MonthlyAccrualSourceLCVo();
Map<String, Object> comment = ConstantUtils.getMap(flowableRecordVo, "comment"); List<Map<String, Object>> taskUserInfos = ConstantUtils.getListData(flowableRecordVo, "taskUserInfos");
String assigneeName = (String) taskUserInfos.get(0).get("assigneeName"); Map<String, Object> comment = ConstantUtils.getMap(flowableRecordVo, "comment");
String comment1 = (String) comment.get("comment"); String assigneeName = (String) taskUserInfos.get(0).get("assigneeName");
sourceLCVo.setName(assigneeName); String comment1 = (String) comment.get("comment");
sourceLCVo.setComment(comment1); sourceLCVo.setName(assigneeName);
sourceLCVo.setSpsj(flowableRecordVo.get("finishTime").toString()); sourceLCVo.setComment(comment1);
sourceLCVos.add(sourceLCVo); sourceLCVo.setSpsj(flowableRecordVo.get("finishTime").toString());
} else { sourceLCVos.add(sourceLCVo);
Map<String, Object> processCommentVo = flowTask.getProcessCommentVo(); } else {
MonthlyAccrualSourceLCVo sourceLCVo = new MonthlyAccrualSourceLCVo(); Map<String, Object> processCommentVo = flowTask.getProcessCommentVo();
sourceLCVo.setName(processCommentVo.get("title").toString()); MonthlyAccrualSourceLCVo sourceLCVo = new MonthlyAccrualSourceLCVo();
sourceLCVo.setComment(processCommentVo.get("content").toString()); sourceLCVo.setName(processCommentVo.get("title").toString());
sourceLCVo.setSpsj(processCommentVo.get("time").toString()); sourceLCVo.setComment(processCommentVo.get("content").toString());
sourceLCVos.add(sourceLCVo); sourceLCVo.setSpsj(processCommentVo.get("time").toString());
sourceLCVos.add(sourceLCVo);
}
} }
} List<Message> messages = messageFeign.selectByBusinessSid(data.getSid()).getData();
List<Message> messages = messageFeign.selectByBusinessSid(data.getSid()).getData(); if (messages.size() > 0) {
if (messages.size() > 0) { for (Message message : messages) {
for (Message message : messages) { MonthlyAccrualSourceLCVo sourceLCVo = new MonthlyAccrualSourceLCVo();
MonthlyAccrualSourceLCVo sourceLCVo = new MonthlyAccrualSourceLCVo(); String receiverNames = "";
String receiverNames = ""; List<MessageList> messageLists = messageListFeign.fetchByMainSid(message.getSid()).getData();
List<MessageList> messageLists = messageListFeign.fetchByMainSid(message.getSid()).getData(); if (messageLists.size() > 0) {
if (messageLists.size() > 0) { for (MessageList messageList : messageLists) {
for (MessageList messageList : messageLists) { receiverNames = receiverNames + messageList.getReceiverName() + "，";
receiverNames = receiverNames + messageList.getReceiverName() + "，"; }
} }
sourceLCVo.setName("系统");
sourceLCVo.setComment("抄送 " + receiverNames.substring(0, receiverNames.lastIndexOf("，")));
sourceLCVo.setSpsj(DateUtil.format(message.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
sourceLCVos.add(sourceLCVo);
} }
sourceLCVo.setName("系统");
sourceLCVo.setComment("抄送 " + receiverNames.substring(0, receiverNames.lastIndexOf("，")));
sourceLCVo.setSpsj(DateUtil.format(message.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
sourceLCVos.add(sourceLCVo);
} }
sourceLCVos.sort(comparing(MonthlyAccrualSourceLCVo::getSpsj));
dataMap.put("lcList", sourceLCVos);
} }
sourceLCVos.sort(comparing(MonthlyAccrualSourceLCVo::getSpsj)); } else {
List<MonthlyAccrualSourceLCVo> sourceLCVos = new ArrayList<>();
dataMap.put("lcList", sourceLCVos); dataMap.put("lcList", sourceLCVos);
} }
List<LoanBuckleApplyRecord> records = loanBuckleApplyRecordService.selByMainSid(sid); List<LoanBuckleApplyRecord> records = loanBuckleApplyRecordService.selByMainSid(sid);
if (!records.isEmpty()) { if (!records.isEmpty()) {
int sortNo = 1; int sortNo = 1;

87
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyService.java
View File

@ -677,7 +677,7 @@ public class LoanMonthlyAccrualApplyService extends MybatisBaseService<LoanMonth
int index = 0; int index = 0;
int indexFinal = 0; int indexFinal = 0;
if (!records.isEmpty()) { if (!records.isEmpty()) {
DictCommonVo dictCommonVo = dictCommonFeign.selectBykey("WithholdMax", "月还计提").getData(); DictCommonVo dictCommonVo = dictCommonFeign.selectBykey("月还计提", "WithholdMax").getData();
if (null != dictCommonVo) { if (null != dictCommonVo) {
String dictValue = dictCommonVo.getDictValue(); String dictValue = dictCommonVo.getDictValue();
int i = Integer.parseInt(dictValue); int i = Integer.parseInt(dictValue);
@ -1028,9 +1028,9 @@ public class LoanMonthlyAccrualApplyService extends MybatisBaseService<LoanMonth
List<Map<String, Object>> newList = new ArrayList<>(); List<Map<String, Object>> newList = new ArrayList<>();
LoanMonthlyAccrualApply data = fetchBySid(sid); LoanMonthlyAccrualApply data = fetchBySid(sid);
if (null != data) { if (null != data) {
if (!data.getNodeState().equals("已办结")) { // if (!data.getNodeState().equals("已办结")) {
return rb.setMsg("无法下载没有办结的审批记录。"); // return rb.setMsg("无法下载没有办结的审批记录。");
} // }
List<LoanFile> files = loanFileService.selectByLinkSid(data.getSid(), LoanFileEnum.ACCRUALAPPLY.getAttachType()); List<LoanFile> files = loanFileService.selectByLinkSid(data.getSid(), LoanFileEnum.ACCRUALAPPLY.getAttachType());
if (!files.isEmpty()) { if (!files.isEmpty()) {
List<String> stringList = new ArrayList<>(); List<String> stringList = new ArrayList<>();
@ -1065,48 +1065,53 @@ public class LoanMonthlyAccrualApplyService extends MybatisBaseService<LoanMonth
dataMap.put("filePath", filePath); dataMap.put("filePath", filePath);
} }
//获取审批记录 //获取审批记录
if (StringUtils.isNotBlank(data.getProcInstId())) { if (data.getNodeState().equals("已办结")) {
List<PCHistTaskListAndCommentList> flowRecordVo = flowableFeignPro.flowRecordAndComment(data.getProcInstId(), "1").getData(); if (StringUtils.isNotBlank(data.getProcInstId())) {
List<MonthlyAccrualSourceLCVo> sourceLCVos = new ArrayList<>(); List<PCHistTaskListAndCommentList> flowRecordVo = flowableFeignPro.flowRecordAndComment(data.getProcInstId(), "1").getData();
for (PCHistTaskListAndCommentList flowTask : flowRecordVo) { List<MonthlyAccrualSourceLCVo> sourceLCVos = new ArrayList<>();
if (flowTask.getFlowableRecordVo() != null) { for (PCHistTaskListAndCommentList flowTask : flowRecordVo) {
Map<String, Object> flowableRecordVo = flowTask.getFlowableRecordVo(); if (flowTask.getFlowableRecordVo() != null) {
MonthlyAccrualSourceLCVo sourceLCVo = new MonthlyAccrualSourceLCVo(); Map<String, Object> flowableRecordVo = flowTask.getFlowableRecordVo();
List<Map<String, Object>> taskUserInfos = ConstantUtils.getListData(flowableRecordVo, "taskUserInfos"); MonthlyAccrualSourceLCVo sourceLCVo = new MonthlyAccrualSourceLCVo();
Map<String, Object> comment = ConstantUtils.getMap(flowableRecordVo, "comment"); List<Map<String, Object>> taskUserInfos = ConstantUtils.getListData(flowableRecordVo, "taskUserInfos");
String assigneeName = (String) taskUserInfos.get(0).get("assigneeName"); Map<String, Object> comment = ConstantUtils.getMap(flowableRecordVo, "comment");
String comment1 = (String) comment.get("comment"); String assigneeName = (String) taskUserInfos.get(0).get("assigneeName");
sourceLCVo.setName(assigneeName); String comment1 = (String) comment.get("comment");
sourceLCVo.setComment(comment1); sourceLCVo.setName(assigneeName);
sourceLCVo.setSpsj(flowableRecordVo.get("finishTime").toString()); sourceLCVo.setComment(comment1);
sourceLCVos.add(sourceLCVo); sourceLCVo.setSpsj(flowableRecordVo.get("finishTime").toString());
} else { sourceLCVos.add(sourceLCVo);
Map<String, Object> processCommentVo = flowTask.getProcessCommentVo(); } else {
MonthlyAccrualSourceLCVo sourceLCVo = new MonthlyAccrualSourceLCVo(); Map<String, Object> processCommentVo = flowTask.getProcessCommentVo();
sourceLCVo.setName(processCommentVo.get("title").toString()); MonthlyAccrualSourceLCVo sourceLCVo = new MonthlyAccrualSourceLCVo();
sourceLCVo.setComment(processCommentVo.get("content").toString()); sourceLCVo.setName(processCommentVo.get("title").toString());
sourceLCVo.setSpsj(processCommentVo.get("time").toString()); sourceLCVo.setComment(processCommentVo.get("content").toString());
sourceLCVos.add(sourceLCVo); sourceLCVo.setSpsj(processCommentVo.get("time").toString());
sourceLCVos.add(sourceLCVo);
}
} }
} List<Message> messages = messageFeign.selectByBusinessSid(data.getSid()).getData();
List<Message> messages = messageFeign.selectByBusinessSid(data.getSid()).getData(); if (messages.size() > 0) {
if (messages.size() > 0) { for (Message message : messages) {
for (Message message : messages) { MonthlyAccrualSourceLCVo sourceLCVo = new MonthlyAccrualSourceLCVo();
MonthlyAccrualSourceLCVo sourceLCVo = new MonthlyAccrualSourceLCVo(); String receiverNames = "";
String receiverNames = ""; List<MessageList> messageLists = messageListFeign.fetchByMainSid(message.getSid()).getData();
List<MessageList> messageLists = messageListFeign.fetchByMainSid(message.getSid()).getData(); if (messageLists.size() > 0) {
if (messageLists.size() > 0) { for (MessageList messageList : messageLists) {
for (MessageList messageList : messageLists) { receiverNames = receiverNames + messageList.getReceiverName() + "，";
receiverNames = receiverNames + messageList.getReceiverName() + "，"; }
} }
sourceLCVo.setName("系统");
sourceLCVo.setComment("抄送 " + receiverNames.substring(0, receiverNames.lastIndexOf("，")));
sourceLCVo.setSpsj(DateUtil.format(message.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
sourceLCVos.add(sourceLCVo);
} }
sourceLCVo.setName("系统");
sourceLCVo.setComment("抄送 " + receiverNames.substring(0, receiverNames.lastIndexOf("，")));
sourceLCVo.setSpsj(DateUtil.format(message.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
sourceLCVos.add(sourceLCVo);
} }
sourceLCVos.sort(comparing(MonthlyAccrualSourceLCVo::getSpsj));
dataMap.put("lcList", sourceLCVos);
} }
sourceLCVos.sort(comparing(MonthlyAccrualSourceLCVo::getSpsj)); } else {
List<MonthlyAccrualSourceLCVo> sourceLCVos = new ArrayList<>();
dataMap.put("lcList", sourceLCVos); dataMap.put("lcList", sourceLCVos);
} }
List<LoanMonthlyAccrualRecord> records = loanMonthlyAccrualRecordService.selByMainSid(sid); List<LoanMonthlyAccrualRecord> records = loanMonthlyAccrualRecordService.selByMainSid(sid);

Write Preview
Loading…
Cancel
Save