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

修改

master
God 1 year ago
parent
7c5254bf8a
commit
e8eb0fd769
5 changed files with 47 additions and 15 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. 6
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/flow/SubmitBaseAccAdjApplyDto.java
  2. 28
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java
  3. 2
      anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
  4. 18
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyService.java
  5. 8
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java

6
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/flow/SubmitBaseAccAdjApplyDto.java
View File

@ -1,10 +1,13 @@
package com.yxt.anrui.base.api.baseaccadjapply.flow;
import com.yxt.anrui.base.api.baseaccadjapply.BaseAccadjApplyDto;
import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicle;
import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @Author dimengzhe
* @Date 2022/6/27 13:38
@ -17,4 +20,7 @@ public class SubmitBaseAccAdjApplyDto extends BaseAccadjApplyDto {
private String instanceId;
@ApiModelProperty("任务id")
private String taskId;
@ApiModelProperty("调账车辆列表")
private List<BaseInternalPurchaseVehicle> detailsList;
}

28
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java
View File

@ -376,6 +376,33 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
//流程中的参数赋值
Map<String, Object> variables = BeanUtil.beanToMap(dto);
//若有网关，则赋值网关中判断的字段。
Boolean i = false;
List<BaseInternalPurchaseVehicle> baseInternalPurchaseVehicles = dto.getDetailsList();
if (baseInternalPurchaseVehicles != null) {
if (baseInternalPurchaseVehicles.size() > 0) {
for (BaseInternalPurchaseVehicle baseInternalPurchaseVehicle : baseInternalPurchaseVehicles) {
String witPinMoney = baseInternalPurchaseVehicle.getWitPinMoney();
String sid = baseInternalPurchaseVehicle.getSid();
BaseInternalPurchaseVehicle baseInternalPurchaseVehicle1 = baseInternalPurchaseVehicleService.fetchBySid(sid);
String witPinMoney1 = baseInternalPurchaseVehicle1.getInitialWitPinMoney();
if (!witPinMoney.equals(witPinMoney1)) {
i = true;
baseInternalPurchaseVehicleService.updateWitPinMoneyBySid(witPinMoney, sid);
}
}
}
} else {
for (String s : purchaseSids) {
BaseInternalPurchaseVehicle baseInternalPurchaseVehicle = baseInternalPurchaseVehicleService.fetchBySid(s);
String witPinMoney = baseInternalPurchaseVehicle.getWitPinMoney();
String initialWitPinMoney = baseInternalPurchaseVehicle.getInitialWitPinMoney();
if (!witPinMoney.equals(initialWitPinMoney)) {
i = true;
break;
}
}
}
variables.put("isAdj", i);
variables.put("businessSid", businessSid);
BaseAccadjApply baseAccadjApply1 = fetchBySid(businessSid);
//用户的部门全路径sid
@ -408,7 +435,6 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
bv.setTaskDefKey(baseAccadjApply.getNodeSid());
bv.setComment("重新提交");
bv.setInstanceId(dto.getInstanceId());
List<BaseInternalPurchaseVehicle> baseInternalPurchaseVehicles = new ArrayList<>();
return complete(bv, baseInternalPurchaseVehicles);
}
return rb;

2
anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
View File

