WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

项目库基础表+相关人员 人名显示修改

Browse Source
This commit is contained in:
xiejunyu
2022-04-19 17:55:58 +08:00
parent 0cdbe676ed
commit 798efa287b
6 changed files with 19 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java
-4
View File
@@ -46,15 +46,11 @@ public class ProjectLibraryBase implements Serializable {
private java.lang.String studioEngineer;
@TableField(exist = false)
private java.lang.String studioEngineerName;
@TableField(exist = false)
private java.lang.String studioEngineerEnName;
/**认证工程师*/
private java.lang.String certificationEngineer;
@TableField(exist = false)
private java.lang.String certificationEngineerName;
@TableField(exist = false)
private java.lang.String certificationEngineerEnName;
/**车型平台*/
@Dict(dicCode = "vehicle_platform")
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRelatedPersonnel.java
-7
View File
@@ -45,25 +45,18 @@ public class ProjectRelatedPersonnel implements Serializable {
private java.lang.String lawEngineer;
@TableField(exist = false)
private java.lang.String lawEngineerName;
@TableField(exist = false)
private java.lang.String lawEngineerEnName;
/**工程接口人*/
@Excel(name = "工程接口人", width = 30,orderNum = "3")
private java.lang.String engineeringInterfacePerson;
@TableField(exist = false)
private java.lang.String engineeringInterfacePersonName;
@TableField(exist = false)
private java.lang.String engineeringInterfacePersonEnName;
/**认证工程师*/
@Excel(name = "认证工程师", width = 30,orderNum = "4")
private java.lang.String certificationEngineer;
@TableField(exist = false)
private java.lang.String certificationEngineerName;
@TableField(exist = false)
private java.lang.String certificationEngineerEnName;
/**备注*/
@Excel(name = "备注", width = 50,orderNum = "5")
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml
+1 -2
View File
@@ -29,8 +29,7 @@
plb.target_market,
plb.project_status,
plb.studio_engineer,
studiouser.realname as studio_engineer_name,
studiouser.username as studio_engineer_en_name,
studiouser.username as studio_engineer_name,
plb.certification_engineer,
plb.vehicle_platform,
plb.digital_platform,
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRelatedPersonnelMapper.xml
-7
View File
@@ -19,8 +19,6 @@
prp.project_id,
prp.duty_territory,
prp.law_engineer,
lawuser.username,
enguser.username,
prp.engineering_interface_person,
prp.certification_engineer,
prp.remark,
@@ -32,11 +30,8 @@
<select id="queryPageList" resultType="com.jero.modules.project.entity.ProjectRelatedPersonnel">
SELECT
<include refid="select_item"/>
FROM
project_related_personnel AS prp
LEFT JOIN sys_user AS lawuser ON prp.law_engineer = lawuser.id
LEFT JOIN sys_user AS enguser ON prp.engineering_interface_person = enguser.id
<where>
<if test="params.projectId != null and params.projectId != ''">
prp.project_id=#{params.projectId}
@@ -50,8 +45,6 @@
<include refid="select_item"/>
FROM
project_related_personnel AS prp
LEFT JOIN sys_user AS lawuser ON prp.law_engineer = lawuser.id
LEFT JOIN sys_user AS enguser ON prp.engineering_interface_person = enguser.id
<where>
prp.id=#{id}
</where>
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+15 -26
View File
@@ -151,41 +151,30 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
for (ProjectLibraryBase projectLibraryBase:records) {
List<SysUser> sysUsers = new ArrayList<>();
//认证工程师多个id查询
List<String> certificationEngineerIdList = Arrays.asList(projectLibraryBase.getCertificationEngineer().split(","));
if (CollectionUtils.isNotEmpty(certificationEngineerIdList)) {
certificationEngineerIdList=certificationEngineerIdList.stream().distinct().collect(Collectors.toList());
QueryWrapper<SysUser> userqueryWrapper = new QueryWrapper<>();
userqueryWrapper.in("id ", certificationEngineerIdList);
sysUsers = sysUserMapper.selectList(userqueryWrapper);
}
if (StringUtils.isNotEmpty(projectLibraryBase.getCertificationEngineer())) {
List<String> certificationEngineerIdList = Arrays.asList(projectLibraryBase.getCertificationEngineer().split(","));
if (CollectionUtils.isNotEmpty(certificationEngineerIdList)) {
certificationEngineerIdList = certificationEngineerIdList.stream().distinct().collect(Collectors.toList());
QueryWrapper<SysUser> userqueryWrapper = new QueryWrapper<>();
userqueryWrapper.in("id ", certificationEngineerIdList);
sysUsers = sysUserMapper.selectList(userqueryWrapper);
}
if(CollectionUtils.isNotEmpty(sysUsers)) {
if (CollectionUtils.isNotEmpty(sysUsers)) {
String certificationEngineerId = projectLibraryBase.getCertificationEngineer();
String certificationEngineerName=null;
String certificationEngineerEnName=null;
StringBuilder certificationName=new StringBuilder();
for (String data:certificationEngineerIdList){
String certificationEngineerName = null;
for (String data : certificationEngineerIdList) {
if (StringUtils.isNotEmpty(certificationEngineerId)) {
certificationEngineerName = sysUsers.stream().filter(e -> data.equals(e.getId()))
.map(sysUser -> sysUser.getRealname()).collect(Collectors.joining(","));
certificationEngineerEnName = sysUsers.stream().filter(e -> data.equals(e.getId()))
.map(sysUser -> sysUser.getUsername()).collect(Collectors.joining(","));
}
certificationName.append(certificationEngineerName).append("(").append(certificationEngineerEnName).append(")").append(" ");
}
projectLibraryBase.setCertificationEngineerName(certificationName.toString());
projectLibraryBase.setCertificationEngineerName(certificationEngineerName);
}
StringBuilder studioCnName= new StringBuilder(projectLibraryBase.getStudioEngineerName());
StringBuilder studioEnName= new StringBuilder(projectLibraryBase.getStudioEngineerEnName());
String studioName = studioCnName.append("(").append(studioEnName).append(")").toString();
projectLibraryBase.setStudioEngineerName(studioName);
}
}
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java
+3 -24
View File
@@ -157,21 +157,14 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
if(CollectionUtils.isNotEmpty(lawEngineerUsers)) {
String lawEngineerId = projectRelatedPersonnel.getLawEngineer();
String lawEngineerName = null;
String lawEngineerEnName = null;
StringBuilder certificationName = new StringBuilder();
for (String data : lawEngineerIdList) {
if (StringUtils.isNotEmpty(lawEngineerId)) {
lawEngineerName = lawEngineerUsers.stream().filter(e -> data.equals(e.getId()))
.map(sysUser -> sysUser.getRealname()).collect(Collectors.joining(","));
lawEngineerEnName = lawEngineerUsers.stream().filter(e -> data.equals(e.getId()))
.map(sysUser -> sysUser.getUsername()).collect(Collectors.joining(","));
}
certificationName.append(lawEngineerName).append("(").append(lawEngineerEnName).append(")").append(" ");
}
projectRelatedPersonnel.setLawEngineerName(certificationName.toString());
projectRelatedPersonnel.setLawEngineerName(lawEngineerName);
}
}
@@ -188,21 +181,14 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
if (CollectionUtils.isNotEmpty(engineeringInterfacePersonUsers)) {
String engineeringInterfacePersonId = projectRelatedPersonnel.getEngineeringInterfacePerson();
String engineeringInterfacePersonName = null;
String engineeringInterfacePersonEnName = null;
StringBuilder certificationName = new StringBuilder();
for (String data : engineeringInterfacePersonIdList) {
if (StringUtils.isNotEmpty(engineeringInterfacePersonId)) {
engineeringInterfacePersonName = engineeringInterfacePersonUsers.stream().filter(e -> data.equals(e.getId()))
.map(sysUser -> sysUser.getRealname()).collect(Collectors.joining(","));
engineeringInterfacePersonEnName = engineeringInterfacePersonUsers.stream().filter(e -> data.equals(e.getId()))
.map(sysUser -> sysUser.getUsername()).collect(Collectors.joining(","));
}
certificationName.append(engineeringInterfacePersonName).append("(").append(engineeringInterfacePersonEnName).append(")").append(" ");
}
projectRelatedPersonnel.setEngineeringInterfacePersonName(certificationName.toString());
projectRelatedPersonnel.setEngineeringInterfacePersonName(engineeringInterfacePersonName);
}
}
@@ -219,21 +205,14 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
if(CollectionUtils.isNotEmpty(certificationEngineerUsers)) {
String certificationEngineerId = projectRelatedPersonnel.getCertificationEngineer();
String certificationEngineerName = null;
String certificationEngineerEnName = null;
StringBuilder certificationName = new StringBuilder();
for (String data : certificationEngineerIdList) {
if (StringUtils.isNotEmpty(certificationEngineerId)) {
certificationEngineerName = certificationEngineerUsers.stream().filter(e -> data.equals(e.getId()))
.map(sysUser -> sysUser.getRealname()).collect(Collectors.joining(","));
certificationEngineerEnName = certificationEngineerUsers.stream().filter(e -> data.equals(e.getId()))
.map(sysUser -> sysUser.getUsername()).collect(Collectors.joining(","));
}
certificationName.append(certificationEngineerName).append("(").append(certificationEngineerEnName).append(")").append(" ");
}
projectRelatedPersonnel.setCertificationEngineerName(certificationName.toString());
projectRelatedPersonnel.setCertificationEngineerName(certificationEngineerName);
}
}