|
|
@ -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; |
|
|
|