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

合并分支 'fix_bug_first_stage' 到 'master'

Browse Source 
Fix bug first stage

查看合并请求 laws-nio/laws-weilai!102
This commit is contained in:
李雪涛
2022-07-22 18:23:54 +08:00
parent 71600c2931 fa0a81eadf
commit 591f030112
4 changed files with 65 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java
+1 -1
View File
@@ -519,7 +519,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
sysUserDepartMapper.insert(sysUserDepart);
// 添加用户角色关系
SysUserRole userRole = new SysUserRole(sysUser.getId(), "1534020318437208065"); // 新增用户默认角色均为工程师
SysUserRole userRole = new SysUserRole(sysUser.getId(), "1550369502225551361"); // 新增用户默认角色均为一般用户
sysUserRoleMapper.insert(userRole);
// 添加用户信息
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/enums/SearchEnum.java
-2
View File
@@ -12,8 +12,6 @@ public enum SearchEnum {
FULL_TEXT_SEARCH_CN("全部中文","fulltextsearchcn"),
FULL_TEXT_SEARCH_EN("全部英文","fulltextsearchen");
String name;
String value;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java
+4 -11
View File
@@ -55,14 +55,7 @@ import javax.servlet.http.HttpServletResponse;
import java.io.File;
import java.io.IOException;
import java.io.OutputStream;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Comparator;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.TreeSet;
import java.util.*;
import java.util.stream.Collectors;
/**
@@ -1047,7 +1040,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
StringBuilder midId = new StringBuilder();
for (String data : lawEngineerNameList) {
if (StringUtils.isNotEmpty(lawEngineerName)) {
lawEngineerId = lawEngineerUsers.stream().filter(e -> data.equals(e.getUsername()))
lawEngineerId = lawEngineerUsers.stream().filter(e -> data.toLowerCase().equals(e.getUsername().toLowerCase()))
.map(sysUser -> sysUser.getId()).collect(Collectors.joining(","));
}
midId.append(lawEngineerId).append(",");
@@ -1081,7 +1074,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
StringBuilder midId = new StringBuilder();
for (String data : engineeringInterfacePersonNameList) {
if (StringUtils.isNotEmpty(engineeringInterfacePersonName)) {
engineeringInterfacePersonId = engineeringInterfacePersonUsers.stream().filter(e -> data.equals(e.getUsername()))
engineeringInterfacePersonId = engineeringInterfacePersonUsers.stream().filter(e -> data.toLowerCase().equals(e.getUsername().toLowerCase()))
.map(sysUser -> sysUser.getId()).collect(Collectors.joining(","));
}
midId.append(engineeringInterfacePersonId).append(",");
@@ -1130,7 +1123,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
StringBuilder midId = new StringBuilder();
for (String data : certificationEngineerNameList) {
if (StringUtils.isNotEmpty(certificationEngineerName)) {
certificationEngineerId = certificationEngineerUsers.stream().filter(e -> data.equals(e.getUsername()))
certificationEngineerId = certificationEngineerUsers.stream().filter(e -> data.toLowerCase().equals(e.getUsername().toLowerCase()))
.map(sysUser -> sysUser.getId()).collect(Collectors.joining(","));
}
midId.append(certificationEngineerId).append(",");
jero-web/src/views/projectManagement/components/listEditModel.vue
+60 -60
View File
@@ -985,77 +985,77 @@
},
getProject(row, res, callback) {
//设计符合性确认-发起人
if (row.designInitiator == 1) {
this.designInitiatorList = res.result.lawEngineerList || []
} else if (row.designInitiator == 2) {
this.designInitiatorList = res.result.certificationEngineerList || []
} else if (row.designInitiator == 3) {
this.designInitiatorList = res.result.engineeringInterfacePersonList || []
} else if (row.designInitiator == 0) {
this.designInitiatorList = res.result.studioPersonList || []
} else if (!row.designInitiator || row.designInitiator == '') {
// if (row.designInitiator == 1) {
// this.designInitiatorList = res.result.lawEngineerList || []
// } else if (row.designInitiator == 2) {
// this.designInitiatorList = res.result.certificationEngineerList || []
// } else if (row.designInitiator == 3) {
// this.designInitiatorList = res.result.engineeringInterfacePersonList || []
// } else if (row.designInitiator == 0) {
// this.designInitiatorList = res.result.studioPersonList || []
// } else if (!row.designInitiator || row.designInitiator == '') {
this.designInitiatorList = res.result.allPersonList || []
}
// }
//设计符合性确认-责任人
if (row.designDuty == 1) {
this.designDutyList = res.result.lawEngineerList || []
} else if (row.designDuty == 2) {
this.designDutyList = res.result.certificationEngineerList || []
} else if (row.designDuty == 3) {
this.designDutyList = res.result.engineeringInterfacePersonList || []
} else if (row.designInitiator == 0) {
this.designDutyList = res.result.studioPersonList || []
} else if (!row.designDuty || row.designDuty == '') {
// if (row.designDuty == 1) {
// this.designDutyList = res.result.lawEngineerList || []
// } else if (row.designDuty == 2) {
// this.designDutyList = res.result.certificationEngineerList || []
// } else if (row.designDuty == 3) {
// this.designDutyList = res.result.engineeringInterfacePersonList || []
// } else if (row.designInitiator == 0) {
// this.designDutyList = res.result.studioPersonList || []
// } else if (!row.designDuty || row.designDuty == '') {
this.designDutyList = res.result.allPersonList || []
}
// }
//prehomo确认-发起人
if (row.prehomoInitiator == 1) {
this.prehomoInitiatorList = res.result.lawEngineerList || []
} else if (row.prehomoInitiator == 2) {
this.prehomoInitiatorList = res.result.certificationEngineerList || []
} else if (row.prehomoInitiator == 3) {
this.prehomoInitiatorList = res.result.engineeringInterfacePersonList || []
} else if (row.designInitiator == 0) {
this.prehomoInitiatorList = res.result.studioPersonList || []
} else if (!row.prehomoInitiator || row.prehomoInitiator == '') {
// if (row.prehomoInitiator == 1) {
// this.prehomoInitiatorList = res.result.lawEngineerList || []
// } else if (row.prehomoInitiator == 2) {
// this.prehomoInitiatorList = res.result.certificationEngineerList || []
// } else if (row.prehomoInitiator == 3) {
// this.prehomoInitiatorList = res.result.engineeringInterfacePersonList || []
// } else if (row.designInitiator == 0) {
// this.prehomoInitiatorList = res.result.studioPersonList || []
// } else if (!row.prehomoInitiator || row.prehomoInitiator == '') {
this.prehomoInitiatorList = res.result.allPersonList || []
}
// }
//prehomo确认-责任人
if (row.prehomoDuty == 1) {
this.prehomoDutyList = res.result.lawEngineerList || []
} else if (row.prehomoDuty == 2) {
this.prehomoDutyList = res.result.certificationEngineerList || []
} else if (row.prehomoDuty == 3) {
this.prehomoDutyList = res.result.engineeringInterfacePersonList || []
} else if (row.designInitiator == 0) {
this.prehomoDutyList = res.result.studioPersonList || []
} else if (!row.prehomoDuty || row.prehomoDuty == '') {
// if (row.prehomoDuty == 1) {
// this.prehomoDutyList = res.result.lawEngineerList || []
// } else if (row.prehomoDuty == 2) {
// this.prehomoDutyList = res.result.certificationEngineerList || []
// } else if (row.prehomoDuty == 3) {
// this.prehomoDutyList = res.result.engineeringInterfacePersonList || []
// } else if (row.designInitiator == 0) {
// this.prehomoDutyList = res.result.studioPersonList || []
// } else if (!row.prehomoDuty || row.prehomoDuty == '') {
this.prehomoDutyList = res.result.allPersonList || []
}
// }
//验证符合性确认-发起人
if (row.verifyInitiator == 1) {
this.verifyInitiatorList = res.result.lawEngineerList || []
} else if (row.verifyInitiator == 2) {
this.verifyInitiatorList = res.result.certificationEngineerList || []
} else if (row.verifyInitiator == 3) {
this.verifyInitiatorList = res.result.engineeringInterfacePersonList || []
} else if (row.designInitiator == 0) {
this.verifyInitiatorList = res.result.studioPersonList || []
} else if (!row.verifyInitiator || row.verifyInitiator == '') {
// if (row.verifyInitiator == 1) {
// this.verifyInitiatorList = res.result.lawEngineerList || []
// } else if (row.verifyInitiator == 2) {
// this.verifyInitiatorList = res.result.certificationEngineerList || []
// } else if (row.verifyInitiator == 3) {
// this.verifyInitiatorList = res.result.engineeringInterfacePersonList || []
// } else if (row.designInitiator == 0) {
// this.verifyInitiatorList = res.result.studioPersonList || []
// } else if (!row.verifyInitiator || row.verifyInitiator == '') {
this.verifyInitiatorList = res.result.allPersonList || []
}
// }
//验证符合性确认-责任人
if (row.verifyDuty == 1) {
this.verifyDutyList = res.result.lawEngineerList || []
} else if (row.verifyDuty == 2) {
this.verifyDutyList = res.result.certificationEngineerList || []
} else if (row.verifyDuty == 3) {
this.verifyDutyList = res.result.engineeringInterfacePersonList || []
} else if (row.designInitiator == 0) {
this.verifyDutyList = res.result.studioPersonList || []
} else if (!row.verifyDuty || row.verifyDuty == '') {
// if (row.verifyDuty == 1) {
// this.verifyDutyList = res.result.lawEngineerList || []
// } else if (row.verifyDuty == 2) {
// this.verifyDutyList = res.result.certificationEngineerList || []
// } else if (row.verifyDuty == 3) {
// this.verifyDutyList = res.result.engineeringInterfacePersonList || []
// } else if (row.designInitiator == 0) {
// this.verifyDutyList = res.result.studioPersonList || []
// } else if (!row.verifyDuty || row.verifyDuty == '') {
this.verifyDutyList = res.result.allPersonList || []
}
// }
callback()
},
getData(row, res) {