Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Sign in / Register
Toggle navigation
H
hzsomms
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ZTGK
hzsomms
Commits
fb79e967
Commit
fb79e967
authored
Jul 27, 2023
by
shizhilong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug修改 -shizhilong
parent
ff1e352b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
43 additions
and
43 deletions
+43
-43
MovementRecordsMasterController.java
...CheckData/controller/MovementRecordsMasterController.java
+43
-43
No files found.
jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/controller/MovementRecordsMasterController.java
View file @
fb79e967
...
...
@@ -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<MovementCourseInfo
One
VO>> 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"
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment