From c5c077d1cbd618e531bbffd6f466d94b8010c560 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?= <7507756+jiang_yuqi@user.noreply.gitee.com> Date: Sat, 4 Jan 2025 19:16:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProProjectInfoSubdeptsUsersMapper.xml | 1 - ...roProjectInfoSubdeptsUsersServiceImpl.java | 46 +++++++++---------- 2 files changed, 23 insertions(+), 24 deletions(-) diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsUsersMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsUsersMapper.xml index 6fa25b11..00a9f552 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsUsersMapper.xml +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsUsersMapper.xml @@ -4,7 +4,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java index a521ae06..6e49709e 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java @@ -310,9 +310,9 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu proSubdeptsGroup.setGroupName(pre+craftPostName+"班组"+count); proSubdeptsGroup.setCraftType(proProjectInfoSubdeptsUsers.getCraftType()); proSubdeptsGroup.setCraftPost(proProjectInfoSubdeptsUsers.getCraftPost()); - proSubdeptsGroup.setGroupLeaderName(user.getNickName()); - proSubdeptsGroup.setGroupLeaderCode(user.getCardCode()); - proSubdeptsGroup.setGroupLeaderPhone(user.getPhonenumber()); + proSubdeptsGroup.setGroupLeaderName(proProjectInfoSubdeptsUsers.getUserName()); + proSubdeptsGroup.setGroupLeaderCode(proProjectInfoSubdeptsUsers.getCardCode()); + proSubdeptsGroup.setGroupLeaderPhone(proProjectInfoSubdeptsUsers.getUserPhone()); proSubdeptsGroup.setUpdateBy(DataSourceEnuns.APP.getInfo()); proSubdeptsGroup.setUpdateTime(DateUtils.getNowDate()); proProjectInfoSubdeptsGroupMapper.updateProProjectInfoSubdeptsGroup(proSubdeptsGroup); @@ -320,9 +320,9 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu proProjectInfoSubdeptsUsers.setSubDeptGroupName(proSubdeptsGroup.getGroupName()); }else{ // 班组主要信息未变更时只修改班组长信息 - proSubdeptsGroup.setGroupLeaderName(user.getNickName()); - proSubdeptsGroup.setGroupLeaderCode(user.getCardCode()); - proSubdeptsGroup.setGroupLeaderPhone(user.getPhonenumber()); + proSubdeptsGroup.setGroupLeaderName(proProjectInfoSubdeptsUsers.getUserName()); + proSubdeptsGroup.setGroupLeaderCode(proProjectInfoSubdeptsUsers.getCardCode()); + proSubdeptsGroup.setGroupLeaderPhone(proProjectInfoSubdeptsUsers.getUserPhone()); proSubdeptsGroup.setUpdateBy(DataSourceEnuns.APP.getInfo()); proSubdeptsGroup.setUpdateTime(DateUtils.getNowDate()); proProjectInfoSubdeptsGroupMapper.updateProProjectInfoSubdeptsGroup(proSubdeptsGroup); @@ -345,9 +345,9 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu proSubdeptsGroup.setGroupName(pre+craftPostName+"班组"+count); proSubdeptsGroup.setCraftType(proProjectInfoSubdeptsUsers.getCraftType()); proSubdeptsGroup.setCraftPost(proProjectInfoSubdeptsUsers.getCraftPost()); - proSubdeptsGroup.setGroupLeaderName(user.getNickName()); - proSubdeptsGroup.setGroupLeaderCode(user.getCardCode()); - proSubdeptsGroup.setGroupLeaderPhone(user.getPhonenumber()); + proSubdeptsGroup.setGroupLeaderName(proProjectInfoSubdeptsUsers.getUserName()); + proSubdeptsGroup.setGroupLeaderCode(proProjectInfoSubdeptsUsers.getCardCode()); + proSubdeptsGroup.setGroupLeaderPhone(proProjectInfoSubdeptsUsers.getUserPhone()); proSubdeptsGroup.setUseStatus(UseStateEnums.AW.getCode()); proSubdeptsGroup.setApproveStatus(ApproveStatus.await.getCode()); proSubdeptsGroup.setCreateBy(DataSourceEnuns.APP.getInfo()); @@ -405,7 +405,7 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu public ProProjectInfoSubdeptsUsers findProSubDeptsUser(Long proId, String phoneNumber){ ProProjectInfoSubdeptsUsers query = new ProProjectInfoSubdeptsUsers(); query.setProjectId(proId); - query.setPhoneNumber(phoneNumber); + query.setUserPhone(phoneNumber); List dataList = proProjectInfoSubdeptsUsersMapper.selectProProjectInfoSubdeptsUsersList(query); if(StringUtils.isNotEmpty(dataList)){ return dataList.get(0); @@ -422,7 +422,7 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu public ProProjectInfoSubdeptsUsers submitUserSignets(SignetFileVo signetFileVo) { ProProjectInfoSubdeptsUsers query = new ProProjectInfoSubdeptsUsers(); query.setProjectId(signetFileVo.getProId()); - query.setPhoneNumber(signetFileVo.getUserPhone()); + query.setUserPhone(signetFileVo.getUserPhone()); List dataList = proProjectInfoSubdeptsUsersMapper.selectProProjectInfoSubdeptsUsersList(query); if (StringUtils.isEmpty(dataList)) { throw new ServiceException("用户信息异常..."); @@ -464,10 +464,9 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu dirFile.mkdirs(); } proSubdeptsUser.setSubStep(100L); - proSubdeptsUser.setEduSignPath(signetFileVo.getImgPath()+".sign.png"); proSubdeptsUser.setEduFilePath(saveEdusFilePath); // word文件转PDF文件 - Map dataMap = getUserDataMap(proSubdeptsUser); + Map dataMap = getUserDataMap(proSubdeptsUser, signetFileVo.getImgPath()); try { PoiUtil.createPdfByWordTemplate(temPath, saveWordFilePath, dataMap); }catch (Exception e){ @@ -487,7 +486,7 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu basSignet.setComId(proSubdeptsUser.getComId()); basSignet.setProjectId(proSubdeptsUser.getProjectId()); basSignet.setUserId(proSubdeptsUser.getUserId()); - basSignet.setSignetPath(proSubdeptsUser.getEduSignPath()+".sign.png"); + basSignet.setSignetPath(signetFileVo.getImgPath()+".sign.png"); basSignet.setSignetNumber(1L); basSignet.setCreateBy(DataSourceEnuns.APP.getInfo()); basSignet.setCreateTime(DateUtils.getNowDate()); @@ -504,7 +503,7 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu // 启动工作流审批节点... Map variables = new HashMap<>(); variables.put("INITIATOR",proSubdeptsUser.getUserId()); - variables.put("userName",proSubdeptsUser.getUser().getNickName()); + variables.put("userName",proSubdeptsUser.getUserName()); variables.put("userDeptName",proSubdeptsUser.getSubDeptName()); variables.put("comId",proSubdeptsUser.getComId()); variables.put("comName",proSubdeptsUser.getComName()); @@ -602,24 +601,25 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu /** * 封装用户文件参数... + * @param proSubdeptsUser 用户对象 + * @param signPath 签名地址 * @return */ - private Map getUserDataMap(ProProjectInfoSubdeptsUsers proSubdeptsUser){ + private Map getUserDataMap(ProProjectInfoSubdeptsUsers proSubdeptsUser,String signPath){ Map dataMap = new HashMap<>(); - SysUser sysUser = proSubdeptsUser.getUser(); - dataMap.put("fName",sysUser.getNickName()); - dataMap.put("fSex",StringUtils.judgeGenderText(sysUser.getCardCode())); - dataMap.put("fAge",StringUtils.getAgeFromIdCard(sysUser.getCardCode())); - dataMap.put("fCode",sysUser.getCardCode()); + dataMap.put("fName",proSubdeptsUser.getUserName()); + dataMap.put("fSex",StringUtils.judgeGenderText(proSubdeptsUser.getCardCode())); + dataMap.put("fAge",StringUtils.getAgeFromIdCard(proSubdeptsUser.getCardCode())); + dataMap.put("fCode",proSubdeptsUser.getCardCode()); dataMap.put("fIllnessStatus",Objects.equals(ShiFouEnums.FOU.getCode(),proSubdeptsUser.getIllnessStatus())?"无":"有"); dataMap.put("fSupIllnessStatus",Objects.equals(ShiFouEnums.FOU.getCode(),proSubdeptsUser.getSupIllnessStatus())?"无":"有"); dataMap.put("fCraftPost", DictUtils.getDictLabel("pro_craft_post",proSubdeptsUser.getCraftPost())); dataMap.put("fDate", DateUtils.dateTimeNow("yyyy年MM月dd日")); dataMap.put("fGroupName", proSubdeptsUser.getSubDeptGroupName()); dataMap.put("fGrade", DictUtils.getDictLabel("educational_type",proSubdeptsUser.getDegreeGrade())); - String userPicturePath = proSubdeptsUser.getUser().getUserPicture().replaceAll(ProfileConfig.profile, ProfileConfig.profilePath); + String userPicturePath = proSubdeptsUser.getUserPicture().replaceAll(ProfileConfig.profile, ProfileConfig.profilePath); dataMap.put("fUserPicture", userPicturePath+".min.jpg"); - String userSignPath = proSubdeptsUser.getEduSignPath().replaceAll(ProfileConfig.profile, ProfileConfig.profilePath); + String userSignPath = signPath.replaceAll(ProfileConfig.profile, ProfileConfig.profilePath); dataMap.put("fUserSign", userSignPath+".sign.png"); dataMap.put("fGroupSign", SignetKeyEnums.GROUP_SIGN.getCode()); dataMap.put("fProjectSign", SignetKeyEnums.PROJECT_SIGN.getCode());