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

start/src/main/resources/sdk-prod.yml

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

start/src/main/resources/sdk.yml

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

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<EightworkInfoDO>()
-                        .select(EightworkInfoDO::getId)
                         .eq(EightworkInfoDO::getWorkId, workId)
         );
     }

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;
 }
 

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<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);
 }
 

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

@@ -32,7 +32,7 @@ public class ConfinedSpaceRepositoryImpl extends BaseRepositoryImpl<ConfinedSpac
     @Override
     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()));
-        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());
     }
 }

web-infrastructure/src/main/resources/mapper/ConfinedSpaceMapper.xml

@@ -4,7 +4,7 @@
 
 <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 *
         from
             confined_space s
@@ -26,6 +26,7 @@
             and s.code like concat('%',#{params.likeCode},'%')
         </if>
         order by s.create_time desc
+        
     </select>
 </mapper>