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

优化

master
God 2 years ago
parent
cdcef170ff
commit
61c0db161e
2 changed files with 54 additions and 4 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. 54
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
  2. 4
      anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java

54
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
View File

@ -2362,6 +2362,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
return rb.setMsg(resultBean.getMsg());
}
String businessSid = resultBean.getData();
finBillApplication = fetchBySid(businessSid);
//创建BusinessVariables实体对象
BusinessVariables bv = new BusinessVariables();
//流程中的参数赋值、若有网关，则赋值网关中判断的字段。
@ -2369,6 +2370,8 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", businessSid);
variables.put("app", appMap);
//判断是否为销售专员发起
variables.put("isZy", finBillApplication.getCreateByName().equals(finBillApplication.getStaffName()));
//用户的部门全路径sid
bv.setOrgSidPath(orgSidPath);
//业务sid
@ -2378,7 +2381,6 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
//流程定义id
bv.setModelId(ProcDefEnum.QKFINBILLAPPLICATION.getProDefId());
//========================================
finBillApplication = fetchBySid(businessSid);
FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery();
flowProcessMapQuery.setProDefKey(bv.getModelId());
flowProcessMapQuery.setVariables(variables);
@ -2386,6 +2388,13 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
variables = flowableFeign.getMap(flowProcessMapQuery).getData();
bv.setFormVariables(variables);
//=======================================
if (finBillApplication.getCreateByName().equals(finBillApplication.getStaffName())){
List<String> orgPathList = Arrays.asList(finBillApplication.getOrgSidPath().split("/"));
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(orgPathList.get(orgPathList.size() - 1)).getData();
String nextNodeUserSids_ = sysOrganization.getManagerSid();
bv.setNextNodeUserSids(nextNodeUserSids_);
}
//=======================================
if (r == 1) {
ResultBean<UpdateFlowFieldVo> voResultBean = flowFeign.startProcess(bv);
if (!voResultBean.getSuccess()) {
@ -2454,6 +2463,8 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
bv.setModelId(finBillApplication.getProcDefId());
//判断是否领取发票原件，若是，则isTrue网关参数为true=============添加
variables.put("isAdj", finBillApplication.getIsLQOrigInvoice().equals("是"));
//判断是否为销售专员发起
variables.put("isZy", finBillApplication.getCreateByName().equals(finBillApplication.getStaffName()));
//查询销售订单价格信息
BusSalesOrderPrice data = busSalesOrderFeign.selectByContractNo(finBillApplication.getContractNo()).getData();
//查询销售订单信息
@ -2471,6 +2482,13 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
variables = flowableFeign.getMap(flowProcessMapQuery).getData();
bv.setFormVariables(variables);
//=======================================
if ("Activity_1w9k3pk".equals(bv.getTaskDefKey())) {//分公司销售专员节点id
List<String> orgPathList = Arrays.asList(finBillApplication.getOrgSidPath().split("/"));
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(orgPathList.get(orgPathList.size() - 1)).getData();
String nextNodeUserSids_ = sysOrganization.getManagerSid();
bv.setNextNodeUserSids(nextNodeUserSids_);
}
//=======================================
if (bv.getTaskId().equals(finBillApplication.getTaskId())) {
ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
if (!resultBean.getSuccess()) {
@ -2796,6 +2814,8 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
bv.setModelId(finBillApplication.getProcDefId());
//判断是否领取发票原件，若是，则isTrue网关参数为true=============添加
variables.put("isAdj", finBillApplication.getIsLQOrigInvoice().equals("是"));
//判断是否为销售专员发起
variables.put("isZy", finBillApplication.getCreateByName().equals(finBillApplication.getStaffName()));
//========================================
finBillApplication = fetchBySid(bv.getBusinessSid());
FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery();
@ -2822,6 +2842,8 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
bv.setModelId(finBillApplication.getProcDefId());
//判断是否领取发票原件，若是，则isTrue网关参数为true=============添加
variables.put("isAdj", finBillApplication.getIsLQOrigInvoice().equals("是"));
//判断是否为销售专员发起
variables.put("isZy", finBillApplication.getCreateByName().equals(finBillApplication.getStaffName()));
//========================================
finBillApplication = fetchBySid(bv.getBusinessSid());
FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery();
@ -2861,6 +2883,8 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
variables.put("app", appMap);
//判断是否领取发票原件，若是，则isTrue网关参数为true=============添加
variables.put("isAdj", finBillApplication.getIsLQOrigInvoice().equals("是"));
//判断是否为销售专员发起
variables.put("isZy", finBillApplication.getCreateByName().equals(finBillApplication.getStaffName()));
//========================================
FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery();
flowProcessMapQuery.setProDefKey(finBillApplication.getProcDefId());
@ -3156,6 +3180,8 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
bv.setModelId(finBillApplication.getProcDefId());
//判断是否领取发票原件，若是，则isTrue网关参数为true=============添加
bv.getFormVariables().put("isAdj", finBillApplication.getIsLQOrigInvoice().equals("是"));
//判断是否为销售专员发起
bv.getFormVariables().put("isZy", finBillApplication.getCreateByName().equals(finBillApplication.getStaffName()));
//========================================
Map<String, Object> variables = bv.getFormVariables();
finBillApplication = fetchBySid(bv.getBusinessSid());
@ -3326,6 +3352,8 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", businessSid);
variables.put("app", appMap);
//判断是否为销售专员发起
variables.put("isZy", finBillApplication1.getCreateByName().equals(finBillApplication1.getStaffName()));
//用户的部门全路径sid
bv.setOrgSidPath(orgSidPath);
//业务sid
@ -3335,7 +3363,6 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
//流程定义id
bv.setModelId(ProcDefEnum.QKLPFINBILLAPPLICATION.getProDefId());
//========================================
finBillApplication1 = fetchBySid(bv.getBusinessSid());
FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery();
flowProcessMapQuery.setProDefKey(bv.getModelId());
flowProcessMapQuery.setVariables(variables);
@ -3343,6 +3370,13 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
variables = flowableFeign.getMap(flowProcessMapQuery).getData();
bv.setFormVariables(variables);
//=======================================
if (finBillApplication1.getCreateByName().equals(finBillApplication1.getStaffName())){
List<String> orgPathList = Arrays.asList(finBillApplication1.getOrgSidPath().split("/"));
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(orgPathList.get(orgPathList.size() - 1)).getData();
String nextNodeUserSids_ = sysOrganization.getManagerSid();
bv.setNextNodeUserSids(nextNodeUserSids_);
}
//=======================================
if (r == 1) {
ResultBean<UpdateFlowFieldVo> voResultBean = flowFeign.startProcess(bv);
if (!voResultBean.getSuccess()) {
@ -3396,6 +3430,8 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", businessSid);
variables.put("app", appMap);
//判断是否为销售专员发起
variables.put("isZy", finBillApplication.getCreateByName().equals(finBillApplication.getStaffName()));
//========================================
FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery();
flowProcessMapQuery.setProDefKey(finBillApplication.getProcDefId());
@ -3406,6 +3442,14 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
bv.setFormVariables(variables);
bv.setOrgSidPath(finBillApplication.getOrgSidPath());
bv.setModelId(finBillApplication.getProcDefId());
//=======================================
if ("Activity_1g5iapj".equals(bv.getTaskDefKey())) {//分公司销售专员节点id
List<String> orgPathList = Arrays.asList(finBillApplication.getOrgSidPath().split("/"));
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(orgPathList.get(orgPathList.size() - 1)).getData();
String nextNodeUserSids_ = sysOrganization.getManagerSid();
bv.setNextNodeUserSids(nextNodeUserSids_);
}
//=======================================
if (bv.getTaskId().equals(finBillApplication.getTaskId())) {
ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
if (!resultBean.getSuccess()) {
@ -3614,6 +3658,8 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
Map<String, Object> variables = new HashMap<>();
//查询业务信息
FinBillApplication finBillApplication = fetchBySid(query.getBusinessSid());
//判断是否为销售专员发起
variables.put("isZy", finBillApplication.getCreateByName().equals(finBillApplication.getStaffName()));
bv.setModelId(finBillApplication.getProcDefId());
//========================================
FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery();
@ -3638,6 +3684,8 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
bv.setFormVariables(variables);
//查询业务信息
FinBillApplication finBillApplication = fetchBySid(query.getBusinessSid());
//判断是否为销售专员发起
variables.put("isZy", finBillApplication.getCreateByName().equals(finBillApplication.getStaffName()));
bv.setModelId(finBillApplication.getProcDefId());
//========================================
FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery();
@ -3675,6 +3723,8 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", businessSid);
variables.put("app", appMap);
//判断是否为销售专员发起
variables.put("isZy", finBillApplication.getCreateByName().equals(finBillApplication.getStaffName()));
//========================================
FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery();
flowProcessMapQuery.setProDefKey(finBillApplication.getProcDefId());

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

@ -15,8 +15,8 @@ public enum ProcDefEnum {
ORDERAPPROVE("订单审批", "order_approve_96asleqi:1:227504"),
SALESPOLICY("销售政策审批流程", "process_biw9gfh7:3:917504"),
FINBILLAPPLICATION("开票申请流程", "process_hxys3ap3:5:5665004"),
QKFINBILLAPPLICATION("欠款开票申请流程", "process_q4evu61h:2:5100004"),
QKLPFINBILLAPPLICATION("欠款领票申请流程", "process_x9r8epty:5:4975008"),
QKFINBILLAPPLICATION("欠款开票申请流程", "process_q4evu61h:3:5682504"),
QKLPFINBILLAPPLICATION("欠款领票申请流程", "process_x9r8epty:6:5682508"),
ARREARSCARRYVEHICLE("欠款提车审批流程", "process_f2dkbvny:5:4975004"),
VEHICLEAPPLY("排产申请流程", "process_9egcg169:14:3120004"),
SCMCARTRANSFER("库存地点变更申请", "process_3bc4p2em:9:1865007"),

Write Preview
Loading…
Cancel
Save