@ -81,7 +81,7 @@ public enum ProcDefEnum {
LOANCASEEXECUTEAPPLY("案件执行立案申请", "process_aeho48ap:1:8220004"),
LOANCASECLOSEAPPLY("案件结案申请", "process_llaxpwkd:1:8220008"),
LOANLAWSUITAPPLY("诉讼申请", "process_xc4lp97d:1:8380004"),
LOANCASEENTRUSTLAWYERAPPLY("案件委托律师", ""),
LOANCASEENTRUSTLAWYERAPPLY("案件委托律师", "process_oe3nvzgn:1:8525004"),
/******************************测试流程id*********************************************/

18
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseentrustlawyerapply/LoanCaseEntrustLawyerApplyService.java
View File

@ -330,7 +330,7 @@ public class LoanCaseEntrustLawyerApplyService extends MybatisBaseService<LoanCa
//需和移动端沟通业务sid保存的属性具体值：appMap中sid不是固定的。移动端提供具体字段。
variables.put("app", appMap);
//流程定义id
bv.setModelId(ProcDefEnum.LOANCASECLOSEAPPLY.getProDefId());
bv.setModelId(ProcDefEnum.LOANCASEENTRUSTLAWYERAPPLY.getProDefId());
bv.setFormVariables(variables);
SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.selectByOrgSidPath(loanCaseEntrustLawyerApply.getOrgPath()).getData();
bv.setNextNodeUserSids(sysOrganizationVo.getManagerSid());
@ -346,9 +346,9 @@ public class LoanCaseEntrustLawyerApplyService extends MybatisBaseService<LoanCa
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(businessSid);
messageFlowableQuery.setModuleName("案件结案申请");
messageFlowableQuery.setModuleName("案件委托律师申请");
messageFlowableQuery.setMsgContent(loanCaseEntrustLawyerApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgTitle("案件结案申请");
messageFlowableQuery.setMsgTitle("案件委托律师申请");
messageFeign.pushMessage(messageFlowableQuery);
return voResultBean;
}
@ -432,9 +432,9 @@ public class LoanCaseEntrustLawyerApplyService extends MybatisBaseService<LoanCa
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(businessSid);
messageFlowableQuery.setModuleName("案件结案申请");
messageFlowableQuery.setModuleName("案件委托律师申请");
messageFlowableQuery.setMsgContent(loanCaseEntrustLawyerApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgTitle("案件结案申请");
messageFlowableQuery.setMsgTitle("案件委托律师申请");
messageFeign.pushMessage(messageFlowableQuery);
}
return rb.success().setData(resultBean.getData());
@ -447,7 +447,7 @@ public class LoanCaseEntrustLawyerApplyService extends MybatisBaseService<LoanCa
ResultBean<List<LoanCaseEntrustLawyerApplyNodeVo>> rb = ResultBean.fireFail();
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(query, bv);
bv.setModelId(ProcDefEnum.LOANCASECLOSEAPPLY.getProDefId());
bv.setModelId(ProcDefEnum.LOANCASEENTRUSTLAWYERAPPLY.getProDefId());
ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv);
//判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
List<LoanCaseEntrustLawyerApplyNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), LoanCaseEntrustLawyerApplyNodeVo.class)).collect(Collectors.toList());
@ -458,7 +458,7 @@ public class LoanCaseEntrustLawyerApplyService extends MybatisBaseService<LoanCa
ResultBean<List<LoanCaseEntrustLawyerApplyNodeVo>> rb = ResultBean.fireFail();
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(query, bv);
bv.setModelId(ProcDefEnum.LOANCASECLOSEAPPLY.getProDefId());
bv.setModelId(ProcDefEnum.LOANCASEENTRUSTLAWYERAPPLY.getProDefId());
ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
//判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
List<LoanCaseEntrustLawyerApplyNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), LoanCaseEntrustLawyerApplyNodeVo.class)).collect(Collectors.toList());
@ -507,7 +507,7 @@ public class LoanCaseEntrustLawyerApplyService extends MybatisBaseService<LoanCa
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(businessSid);
messageFlowableQuery.setModuleName("案件结案申请");
messageFlowableQuery.setModuleName("案件委托律师申请");
ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
@ -516,7 +516,7 @@ public class LoanCaseEntrustLawyerApplyService extends MybatisBaseService<LoanCa
} else {
messageFlowableQuery.setMsgContent(loanCaseEntrustLawyerApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
}
messageFlowableQuery.setMsgTitle("案件结案申请");
messageFlowableQuery.setMsgTitle("案件委托律师申请");
messageFeign.pushMessage(messageFlowableQuery);
return rb.success();
}

8
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java
View File

@ -892,8 +892,8 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
downInvoAppForm.setNum("1");
String dj = busSalesOrderPriceFeign.getPriceByOrderSid(salesOrderVehicle.getSalesOrderSid()).getData();
downInvoAppForm.setDj(dj);
FinVehicleInvoice finVehicleInvoice = finVehicleInvoiceFeign.selectByVinAndContractNo(salesOrderVehicle.getLinkSid(), printConfirmDto.getContractNo()).getData();
downInvoAppForm.setKpje(finVehicleInvoice.getInvoiceAmount().toString());
SolutionsDetailsVo solutionsDetailsVo = loanSolutionsService.selectDetails(salesOrderVehicle.getSalesOrderSid()).getData();
downInvoAppForm.setKpje(solutionsDetailsVo.getMainVehicleAmount());
downInvoAppForm.setFplx("机动车统一销售发票");
downInvoAppForms.add(downInvoAppForm);
List<BaseTrailer> baseTrailers = baseTrailerFeign.getByVehSid(salesOrderVehicle.getLinkSid()).getData();
@ -943,8 +943,8 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
downInvoAppForm.setNum(String.valueOf(salesOrderVehicles.size()));
String dj = busSalesOrderPriceFeign.getPriceByOrderSid(salesOrderVehicles.get(0).getSalesOrderSid()).getData();
downInvoAppForm.setDj(dj);
FinVehicleInvoice finVehicleInvoice = finVehicleInvoiceFeign.selectByVinAndContractNo(salesOrderVehicles.get(0).getLinkSid(), printConfirmDto.getContractNo()).getData();
downInvoAppForm.setKpje(finVehicleInvoice.getInvoiceAmount().toString());
SolutionsDetailsVo solutionsDetailsVo = loanSolutionsService.selectDetails(salesOrderVehicles.get(0).getSalesOrderSid()).getData();
downInvoAppForm.setKpje(solutionsDetailsVo.getMainVehicleAmount());
downInvoAppForm.setFplx("机动车统一销售发票");
downInvoAppForms.add(downInvoAppForm);
for (SalesOrderVehicle salesOrderVehicle : salesOrderVehicles) {

Write Preview
Loading…
Cancel
Save