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-11-03 16:00:41 +08:00
parent e4c31f6e30
commit e4813a5bf1
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/zhgd/xmgl/modules/quality/service/impl/AcceptInspectRecordServiceImpl.java
View File

@ -64,7 +64,7 @@ public class AcceptInspectRecordServiceImpl extends ServiceImpl<AcceptInspectRec
private IAcceptInspectQuestionService acceptInspectQuestionService; private IAcceptInspectQuestionService acceptInspectQuestionService;
@Autowired @Autowired
private IAcceptInspectQuestionExamineService acceptAcceptInspectQuestionExamineService; private IAcceptInspectQuestionExamineService acceptInspectQuestionExamineService;
@Autowired @Autowired
private ICheckAcceptApplyService checkAcceptApplyService; private ICheckAcceptApplyService checkAcceptApplyService;
@ -147,9 +147,9 @@ public class AcceptInspectRecordServiceImpl extends ServiceImpl<AcceptInspectRec
wrapper.set(AcceptInspectQuestionExamine::getSuggest, suggest); wrapper.set(AcceptInspectQuestionExamine::getSuggest, suggest);
wrapper.in(AcceptInspectQuestionExamine::getInspectQuestionId, questionId); wrapper.in(AcceptInspectQuestionExamine::getInspectQuestionId, questionId);
wrapper.eq(AcceptInspectQuestionExamine::getExamineState, 0); wrapper.eq(AcceptInspectQuestionExamine::getExamineState, 0);
acceptAcceptInspectQuestionExamineService.update(wrapper); acceptInspectQuestionExamineService.update(wrapper);
} }
if (acceptInspectRecord.getState() == 5 && list.stream().filter(l -> l.getState() == 4).collect(Collectors.toList()).size() != list.size()) { if (acceptInspectRecord.getState() == 5 && list.stream().filter(l -> l.getState() == 4 || l.getState() == 3).collect(Collectors.toList()).size() != list.size()) {
return true; return true;
} }
return this.updateById(acceptInspectRecord); return this.updateById(acceptInspectRecord);

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

@ -168,7 +168,7 @@ public class InspectRecordServiceImpl extends ServiceImpl<InspectRecordMapper, I
wrapper.eq(InspectQuestionExamine::getExamineState, 0); wrapper.eq(InspectQuestionExamine::getExamineState, 0);
inspectQuestionExamineService.update(wrapper); inspectQuestionExamineService.update(wrapper);
} }
if (inspectRecord.getState() == 5 && list.stream().filter(l -> l.getState() == 4).collect(Collectors.toList()).size() != list.size()) { if (inspectRecord.getState() == 5 && list.stream().filter(l -> l.getState() == 4 || l.getState() == 3).collect(Collectors.toList()).size() != list.size()) {
return true; return true;
} }
return this.updateById(inspectRecord); return this.updateById(inspectRecord);