diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basebrandletpricepowimit/BaseBrandMitQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basebrandletpricepowimit/BaseBrandMitQuery.java index 7c5f1ab554..ead0e00345 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basebrandletpricepowimit/BaseBrandMitQuery.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basebrandletpricepowimit/BaseBrandMitQuery.java @@ -18,4 +18,6 @@ public class BaseBrandMitQuery implements Query { private String roleSid; @ApiModelProperty("使用组织sid") private String orgSid; + @ApiModelProperty("部门sid") + private String deptSid; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/flow/GetNodeQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/flow/GetNodeQuery.java index 87a09395f6..f7857efba2 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/flow/GetNodeQuery.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/flow/GetNodeQuery.java @@ -5,7 +5,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotBlank; -import java.util.Map; /** * @Author dimengzhe @@ -19,7 +18,7 @@ public class GetNodeQuery implements Query { @ApiModelProperty(value = "环节定义id") @NotBlank(message = "参数错误：taskDefKey") private String taskDefKey; -/* - @ApiModelProperty(value = "不确定是否需要前端传：还是有分支网关的时候传？？") - private Map formVariables;*/ + + @ApiModelProperty("业务sid") + private String businessSid; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basebrandletpricepowimit/BaseBrandletpricepowimitMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basebrandletpricepowimit/BaseBrandletpricepowimitMapper.java index 2db40707c4..4c7a29ef75 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basebrandletpricepowimit/BaseBrandletpricepowimitMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basebrandletpricepowimit/BaseBrandletpricepowimitMapper.java @@ -66,4 +66,5 @@ public interface BaseBrandletpricepowimitMapper extends BaseMapper + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basebrandletpricepowimit/BaseBrandletpricepowimitService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basebrandletpricepowimit/BaseBrandletpricepowimitService.java index 015bdca710..7a25cb0fa5 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basebrandletpricepowimit/BaseBrandletpricepowimitService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basebrandletpricepowimit/BaseBrandletpricepowimitService.java @@ -185,10 +185,15 @@ public class BaseBrandletpricepowimitService extends MybatisBaseService baseModelModpriceModelVos = baseModelModpriceModelService.fetchByMainSid(bv.getBusinessSid()); if (bv.getTaskId().equals(baseModelModprice.getTaskId())) { //流程中的参数赋值、若有网关，则赋值网关中判断的字段。 @@ -423,25 +418,23 @@ public class BaseModelModpriceService extends MybatisBaseService> getNextNodesForSubmit(GetNodeQuery query) { ResultBean> rb = ResultBean.fireFail(); + BaseModelModprice baseModelModprice = fetchBySid(query.getBusinessSid()); BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(query, bv); - bv.setModelId(ProcDefEnum.BASEMODELMODPRICE.getProDefId()); + bv.setModelId(baseModelModprice.getProcDefId()); ResultBean>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv); - //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList()); -// List voList = resultBean.getData().stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList()); return rb.success().setData(voList); } public ResultBean> getPreviousNodesForReject(GetNodeQuery query) { ResultBean> rb = ResultBean.fireFail(); BusinessVariables bv = new BusinessVariables(); + BaseModelModprice baseModelModprice = fetchBySid(query.getBusinessSid()); BeanUtil.copyProperties(query, bv); - bv.setModelId(ProcDefEnum.BASEMODELMODPRICE.getProDefId()); + bv.setModelId(baseModelModprice.getProcDefId()); ResultBean>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv); - //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList()); -// List voList = resultBean.getData().stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList()); return rb.success().setData(voList); } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java index 8ba48b5b25..cb895b52eb 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java @@ -412,7 +412,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService variables = new HashMap<>(); Map appMap = new HashMap<>(); appMap.put("sid", bv.getBusinessSid()); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleService.java index df10f620b1..8f7f769798 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleService.java @@ -300,7 +300,6 @@ public class BusDepositVehicleService extends MybatisBaseService list = baseMapper.selByUserSid(createBySid); -// Integer count = strings.stream().mapToInt(Integer::valueOf).sum(); vo.setExplain("目前该销售人员已预订" + list.size() + "台车辆"); } return new ResultBean().success().setData(vo); @@ -319,131 +318,4 @@ public class BusDepositVehicleService extends MybatisBaseService selectVehicleBySid(String customerSid, String modelSid, String configSid, String orgSid) { return baseMapper.selectVehicleBySid(customerSid,modelSid,configSid,orgSid); } - - /* public ResultBean submitVirtualOrderVehicle(SubmitVirtualOrderVehicleDto dto) { - ResultBean rb = ResultBean.fireFail(); - //根据用户sid获取staffSid - ResultBean userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid()); - if (!userVoResultBean.getSuccess()) { - return rb.setMsg(userVoResultBean.getMsg()); - } - //根据staffSid获取用户的组织全路径 - ResultBean staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid()); - if (!staffOrgResultBean.getSuccess()) { - return rb.setMsg(staffOrgResultBean.getMsg()); - } - //用户的组织全路径 - String orgSidPath = staffOrgResultBean.getData().getOrgSidPath(); - BusDepositVehicle busDepositVehicle = fetchBySid(dto.getSid()); - int r = submitBusinessData(dto, busDepositVehicle); - if (r == 3) { - return rb.setMsg("该申请不存在"); - } - if (r == 0) { - return rb.setMsg("操作失败!提交的数据不一致"); - } - BusMainDeposit busMainDeposit = busMainDepositService.fetchBySid(dto.getVirtualOrderSid()); - if (busMainDeposit != null) { - if (com.yxt.common.base.utils.StringUtils.isNotBlank(busMainDeposit.getNodeState())) { - if (!(busMainDeposit.getNodeState().contains("已办结") || busMainDeposit.getNodeState().contains("已终止") || busMainDeposit.getNodeState().contains("申请"))) { - return rb.setMsg("该申请已存在，请务重复提交！"); - } - } - } - //新增修改保存 - ResultBean resultBean = busMainDepositService.reserveCarInfo(dto); - if (!resultBean.getSuccess()) { - return rb.setMsg(resultBean.getMsg()); - } - String businessSid = resultBean.getData(); - //创建BusinessVariables实体对象 - BusinessVariables bv = new BusinessVariables(); - //流程中的参数赋值、若有网关，则赋值网关中判断的字段。 - Map variables = new HashMap<>(); - //用户的部门全路径sid - bv.setOrgSidPath(orgSidPath); - //业务sid - bv.setBusinessSid(businessSid); - //用户sid - bv.setUserSid(dto.getUserSid()); - bv.setFormVariables(variables); - //若app移动端有此功能，则传递appMap参数 - Map appMap = new HashMap<>(); - //需和移动端沟通业务sid保存的属性具体值：appMap中sid不是固定的。移动端提供具体字段。 - appMap.put("sid", businessSid); - variables.put("app", appMap); - //流程定义id - bv.setModelId(ProcDefEnum.SCMCARTRANSFER.getProDefId()); - if (r == 1) { - ResultBean voResultBean = flowableFeign.startProcess(bv); - UpdateFlowFieldVo ufVo = voResultBean.getData(); - updateFlowFiled(BeanUtil.beanToMap(ufVo)); - return voResultBean; - } - if (r == 2) { - // ToDo:驳回到发起人后再次提交 - if (StringUtils.isBlank(dto.getInstanceId())) { - return rb.setMsg("参数错误：instanceId"); - } - bv.setTaskId(busDepositVehicle.getTaskId()); - bv.setTaskDefKey(busDepositVehicle.getNodeId()); - bv.setComment(StringUtils.isNotBlank(dto.getComment()) ? dto.getComment() : "重新提交"); - bv.setInstanceId(dto.getInstanceId()); - return complete(bv); - } - return rb; - }*/ - - /** - * 判断提交的流程是否被允许 - * - * @param dto - * @return - */ - /* private synchronized int submitBusinessData(SubmitVirtualOrderVehicleDto dto, BusDepositVehicle busDepositVehicle) { - int r = 0; - if (StringUtils.isBlank(dto.getSid())) { - r = 1; - } else { - if (busDepositVehicle != null) { - String businessTaskId = busDepositVehicle.getTaskId(); - if (StringUtils.isBlank(businessTaskId) && StringUtils.isBlank(dto.getTaskId())) { - //新提交 - r = 1; - } else if (StringUtils.isNotBlank(businessTaskId) && businessTaskId.equals(dto.getTaskId())) { - //二次提交//只有数据一致的时候才能进行下一步 - r = 2; - } - } else { - r = 3; - } - - } - return r; - }*/ - - /** - * 更新流程相关的状态 - * - * @param map - * @return - */ - /* private int updateFlowFiled(Map map) { - return baseMapper.updateFlowFiled(map); - } - - public ResultBean complete(BusinessVariables bv) { - ResultBean rb = ResultBean.fireFail(); - BusDepositVehicle busDepositVehicle = fetchBySid(bv.getBusinessSid()); - if (bv.getTaskId().equals(busDepositVehicle.getTaskId())) { - ResultBean resultBean = flowableFeign.handleProsess(bv); - if (!resultBean.getSuccess()) { - return rb.setMsg(resultBean.getMsg()); - } - updateFlowFiled(BeanUtil.beanToMap(resultBean.getData())); - return rb.success().setData(resultBean.getData()); - } else { - return rb.setMsg("操作失败!提交的数据不一致"); - } - }*/ } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index c1066740a5..0de25bebaf 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -1294,6 +1294,9 @@ public class BusSalesOrderService extends MybatisBaseService deptSidList = Arrays.asList(busSalesOrder.getOrgSidPath().split("/")); + String deptSid = deptSidList.get(deptSidList.size()-1); + baseBrandMitQuery.setDeptSid(deptSid); ResultBean resultBean1 = baseBrandletpricepowimitFeign.getMoney(baseBrandMitQuery); if (resultBean1.getSuccess()) { String price = resultBean1.getData(); @@ -1321,6 +1324,9 @@ public class BusSalesOrderService extends MybatisBaseService resultBean2 = baseBrandletpricepowimitFeign.getMoney(baseBrandMitQuery); if (resultBean2.getSuccess()) { String price = resultBean2.getData(); diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java index 0ff14fef50..e8ef40aaee 100644 --- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java @@ -20,9 +20,9 @@ public enum ProcDefEnum { //QKLPFINBILLAPPLICATION("欠款领票申请流程", "process_x9r8epty:2:1365004"), QKLPFINBILLAPPLICATION("欠款领票申请流程", "process_x9r8epty:4:1592512"), BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "advance_ginvoiceapply:1:242664"), - ARREARSCARRYVEHICLE("欠款提车审批流程", "process_f2dkbvny:3:1595008"), + ARREARSCARRYVEHICLE("欠款提车审批流程", "process_f2dkbvny:4:1865016"), VEHICLEAPPLY("排产申请流程", "process_9egcg169:13:1250004"), - SCMCARTRANSFER("库存地点变更申请", "process_3bc4p2em:8:725008"), + SCMCARTRANSFER("库存地点变更申请", "process_3bc4p2em:9:1865007"), BASEVEHICLEACTUALSALES("未售买断", "process_6qx07b75:8:725012"), FINCOSTAPPLY("费用申请", "process_u0pahv0s:6:725016"), FINPAYAPPLY("付款申请", "process_gin2tntb:4:725020"), @@ -32,7 +32,7 @@ public enum ProcDefEnum { SEALAPPLY("盖章申请", "process_7h0z66tp:1:240064"), SALESORDER("销售订单审批流程", "process_p5ils2rn:10:1250008"), BASEOUTSOURCINGAPPLICATION("外采申请", "process_5tqysnjc:5:722504"), - BASEMODELMODPRICE("车型调价申请", "process_kydcif7k:7:722512"), + BASEMODELMODPRICE("车型调价申请", "process_kydcif7k:8:1865012"), BASEINTERNALPURCHASE("调车申请", "process_i6luw5xq:3:722516"), BASEACCADJAPPLY("调账申请", "process_r6pyzqoz:4:1362508"), BUSDELIVEREDAPPLY("出库申请", "process_wgt1n66l:10:1700004"), diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/flowable/GetNodeQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/flowable/GetNodeQuery.java index e2bb128f20..3f2c56ee4c 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/flowable/GetNodeQuery.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/flowable/GetNodeQuery.java @@ -5,7 +5,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotBlank; -import java.util.Map; @Data public class GetNodeQuery implements Query { @@ -15,7 +14,6 @@ public class GetNodeQuery implements Query { @NotBlank(message = "参数错误：taskDefKey") private String taskDefKey; -// @ApiModelProperty(value = "分支字段及业务字段") -// private Map formVariables; + private String businessSid; } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java index 338880ec8c..e4ef3ba5d5 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java @@ -1068,6 +1068,7 @@ public class ScmVehicleGressionService extends MybatisBaseService resultBean = flowableFeign.handleProsess(bv); @@ -1209,9 +1210,10 @@ public class ScmVehicleGressionService extends MybatisBaseService> getPreviousNodesForReject(GetNodeQuery query) { ResultBean> rb = new ResultBean<>(); + ScmVehicleGression scmVehicleGression = fetchBySid(query.getBusinessSid()); BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(query, bv); - bv.setModelId(ProcDefEnum.SCMCARTRANSFER.getProDefId()); + bv.setModelId(scmVehicleGression.getProcDefId()); ResultBean>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv); //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList()); @@ -1226,9 +1228,10 @@ public class ScmVehicleGressionService extends MybatisBaseService> getNextNodesForSubmit(GetNodeQuery query) { ResultBean> rb = ResultBean.fireFail(); + ScmVehicleGression scmVehicleGression = fetchBySid(query.getBusinessSid()); BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(query, bv); - bv.setModelId(ProcDefEnum.SCMCARTRANSFER.getProDefId()); + bv.setModelId(scmVehicleGression.getProcDefId()); ResultBean>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv); List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList()); return rb.success().setData(voList);