diff --git a/start/src/main/resources/sdk-prod.yml b/start/src/main/resources/sdk-prod.yml index 204c10b..b78ab3b 100644 --- a/start/src/main/resources/sdk-prod.yml +++ b/start/src/main/resources/sdk-prod.yml @@ -51,7 +51,7 @@ openapi: tenantIds: 1838408702262321152 message: code: - list-check-taskLogTemplate: MS000127 + taskLogTemplate: MS000127 diff --git a/start/src/main/resources/sdk.yml b/start/src/main/resources/sdk.yml index 204c10b..b78ab3b 100644 --- a/start/src/main/resources/sdk.yml +++ b/start/src/main/resources/sdk.yml @@ -51,7 +51,7 @@ openapi: tenantIds: 1838408702262321152 message: code: - list-check-taskLogTemplate: MS000127 + taskLogTemplate: MS000127 diff --git a/web-app/src/main/java/com/zcloud/eightwork/command/TaskLogUpdateExe.java b/web-app/src/main/java/com/zcloud/eightwork/command/TaskLogUpdateExe.java index 9db068d..2129e8a 100644 --- a/web-app/src/main/java/com/zcloud/eightwork/command/TaskLogUpdateExe.java +++ b/web-app/src/main/java/com/zcloud/eightwork/command/TaskLogUpdateExe.java @@ -1372,7 +1372,6 @@ public class TaskLogUpdateExe { private EightworkInfoDO getEightworkInfoDO(String workId) { return eightworkInfoRepository.getOne( new LambdaQueryWrapper() - .select(EightworkInfoDO::getId) .eq(EightworkInfoDO::getWorkId, workId) ); } diff --git a/web-client/src/main/java/com/zcloud/eightwork/dto/ConfinedSpacePageQry.java b/web-client/src/main/java/com/zcloud/eightwork/dto/ConfinedSpacePageQry.java index 5dd4ba7..3528f98 100644 --- a/web-client/src/main/java/com/zcloud/eightwork/dto/ConfinedSpacePageQry.java +++ b/web-client/src/main/java/com/zcloud/eightwork/dto/ConfinedSpacePageQry.java @@ -28,5 +28,7 @@ public class ConfinedSpacePageQry extends PageQuery { private String likeCode; private String eqType; private String eqRiskLevel; + + private String menuPath; } diff --git a/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/mapper/ConfinedSpaceMapper.java b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/mapper/ConfinedSpaceMapper.java index 5285141..e1a50d7 100644 --- a/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/mapper/ConfinedSpaceMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/mapper/ConfinedSpaceMapper.java @@ -23,6 +23,6 @@ import java.util.Map; }) public interface ConfinedSpaceMapper extends BaseMapper { - IPage listPage(Page> page, Map params, String menuPerms); + IPage listPage(Page> page, Map params, String menuPerms); } diff --git a/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/repository/impl/ConfinedSpaceRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/repository/impl/ConfinedSpaceRepositoryImpl.java index 7711c09..0e25567 100644 --- a/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/repository/impl/ConfinedSpaceRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/repository/impl/ConfinedSpaceRepositoryImpl.java @@ -32,7 +32,7 @@ public class ConfinedSpaceRepositoryImpl extends BaseRepositoryImpl listPage(Map params) { Page> page = new Page<>(Integer.parseInt(params.get("pageIndex").toString()),Integer.parseInt(params.get("pageSize").toString())); - IPage iPage = confinedSpaceMapper.listPage(page, params,"confinedspacework-ledger-qy-list"); + IPage iPage = confinedSpaceMapper.listPage(page, params,"confinedspacework-ledger-qy-list"); return PageHelper.pageToResponse(iPage, iPage.getRecords()); } } diff --git a/web-infrastructure/src/main/resources/mapper/ConfinedSpaceMapper.xml b/web-infrastructure/src/main/resources/mapper/ConfinedSpaceMapper.xml index b1151a8..4c04ac4 100644 --- a/web-infrastructure/src/main/resources/mapper/ConfinedSpaceMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/ConfinedSpaceMapper.xml @@ -4,7 +4,7 @@ - select * from confined_space s @@ -26,6 +26,7 @@ and s.code like concat('%',#{params.likeCode},'%') order by s.create_time desc +