|
@@ -124,6 +124,12 @@ public class ProjectAppService extends ServiceImpl<ProjectMapper, Project> {
|
|
|
* @date 2019/12/31 3:13 PM
|
|
|
*/
|
|
|
public IPage<ProjectLiftResponse> projectLiftList(ProjectRequest request) {
|
|
|
+ if (DefaultRole.MTWORK.getCode().equals(request.getCurrentRoleCode())) {
|
|
|
+ String globalSet = maintenanceRecordMapper.getGlobalSet(request.getMtCompanyId());
|
|
|
+ if (Objects.isNull(globalSet)) globalSet = "0";
|
|
|
+ //是否能查看到项目下其他维保工的电梯
|
|
|
+ request.setLook(Objects.equals("0", globalSet) ? "0" : "1");
|
|
|
+ }
|
|
|
return baseMapper.findListByProjectId(request.getPage(), request);
|
|
|
}
|
|
|
|
|
@@ -226,11 +232,7 @@ public class ProjectAppService extends ServiceImpl<ProjectMapper, Project> {
|
|
|
String globalSet = maintenanceRecordMapper.getGlobalSet(request.getMtCompanyId());
|
|
|
if (Objects.isNull(globalSet)) globalSet = "0";
|
|
|
//维保工不能查看到项目组其他维保工的任务
|
|
|
- if (Objects.equals("0", globalSet)) {
|
|
|
- request.setLook("0");
|
|
|
- } else {
|
|
|
- request.setLook("1");
|
|
|
- }
|
|
|
+ request.setLook(Objects.equals("0", globalSet) ? "0" : "1");
|
|
|
}
|
|
|
//总经理查询所有保养任务
|
|
|
if (DefaultRole.HIGH_DIRECTOR.getCode().equals(request.getCurrentRoleCode())) {
|
|
@@ -273,16 +275,11 @@ public class ProjectAppService extends ServiceImpl<ProjectMapper, Project> {
|
|
|
if (Objects.nonNull(request.getBeginTime())) {
|
|
|
request.setEndTime(request.getBeginTime().with(TemporalAdjusters.lastDayOfMonth()));
|
|
|
}
|
|
|
- log.info("角色名称:" + request.getCurrentRoleCode());
|
|
|
if (DefaultRole.MTWORK.getCode().equals(request.getCurrentRoleCode())) {
|
|
|
String globalSet = maintenanceRecordMapper.getGlobalSet(request.getMtCompanyId());
|
|
|
if (Objects.isNull(globalSet)) globalSet = "0";
|
|
|
//维保工不能查看到项目组其他维保工的任务
|
|
|
- if (Objects.equals("0", globalSet)) {
|
|
|
- request.setLook("0");
|
|
|
- } else {
|
|
|
- request.setLook("1");
|
|
|
- }
|
|
|
+ request.setLook(Objects.equals("0", globalSet) ? "0" : "1");
|
|
|
}
|
|
|
//总经理查询所有保养任务
|
|
|
if (DefaultRole.HIGH_DIRECTOR.getCode().equals(request.getCurrentRoleCode())) {
|
|
@@ -333,11 +330,7 @@ public class ProjectAppService extends ServiceImpl<ProjectMapper, Project> {
|
|
|
String globalSet = maintenanceRecordMapper.getGlobalSet(request.getMtCompanyId());
|
|
|
if (Objects.isNull(globalSet)) globalSet = "0";
|
|
|
//维保工不能查看到项目组其他维保工的任务
|
|
|
- if (Objects.equals("0", globalSet)) {
|
|
|
- request.setLook("0");
|
|
|
- } else {
|
|
|
- request.setLook("1");
|
|
|
- }
|
|
|
+ request.setLook(Objects.equals("0", globalSet) ? "0" : "1");
|
|
|
}
|
|
|
//总经理查询所有保养任务
|
|
|
if (DefaultRole.HIGH_DIRECTOR.getCode().equals(request.getCurrentRoleCode())) {
|