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

Merge remote-tracking branch 'origin/master'

zhanglei
yunuo970428 2 years ago
parent
3db9100cf2 0ce3a5b673
commit
7b2f9289fd
2 changed files with 44 additions and 48 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. 16
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java
  2. 76
      anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java

16
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java
View File

@ -581,10 +581,9 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
} }
} }
public ResultBean InitiatorToAnswer(BusinessVariables bv,String id) { public ResultBean InitiatorToAnswer(BusinessVariables bv, String id) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
BaseInternalPurchase baseInternalPurchase = fetchBySid(bv.getBusinessSid()); BaseInternalPurchase baseInternalPurchase = fetchBySid(bv.getBusinessSid());
bv.setOrgSidPath(baseInternalPurchase.getOrgSidPath());
String shuntingTypeValue = baseInternalPurchase.getShuntingTypeValue(); String shuntingTypeValue = baseInternalPurchase.getShuntingTypeValue();
if (shuntingTypeValue.equals("调入")) { if (shuntingTypeValue.equals("调入")) {
String callOutOrgSid = baseInternalPurchase.getSellerOrgSid(); String callOutOrgSid = baseInternalPurchase.getSellerOrgSid();
@ -616,20 +615,23 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
List<GetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList()); List<GetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
List<String> candidateGroups = voList.get(0).getCandidateGroups(); List<String> candidateGroups = voList.get(0).getCandidateGroups();
UserRoleQuery userRoleQuery = new UserRoleQuery(); UserRoleQuery userRoleQuery = new UserRoleQuery();
if (StringUtils.isNotBlank(id)){ if (StringUtils.isNotBlank(id)) {
if (id.equals("Activity_08r04ow")){ if (id.equals("Activity_08r04ow")) {//事业部副总经理审批(管辖调出方)
String sellerOrgSid = baseInternalPurchase.getSellerOrgSid(); String sellerOrgSid = baseInternalPurchase.getSellerOrgSid();
userRoleQuery.setRoleSid(candidateGroups.get(0)); userRoleQuery.setRoleSid(candidateGroups.get(0));
userRoleQuery.setOrgSid(sellerOrgSid); userRoleQuery.setOrgSid(sellerOrgSid);
}else if (id.equals("Activity_02xqz9n")){ SysOrganizationVo data = sysOrganizationFeign.fetchBySid(callInOrgSid).getData();
String orgSidPath = data.getOrgSidPath();
bv.setOrgSidPath(orgSidPath);
} else if (id.equals("Activity_02xqz9n")) {//事业部副总经理审批(管辖调入方)
String buyerOrgSid = baseInternalPurchase.getBuyerOrgSid(); String buyerOrgSid = baseInternalPurchase.getBuyerOrgSid();
userRoleQuery.setRoleSid(candidateGroups.get(0)); userRoleQuery.setRoleSid(candidateGroups.get(0));
userRoleQuery.setOrgSid(buyerOrgSid); userRoleQuery.setOrgSid(buyerOrgSid);
}else { } else {
userRoleQuery.setRoleSid(candidateGroups.get(0)); userRoleQuery.setRoleSid(candidateGroups.get(0));
userRoleQuery.setOrgSid(callInOrgSid); userRoleQuery.setOrgSid(callInOrgSid);
} }
}else { } else {
userRoleQuery.setRoleSid(candidateGroups.get(0)); userRoleQuery.setRoleSid(candidateGroups.get(0));
userRoleQuery.setOrgSid(callInOrgSid); userRoleQuery.setOrgSid(callInOrgSid);
} }

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

@ -12,58 +12,52 @@ public enum ProcDefEnum {
ORDERAPPROVE("订单审批", "order_approve_96asleqi:1:227504"), ORDERAPPROVE("订单审批", "order_approve_96asleqi:1:227504"),
// CARSALECONTRACTAPPROVE("新车买卖合同审批", "car_sale_contract_asbspcvd:1:230020"), // CARSALECONTRACTAPPROVE("新车买卖合同审批", "car_sale_contract_asbspcvd:1:230020"),
//SALESPOLICY("销售政策审批流程", "process_biw9gfh7:1:707508"),//正式销售政策流程定义id //SALESPOLICY("销售政策审批流程", "process_biw9gfh7:1:707508"),//正式销售政策流程定义id
SALESPOLICY("销售政策审批流程", "process_biw9gfh7:2:867524"),//测试销售政策流程定义id //SALESPOLICY("销售政策审批流程", "process_biw9gfh7:2:727504"),//TODO：正式新2022-11-25
// ADVANCEGINVOICEAPPLY("提前开票申请流程", "advance_ginvoiceapply:1:242664"),
//BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "process_zt1gov6e:3:820008"), //测试
// BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "process_zt1gov6e:1:765004"),//本地
// FINBILLAPPLICATION("开票申请流程", "process_t5ksueur:1:252833"), // FINBILLAPPLICATION("开票申请流程", "process_t5ksueur:1:252833"),
FINBILLAPPLICATION("开票申请流程", "process_sndce6s9:1:862516"),//测试（新）2022、11、22 // BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "advance_ginvoiceapply:1:242664"),
// ADVANCEGINVOICEAPPLY("提前开票申请流程", "advance_ginvoiceapply:1:242664"), // ARREARSCARRYVEHICLE("欠款提车审批流程", "process_8ax1xxn3:1:795004"),
// BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "process_zt1gov6e:3:820008"), //测试 // VEHICLEAPPLY("排产申请流程", "process_9egcg169:11:865004"),//TODO：正式新2022-11-25
BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "process_zt1gov6e:4:862504"), //测试（新）2022、11、22 // SCMCARTRANSFER("库存地点变更申请", "process_3bc4p2em:8:725008"), //TODO：正式新2022-11-25
// BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "process_zt1gov6e:1:765004"),//本地 // BASEVEHICLEACTUALSALES("未售买断", "process_6qx07b75:8:725012"),//ToDo：正式新2022-11-25
// ARREARSCARRYVEHICLE("欠款提车审批流程", "process_ll25axqj:1:687508"),//本地 // FINCOSTAPPLY("费用申请", "process_u0pahv0s:6:725016"),//ToDo:正式新2022-11-25
//ARREARSCARRYVEHICLE("欠款提车审批流程", "process_8ax1xxn3:1:795004"),//测试 // FINPAYAPPLY("付款申请", "process_gin2tntb:4:725020"),//ToDo:正式新2022-11-25
// VEHICLEAPPLY("排产申请流程", "process_9egcg169:7:467504"),//TODO
//VEHICLEAPPLY("排产申请流程", "process_9egcg169:10:657508"),//TODO
// ARREARSCARRYVEHICLE("欠款提车审批流程", "process_8ax1xxn3:1:795004"),//测试
ARREARSCARRYVEHICLE("欠款提车审批流程", "process_8ax1xxn3:2:862512"),//测试（新）2022、11、22
VEHICLEAPPLY("排产申请流程", "process_9egcg169:10:657508"),//TODO
// RECORDAPPLICATION("入账申请", "record_application_7y80d4r8:1:265008"),//TODO // RECORDAPPLICATION("入账申请", "record_application_7y80d4r8:1:265008"),//TODO
RECORDAPPLICATION("入库申请", "process_xbwq2c7p:3:675024"),//TODO RECORDAPPLICATION("入库申请", "process_xbwq2c7p:3:675024"),//TODO
SCMVEHICLERETURN("采购退库", "process_md8aeoap:2:867508"),//测试采购退库流程定义id //SCMVEHICLERETURN("采购退库", "process_md8aeoap:2:722508"),//ToDo:正式新2022-11-25
//BASEVEHICLEACTUALSALES("未售买断", "process_6qx07b75:6:457504"),//ToDo SEALAPPLY("盖章申请", "process_7h0z66tp:1:240064"),
SEALAPPLY("盖章申请", "process_7h0z66tp:1:240064" ),
// BASEVEHICLEACTUALSALES("未售买断", "process_6qx07b75:6:457504"),//ToDo
SALESORDER("销售订单审批流程", "process_p5ils2rn:5:557508"), SALESORDER("销售订单审批流程", "process_p5ils2rn:5:557508"),
BASEOUTSOURCINGAPPLICATION("外采申请", "process_5tqysnjc:5:867504"),//测试外采流程定义id //BASEOUTSOURCINGAPPLICATION("外采申请", "process_5tqysnjc:5:722504"),//ToDo:正式新2022-11-25
BASEMODELMODPRICE("车型调价申请", "process_kydcif7k:7:867520"),//测试车型调价流程定义id //BASEMODELMODPRICE("车型调价申请", "process_kydcif7k:7:722512"),//ToDo:正式新2022-11-25
BASEINTERNALPURCHASE("调车申请", "process_i6luw5xq:4:892504"),//测试调车流程定义id //BASEINTERNALPURCHASE("调车申请", "process_i6luw5xq:3:722516"),//ToDo:正式新2022-11-25
BASEACCADJAPPLY("调账申请", "process_r6pyzqoz:2:867516"), //测试调账流程定义id //BASEACCADJAPPLY("调账申请", "process_r6pyzqoz:2:722520"), //ToDo:正式新2022-11-25
// SCMCARTRANSFER("库存地点变更申请", "process_3bc4p2em:6:510004"), //TODO BUSDELIVEREDAPPLY("出库申请", "process_wgt1n66l:2:357504"),
// FINCOSTAPPLY("费用申请","process_u0pahv0s:5:457512"), BASESHUNINVOICAPPLY("调车开票申请", "process_u4xrvaso:1:400008"),
// FINPAYAPPLY("付款申请","process_gin2tntb:3:457508"), BASEVEHINSTALLMODPRICE("上装调价申请", "process_s0a0svth:1:492508"),
BUSDELIVEREDAPPLY("出库申请","process_wgt1n66l:2:357504"), SCMVEHREBATEWITHAPPLY("单车返利预提申请", "process_qegarc7r:1:535004"),
//BASEACCADJAPPLY("调账申请","process_r6pyzqoz:1:695004"),//正式调账流程定义id SCMVEHREBATECHECKAPPLY("单车返利核对申请", "process_3xtbbru8:1:560004"),
BASESHUNINVOICAPPLY("调车开票申请","process_u4xrvaso:1:400008"), SCMSPECIALREBATEWITHAPPLY("专项返利预提申请", "process_l0yxpgs2:1:590004"),
BASEVEHINSTALLMODPRICE("上装调价申请","process_s0a0svth:1:492508"), SCMSPECIALREBATECHECKAPPLY("专项返利核对申请", "process_qw22vupn:1:590008"),
SCMVEHREBATEWITHAPPLY("单车返利预提申请","process_qegarc7r:1:535004"), SCMSPECIALREBATECHEDISTRIBUTE("专项返利分配申请", "process_h3w1aval:1:615004"),
SCMVEHREBATECHECKAPPLY("单车返利核对申请","process_3xtbbru8:1:560004"), SCMCOLLECTIONREBATEWITHAPPLY("回款返利预提申请", "process_k4lodiyg:1:630004"),
SCMSPECIALREBATEWITHAPPLY("专项返利预提申请","process_l0yxpgs2:1:590004"), SCMCOLLECTIONREBATECHECKAPPLY("回款返利核对申请", "process_fgrv1mbv:1:630008"),
SCMSPECIALREBATECHECKAPPLY("专项返利核对申请","process_qw22vupn:1:590008"), CONTRACTAPPLY("合同审核", "process_gd8c9xd5:1:545008"),
SCMSPECIALREBATECHEDISTRIBUTE("专项返利分配申请","process_h3w1aval:1:615004"),
SCMCOLLECTIONREBATEWITHAPPLY("回款返利预提申请","process_k4lodiyg:1:630004"),
SCMCOLLECTIONREBATECHECKAPPLY("回款返利核对申请","process_fgrv1mbv:1:630008"),
CONTRACTAPPLY("合同审核","process_gd8c9xd5:1:545008"),
/******************************测试流程id*********************************************/ /******************************测试流程id*********************************************/
SCMCARTRANSFER("库存地点变更申请", "process_3bc4p2em:8:860004"), //TODO:测试 SCMCARTRANSFER("库存地点变更申请", "process_3bc4p2em:8:860004"), //TODO:测试
BASEVEHICLEACTUALSALES("未售买断", "process_6qx07b75:9:852504"),//ToDo:测试 BASEVEHICLEACTUALSALES("未售买断", "process_6qx07b75:9:852504"),//ToDo:测试
// VEHICLEAPPLY("排产申请流程", "process_9egcg169:11:865004"),//TODO:测试 VEHICLEAPPLY("排产申请流程", "process_9egcg169:11:865004"),//TODO:测试
FINCOSTAPPLY("费用申请","process_u0pahv0s:6:902504"),//ToDo:测试 FINCOSTAPPLY("费用申请","process_u0pahv0s:6:902504"),//ToDo:测试
FINPAYAPPLY("付款申请","process_gin2tntb:4:902508"),//ToDo:测试 FINPAYAPPLY("付款申请","process_gin2tntb:4:902508"),//ToDo:测试
ARREARSCARRYVEHICLE("欠款提车审批流程", "process_8ax1xxn3:2:862512"),//测试（新）2022、11、22
BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "process_zt1gov6e:3:820008"), //测试
FINBILLAPPLICATION("开票申请流程", "process_sndce6s9:1:862516"),//测试（新）2022、11、22
BASEOUTSOURCINGAPPLICATION("外采申请", "process_5tqysnjc:5:867504"),//测试外采流程定义id
BASEMODELMODPRICE("车型调价申请", "process_kydcif7k:7:867520"),//测试车型调价流程定义id
BASEINTERNALPURCHASE("调车申请", "process_i6luw5xq:4:892504"),//测试调车流程定义id
BASEACCADJAPPLY("调账申请", "process_r6pyzqoz:2:867516"), //测试调账流程定义id
SCMVEHICLERETURN("采购退库", "process_md8aeoap:2:867508"),//测试采购退库流程定义id
SALESPOLICY("销售政策审批流程", "process_biw9gfh7:2:867524"),//测试销售政策流程定义id
; ;
ProcDefEnum(String proDefName, String proDefId) { ProcDefEnum(String proDefName, String proDefId) {

Write Preview
Loading…
Cancel
Save