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

测试流程id修改

master
dimengzhe 2 years ago
parent
7e0d24c9f4
commit
ab727220c6
7 changed files with 42 additions and 16 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. 2
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyVo.java
  2. 3
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyMapper.xml
  3. 28
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java
  4. 20
      anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
  5. 2
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserVo.java
  6. 1
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java
  7. 2
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/app/AppSysUserRest.java

2
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyVo.java
View File

@ -74,5 +74,7 @@ public class FinPaymentapplyVo implements Vo {
private String procDefId;
@ApiModelProperty("流程实例id")
private String procInstId;
@ApiModelProperty("开户行")
private String receiveBank;
}

3
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyMapper.xml
View File

@ -17,7 +17,8 @@
when 2 then '已付款' end as state,
fp.remarks,
fp.procInstId,
fp.procDefId
fp.procDefId,
fp.receiveBank
FROM fin_paymentapply fp
<where>
${ew.sqlSegment}

28
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java
View File

@ -407,21 +407,43 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
//ToDo:到出纳记录
if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
FinPaymentapplyDetailsVo vo = fetchDetailsVoBySid(bv.getBusinessSid());
ResultBean<String> stringResultBean = sysStaffOrgFeign.getPathSidByUserSid(finPaymentapply.getCreateBySid());
FinPaymentrecordDto finPaymentrecordDto = new FinPaymentrecordDto();
//付款申请sid
finPaymentrecordDto.setApplySid(finPaymentapply.getSid());
//付款单位sid
finPaymentrecordDto.setPayCompanySid(finPaymentapply.getPayCompanySid());
//付款类别
finPaymentrecordDto.setPayType(1);
//创建组织
finPaymentrecordDto.setCreateOrgSid(stringResultBean.getData());
//使用组织
finPaymentrecordDto.setUseOrgSid(stringResultBean.getData());
finPaymentrecordDto.setCost(finPaymentapply.getCost());
//款项名称
finPaymentrecordDto.setCostTitleKey(finPaymentapply.getCostTitleKey());
finPaymentrecordDto.setCostTitleValue(finPaymentapply.getCostTitleValue());
//款项类别
finPaymentrecordDto.setCostTypeKey(finPaymentapply.getCostTypeKey());
finPaymentrecordDto.setCostTypeValue(finPaymentapply.getCostTypeValue());
//收款单位名称
finPaymentrecordDto.setReceiveCompany(finPaymentapply.getReceiveCompany());
finPaymentrecordDto.setReceiveBankAccount(finPaymentapply.getReceiveBankAccount());
finPaymentrecordService.saveDto(finPaymentrecordDto);
List<FinPaymentapplyDetailVo> detailVoList = vo.getDetailsList();
detailVoList.removeAll(Collections.singleton(null));
if(detailVoList.isEmpty()){
for (FinPaymentapplyDetailVo finPaymentapplyDetailVo : detailVoList){
//收款银行账号
finPaymentrecordDto.setReceiveBankAccount(finPaymentapply.getReceiveBankAccount());
finPaymentrecordDto.setReceiveBank(finPaymentapplyDetailVo.getBank());
//金额
if(StringUtils.isNotBlank(finPaymentapplyDetailVo.getPayAccount())){
finPaymentrecordDto.setCost(Integer.valueOf(finPaymentapplyDetailVo.getPayAccount()));
}
finPaymentrecordService.saveDto(finPaymentrecordDto);
}
}
} else {
//极光推送
UpdateFlowFieldVo ufVo = resultBean.getData();

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

@ -11,25 +11,23 @@ public enum ProcDefEnum {
ORDERDEPOSITVEHICLEAPPROVE("简易订单-车辆预定", "process_pkyns85b:5:575008"),
ORDERAPPROVE("订单审批", "order_approve_96asleqi:1:227504"),
// CARSALECONTRACTAPPROVE("新车买卖合同审批", "car_sale_contract_asbspcvd:1:230020"),
//SALESPOLICY("销售政策审批流程", "process_biw9gfh7:1:707508"),//正式销售政策流程定义id
//SALESPOLICY("销售政策审批流程", "process_biw9gfh7:2:727504"),//TODO：正式新2022-11-25
// SALESPOLICY("销售政策审批流程", "process_biw9gfh7:2:727504"),//TODO：正式新2022-11-25
// FINBILLAPPLICATION("开票申请流程", "process_t5ksueur:1:252833"),
// BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "advance_ginvoiceapply:1:242664"),
// ARREARSCARRYVEHICLE("欠款提车审批流程", "process_8ax1xxn3:1:795004"),
// VEHICLEAPPLY("排产申请流程", "process_9egcg169:11:725004"),//TODO：正式新2022-11-25
// VEHICLEAPPLY("排产申请流程", "process_9egcg169:12:735004"),//TODO：正式新2022-11-25
// SCMCARTRANSFER("库存地点变更申请", "process_3bc4p2em:8:725008"), //TODO：正式新2022-11-25
// BASEVEHICLEACTUALSALES("未售买断", "process_6qx07b75:8:725012"),//ToDo：正式新2022-11-25
// FINCOSTAPPLY("费用申请", "process_u0pahv0s:6:725016"),//ToDo:正式新2022-11-25
// FINPAYAPPLY("付款申请", "process_gin2tntb:4:725020"),//ToDo:正式新2022-11-25
// RECORDAPPLICATION("入账申请", "record_application_7y80d4r8:1:265008"),//TODO
RECORDAPPLICATION("入库申请", "process_xbwq2c7p:3:675024"),//TODO
//SCMVEHICLERETURN("采购退库", "process_md8aeoap:2:722508"),//ToDo:正式新2022-11-25
// RECORDAPPLICATION("入库申请", "process_xbwq2c7p:3:675024"),//TODO
// SCMVEHICLERETURN("采购退库", "process_md8aeoap:2:722508"),//ToDo:正式新2022-11-25
SEALAPPLY("盖章申请", "process_7h0z66tp:1:240064"),
SALESORDER("销售订单审批流程", "process_p5ils2rn:5:557508"),
//BASEOUTSOURCINGAPPLICATION("外采申请", "process_5tqysnjc:5:722504"),//ToDo:正式新2022-11-25
//BASEMODELMODPRICE("车型调价申请", "process_kydcif7k:7:722512"),//ToDo:正式新2022-11-25
//BASEINTERNALPURCHASE("调车申请", "process_i6luw5xq:3:722516"),//ToDo:正式新2022-11-25
//BASEACCADJAPPLY("调账申请", "process_r6pyzqoz:2:722520"), //ToDo:正式新2022-11-25
// BASEOUTSOURCINGAPPLICATION("外采申请", "process_5tqysnjc:5:722504"),//ToDo:正式新2022-11-25
// BASEMODELMODPRICE("车型调价申请", "process_kydcif7k:7:722512"),//ToDo:正式新2022-11-25
// BASEINTERNALPURCHASE("调车申请", "process_i6luw5xq:3:722516"),//ToDo:正式新2022-11-25
// BASEACCADJAPPLY("调账申请", "process_r6pyzqoz:2:722520"), //ToDo:正式新2022-11-25
BUSDELIVEREDAPPLY("出库申请", "process_wgt1n66l:2:357504"),
BASESHUNINVOICAPPLY("调车开票申请", "process_u4xrvaso:1:400008"),
BASEVEHINSTALLMODPRICE("上装调价申请", "process_s0a0svth:1:492508"),
@ -46,7 +44,7 @@ public enum ProcDefEnum {
/******************************测试流程id*********************************************/
SCMCARTRANSFER("库存地点变更申请", "process_3bc4p2em:8:860004"), //TODO:测试
BASEVEHICLEACTUALSALES("未售买断", "process_6qx07b75:9:852504"),//ToDo:测试
VEHICLEAPPLY("排产申请流程", "process_9egcg169:11:865004"),//TODO:测试
VEHICLEAPPLY("排产申请流程", "process_9egcg169:12:910004"),//TODO:测试
FINCOSTAPPLY("费用申请","process_u0pahv0s:6:902504"),//ToDo:测试
FINPAYAPPLY("付款申请","process_gin2tntb:4:902508"),//ToDo:测试
ARREARSCARRYVEHICLE("欠款提车审批流程", "process_8ax1xxn3:2:862512"),//测试（新）2022、11、22

2
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserVo.java
View File

@ -88,4 +88,6 @@ public class SysUserVo implements Vo {
@ApiModelProperty("是否需要更换密码")
private Boolean needResetPsd;
@ApiModelProperty("工号")
private String jobNumber;
}

1
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java
View File

@ -199,6 +199,7 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
SysUserVo vo = new SysUserVo();
BeanUtil.copyProperties(entity, vo);
vo.setName(sysStaffinfo.getName());
vo.setJobNumber(sysStaffinfo.getJobNumber());
List<SysStaffOrgVo> orgVoList = sysStaffOrgService.getSysStaffOrgListByStaffSid(staffSid);
if (orgVoList.size() > 0) { // 手机端销售人员用到orgsid,目前按唯一算
SysStaffOrgVo sysStaffOrgVo = orgVoList.get(0);

2
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/app/AppSysUserRest.java
View File

@ -291,7 +291,7 @@ public class AppSysUserRest implements AppSysUserFeign {
}
userInfo.setHeadImage(headImage);
userInfo.setName(StringUtils.isBlank(sysUserVo.getName()) ? "" : sysUserVo.getName());
userInfo.setId("ID：" + sysUserVo.getId());
userInfo.setId("ID：" + sysUserVo.getJobNumber());
//根据组织机构sid查询该用户的职位以及分公司的部门
List<String> strings = new ArrayList<>();
List<SysStaffOrg> list = sysUserService.selectOrgBySid(orgPath,sysUserVo.getStaffSid());

Write Preview
Loading…
Cancel
Save