活动物料模块

sailun-allsteel-bus-provider/sailun-allsteel-bus-service/src/main/java/io/platform/activity/biz/mapper/ActivityMaterialMapper.java

@@ -1,8 +1,12 @@
 package io.platform.activity.biz.mapper;
 
+import io.platform.activity.dto.ActivityMaterialDto;
 import io.platform.base.common.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import io.platform.activity.biz.entity.ActivityMaterial;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 
 /**
@@ -11,4 +15,7 @@ import io.platform.activity.biz.entity.ActivityMaterial;
 @Mapper
 public interface ActivityMaterialMapper extends BaseMapper<ActivityMaterial>{
 
+    List<ActivityMaterialDto> selectActivityList(@Param("activityMaterialDto") ActivityMaterialDto activityMaterialDto);
+
+    Long selectActivityCount(@Param("activityMaterialDto")ActivityMaterialDto activityMaterialDto);
 }

sailun-allsteel-bus-provider/sailun-allsteel-bus-service/src/main/java/io/platform/activity/biz/service/ActivityMaterialService.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import io.platform.activity.biz.mapper.ActivityMaterialMapper;
 import io.platform.activity.biz.entity.ActivityMaterial;
 
+import io.platform.activity.dto.ActivityMaterialDto;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -18,4 +19,22 @@ public class ActivityMaterialService extends ServiceImpl<ActivityMaterialMapper,
         return baseMapper.selectByMap(map);
     }
 
+
+    /**
+     * 查询活动物料列表
+     * @param activityMaterialDto
+     * @return
+     */
+    public List<ActivityMaterialDto> selectActivityList(ActivityMaterialDto activityMaterialDto) {
+        return this.baseMapper.selectActivityList(activityMaterialDto);
+    }
+
+    /**
+     * 查询活动物料条数
+     * @param activityMaterialDto
+     * @return
+     */
+    public Long selectActivityCount(ActivityMaterialDto activityMaterialDto) {
+        return this.baseMapper.selectActivityCount(activityMaterialDto);
+    }
 }

sailun-allsteel-bus-provider/sailun-allsteel-bus-service/src/main/java/io/platform/activity/service/client/impl/ActivityMaterialServiceClientImpl.java

@@ -5,6 +5,7 @@ import com.alibaba.dubbo.config.annotation.Service;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
+import com.github.pagehelper.PageHelper;
 import io.platform.base.common.BaseServiceClient;
 import io.platform.base.common.utils.ExecuteResult;
 
@@ -131,14 +132,18 @@ public class ActivityMaterialServiceClientImpl extends BaseServiceClient<Activit
         page.setDesc(pageDto.descs());
         page.condition().putAll(pageDto.condition());*/
 
+        PageHelper.startPage((int)pageDto.getCurrent(),(int)pageDto.getSize());
+
         ActivityMaterial activityMaterial = new ActivityMaterial();
         revert(activityMaterialDto,activityMaterial);
 
         QueryWrapper<ActivityMaterial> wrapper = new QueryWrapper<>();
         wrapper.setEntity(activityMaterial);
 
-        List<ActivityMaterialDto> activityMaterialDtoList = convertList(activityMaterialService.page(page,wrapper).getRecords(),ActivityMaterialDto.class);
-        pageDto.setTotal(activityMaterialService.count(wrapper));
+        //List<ActivityMaterialDto> activityMaterialDtoList = convertList(activityMaterialService.page(page,wrapper).getRecords(),ActivityMaterialDto.class);
+        //pageDto.setTotal(activityMaterialService.count(wrapper));
+        List<ActivityMaterialDto> activityMaterialDtoList = this.activityMaterialService.selectActivityList(activityMaterialDto);
+        pageDto.setTotal(this.activityMaterialService.selectActivityCount(activityMaterialDto));
         pageDto.setRecords(activityMaterialDtoList);
         return pageDto;
     }

sailun-allsteel-bus-provider/sailun-allsteel-bus-service/src/main/resources/mybatis/activity/ActivityMaterialMapper.xml

@@ -5,4 +5,7 @@
 
 
 
+
+
+
 </mapper>