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

流程问题修改

master
hp 2 years ago
parent
3a7c05fd05
commit
224c2faa0d
10 changed files with 80 additions and 6 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-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/AppAdvanceInvoiceDto.java
  2. 2
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/BusAdvanceGinvoiceapply.java
  3. 2
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryDto.java
  4. 2
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApply.java
  5. 22
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyService.java
  6. 25
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java
  7. 3
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplication.java
  8. 2
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDto.java
  9. 17
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
  10. 9
      anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java

2
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/AppAdvanceInvoiceDto.java
View File

@ -49,4 +49,6 @@ public class AppAdvanceInvoiceDto implements Dto {
private String taskId;
@ApiModelProperty("流程实列id")
private String procInsId;
@ApiModelProperty("当前用户部门的全路径")
private String orgSidPath;
}

2
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/BusAdvanceGinvoiceapply.java
View File

@ -98,4 +98,6 @@ public class BusAdvanceGinvoiceapply extends BaseEntity {
private String procInstId;
@ApiModelProperty(value = "任务id")
private String taskId;
@ApiModelProperty(value = "当前用户部门全路径")
private String orgSidPath;
}

2
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryDto.java
View File

@ -41,4 +41,6 @@ public class AppArrearsCarryDto implements Dto {
private String procInsId;
@ApiModelProperty("用户sid")
private String taskId;
@ApiModelProperty("当前用户部门的全路径")
private String orgSidPath;
}

2
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApply.java
View File

@ -83,4 +83,6 @@ public class BusArrearsCarryVehicleApply extends BaseEntity {
private String procInstId;
@ApiModelProperty(value = "任务id")
private String taskId;
@ApiModelProperty("当前用户部门的全路径")
private String orgSidPath;
}

22
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyService.java
View File

