diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java index b8b6a1ff21..6917548385 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java @@ -278,6 +278,7 @@ public class BusVehicleOrderService extends MybatisBaseService工作流任务

@@ -95,4 +96,7 @@ public class FlowTask extends BaseEntity implements Serializable { @ApiModelProperty("任务完成时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date finishTime; + + @ApiModelProperty("环节的办理人信息") + private List taskUserInfos; } diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/TaskUserInfo.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/TaskUserInfo.java new file mode 100644 index 0000000000..dfc99d42a0 --- /dev/null +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/TaskUserInfo.java @@ -0,0 +1,31 @@ +package com.yxt.anrui.portal.api.flow; + +public class TaskUserInfo { + private String assigneeName; + private String assigneeHeadImage; + private String assigneeSid; + + public String getAssigneeSid() { + return assigneeSid; + } + + public void setAssigneeSid(String assigneeSid) { + this.assigneeSid = assigneeSid; + } + + public String getAssigneeName() { + return assigneeName; + } + + public void setAssigneeName(String assigneeName) { + this.assigneeName = assigneeName; + } + + public String getAssigneeHeadImage() { + return assigneeHeadImage; + } + + public void setAssigneeHeadImage(String assigneeHeadImage) { + this.assigneeHeadImage = assigneeHeadImage; + } +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundDto.java index 8a4ee13b94..908d6f62c4 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundDto.java @@ -155,6 +155,8 @@ public class ScmApplyInboundDto implements Dto { @ApiModelProperty("申请人组织路径") private String orgSidPath; // 申请人组织路径 + @ApiModelProperty("排产申请编号") + private String pcApplicationCode; @ApiModelProperty("车辆列表") private List vehicleList; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseVo.java index 0ece91906b..d95c0cc900 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseVo.java @@ -56,7 +56,7 @@ public class ScmWarehouseVo implements Vo { private String useOrg; // 使用组织 @ApiModelProperty("使用组织sid") - private String[][] useOrgSid; // 使用组织sid + private String useOrgSid; // 使用组织sid @ApiModelProperty("名称") private String warehouseName; // 名称 diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseService.java index b7d145b1d2..c1a4947527 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseService.java @@ -172,20 +172,6 @@ public class ScmWarehouseService extends MybatisBaseService list = Arrays.asList(entity.getUseOrgSid().split(",")); - String[][] s = new String[list.size()][]; - for (int i = 0; i < list.size(); i++) { - String[] list1 = {}; - //根据使用组织查询上级 - ResultBean resultBean = sysOrganizationFeign.selectBySid(list.get(i)); - if (resultBean.getSuccess()) { - list1 = resultBean.getData().getOrgSidPath().replace("/", ",").split(","); - } - s[i] = list1; - } - vo.setUseOrgSid(s); - } return vo; }