From ce4a770744d7a0b4e4ea3b5101556b94e72bdf1c Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 14 十一月 2023 17:49:20 +0800
Subject: [PATCH] 修改打卡
---
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/service/impl/UnionOutdoorLaborDynamicServiceImpl.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/service/impl/UnionOutdoorLaborDynamicServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/service/impl/UnionOutdoorLaborDynamicServiceImpl.java
index 1b0847f..09a25fc 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/service/impl/UnionOutdoorLaborDynamicServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/service/impl/UnionOutdoorLaborDynamicServiceImpl.java
@@ -5,15 +5,11 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.equipment.UnionOutdoorLaborDynamicDto;
-import com.panzhihua.common.model.dtos.grid.PageEasyAppDTO;
import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.grid.ComActEasyPhotoTypeDetailsVO;
-import com.panzhihua.common.model.vos.grid.ComActEasyPhotoVO;
import com.panzhihua.service_equipment.dao.UnionOutdoorLaborDynamicMapper;
import com.panzhihua.service_equipment.model.dos.UnionOutdoorLaborDynamic;
import com.panzhihua.service_equipment.service.UnionOutdoorLaborDynamicService;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@Slf4j
@@ -36,11 +32,14 @@
case 1:
case 2:
case 3:
+ case 4:
unionOutdoorLaborDynamicQueryWrapper.eq("type",unionOutdoorLaborDynamicDto.getType());
break;
}
}
- return R.ok( baseMapper.selectPage(page, unionOutdoorLaborDynamicQueryWrapper));
+ Page pageResult = baseMapper.selectPage(page, unionOutdoorLaborDynamicQueryWrapper);
+ pageResult.setTotal(pageResult.getRecords().size());
+ return R.ok(pageResult);
}
/**
--
Gitblit v1.7.1