@ -518,6 +518,16 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService<BusAdvanc
String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData();
SysUserVo sysUserVo = sysUserFeign.fetchBySid(dto.getUserSid()).getData();
BusAdvanceGinvoiceapply busAdvanceGinvoiceapply = fetchBySid(dto.getContractSid());
if (StringUtils.isBlank(dto.getOrgSidPath())){
//根据staffSid获取用户的组织全路径
ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(sysUserVo.getStaffSid());
if (!staffOrgResultBean.getSuccess()) {
return rb.setMsg(staffOrgResultBean.getMsg());
}
//用户的组织全路径
String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
dto.setOrgSidPath(orgSidPath);
}
BeanUtil.copyProperties(dto, busAdvanceGinvoiceapply);
String sid = dto.getContractSid();
busGinvoiceapplyVehicleService.delByAdvGinSid(sid);
@ -596,6 +606,7 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService<BusAdvanc
}
//用户的组织全路径
String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
dto.setOrgSidPath(orgSidPath);
BusAdvanceGinvoiceapply busAdvanceGinvoiceapply = fetchBySid(dto.getContractSid());
int r = submitBusinessData(dto, busAdvanceGinvoiceapply);
if (r == 3) {
@ -604,6 +615,7 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService<BusAdvanc
if (r == 0) {
return rb.setMsg("操作失败!提交的数据不一致");
}
dto.setOrgSidPath(orgSidPath);
//新增修改保存
ResultBean<String> resultBean = saveAdvanceInvoice(dto);
if (!resultBean.getSuccess()) {
@ -717,6 +729,11 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService<BusAdvanc
appMap.put("contractSid", bv.getBusinessSid());
variables.put("app", appMap);
bv.setFormVariables(variables);
if (StringUtils.isNotBlank(busAdvanceGinvoiceapply.getOrgSidPath())) {
bv.setOrgSidPath(busAdvanceGinvoiceapply.getOrgSidPath());
} else {
return rb.setMsg("orgSidPath 为空！");
}
if (bv.getTaskId().equals(busAdvanceGinvoiceapply.getTaskId())) {
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
if (!resultBean.getSuccess()) {
@ -821,6 +838,11 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService<BusAdvanc
appMap.put("contractSid", bv.getBusinessSid());
variables.put("app", appMap);
bv.setFormVariables(variables);
if (StringUtils.isNotBlank(busAdvanceGinvoiceapply.getOrgSidPath())) {
bv.setOrgSidPath(busAdvanceGinvoiceapply.getOrgSidPath());
} else {
return rb.setMsg("orgSidPath 为空！");
}
ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
//判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
List<GetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());

25
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java
View File

@ -606,8 +606,18 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
ResultBean rb = ResultBean.fireFail();
// 取出分公司sid
String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData();
// 取出当前登录用户信息
SysUserVo sysUserVo = sysUserFeign.fetchBySid(dto.getUserSid()).getData();
if (StringUtils.isBlank(dto.getOrgSidPath())){
// 取出当前登录用户信息
SysUserVo sysUserVo = sysUserFeign.fetchBySid(dto.getUserSid()).getData();
//根据staffSid获取用户的组织全路径
ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(sysUserVo.getStaffSid());
if (!staffOrgResultBean.getSuccess()) {
return rb.setMsg(staffOrgResultBean.getMsg());
}
//用户的组织全路径
String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
dto.setOrgSidPath(orgSidPath);
}
//根据申请sid查询数据
BusArrearsCarryVehicleApply busArrearsCarryVehicleApply = fetchBySid(dto.getContractSid());
BeanUtil.copyProperties(dto, busArrearsCarryVehicleApply);
@ -650,6 +660,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
}
//用户的组织全路径
String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
dto.setOrgSidPath(orgSidPath);
BusArrearsCarryVehicleApply busArrearsCarryVehicleApply = fetchBySid(dto.getContractSid());
int r = submitBusinessData(dto, busArrearsCarryVehicleApply);
if (r == 3) {
@ -771,6 +782,11 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
appMap.put("contractSid", bv.getBusinessSid());
variables.put("app", appMap);
bv.setFormVariables(variables);
if (StringUtils.isNotBlank(busArrearsCarryVehicleApply.getOrgSidPath())) {
bv.setOrgSidPath(busArrearsCarryVehicleApply.getOrgSidPath());
} else {
return rb.setMsg("orgSidPath 为空！");
}
if (bv.getTaskId().equals(busArrearsCarryVehicleApply.getTaskId())) {
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
if (!resultBean.getSuccess()) {
@ -888,6 +904,11 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
appMap.put("contractSid", bv.getBusinessSid());
variables.put("app", appMap);
bv.setFormVariables(variables);
if (StringUtils.isNotBlank(busArrearsCarryVehicleApply.getOrgSidPath())) {
bv.setOrgSidPath(busArrearsCarryVehicleApply.getOrgSidPath());
} else {
return rb.setMsg("orgSidPath 为空！");
}
ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
//判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
List<GetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());

3
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplication.java
View File

@ -89,6 +89,7 @@ public class FinBillApplication extends BaseEntity {
private String nodeState;
@ApiModelProperty(value = "是否延迟开票")
private Integer isDelayBill;
@ApiModelProperty("当前用户部门全路径")
private String orgSidPath;
private String taskId;
}

2
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDto.java
View File

@ -93,6 +93,8 @@ public class FinBillApplicationDto implements Dto {
private String isHighAndLowOpen;
@ApiModelProperty("备注")
private String remarks; // 备注
@ApiModelProperty("当前用户部门全路径")
private String orgSidPath;
@ApiModelProperty("开票车辆信息")
private List<FinBillVehicleDto> finBillVehicles; // 开票车辆信息
@ApiModelProperty("客户开票申请书附件信息")

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

@ -200,6 +200,21 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
public ResultBean<String> saveOrUpdateDto(FinBillApplicationDto dto) {
ResultBean rb = ResultBean.fireFail();
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dto.getOrgSidPath())) {
//根据用户sid获取staffSid
ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid());
if (!userVoResultBean.getSuccess()) {
return rb.setMsg(userVoResultBean.getMsg());
}
//根据staffSid获取用户的组织全路径
ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
if (!staffOrgResultBean.getSuccess()) {
return rb.setMsg(staffOrgResultBean.getMsg());
}
//用户的组织全路径
String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
dto.setOrgSidPath(orgSidPath);
}
List<FinBillVehicleDto> finBillVehicles = dto.getFinBillVehicles();
List<FinBillApplicationAppendxDto> khkpsqsApplicationAppendxs = dto.getKhkpsqsApplicationAppendxs();
List<FinBillApplicationAppendxDto> kpxxqrsApplicationAppendxs = dto.getKpxxqrsApplicationAppendxs();
@ -686,6 +701,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
appMap.put("contractSid", businessSid);
variables.put("app", appMap);
bv.setFormVariables(variables);
bv.setOrgSidPath(finBillApplication.getOrgSidPath());
if (bv.getTaskId().equals(finBillApplication.getTaskId())) {
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
if (!resultBean.getSuccess()) {
@ -868,6 +884,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
}
//用户的组织全路径
String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
dto.setOrgSidPath(orgSidPath);
FinBillApplication finBillApplication = fetchBySid(dto.getSid());
int r = submitBusinessData(dto, finBillApplication);
if (r == 3) {

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

@ -11,12 +11,15 @@ public enum ProcDefEnum {
// CARSALECONTRACTAPPROVE("新车买卖合同审批", "car_sale_contract_asbspcvd:1:230020"),
//SALESPOLICY("销售政策审批流程", "process_biw9gfh7:1:707508"),//正式销售政策流程定义id
SALESPOLICY("销售政策审批流程", "process_biw9gfh7:1:822504"),//测试销售政策流程定义id
FINBILLAPPLICATION("开票申请流程", "process_t5ksueur:1:252833"),
// FINBILLAPPLICATION("开票申请流程", "process_t5ksueur:1:252833"),
FINBILLAPPLICATION("开票申请流程", "process_sndce6s9:1:862516"),//测试（新）2022、11、22
// ADVANCEGINVOICEAPPLY("提前开票申请流程", "advance_ginvoiceapply:1:242664"),
BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "process_zt1gov6e:3:820008"), //测试
// BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "process_zt1gov6e:3:820008"), //测试
BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "process_zt1gov6e:4:862504"), //测试（新）2022、11、22
// BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "process_zt1gov6e:1:765004"),//本地
// ARREARSCARRYVEHICLE("欠款提车审批流程", "process_ll25axqj:1:687508"),//本地
ARREARSCARRYVEHICLE("欠款提车审批流程", "process_8ax1xxn3:1:795004"),//测试
// ARREARSCARRYVEHICLE("欠款提车审批流程", "process_8ax1xxn3:1:795004"),//测试
ARREARSCARRYVEHICLE("欠款提车审批流程", "process_8ax1xxn3:2:862512"),//测试（新）2022、11、22
// VEHICLEAPPLY("排产申请流程", "process_9egcg169:10:657508"),//TODO
VEHICLEAPPLY("排产申请流程", "process_9egcg169:11:865004"),//TODO:测试
// RECORDAPPLICATION("入账申请", "record_application_7y80d4r8:1:265008"),//TODO

Write Preview
Loading…
Cancel
Save