admin/wisdomisitezw_java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

质量监督修改

Browse Source
This commit is contained in:
pengjie 2023-08-04 15:58:55 +08:00
parent ca6337aeb9
commit 8f666a68cf
4 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java
View File

@ -80,7 +80,6 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
} else {
wrapper.eq("u.sn", systemUser.getSn());
}
wrapper.ne("u.user_id", user.getUserId());
return baseMapper.getPageList(wrapper);
}

6
src/main/java/com/zhgd/xmgl/modules/safety/entity/InspectQuestion.java
View File

@ -77,9 +77,9 @@ public class InspectQuestion implements Serializable {
private String createByName;
/**
* 状态(1:待整改;2:已整改;3:已闭合;4:已驳回)
* 状态(1:待整改;2:待审核;3:已闭合;4:已驳回)
*/
@Excel(name = "状态(1:待整改;2:已整改;3:已闭合;4:已驳回)", width = 15)
@ApiModelProperty(value = "状态(1:待整改;2:已整改;3:已闭合;4:已驳回)")
@Excel(name = "状态(1:待整改;2:待审核;3:已闭合;4:已驳回)", width = 15)
@ApiModelProperty(value = "状态(1:待整改;2:待审核;3:已闭合;4:已驳回)")
private Integer state;
}

2
src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InspectQuestionExamineServiceImpl.java
View File

@ -65,7 +65,6 @@ public class InspectQuestionExamineServiceImpl extends ServiceImpl<InspectQuesti
} else if (inspectQuestions.stream().filter(i -> i.getState() < 2).collect(Collectors.toList()).size() == 0) {
state = 3;
}
if (state != 2) {
LambdaUpdateWrapper<InspectRecord> recordWrapper = Wrappers.<InspectRecord>lambdaUpdate();
recordWrapper.set(InspectRecord::getState, state);
if (state == 4) {
@ -75,4 +74,3 @@ public class InspectQuestionExamineServiceImpl extends ServiceImpl<InspectQuesti
inspectRecordService.update(recordWrapper);
}
}
}

5
src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InspectRecordServiceImpl.java
View File

@ -164,6 +164,9 @@ public class InspectRecordServiceImpl extends ServiceImpl<InspectRecordMapper, I
wrapper.eq(InspectQuestionExamine::getExamineState, 0);
inspectQuestionExamineService.update(wrapper);
}
if (inspectRecord.getState() == 5 && list.stream().filter(l -> l.getState() == 4).collect(Collectors.toList()).size() != list.size()) {
return true;
}
return this.updateById(inspectRecord);
}
return false;
@ -225,8 +228,6 @@ public class InspectRecordServiceImpl extends ServiceImpl<InspectRecordMapper, I
inspectRecordVo.setCreateTime(new Date());
inspectRecordVo.setCreateBy(user.getUserId());
inspectRecordVo.setQuestionNum(inspectRecordVo.getInspectQuestionList().size());
String inspectUser = inspectRecordVo.getInspectUser();
inspectRecordVo.setInspectUser(StringUtils.isNotBlank(inspectUser) ? inspectUser + "," + user.getUserId() : user.getUserId());
if (StringUtils.isNotBlank(inspectRecordVo.getEngineeringSn())) {
String projectSn = engineeringService.getOne(Wrappers.<Engineering>lambdaQuery().eq(Engineering::getEngineeringSn, inspectRecordVo.getEngineeringSn())).getProjectSn();
inspectRecordVo.setProjectSn(projectSn);