skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/manageProtect/mapper/ManageProtectRecordMapper.java
@@ -17,5 +17,5 @@ * @DATE: 2023/5/27 10:09 */ public interface ManageProtectRecordMapper extends BaseMapper<ManageProtectRecord> { IPage<ManageProtectRecordVO> selectRecordPage(IPage<ManageProtectRecordVO> page, @Param("record") ManageProtectRecordVO manageProtectRecordVO); List<ManageProtectRecordVO> selectRecordPage(IPage<ManageProtectRecordVO> page, @Param("record") ManageProtectRecordVO manageProtectRecordVO); } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/manageProtect/mapper/ManageProtectRecordMapper.xml
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/manageProtect/service/impl/ManageProtectRecordServiceImpl.java
@@ -23,9 +23,8 @@ @Service public class ManageProtectRecordServiceImpl extends BaseServiceImpl<ManageProtectRecordMapper, ManageProtectRecord> implements IManageProtectRecordService { @Override public IPage<ManageProtectRecordVO> selectPage(IPage<ManageProtectRecordVO> page, ManageProtectRecordVO manageProtectRecordVO) { return baseMapper.selectRecordPage(page,manageProtectRecordVO); return page.setRecords(baseMapper.selectRecordPage(page,manageProtectRecordVO)); } } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolTaskMapper.xml
@@ -221,7 +221,7 @@ COUNT(*) AS need, SUM(CASE WHEN t.state = 3 THEN 1 ELSE 0 END) AS finish, SUM(CASE WHEN t.state = 1 or state = 2 THEN 1 ELSE 0 END) AS todo FROM SK002.SM_PATROL_TASK t FROM SM_PATROL_TASK t LEFT JOIN SJZT_MD."att_res_base" arb on arb."guid" = t.project_id LEFT JOIN SJZT_MD."att_ad_base" aab on aab."guid" = CONCAT(arb."ad_guid",'000000') WHERE @@ -253,7 +253,7 @@ COUNT(*) AS need, SUM(CASE WHEN t.state = 3 THEN 1 ELSE 0 END) AS finish, SUM(CASE WHEN t.state = 1 or state = 2 THEN 1 ELSE 0 END) AS todo FROM SK002.SM_PATROL_TASK t FROM SM_PATROL_TASK t LEFT JOIN SJZT_MD."att_res_base" arb on arb."guid" = t.project_id LEFT JOIN SJZT_MD."att_ad_base" aab on aab."guid" = CONCAT(arb."ad_guid",'000000') where t.is_deleted = 0 AND aab."p_ad_code" != '420000000000' @@ -305,7 +305,7 @@ COUNT(*) AS need, SUM(CASE WHEN t.state = 3 THEN 1 ELSE 0 END) AS finish, SUM(CASE WHEN t.state = 1 or state = 2 THEN 1 ELSE 0 END) AS todo FROM SK002.SM_PATROL_TASK t FROM SM_PATROL_TASK t LEFT JOIN SJZT_MD."att_res_base" arb on arb."guid" = t.project_id LEFT JOIN SJZT_MD."att_ad_base" aab on aab."guid" = CONCAT(arb."ad_guid",'000000') WHERE @@ -337,7 +337,7 @@ COUNT(*) AS need, SUM(CASE WHEN t.state = 3 THEN 1 ELSE 0 END) AS finish, SUM(CASE WHEN t.state = 1 or state = 2 THEN 1 ELSE 0 END) AS todo FROM SK002.SM_PATROL_TASK t FROM SM_PATROL_TASK t LEFT JOIN SJZT_MD."att_res_base" arb on arb."guid" = t.project_id LEFT JOIN SJZT_MD."att_ad_base" aab on aab."guid" = CONCAT(arb."ad_guid",'000000') where t.is_deleted = 0 AND aab."p_ad_code" != '420000000000' skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/schedulingModules/mapper/SchedulingRecordMapper.java
@@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; import java.util.List; /** * @PROJECT_NAME: skjcmanager * @DESCRIPTION: @@ -15,5 +17,5 @@ * @DATE: 2023/5/27 15:25 */ public interface SchedulingRecordMapper extends BaseMapper<SchedulingRecord> { IPage<SchedulingRecordVO> selectRecordPage(IPage<SchedulingRecordVO> page, @Param("record") SchedulingRecordVO schedulingRecordVO); List<SchedulingRecordVO> selectRecordPage(IPage<SchedulingRecordVO> page, @Param("record") SchedulingRecordVO schedulingRecordVO); } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/schedulingModules/mapper/SchedulingRecordMapper.xml
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/schedulingModules/service/impl/SchedulingRecordServiceImpl.java
@@ -20,6 +20,6 @@ @Override public IPage<SchedulingRecordVO> selectPage(IPage<SchedulingRecordVO> page, SchedulingRecordVO schedulingRecordVO) { return baseMapper.selectRecordPage(page,schedulingRecordVO); return page.setRecords(baseMapper.selectRecordPage(page,schedulingRecordVO)); } }