zcloud_gbs
/
zcloud-gbs-eightwork
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(confined-space): 修复受限空间分页查询返回类型错误

master
zhaokai 2026-04-15 08:50:15 +08:00
parent 5d05c9b73a
commit 606b4a6459
7 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
start/src/main/resources/sdk-prod.yml
View File

@ -51,7 +51,7 @@ openapi:
tenantIds: 1838408702262321152 tenantIds: 1838408702262321152
message: message:
code: code:
list-check-taskLogTemplate: MS000127 taskLogTemplate: MS000127

2
start/src/main/resources/sdk.yml
View File

@ -51,7 +51,7 @@ openapi:
tenantIds: 1838408702262321152 tenantIds: 1838408702262321152
message: message:
code: code:
list-check-taskLogTemplate: MS000127 taskLogTemplate: MS000127

1
web-app/src/main/java/com/zcloud/eightwork/command/TaskLogUpdateExe.java
View File

@ -1372,7 +1372,6 @@ public class TaskLogUpdateExe {
private EightworkInfoDO getEightworkInfoDO(String workId) { private EightworkInfoDO getEightworkInfoDO(String workId) {
return eightworkInfoRepository.getOne( return eightworkInfoRepository.getOne(
new LambdaQueryWrapper<EightworkInfoDO>() new LambdaQueryWrapper<EightworkInfoDO>()
.select(EightworkInfoDO::getId)
.eq(EightworkInfoDO::getWorkId, workId) .eq(EightworkInfoDO::getWorkId, workId)
); );
} }

2
web-client/src/main/java/com/zcloud/eightwork/dto/ConfinedSpacePageQry.java
View File

@ -28,5 +28,7 @@ public class ConfinedSpacePageQry extends PageQuery {
private String likeCode; private String likeCode;
private String eqType; private String eqType;
private String eqRiskLevel; private String eqRiskLevel;
private String menuPath;
} }

2
web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/mapper/ConfinedSpaceMapper.java
View File

@ -23,6 +23,6 @@ import java.util.Map;
}) })
public interface ConfinedSpaceMapper extends BaseMapper<ConfinedSpaceDO> { public interface ConfinedSpaceMapper extends BaseMapper<ConfinedSpaceDO> {
IPage<EightworkInfoDO> listPage(Page<Map<String, Object>> page, Map<String, Object> params, String menuPerms); IPage<ConfinedSpaceDO> listPage(Page<Map<String, Object>> page, Map<String, Object> params, String menuPerms);
} }

2
web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/repository/impl/ConfinedSpaceRepositoryImpl.java
View File

@ -32,7 +32,7 @@ public class ConfinedSpaceRepositoryImpl extends BaseRepositoryImpl<ConfinedSpac
@Override @Override
public PageResponse<ConfinedSpaceDO> listPage(Map<String, Object> params) { public PageResponse<ConfinedSpaceDO> listPage(Map<String, Object> params) {
Page<Map<String,Object>> page = new Page<>(Integer.parseInt(params.get("pageIndex").toString()),Integer.parseInt(params.get("pageSize").toString())); Page<Map<String,Object>> page = new Page<>(Integer.parseInt(params.get("pageIndex").toString()),Integer.parseInt(params.get("pageSize").toString()));
IPage<EightworkInfoDO> iPage = confinedSpaceMapper.listPage(page, params,"confinedspacework-ledger-qy-list"); IPage<ConfinedSpaceDO> iPage = confinedSpaceMapper.listPage(page, params,"confinedspacework-ledger-qy-list");
return PageHelper.pageToResponse(iPage, iPage.getRecords()); return PageHelper.pageToResponse(iPage, iPage.getRecords());
} }
} }

3
web-infrastructure/src/main/resources/mapper/ConfinedSpaceMapper.xml
View File

@ -4,7 +4,7 @@
<mapper namespace="com.zcloud.eightwork.persistence.mapper.ConfinedSpaceMapper"> <mapper namespace="com.zcloud.eightwork.persistence.mapper.ConfinedSpaceMapper">
<select id="listPage" resultType="com.zcloud.eightwork.persistence.dataobject.EightworkInfoDO"> <select id="listPage" resultType="com.zcloud.eightwork.persistence.dataobject.ConfinedSpaceDO">
select * select *
from from
confined_space s confined_space s
@ -26,6 +26,7 @@
and s.code like concat('%',#{params.likeCode},'%') and s.code like concat('%',#{params.likeCode},'%')
</if> </if>
order by s.create_time desc order by s.create_time desc
</select> </select>
</mapper> </mapper>