From 7e925e5a025e90c42edb2865f5085b8eedcea3b9 Mon Sep 17 00:00:00 2001 From: 李宇 <986321569@qq.com> Date: 星期三, 14 四月 2021 12:52:54 +0800 Subject: [PATCH] 修改领用单数据 --- src/main/java/com/nanometer/smartlab/controller/OpeUseFlowInfoController.java | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/nanometer/smartlab/controller/OpeUseFlowInfoController.java b/src/main/java/com/nanometer/smartlab/controller/OpeUseFlowInfoController.java index 1df0b3a..d93ae38 100644 --- a/src/main/java/com/nanometer/smartlab/controller/OpeUseFlowInfoController.java +++ b/src/main/java/com/nanometer/smartlab/controller/OpeUseFlowInfoController.java @@ -9,6 +9,7 @@ import com.nanometer.smartlab.entity.dto.ApplyListDto; import com.nanometer.smartlab.service.SysUserService; import com.nanometer.smartlab.util.Utils; +import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; import org.primefaces.context.RequestContext; import org.primefaces.model.LazyDataModel; @@ -166,14 +167,19 @@ List<ApplyListDto> applyList = new ArrayList<>(); //获取当时操作状态为领取的人员 Map<String,String> info= opeUseFlowService.getApplyUserByReagentCode(code); - Map applyPersonInfo = sysUserService.getUser(info.get("user_id")); + SysUser applyPersonInfo = sysUserService.getUser(info.get("user_id")); printTable.put("head", instituteName); printTable.put("title", "领用单"); - printTable.put("applyPerson", applyPersonInfo.get("name")); - printTable.put("department", applyPersonInfo.get("meta_value")); + printTable.put("applyPerson", applyPersonInfo.getName()); + printTable.put("department", applyPersonInfo.getDepartment()); String time = new SimpleDateFormat("yyyy-MM-dd").format(info.get("create_time")); printTable.put("date", time); - printTable.put("phone", applyPersonInfo.get("phone")); + if (StringUtils.isNotBlank(applyPersonInfo.getPhone())){ + printTable.put("phone", applyPersonInfo.getPhone()); + } + if (StringUtils.isNotBlank(applyPersonInfo.getProject())){ + printTable.put("project", applyPersonInfo.getProject()); + } printTable.put("receiptNumber", receiptNumber); for (Map.Entry<String, Integer> map : printInfo.entrySet()) { -- Gitblit v1.9.2