Skip to content

H
hzsomms
Commit 6a657431 authored by 史志龙's avatar 史志龙
Browse files
Options

代码更新--shizhilong

parent 1e53dd39
Hide whitespace changes
Inline Side-by-side
Showing with 97 additions and 29 deletions
jeecg-module-system/src/main/java/org/jeecg/modules/diseaseAnalysis/mapper/xml/AnalysisLineBatchMapper.xml
View file @ 6a657431
......@@ -273,10 +273,13 @@
<select id="getWorkPageList" resultType="org.jeecg.modules.diseaseAnalysis.vo.AnalysisLineBatchWorkVO">
SELECT
t1.*,
t1.id as analysisBatchId,
t1.starting_mileage as unitStartMileage,
t1.end_mileage as unitEndMileage,
t2.check_time,
t2.check_by,
t2.ek_id,
t2.ek_code,
t2.ek_code
FROM
t_dsa_analysis_line_batch t1 left join t_dsa_analysis_line_batch_check_data_map t2 on t1.id = t2.analysis_batch_id
WHERE
......
jeecg-module-system/src/main/java/org/jeecg/modules/diseaseAnalysis/vo/AnalysisLineBatchWorkVO.java
View file @ 6a657431
......@@ -27,8 +27,8 @@ public class AnalysisLineBatchWorkVO {
private static final long serialVersionUID = 1L;
@ApiModelProperty("主键")
private String id;
@ApiModelProperty("分析批次主键")
private String analysisBatchId;
@ApiModelProperty("创建人")
private String createBy;
......@@ -58,10 +58,10 @@ public class AnalysisLineBatchWorkVO {
private String lineAliasName;
@ApiModelProperty("分析起始里程")
private BigDecimal startingMileage;
private BigDecimal unitStartMileage;
@ApiModelProperty("分析终点里程")
private BigDecimal endMileage;
private BigDecimal unitEndMileage;
@ApiModelProperty("分析状态 0-创建 1-分析中 99-分析完成")
private Integer analysisStatus;
......
jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/controller/WorkBatchController.java
View file @ 6a657431
......@@ -94,8 +94,9 @@ public class WorkBatchController extends JeecgController<WorkBatch, IWorkBatchSe
map.put("cx", corrugationInfoList);
}else if(analysisType == 5){
List<AnalysisLineBatchUnitDeviceTrackBedInfoVO> trackBedInfoList = this.service.getAnalysisLineBatchUnitDeviceTrackBedInfoList(analysisBatchId,analysisBatchUnitDeviceId);
Map<String, List<AnalysisLineBatchUnitDeviceTrackBedInfoVO>> trackBedMap = trackBedInfoList.stream().collect(Collectors.groupingBy(AnalysisLineBatchUnitDeviceTrackBedInfoVO::getTrackBedCode));
//道床检查超限数据
map.put("cx", trackBedInfoList);
map.put("cx", trackBedMap);
}else {
//根据分析单元id查询巡道员备忘录
String remark = analysisLineBatchUnitDeviceService.getById(analysisBatchUnitDeviceId).getRemark();
......
jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/dto/DispatchDTO.java
View file @ 6a657431
......@@ -29,6 +29,12 @@ public class DispatchDTO {
@ApiModelProperty("分析批id")
private String analysisBatchId;
@ApiModelProperty("检查批次id")
private String ekId;
@ApiModelProperty("检查批次code")
private String ekCode;
@ApiModelProperty("单元设备id")
private String unitId;
......
jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/dto/WorkBatchSaveOrUpdateDetailDTO.java
View file @ 6a657431
......@@ -18,6 +18,12 @@ public class WorkBatchSaveOrUpdateDetailDTO {
@ApiModelProperty("分析批次code")
private String analysisBatchCode;
@ApiModelProperty("检查批次id")
private String ekId;
@ApiModelProperty("检查批次code")
private String ekCode;
@ApiModelProperty("单元设备id")
private String unitId;
......
jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/entity/WorkBatchDetail.java
View file @ 6a657431
......@@ -69,6 +69,14 @@ public class WorkBatchDetail implements Serializable {
@TableField("analysis_batch_unit_device_id")
private String analysisBatchUnitDeviceId;
@TableField("ek_id")
@ApiModelProperty("检查批次id")
private String ekId;
@ApiModelProperty("检查批次code")
@TableField("ek_code")
private String ekCode;
@ApiModelProperty("检查日期")
@TableField("check_time")
private Date checkTime;
......
jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/mapper/xml/WorkBatchDetailMapper.xml
View file @ 6a657431
......@@ -43,7 +43,9 @@
t1.reform_remark,
t1.remark,
t1.check_by,
t1.check_time
t1.check_time,
t1.ek_id,
t1.ek_code
FROM t_mw_work_batch_detail t1
WHERE t1.work_batch_id in
<if test="workBatchIds !=null and workBatchIds.size()>0">
......
jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/service/impl/WorkBatchServiceImpl.java
View file @ 6a657431
......@@ -104,7 +104,7 @@ public class WorkBatchServiceImpl extends ServiceImpl<WorkBatchMapper, WorkBatch
});
//作业批次明细-超限列表
//作业批次明细-超限列表
List<String> analysisBatchUnitDeviceIds = workBatchDetailAllList.stream().filter(obj -> obj.getAnalysisBatchUnitDeviceId() != null).map(WorkBatchDetailVO::getAnalysisBatchUnitDeviceId).collect(Collectors.toList());
if (ObjectUtil.isNotEmpty(analysisBatchUnitDeviceIds)) {
List<AnalysisBatchUnitDeviceTransfiniteVO> transfiniteListAll = transfiniteMapper.getTransfiniteListByIds(analysisBatchUnitDeviceIds);
......@@ -122,6 +122,7 @@ public class WorkBatchServiceImpl extends ServiceImpl<WorkBatchMapper, WorkBatch
/**
* 动静态超限数据查询
*
* @param analysisBatchUnitDeviceId
* @return
*/
......@@ -132,9 +133,11 @@ public class WorkBatchServiceImpl extends ServiceImpl<WorkBatchMapper, WorkBatch
List<AnalysisBatchUnitDeviceTransfiniteVO> transfiniteListAll = transfiniteMapper.getTransfiniteListByIds(ids);
return transfiniteListAll;
}
/**
* 道岔
* @param analysisBatchId 分析批次id
*
* @param analysisBatchId 分析批次id
* @param analysisBatchUnitDeviceId 分析单元id
* @return
*/
......@@ -143,9 +146,11 @@ public class WorkBatchServiceImpl extends ServiceImpl<WorkBatchMapper, WorkBatch
List<AnalysisLineBatchUnitDeviceTurnoutInfoVO> analysisLineBatchUnitEkInfoList = analysisLineBatchService.getAnalysisLineBatchUnitEkInfoList(analysisBatchId, "", analysisBatchUnitDeviceId);
return analysisLineBatchUnitEkInfoList;
}
/**
* 钢轨伤损
* @param analysisBatchId 分析批次id
*
* @param analysisBatchId 分析批次id
* @param analysisBatchUnitDeviceId 分析单元id
* @return
*/
......@@ -157,7 +162,8 @@ public class WorkBatchServiceImpl extends ServiceImpl<WorkBatchMapper, WorkBatch
/**
* 曲线磨耗检查
* @param analysisBatchId 分析批次id
*
* @param analysisBatchId 分析批次id
* @param analysisBatchUnitDeviceId 分析单元id
* @return
*/
......@@ -166,9 +172,11 @@ public class WorkBatchServiceImpl extends ServiceImpl<WorkBatchMapper, WorkBatch
List<AnalysisLineBatchUnitDeviceCurveWearInfoVO> analysisLineBatchUnitDeviceCurveWearInfoList = analysisLineBatchService.getAnalysisLineBatchUnitDeviceCurveWearInfoList(analysisBatchId, "", analysisBatchUnitDeviceId);
return analysisLineBatchUnitDeviceCurveWearInfoList;
}
/**
* 钢轨波磨检查
* @param analysisBatchId 分析批次id
*
* @param analysisBatchId 分析批次id
* @param analysisBatchUnitDeviceId 分析单元id
* @return
*/
......@@ -177,9 +185,11 @@ public class WorkBatchServiceImpl extends ServiceImpl<WorkBatchMapper, WorkBatch
List<AnalysisLineBatchUnitDeviceCorrugationInfoVO> analysisLineBatchUnitDeviceCorrugationInfoList = analysisLineBatchService.getAnalysisLineBatchUnitDeviceCorrugationInfoList(analysisBatchId, "", analysisBatchUnitDeviceId);
return analysisLineBatchUnitDeviceCorrugationInfoList;
}
/**
* 道床检查
* @param analysisBatchId 分析批次id
*
* @param analysisBatchId 分析批次id
* @param analysisBatchUnitDeviceId 分析单元id
* @return
*/
......@@ -188,9 +198,11 @@ public class WorkBatchServiceImpl extends ServiceImpl<WorkBatchMapper, WorkBatch
List<AnalysisLineBatchUnitDeviceTrackBedInfoVO> analysisLineBatchUnitDeviceTrackBedInfoVOList = analysisLineBatchService.getAnalysisLineBatchUnitDeviceTrackBedInfoList(analysisBatchId, "", analysisBatchUnitDeviceId);
return analysisLineBatchUnitDeviceTrackBedInfoVOList;
}
/**
* 线路巡查
* @param analysisBatchId 分析批次id
*
* @param analysisBatchId 分析批次id
* @param analysisBatchUnitDeviceId 分析单元id
* @return
*/
......@@ -199,9 +211,11 @@ public class WorkBatchServiceImpl extends ServiceImpl<WorkBatchMapper, WorkBatch
List<AnalysisLineBatchUnitDevicePatrolInfoVO> patrolInfoList = analysisLineBatchService.getAnalysisLineBatchUnitDevicePatrolInfoList(analysisBatchId, "", analysisBatchUnitDeviceId);
return patrolInfoList;
}
/**
* 协助线路巡查
* @param analysisBatchId 分析批次id
*
* @param analysisBatchId 分析批次id
* @param analysisBatchUnitDeviceId 分析单元id
* @return
*/
......@@ -242,6 +256,8 @@ public class WorkBatchServiceImpl extends ServiceImpl<WorkBatchMapper, WorkBatch
workBatchDetail.setAnalysisBatchCode(detailDTO.getAnalysisBatchCode());
workBatchDetail.setCheckBy(detailDTO.getCheckBy());
workBatchDetail.setCheckTime(detailDTO.getCheckTime());
workBatchDetail.setEkId(detailDTO.getEkId());
workBatchDetail.setEkCode(detailDTO.getEkCode());
AnalysisLineBatchUnitDevice model = analysisLineBatchUnitDeviceService.lambdaQuery()
.eq(AnalysisLineBatchUnitDevice::getAnalysisBatchId, detailDTO.getAnalysisBatchId())
.one();
......@@ -344,6 +360,10 @@ public class WorkBatchServiceImpl extends ServiceImpl<WorkBatchMapper, WorkBatch
workBatchDetail.setAnalysisBatchUnitDeviceId(transfiniteDTO.getId());
workBatchDetail.setCheckBy(transfiniteDTO.getCheckBy());
workBatchDetail.setCheckTime(transfiniteDTO.getCheckTime());
if (dto.getAnalysisType() != 0) {
workBatchDetail.setEkId(transfiniteDTO.getEkId());
workBatchDetail.setEkCode(transfiniteDTO.getEkCode());
}
if (dto.getAnalysisType() != 5 && dto.getAnalysisType() != 6) {
//非道床和线路巡查才存单元设备信息
workBatchDetail.setUnitId(transfiniteDTO.getUnitId());
......@@ -486,6 +506,8 @@ public class WorkBatchServiceImpl extends ServiceImpl<WorkBatchMapper, WorkBatch
workBatchDetail.setAnalysisBatchCode(transfinite.getAnalysisBatchCode());
workBatchDetail.setCheckBy(dto.getCheckBy());
workBatchDetail.setCheckTime(dto.getCheckTime());
workBatchDetail.setEkId(transfinite.getEkId());
workBatchDetail.setEkCode(transfinite.getEkCode());
if (dto.getAnalysisType() != 5 && dto.getAnalysisType() != 6) {
//非动静态分析且非道床和线路巡查分析才保存这些参数
workBatchDetail.setUnitId(transfinite.getUnitId());
......@@ -534,81 +556,95 @@ public class WorkBatchServiceImpl extends ServiceImpl<WorkBatchMapper, WorkBatch
public List<WorkBatchUserVO> listUser(String query) {
return this.baseMapper.listUser(query);
}
/**
* 整改道岔
* @param workId 维修主表id
*
* @param workId 维修主表id
* @param workInfoId 维修单元表id
* @return
*/
@Override
public List<WorkBatchDetailTurnoutInfoVO> getWorkBatchDetailTurnoutInfoList(String workId, String workInfoId) {
List<WorkBatchDetailTurnoutInfoVO> list = this.baseMapper.getWorkBatchDetailTurnoutInfoList(workId,workInfoId);
List<WorkBatchDetailTurnoutInfoVO> list = this.baseMapper.getWorkBatchDetailTurnoutInfoList(workId, workInfoId);
return list;
}
/**
* 整改钢轨伤损
* @param workId 维修主表id
*
* @param workId 维修主表id
* @param workInfoId 维修单元表id
* @return
*/
@Override
public List<WorkBatchDetailRailWearInfoVO> getWorkBatchDetailRailWearInfoList(String workId, String workInfoId) {
List<WorkBatchDetailRailWearInfoVO> list = this.baseMapper.getWorkBatchDetailRailWearInfoList(workId,workInfoId);
List<WorkBatchDetailRailWearInfoVO> list = this.baseMapper.getWorkBatchDetailRailWearInfoList(workId, workInfoId);
return list;
}
/**
* 整改曲线磨耗
* @param workId 维修主表id
*
* @param workId 维修主表id
* @param workInfoId 维修单元表id
* @return
*/
@Override
public List<WorkBatchDetailCurveWearInfoVO> getWorkBatchDetailCurveWearInfoList(String workId, String workInfoId) {
List<WorkBatchDetailCurveWearInfoVO> list = this.baseMapper.getWorkBatchDetailCurveWearInfoList(workId,workInfoId);
List<WorkBatchDetailCurveWearInfoVO> list = this.baseMapper.getWorkBatchDetailCurveWearInfoList(workId, workInfoId);
return list;
}
/**
* 整改钢轨波磨
* @param workId 维修主表id
*
* @param workId 维修主表id
* @param workInfoId 维修单元表id
* @return
*/
@Override
public List<WorkBatchDetailCorrugationInfoVO> getWorkBatchDetailCorrugationInfoList(String workId, String workInfoId) {
List<WorkBatchDetailCorrugationInfoVO> list = this.baseMapper.getWorkBatchDetailCorrugationInfoList(workId,workInfoId);
List<WorkBatchDetailCorrugationInfoVO> list = this.baseMapper.getWorkBatchDetailCorrugationInfoList(workId, workInfoId);
return list;
}
/**
* 整改道床
* @param workId 维修主表id
*
* @param workId 维修主表id
* @param workInfoId 维修单元表id
* @return
*/
@Override
public List<WorkBatchDetailTrackBedInfoVO> getWorkBatchDetailTrackBedInfoList(String workId, String workInfoId) {
List<WorkBatchDetailTrackBedInfoVO> list = this.baseMapper.getWorkBatchDetailTrackBedInfoList(workId,workInfoId);
List<WorkBatchDetailTrackBedInfoVO> list = this.baseMapper.getWorkBatchDetailTrackBedInfoList(workId, workInfoId);
return list;
}
/**
* 整改线路巡查
* @param workId 维修主表id
*
* @param workId 维修主表id
* @param workInfoId 维修单元表id
* @return
*/
@Override
public List<WorkBatchDetailPatrolInfoVO> getWorkBatchDetailPatrolInfoList(String workId, String workInfoId) {
List<WorkBatchDetailPatrolInfoVO> list = this.baseMapper.getWorkBatchDetailPatrolInfoList(workId,workInfoId);
List<WorkBatchDetailPatrolInfoVO> list = this.baseMapper.getWorkBatchDetailPatrolInfoList(workId, workInfoId);
return list;
}
/**
* 整改协助线路巡查
* @param workId 维修主表id
*
* @param workId 维修主表id
* @param workInfoId 维修单元表id
* @return
*/
@Override
public List<WorkBatchDetailPatrolAssistInfoVO> getWorkBatchDetailPatrolAssistInfoList(String workId, String workInfoId) {
List<WorkBatchDetailPatrolAssistInfoVO> list = this.baseMapper.getWorkBatchDetailPatrolAssistInfoList(workId,workInfoId);
List<WorkBatchDetailPatrolAssistInfoVO> list = this.baseMapper.getWorkBatchDetailPatrolAssistInfoList(workId, workInfoId);
return list;
}
}
jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/vo/WorkBatchDetailVO.java
View file @ 6a657431
......@@ -47,6 +47,12 @@ public class WorkBatchDetailVO {
@ApiModelProperty("工作批次id")
private String workBatchId;
@ApiModelProperty("检查批次id")
private String ekId;
@ApiModelProperty("检查批次code")
private String ekCode;
@ApiModelProperty("检查日期")
private Date checkTime;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment