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
61c13642
Commit
61c13642
authored
Oct 13, 2023
by
hkl
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat:1.bug修复
parent
48210361
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
32 additions
and
0 deletions
+32
-0
RecordsMasterCheckController.java
...es/checkData/controller/RecordsMasterCheckController.java
+13
-0
TrackBedManagementMapper.java
.../modules/deviceAsset/mapper/TrackBedManagementMapper.java
+4
-0
TrackBedManagementMapper.xml
...dules/deviceAsset/mapper/xml/TrackBedManagementMapper.xml
+8
-0
ITrackBedManagementService.java
...dules/deviceAsset/service/ITrackBedManagementService.java
+2
-0
TrackBedManagementServiceImpl.java
...viceAsset/service/impl/TrackBedManagementServiceImpl.java
+5
-0
No files found.
jeecg-module-system/src/main/java/org/jeecg/modules/checkData/controller/RecordsMasterCheckController.java
View file @
61c13642
...
@@ -102,9 +102,22 @@ public class RecordsMasterCheckController extends JeecgController<RecordsMasterC
...
@@ -102,9 +102,22 @@ public class RecordsMasterCheckController extends JeecgController<RecordsMasterC
.
eq
(
ObjectUtil
.
isNotEmpty
(
lineAliasId
),
TrackBedManagement:
:
getLineAliasId
,
lineAliasId
)
.
eq
(
ObjectUtil
.
isNotEmpty
(
lineAliasId
),
TrackBedManagement:
:
getLineAliasId
,
lineAliasId
)
.
orderByAsc
(
TrackBedManagement:
:
getTrackBedCode
)
.
orderByAsc
(
TrackBedManagement:
:
getTrackBedCode
)
.
list
();
.
list
();
// List<TrackBedManagement> listResult = trackBedManagementService
return
Result
.
OK
(
listResult
);
}
@AutoLog
(
value
=
"根据区间id查询道床列表"
)
@ApiOperation
(
value
=
"根据区间id查询道床列表"
,
notes
=
"根据区间id查询道床列表"
)
@GetMapping
(
value
=
"/getTrackBedById"
)
public
Result
<
List
<
TrackBedManagement
>>
getTrackBedById
(
String
id
)
{
List
<
TrackBedManagement
>
listResult
=
trackBedManagementService
.
getTrackBedById
(
id
);
return
Result
.
OK
(
listResult
);
return
Result
.
OK
(
listResult
);
}
}
/**
/**
* 根据道床使用情况记录数据表的道床id查询对应的实用情况
* 根据道床使用情况记录数据表的道床id查询对应的实用情况
*
*
...
...
jeecg-module-system/src/main/java/org/jeecg/modules/deviceAsset/mapper/TrackBedManagementMapper.java
View file @
61c13642
...
@@ -6,6 +6,8 @@ import org.jeecg.modules.deviceAsset.dto.TrackBedManagementDTO;
...
@@ -6,6 +6,8 @@ import org.jeecg.modules.deviceAsset.dto.TrackBedManagementDTO;
import
org.jeecg.modules.deviceAsset.entity.TrackBedManagement
;
import
org.jeecg.modules.deviceAsset.entity.TrackBedManagement
;
import
org.jeecg.modules.deviceAsset.vo.TrackBedManagementVO
;
import
org.jeecg.modules.deviceAsset.vo.TrackBedManagementVO
;
import
java.util.List
;
/**
/**
* <p>
* <p>
* 资产管理-道床管理 Mapper 接口
* 资产管理-道床管理 Mapper 接口
...
@@ -17,4 +19,6 @@ import org.jeecg.modules.deviceAsset.vo.TrackBedManagementVO;
...
@@ -17,4 +19,6 @@ import org.jeecg.modules.deviceAsset.vo.TrackBedManagementVO;
public
interface
TrackBedManagementMapper
extends
BaseMapper
<
TrackBedManagement
>
{
public
interface
TrackBedManagementMapper
extends
BaseMapper
<
TrackBedManagement
>
{
Page
<
TrackBedManagementVO
>
queryPageList
(
Page
<
TrackBedManagementVO
>
pageData
,
TrackBedManagementDTO
dto
);
Page
<
TrackBedManagementVO
>
queryPageList
(
Page
<
TrackBedManagementVO
>
pageData
,
TrackBedManagementDTO
dto
);
List
<
TrackBedManagement
>
getTrackBedById
(
String
id
);
}
}
jeecg-module-system/src/main/java/org/jeecg/modules/deviceAsset/mapper/xml/TrackBedManagementMapper.xml
View file @
61c13642
...
@@ -29,4 +29,12 @@
...
@@ -29,4 +29,12 @@
AND t3.status = 1
AND t3.status = 1
</where>
</where>
</select>
</select>
<select
id=
"getTrackBedById"
resultType=
"org.jeecg.modules.deviceAsset.entity.TrackBedManagement"
>
SELECT
DISTINCT t1.trak_bed_management_id,t2.*
FROM
t_ek_track_bed_management_check t1
LEFT JOIN t_da_track_bed_management t2 ON t1.trak_bed_management_id = t2.id
WHERE t1.records_master_check_id = #{id}
</select>
</mapper>
</mapper>
jeecg-module-system/src/main/java/org/jeecg/modules/deviceAsset/service/ITrackBedManagementService.java
View file @
61c13642
...
@@ -21,4 +21,6 @@ public interface ITrackBedManagementService extends IService<TrackBedManagement>
...
@@ -21,4 +21,6 @@ public interface ITrackBedManagementService extends IService<TrackBedManagement>
Page
<
TrackBedManagementVO
>
queryPageList
(
Page
<
TrackBedManagementVO
>
pageData
,
TrackBedManagementDTO
dto
);
Page
<
TrackBedManagementVO
>
queryPageList
(
Page
<
TrackBedManagementVO
>
pageData
,
TrackBedManagementDTO
dto
);
List
<
TrackBedManagement
>
queryList
();
List
<
TrackBedManagement
>
queryList
();
List
<
TrackBedManagement
>
getTrackBedById
(
String
id
);
}
}
jeecg-module-system/src/main/java/org/jeecg/modules/deviceAsset/service/impl/TrackBedManagementServiceImpl.java
View file @
61c13642
...
@@ -31,4 +31,9 @@ public class TrackBedManagementServiceImpl extends ServiceImpl<TrackBedManagemen
...
@@ -31,4 +31,9 @@ public class TrackBedManagementServiceImpl extends ServiceImpl<TrackBedManagemen
public
List
<
TrackBedManagement
>
queryList
()
{
public
List
<
TrackBedManagement
>
queryList
()
{
return
null
;
return
null
;
}
}
@Override
public
List
<
TrackBedManagement
>
getTrackBedById
(
String
id
)
{
return
this
.
baseMapper
.
getTrackBedById
(
id
);
}
}
}
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