diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/mapper/ResultAnalysisMapper.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/mapper/ResultAnalysisMapper.java index 9dc2752..2464b8e 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/mapper/ResultAnalysisMapper.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/mapper/ResultAnalysisMapper.java @@ -7,6 +7,7 @@ import com.inspect.analysis.domain.ResultAnalysis; import com.inspect.partrolresult.domain.PatrolResult; import com.inspect.task.domain.PatrolData; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; @@ -64,4 +65,8 @@ public interface ResultAnalysisMapper { List selectResultAnalyseForAlarm(AnalyseSummaryAlarmModel alarmModel); List selectResultAnalysisListForAlarm(AnalyseSummaryAlarmModel alarmModel); + + int selectResultAnalysisByMainIds(@Param("lineIds") List lineIds); + + List selectResultAnalysisListByMainIds(@Param("lineIds") List lineIds); } diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/IResultAnalysisService.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/IResultAnalysisService.java index a50f51d..00740c3 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/IResultAnalysisService.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/IResultAnalysisService.java @@ -14,6 +14,8 @@ public interface IResultAnalysisService { int selectResultAnalysisByMainId(Long mainId); + int selectResultAnalysisByMainIds(List mainIds); + List selectResultAnalysisList(ResultAnalysis resultAnalysis); List selectResultAnalysisListByMainId(ResultAnalysis mainId); diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/ResultAnalysisServiceImpl.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/ResultAnalysisServiceImpl.java index 87bf6f6..0f782a6 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/ResultAnalysisServiceImpl.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/ResultAnalysisServiceImpl.java @@ -31,6 +31,11 @@ public class ResultAnalysisServiceImpl implements IResultAnalysisService { return this.resultAnalysisMapper.selectResultAnalysisByMainId(lineId); } + @Override + public int selectResultAnalysisByMainIds(List lineIds) { + return this.resultAnalysisMapper.selectResultAnalysisByMainIds(lineIds); + } + public List selectResultAnalysisList(ResultAnalysis resultAnalysis) { return this.resultAnalysisMapper.selectResultAnalysisList(resultAnalysis); } diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java index 0f467a6..af34b03 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java @@ -166,22 +166,33 @@ public class PatrolResultController extends BaseController { @GetMapping({"/list"}) public TableDataInfo list(PatrolResult patrolResult) { startPage(); - List list = patrolResultService.selectPatroByAllDev(patrolResult); - for (PatrolResult result : list) { - PatrolResultAux pra = new PatrolResultAux(); - pra.setResultId(result.getLineId() + ""); - List pra1 = iPatrolResultAuxService.selectPatrolResultAuxList(pra); - if (!pra1.isEmpty()) { - result.setValue(pra1.get(0).getValue()); + String mainId = patrolResult.getMainId(); + List list = new ArrayList<>(); + if (StringUtils.isNotBlank(mainId)) { + List lineIds = patrolTaskResultMainService.selectLineIds(Long.parseLong(mainId)); + if (lineIds != null && lineIds.size() > 0) { + patrolResult.setMainIds(lineIds); + list = patrolResultService.selectPatroByAllDevByMainIds(patrolResult); + } else { + list = patrolResultService.selectPatroByAllDev(patrolResult); } + for (PatrolResult result : list) { + PatrolResultAux pra = new PatrolResultAux(); + pra.setResultId(result.getLineId() + ""); + List pra1 = iPatrolResultAuxService.selectPatrolResultAuxList(pra); + if (!pra1.isEmpty()) { + result.setValue(pra1.get(0).getValue()); + } - if ("0".equals(result.getValue())) { - result.setValue("正常"); - } + if ("0".equals(result.getValue())) { + result.setValue("正常"); + } - if ("-1".equals(result.getValue()) || "1".equals(result.getValue())) { - result.setValue("异常"); + if ("-1".equals(result.getValue()) || "1".equals(result.getValue())) { + result.setValue("异常"); + } } + } return getDataTable(list); diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/domain/PatrolResult.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/domain/PatrolResult.java index a2a41be..fa4b24f 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/domain/PatrolResult.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/domain/PatrolResult.java @@ -158,6 +158,8 @@ public class PatrolResult extends BaseEntity { private String patrolPointName; private String channelCode; + private List mainIds; + public PatrolResult(String mainId) { this.mainId = mainId; } @@ -233,6 +235,7 @@ public class PatrolResult extends BaseEntity { ", algId=" + algId + ", patrolPointName='" + patrolPointName + '\'' + ", channelCode='" + channelCode + '\'' + + ", mainIds='" + mainIds + '\'' + '}'; } } diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/mapper/PatrolResultMapper.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/mapper/PatrolResultMapper.java index d871f6e..9903751 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/mapper/PatrolResultMapper.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/mapper/PatrolResultMapper.java @@ -38,6 +38,8 @@ public interface PatrolResultMapper { List selectPatroByAllDev(PatrolResult patrolResult); + List selectPatroByAllDevByMainIds(PatrolResult patrolResult); + List selectAlgInfo(PatrolResult patrolResult); List queryPatrolResultByPointID(String key, Date date, Date date2); @@ -99,4 +101,10 @@ public interface PatrolResultMapper { List inspectResult(InspectionPointParam inspectionPointParam); BasedataEqpBookChannel selectChannelName(@Param("channelCode") String channelCode); + + List selectPatrolResultListByMainIds(@Param("mainIds") List mainIds); + + List selectResultRefByLineIds(@Param("mainIds") List mainIds); + + List selectBaseInfoByMainIds(@Param("mainIds") List mainIds); } diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/IPatrolResultService.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/IPatrolResultService.java index d1b5b5e..29780bc 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/IPatrolResultService.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/IPatrolResultService.java @@ -31,6 +31,8 @@ public interface IPatrolResultService { List selectPatroByAllDev(PatrolResult patrolResult); + List selectPatroByAllDevByMainIds(PatrolResult patrolResult); + List selectAlgInfo(PatrolResult patrolResult); Map selectAlgorithmType(String type); @@ -73,7 +75,7 @@ public interface IPatrolResultService { List select6FsResultValue(PatrolResult patrolResult); - Long saveReport(PatrolTaskResultMain resultMain, List resultList); + Long saveReport(PatrolTaskResultMain resultMain, List lineIds, Long currentLineId, List resultList); List selectResultRefByLineId(String lineId); @@ -82,4 +84,6 @@ public interface IPatrolResultService { List inspectResult(InspectionPointParam inspectionPointParam); BasedataEqpBookChannel selectChannelName(String channelCode); + + List selectPatrolResultListByMainIds(List mainIds); } diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/impl/PatrolResultServiceImpl.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/impl/PatrolResultServiceImpl.java index d2c7a02..4855ed8 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/impl/PatrolResultServiceImpl.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/impl/PatrolResultServiceImpl.java @@ -113,6 +113,10 @@ public class PatrolResultServiceImpl implements IPatrolResultService { return patrolResultMapper.selectPatroByAllDev(patrolResult); } + public List selectPatroByAllDevByMainIds(PatrolResult patrolResult) { + return patrolResultMapper.selectPatroByAllDevByMainIds(patrolResult); + } + public List selectAlgInfo(PatrolResult patrolResult) { return patrolResultMapper.selectAlgInfo(patrolResult); } @@ -288,21 +292,25 @@ public class PatrolResultServiceImpl implements IPatrolResultService { } @Transactional - public Long saveReport(PatrolTaskResultMain resultMain, List resultList) { + public Long saveReport(PatrolTaskResultMain resultMain, List lineIds, Long currentLineId, List resultList) { long startTime = System.currentTimeMillis(); - String mainId = String.valueOf(resultMain.getLineId()); - resultMain.setCheckTime(new Date()); - resultMain.setFileStatus("1"); - this.patrolTaskResultMainMapper.updatePatrolTaskResultMain(resultMain); - this.patrolResultMapper.updatePatrolResultByMainId(mainId); +// String mainId = String.valueOf(resultMain.getLineId()); + for (Long lineId : lineIds) { + resultMain.setLineId(lineId); + resultMain.setCheckTime(new Date()); + resultMain.setFileStatus("1"); + this.patrolTaskResultMainMapper.updatePatrolTaskResultMain(resultMain); + this.patrolResultMapper.updatePatrolResultByMainId(String.valueOf(lineId)); + } PrintUtil.useTime("AMENDING DATA", startTime); - return saveReportData(resultList, resultMain); + resultMain.setLineId(currentLineId); + return saveReportData(resultList, resultMain, lineIds); } - public Long saveReportData(List resultList, PatrolTaskResultMain resultMain) { + public Long saveReportData(List resultList, PatrolTaskResultMain resultMain, List lineIds) { long startTime = System.currentTimeMillis(); String mainId = String.valueOf(resultMain.getLineId()); - String analyseNum = statisticsAnalyseNum(mainId, resultList.size()); + String analyseNum = statisticsAnalyseNum(lineIds, resultList.size()); startTime = PrintUtil.useTime("STATISTICS ANALYZE DATA", startTime); if (resultList.isEmpty()) { throw new ServiceException("LACK INSPECT RESULT: " + mainId); @@ -350,7 +358,7 @@ public class PatrolResultServiceImpl implements IPatrolResultService { report.setStationType(stationType); inspectionReportMapper.insertInspectionReport(report); PrintUtil.useTime("NEW TASK REPORT", startTime); - batchInsertReportData(String.valueOf(report.getLineId()), mainId); + batchInsertReportData(String.valueOf(report.getLineId()), lineIds); PrintUtil.useTime("BATCH INSERT DETAIL", startTime); } @@ -371,13 +379,15 @@ public class PatrolResultServiceImpl implements IPatrolResultService { report.setInspectionEndTime(DateUtil.parseDateTime(taskStatus.getEndTime())); } - public void batchInsertReportData(String reportId, String mainId) { - log.info("batchInsertReportData reportId:" + reportId + ", mainId:" + mainId); + public void batchInsertReportData(String reportId, List mainIds) { + log.info("batchInsertReportData reportId:" + reportId + ", mainIds:" + mainIds); long startTime = System.currentTimeMillis(); - List patrolResultRefs = patrolResultMapper.selectResultRefByLineId(mainId); +// List patrolResultRefs = patrolResultMapper.selectResultRefByLineId(mainId); + List patrolResultRefs = patrolResultMapper.selectResultRefByLineIds(mainIds); log.info("batchInsertReportData patrolResultRefs:" + patrolResultRefs); startTime = PrintUtil.useTime("SELECT RESULT", startTime); - List basePointAreaInfoList = patrolResultMapper.selectBaseInfoByMainId(mainId); +// List basePointAreaInfoList = patrolResultMapper.selectBaseInfoByMainId(mainId); + List basePointAreaInfoList = patrolResultMapper.selectBaseInfoByMainIds(mainIds); log.info("batchInsertReportData basePointAreaInfoList:" + basePointAreaInfoList); PrintUtil.useTime("AREA INQUERY", startTime); log.info("REPORTS SIZE: {}", patrolResultRefs.size()); @@ -480,11 +490,13 @@ public class PatrolResultServiceImpl implements IPatrolResultService { } } - public String statisticsAnalyseNum(String mainId, int totalNum) { + public String statisticsAnalyseNum(List lineIds, int totalNum) { int okNum = 0; int failNum = 0; int confirmNum = 0; - List analyses = resultAnalysisMapper.selectResultAnalysisListByMainId(new ResultAnalysis(mainId)); +// List analyses = resultAnalysisMapper.selectResultAnalysisListByMainId(new ResultAnalysis(mainId)); + List analyses = resultAnalysisMapper.selectResultAnalysisListByMainIds(lineIds); + log.info("lineIds:{},statisticsAnalyseNum analyses:{}", lineIds, analyses); for (ResultAnalysis analyse : analyses) { String var9 = analyse.getPointStatus(); byte var10 = -1; @@ -546,6 +558,11 @@ public class PatrolResultServiceImpl implements IPatrolResultService { return patrolResultMapper.selectChannelName(channelCode); } + @Override + public List selectPatrolResultListByMainIds(List mainIds) { + return patrolResultMapper.selectPatrolResultListByMainIds(mainIds); + } + public static void main(String[] args) { List students = new ArrayList<>(); students.add("s1"); diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresultAux/mapper/PatrolResultAuxMapper.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresultAux/mapper/PatrolResultAuxMapper.java index dd8c465..1c6a042 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresultAux/mapper/PatrolResultAuxMapper.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresultAux/mapper/PatrolResultAuxMapper.java @@ -2,6 +2,7 @@ package com.inspect.partrolresultAux.mapper; import com.inspect.partrolresultAux.domain.PatrolResultAux; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -13,6 +14,8 @@ public interface PatrolResultAuxMapper { List selectPatrolResultAuxListByMainId(PatrolResultAux patrolResultAux); + List selectPatrolResultAuxListByMainIds(@Param("mainIds") List mainIds); + int insertPatrolResultAux(PatrolResultAux patrolResultAux); int updatePatrolResultAux(PatrolResultAux patrolResultAux); diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresultAux/service/IPatrolResultAuxService.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresultAux/service/IPatrolResultAuxService.java index eb7d8af..da062ae 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresultAux/service/IPatrolResultAuxService.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresultAux/service/IPatrolResultAuxService.java @@ -11,6 +11,8 @@ public interface IPatrolResultAuxService { List selectPatrolResultAuxListByMainId(PatrolResultAux patrolResultAux); + List selectPatrolResultAuxListByMainIds(List mainIds); + int insertPatrolResultAux(PatrolResultAux patrolResultAux); int updatePatrolResultAux(PatrolResultAux patrolResultAux); diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresultAux/service/impl/PatrolResultAuxServiceImpl.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresultAux/service/impl/PatrolResultAuxServiceImpl.java index 4a1fe0b..fb29f8a 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresultAux/service/impl/PatrolResultAuxServiceImpl.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresultAux/service/impl/PatrolResultAuxServiceImpl.java @@ -30,6 +30,11 @@ public class PatrolResultAuxServiceImpl implements IPatrolResultAuxService { return this.patrolResultAuxMapper.selectPatrolResultAuxListByMainId(patrolResultAux); } + @Override + public List selectPatrolResultAuxListByMainIds(List mainIds) { + return this.patrolResultAuxMapper.selectPatrolResultAuxListByMainIds(mainIds); + } + public int insertPatrolResultAux(PatrolResultAux patrolResultAux) { patrolResultAux.setCreateTime(DateUtils.getNowDate()); return this.patrolResultAuxMapper.insertPatrolResultAux(patrolResultAux); diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/controller/PatrolTaskResultMainController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/controller/PatrolTaskResultMainController.java index df925ec..f8f0521 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/controller/PatrolTaskResultMainController.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/controller/PatrolTaskResultMainController.java @@ -1,6 +1,7 @@ package com.inspect.resultmain.controller; import cn.hutool.core.date.DateUtil; +import com.inspect.analysis.domain.resultList; import com.inspect.analysis.service.IResultAnalysisService; import com.inspect.base.core.sftp.SftpClient; import com.inspect.base.core.sftp.SftpUploadEntity; @@ -163,16 +164,23 @@ public class PatrolTaskResultMainController extends BaseController { String mainId = String.valueOf(lineId); long startTime = System.currentTimeMillis(); logger.info("[ARCHIVE] Starting, Id: {}", mainId); + List lineIds = patrolTaskResultMainService.selectLineIds(lineId); + if (lineIds.size() == 0) { + lineIds.add(lineId); + } + logger.info("---归档--lineIds size: {}，lineIds：{}", lineIds.size(), lineIds); int analyseNum, collectNum; AtomicInteger modifyNum = new AtomicInteger(0); - List resultList = patrolResultService.selectPatrolResultList(new PatrolResult(mainId)); +// List resultList = patrolResultService.selectPatrolResultList(new PatrolResult(mainId)); + List resultList = patrolResultService.selectPatrolResultListByMainIds(lineIds); if (resultList.isEmpty()) { final String result = "[ARCHIVE] Fail, Data is gathering, Please wait!"; logger.error(result); return AjaxResult.error(result); } - List patrolResultAuxList = iPatrolResultAuxService.selectPatrolResultAuxListByMainId(new PatrolResultAux(mainId)); +// List patrolResultAuxList = iPatrolResultAuxService.selectPatrolResultAuxListByMainId(new PatrolResultAux(mainId)); + List patrolResultAuxList = iPatrolResultAuxService.selectPatrolResultAuxListByMainIds(lineIds); for (PatrolResultAux aux : patrolResultAuxList) { resultList.forEach((item) -> { if (aux.getResultId().equals(String.valueOf(item.getLineId()))) { @@ -186,7 +194,8 @@ public class PatrolTaskResultMainController extends BaseController { startTime = PrintUtil.useTime("INQUIRY MEND DATA", startTime); collectNum = resultList.size(); - analyseNum = resultAnalysisService.selectResultAnalysisByMainId(lineId); +// analyseNum = resultAnalysisService.selectResultAnalysisByMainId(lineId); + analyseNum = resultAnalysisService.selectResultAnalysisByMainIds(lineIds); startTime = PrintUtil.useTime("INQUIRY ANALYZE DATA", startTime); logger.info("[ARCHIVE] Id: {}, collectNum: {}, analyseNum: {}, modifyNum:{}", mainId, collectNum, analyseNum, modifyNum.get()); if (modifyNum.get() + analyseNum != collectNum) { @@ -194,7 +203,7 @@ public class PatrolTaskResultMainController extends BaseController { logger.error(failMsg); return AjaxResult.error(failMsg); } else { - Long reportId = patrolResultService.saveReport(resultMain, resultList); + Long reportId = patrolResultService.saveReport(resultMain, lineIds, lineId, resultList); PrintUtil.useTime("ARCHIVE END", startTime); (new Thread(() -> { long beginTime = (new Date()).getTime(); diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/mapper/PatrolTaskResultMainMapper.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/mapper/PatrolTaskResultMainMapper.java index 0a12a1a..4c91aea 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/mapper/PatrolTaskResultMainMapper.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/mapper/PatrolTaskResultMainMapper.java @@ -25,4 +25,6 @@ public interface PatrolTaskResultMainMapper { List selectMainFileStatus(String patrolIds); + List selectLineIds(Long lineId); + } diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/service/IPatrolTaskResultMainService.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/service/IPatrolTaskResultMainService.java index 6135a81..22c003e 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/service/IPatrolTaskResultMainService.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/service/IPatrolTaskResultMainService.java @@ -23,4 +23,6 @@ public interface IPatrolTaskResultMainService { List selectMainFileStatus(String patrolIds); + List selectLineIds(Long lineId); + } diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/service/impl/PatrolTaskResultMainServiceImpl.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/service/impl/PatrolTaskResultMainServiceImpl.java index 0fc851c..51cdc54 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/service/impl/PatrolTaskResultMainServiceImpl.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/service/impl/PatrolTaskResultMainServiceImpl.java @@ -56,4 +56,9 @@ public class PatrolTaskResultMainServiceImpl implements IPatrolTaskResultMainSer return this.patrolTaskResultMainMapper.selectMainFileStatus(patrolIds); } + @Override + public List selectLineIds(Long lineId) { + return this.patrolTaskResultMainMapper.selectLineIds(lineId); + } + } diff --git a/inspect-main/inspect-main-task/src/main/resources/mapper/task/InspectionReportMapper.xml b/inspect-main/inspect-main-task/src/main/resources/mapper/task/InspectionReportMapper.xml index 3daa454..003cb34 100644 --- a/inspect-main/inspect-main-task/src/main/resources/mapper/task/InspectionReportMapper.xml +++ b/inspect-main/inspect-main-task/src/main/resources/mapper/task/InspectionReportMapper.xml @@ -79,13 +79,12 @@ left JOIN patrol_task b on a.task_id=b.task_id left JOIN basedata_device c on b.device_list = c.device_id left JOIN basedata_area d on b.area_id =d.area_id - left JOIN basedata_eqpbook e on find_in_set( e.patrol_device_code, b.dev_no ) +-- left JOIN basedata_eqpbook e on find_in_set( e.patrol_device_code, b.dev_no ) and b.area_name like concat('%',#{areaName},'%') and d.area_name like concat('%',#{areaType},'%') and area_type ='bayunit' - and e.type =#{deviceType} and b.type = #{type} AND date_format(a.inspection_date,'%y%m%d') >= date_format(#{cycleStartTime},'%y%m%d') diff --git a/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultAuxMapper.xml b/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultAuxMapper.xml index 8b34e32..d0f00c5 100644 --- a/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultAuxMapper.xml +++ b/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultAuxMapper.xml @@ -80,11 +80,23 @@ where b.main_id = #{resultId} + + + insert into patrol_result_aux diff --git a/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml b/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml index 2790154..7c1108b 100644 --- a/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml +++ b/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml @@ -411,6 +411,34 @@ ORDER BY line_id desc + + @@ -570,6 +598,29 @@ and a.patrol_device_code = c.dev_no where a.main_id = #{mainId} + + + + + diff --git a/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolTaskResultMainMapper.xml b/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolTaskResultMainMapper.xml index a23c408..9efbd41 100644 --- a/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolTaskResultMainMapper.xml +++ b/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolTaskResultMainMapper.xml @@ -73,23 +73,24 @@ + + diff --git a/inspect-main/inspect-main-task/src/main/resources/mapper/task/ResultAnalysisMapper.xml b/inspect-main/inspect-main-task/src/main/resources/mapper/task/ResultAnalysisMapper.xml index ff7e7e9..28dac2e 100644 --- a/inspect-main/inspect-main-task/src/main/resources/mapper/task/ResultAnalysisMapper.xml +++ b/inspect-main/inspect-main-task/src/main/resources/mapper/task/ResultAnalysisMapper.xml @@ -115,6 +115,18 @@ where a.main_id = #{businessId} and b.business_id is not null + + + @@ -466,6 +478,16 @@ WHERE a.main_id = #{mainId} + + insert into patrol_analyse_log (content,type,create_time,task_patrol_id,filter,request_id)