Skip to content

H
hzsomms
Commit d7b7b051 authored by hkl's avatar hkl
Browse files
Options

Merge remote-tracking branch 'origin/dev' into dev-hkl

parents 2de09b3c 71595f69
Hide whitespace changes
Inline Side-by-side
Showing with 43 additions and 43 deletions
jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/controller/MovementRecordsMasterController.java
View file @ d7b7b051
......@@ -176,61 +176,61 @@ public class MovementRecordsMasterController extends JeecgController<MovementRec
* @param movementCourseId 对应的里程相关信息id
* @return
*/
@AutoLog(value = "根据动静态几何尺寸数据id和对应的里程相关信息id查询其详情")
@ApiOperation(value = "根据动静态几何尺寸数据id和对应的里程相关信息id查询其详情", notes = "根据动静态几何尺寸数据id和对应的里程相关信息id查询其详情")
@GetMapping(value = "/getInfoById")
public Result<List<MovementCourseInfoVO>> getInfoById(@ApiParam(name = "动静态几何尺寸数据id") String movementMasterId, @ApiParam(name = "检查里程相关信息id") String movementCourseId) {
List<MovementCourseInfo> listResult = movementCourseInfoService.lambdaQuery()
.eq(ObjectUtil.isNotEmpty(movementMasterId), MovementCourseInfo::getMovementMasterId, movementMasterId)
.eq(ObjectUtil.isNotEmpty(movementCourseId), MovementCourseInfo::getMovementCourseId, movementCourseId)
.eq(MovementCourseInfo::getDelFlag, "0")
.orderByAsc(MovementCourseInfo::getInfoSort)
.list();
List<MovementCourseInfoVO> resultList = new ArrayList<>();
if(listResult != null && listResult.size() > 0){
resultList = BeanCopyUtil.copyListProperties(listResult, MovementCourseInfoVO::new);
}
return Result.OK(resultList);
}
// @AutoLog(value = "根据动静态几何尺寸数据id和对应的里程相关信息id查询其详情")
// @ApiOperation(value = "根据动静态几何尺寸数据id和对应的里程相关信息id查询其详情", notes = "根据动静态几何尺寸数据id和对应的里程相关信息id查询其详情")
// @GetMapping(value = "/getInfoById")
// public Result<List<MovementCourseInfoOneVO>> getInfoById(@ApiParam(name = "动静态几何尺寸数据id") String movementMasterId, @ApiParam(name = "检查里程相关信息id") String movementCourseId) {
// public Result<List<MovementCourseInfoVO>> getInfoById(@ApiParam(name = "动静态几何尺寸数据id") String movementMasterId, @ApiParam(name = "检查里程相关信息id") String movementCourseId) {
// List<MovementCourseInfo> listResult = movementCourseInfoService.lambdaQuery()
// .eq(ObjectUtil.isNotEmpty(movementMasterId), MovementCourseInfo::getMovementMasterId, movementMasterId)
// .eq(ObjectUtil.isNotEmpty(movementCourseId), MovementCourseInfo::getMovementCourseId, movementCourseId)
// .eq(MovementCourseInfo::getDelFlag, "0")
// .orderByAsc(MovementCourseInfo::getInfoSort)
// .list();
//
// //初始化最终返回的集合
// List<MovementCourseInfoOneVO> resultList = new ArrayList<>();
// if (listResult != null && listResult.size() > 0) {
// List<String> trackCodeList = listResult.stream().map(MovementCourseInfo::getTrackCode).distinct().collect(Collectors.toList());
// for (String code : trackCodeList) {
// //初始化最终返回的对象
// MovementCourseInfoOneVO resultModel = new MovementCourseInfoOneVO();
// //初始化检查项目对应的详情记录的集合
// List<MovementCourseInfoVO> infoList = new ArrayList<>();
// //循环符合条件的数据项集合
// for (MovementCourseInfo entity : listResult) {
// //判断项目名称一样
// if (code.equals(entity.getTrackCode())) {
// //初始化检查项目对应的详情记录的对象
// MovementCourseInfoVO infoVo = new MovementCourseInfoVO();
// BeanCopyUtil.copyProperties(entity, infoVo);
// infoList.add(infoVo);
// }
// }
// resultModel.setInfoList(infoList);
// resultModel.setTrackCode(code);
// resultList.add(resultModel);
// }
// List<MovementCourseInfoVO> resultList = new ArrayList<>();
// if(listResult != null && listResult.size() > 0){
// resultList = BeanCopyUtil.copyListProperties(listResult, MovementCourseInfoVO::new);
// }
// return Result.OK(resultList);
// }
@AutoLog(value = "根据动静态几何尺寸数据id和对应的里程相关信息id查询其详情")
@ApiOperation(value = "根据动静态几何尺寸数据id和对应的里程相关信息id查询其详情", notes = "根据动静态几何尺寸数据id和对应的里程相关信息id查询其详情")
@GetMapping(value = "/getInfoById")
public Result<List<MovementCourseInfoOneVO>> getInfoById(@ApiParam(name = "动静态几何尺寸数据id") String movementMasterId, @ApiParam(name = "检查里程相关信息id") String movementCourseId) {
List<MovementCourseInfo> listResult = movementCourseInfoService.lambdaQuery()
.eq(ObjectUtil.isNotEmpty(movementMasterId), MovementCourseInfo::getMovementMasterId, movementMasterId)
.eq(ObjectUtil.isNotEmpty(movementCourseId), MovementCourseInfo::getMovementCourseId, movementCourseId)
.eq(MovementCourseInfo::getDelFlag, "0")
.orderByAsc(MovementCourseInfo::getInfoSort)
.list();
//初始化最终返回的集合
List<MovementCourseInfoOneVO> resultList = new ArrayList<>();
if (listResult != null && listResult.size() > 0) {
List<String> trackCodeList = listResult.stream().map(MovementCourseInfo::getTrackCode).distinct().collect(Collectors.toList());
for (String code : trackCodeList) {
//初始化最终返回的对象
MovementCourseInfoOneVO resultModel = new MovementCourseInfoOneVO();
//初始化检查项目对应的详情记录的集合
List<MovementCourseInfoVO> infoList = new ArrayList<>();
//循环符合条件的数据项集合
for (MovementCourseInfo entity : listResult) {
//判断项目名称一样
if (code.equals(entity.getTrackCode())) {
//初始化检查项目对应的详情记录的对象
MovementCourseInfoVO infoVo = new MovementCourseInfoVO();
BeanCopyUtil.copyProperties(entity, infoVo);
infoList.add(infoVo);
}
}
resultModel.setInfoList(infoList);
resultModel.setTrackCode(code);
resultList.add(resultModel);
}
}
return Result.OK(resultList);
}
@AutoLog(value = "动静态几何尺寸主数据新增或者编辑")
@ApiOperation(value = "动静态几何尺寸主数据新增或者编辑", notes = "动静态几何尺寸主数据新增或者编辑")
@PostMapping(value = "/saveOrUpdate")
......
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