|
|
@@ -20,6 +20,7 @@ import org.springblade.core.secure.utils.SecureUtil;
|
|
|
import org.springblade.core.tool.utils.BeanUtil;
|
|
|
import org.springblade.core.tool.utils.Func;
|
|
|
import org.springblade.core.tool.utils.ObjectUtil;
|
|
|
+import org.springblade.system.entity.Dept;
|
|
|
import org.springblade.system.user.entity.User;
|
|
|
import org.springblade.system.user.feign.IUserClient;
|
|
|
import org.springframework.beans.BeanUtils;
|
|
|
@@ -46,13 +47,19 @@ public class EMUseCarServiceImpl extends BaseServiceImpl<ExMUseCarMapper, EMUseC
|
|
|
queryWrapper.lambda().eq(EMUseCarInfo::getIsTemp, 1);
|
|
|
IPage<EMUseCarInfo> pages = this.page(page, queryWrapper.lambda().orderBy(true, true, EMUseCarInfo::getCreateTime));
|
|
|
Map<Long, String> userMap = iUserClient.selectUserAll().stream().collect(Collectors.toMap(User::getId, User::getRealName));
|
|
|
+ List<Dept> deptList = jdbcTemplate.query("select id,dept_name from blade_dept where tenant_id = 003077 and dept_type = 2", new BeanPropertyRowMapper<>(Dept.class));
|
|
|
return pages.convert(obj -> {
|
|
|
EMUseCarInfoVO vo = new EMUseCarInfoVO();
|
|
|
BeanUtils.copyProperties(obj, vo);
|
|
|
vo.setCreateName(userMap.get(vo.getCreateUser()));
|
|
|
vo.setApprovalStatusName(vo.getStatus().equals(1) ? "待审批" : (vo.getStatus().equals(2) ? "已审批" : (vo.getStatus().equals(3) ? "已驳回" : "未上报")));
|
|
|
vo.setApprovalResultName(vo.getApprovalStatusName().equals("已审批") || vo.getApprovalStatusName().equals("已驳回") ? "已通过" : "未通过");
|
|
|
- vo.setUcOrgName(""); //TODO 部门
|
|
|
+
|
|
|
+ for (Dept dept : deptList) {
|
|
|
+ if (ObjectUtil.isNotEmpty(obj.getUcOrgId()) && obj.getUcOrgId().equals(dept.getId())) {
|
|
|
+ vo.setUcOrgName(dept.getDeptName());
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
if (ObjectUtil.isNotEmpty(obj.getUseStartDate()) && ObjectUtil.isNotEmpty(obj.getUseEndDate())) {
|
|
|
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy/MM/dd");
|
liuyc