Browse Source

修改

master
ligaode 1 week ago
parent
commit
90ebde0c3e
  1. 3
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/AppBusDepositDetailInfoQuery.java
  2. 20
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositService.java
  3. 3
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/deposit/DepositDetailInfoQuery.java

3
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/AppBusDepositDetailInfoQuery.java

@ -10,7 +10,8 @@ public class AppBusDepositDetailInfoQuery implements Query {
@ApiModelProperty("订单sid")
private String virtualOrderSid;
@ApiModelProperty("全路径")
private String orgPath;
@ApiModelProperty("用户sid")
private String userSid;
}

20
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositService.java

@ -26,6 +26,7 @@ import org.springframework.stereotype.Service;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
@ -132,8 +133,21 @@ public class BusDepositService extends MybatisBaseService<BusDepositMapper, BusD
String userSid = query.getUserSid();
String virtualOrderSid = query.getVirtualOrderSid();
SysUserVo sysUserVo = sysUserFeign.fetchBySid(userSid).getData();
String orgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
SysOrganizationVo data = sysOrganizationFeign.fetchBySid(orgSid).getData();
String deptName = "";
if (StringUtils.isNotBlank(query.getOrgPath())) {
List<String> split = Arrays.asList(query.getOrgPath().split("/"));
if (split.size() > 1) {
//获取本级sid获取本级部门信息
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(split.size() - 2)).getData();
SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData();
deptName = sysOrganization.getName() + "/" + sysOrganization1.getName();
deptName = sysOrganization1.getName();
} else {
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData();
deptName = sysOrganization.getName();
deptName = sysOrganization.getName();
}
}
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
AppBusDepositBusDetailsVo vo = new AppBusDepositBusDetailsVo();
if (StringUtils.isNotBlank(virtualOrderSid)) {
@ -162,7 +176,7 @@ public class BusDepositService extends MybatisBaseService<BusDepositMapper, BusD
vo.setCustomerList(customerList);
return vo;
} else {
vo.setDepartmentName(data.getName());
vo.setDepartmentName(deptName);
vo.setStaffName(sysUserVo.getName());
vo.setCreateDate(simpleDateFormat.format(new Date()));
return vo;

3
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/deposit/DepositDetailInfoQuery.java

@ -10,7 +10,8 @@ public class DepositDetailInfoQuery implements Query {
private static final long serialVersionUID = -8558418138668642644L;
@ApiModelProperty("订单sid")
private String virtualOrderSid;
@ApiModelProperty("全路径")
private String orgPath;
@ApiModelProperty("用户sid")
private String userSid;
}

Loading…
Cancel
Save