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()) { src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java
@@ -1210,16 +1210,20 @@ printTable = new Hashtable(); int sum = 0; List<ApplyListDto> applyList = new ArrayList<>(); Map applyPersonInfo = sysUserService.getUser(userId); SysUser applyPersonInfo = sysUserService.getUser(userId); 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()); printTable.put("date", Utils.now("yyyy-MM-dd")); printTable.put("phone", applyPersonInfo.get("phone")); String receiptNum = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(new Date()); printTable.put("receiptNumber", receiptNum); printTable.put("project", applyPersonInfo.get("project")); if (StringUtils.isNotBlank(applyPersonInfo.getPhone())){ printTable.put("phone", applyPersonInfo.getPhone()); } if (StringUtils.isNotBlank(applyPersonInfo.getProject())){ printTable.put("project", applyPersonInfo.getProject()); } SysLaboratory lab = sysLaboratoryService.getSysLaboratory(laboratoryId); printTable.put("lab", lab.getName()); this.receiptNumber = receiptNum; @@ -1487,14 +1491,18 @@ printTable = null; printTable = new Hashtable(); List<ApplyListDto> applyList = new ArrayList<>(); Map applyPersonInfo = sysUserService.getUser(userId); SysUser applyPersonInfo = sysUserService.getUser(userId); 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()); printTable.put("date", Utils.now("yyyy-MM-dd")); printTable.put("phone", applyPersonInfo.get("phone")); printTable.put("project", applyPersonInfo.get("project")); if (StringUtils.isNotBlank(applyPersonInfo.getPhone())){ printTable.put("phone", applyPersonInfo.getPhone()); } if (StringUtils.isNotBlank(applyPersonInfo.getProject())){ printTable.put("project", applyPersonInfo.getProject()); } SysLaboratory lab = sysLaboratoryService.getSysLaboratory(laboratoryId); String receiptNum = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(new Date()); printTable.put("receiptNumber", receiptNum); src/main/java/com/nanometer/smartlab/dao/SysUserDao.java
@@ -35,7 +35,7 @@ public SysUser selectByAccount(SysUser user); Map getUser(String id); SysUser getUser(String id); void insertUserFavor(Map params);
@@ -84,10 +84,18 @@ where id = #{id} and valid_flag = 1 </select> <select id="getUser" parameterType="java.lang.String" resultType="java.util.Map"> select * from sys_user <select id="getUser" parameterType="java.lang.String" resultMap="SysUser"> select sys_user.id, sys_user.`name`, sys_user.phone, sys_user.project, base_meta.meta_value as department from sys_user left join base_meta on sys_user.department = base_meta.id where sys_user.id = #{id} and sys_user.valid_flag = 1 where sys_user.id = #{id} and sys_user.valid_flag = 1 and base_meta.valid_flag = 1 </select> <insert id="insertUserFavor" parameterType="java.util.Map"> src/main/java/com/nanometer/smartlab/service/SysUserService.java
@@ -37,7 +37,7 @@ public int insertSysUserList(List<SysUser> userList); Map getUser(String id); SysUser getUser(String id); void updateUserFavor(SysReagent reagent, SysUser user) throws Exception;
@@ -343,7 +343,7 @@ } @Override public Map getUser(String id) { public SysUser getUser(String id) { try { return this.sysUserDao.getUser(id); } catch (DataAccessException e) {
