|
|
|
@ -1160,14 +1160,25 @@ public class PatrolResultServiceImpl implements IPatrolResultService { |
|
|
|
int okNum = 0; |
|
|
|
int failNum = 0; |
|
|
|
int confirmNum = 0; |
|
|
|
int qxNumFilter = 0; |
|
|
|
int ycNumFilter = 0; |
|
|
|
int qxNumAI = 0; |
|
|
|
List<ResultAnalysis> analysesAI = resultAnalysisMapper.selectResultAnalysisListByMainIdsNew(lineIds, "0"); |
|
|
|
List<ResultAnalysis> analyseFilter = resultAnalysisMapper.selectResultAnalysisListByMainIdsNew(lineIds, "1"); |
|
|
|
Map<String, ResultAnalysis> keyToAnalysisMap = new HashMap<>(); |
|
|
|
for (ResultAnalysis resultAnalysis : analysesAI) { |
|
|
|
keyToAnalysisMap.put(resultAnalysis.getAlgType() + "_" + resultAnalysis.getObjectId(), resultAnalysis); |
|
|
|
if ("0".equals(resultAnalysis.getResultType())) { |
|
|
|
++qxNumAI; |
|
|
|
} |
|
|
|
} |
|
|
|
for (ResultAnalysis analyse : analyseFilter) { |
|
|
|
keyToAnalysisMap.putIfAbsent(analyse.getAlgType() + "_" + analyse.getObjectId(), analyse); |
|
|
|
if ("0".equals(analyse.getResultType())) { |
|
|
|
++qxNumFilter; |
|
|
|
} else if ("2".equals(analyse.getResultType())) { |
|
|
|
++ycNumFilter; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@ -1186,7 +1197,8 @@ public class PatrolResultServiceImpl implements IPatrolResultService { |
|
|
|
if ("0".equals(exportReportFlag)) { |
|
|
|
return String.format(messageUtils.get("缺陷点位:%d个。"), confirmNum); |
|
|
|
} else { |
|
|
|
return String.format(messageUtils.get("本次任务巡视总点位:%d个,已检点位:%d个,未检点位:0个,正常点位:%d个,异常点位:%d个,缺陷点位:%d个。"), totalNum, totalNum, okNum, failNum, confirmNum); |
|
|
|
// return String.format(messageUtils.get("本次任务巡视总点位:%d个,已检点位:%d个,未检点位:0个,正常点位:%d个,异常点位:%d个,缺陷点位:%d个。"), totalNum, totalNum, okNum, failNum, confirmNum); |
|
|
|
return String.format(messageUtils.get("本次任务巡视总点位:%d个,已检点位:%d个,未检点位:0个,初筛缺陷点位:%d个,异常点位:%d个;大模型复检缺陷点位:%d个。"), totalNum, totalNum, qxNumFilter, ycNumFilter, qxNumAI); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|