draw list

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/sweet/SweetIntegralActivityDrawController.java

@@ -10,8 +10,7 @@ import com.liquidnet.client.admin.common.utils.poi.ExcelUtil;
 import com.liquidnet.client.admin.zhengzai.sweet.dto.SweetActivityDrawExcelListDao;
 import com.liquidnet.client.admin.zhengzai.sweet.service.ISweetIntegralActivityDrawService;
 import com.liquidnet.service.sweet.dto.SweetActivityDrawListDao;
-import com.liquidnet.service.sweet.dto.param.admin.SweetIntegralActivityDrawListSearchParam;
-import com.liquidnet.service.sweet.entity.SweetIntegralActivityDraw;
+import com.liquidnet.service.sweet.dto.admin.SweetIntegralActivityDrawListSearchParam;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -47,6 +46,7 @@ public class SweetIntegralActivityDrawController extends BaseController {
 
     @Log(title = "积分活动中奖列表数据", businessType = BusinessType.LIST)
     @RequiresPermissions("sweet:integralActivityDraw:list")
+    @ApiOperation(value = "积分活动中奖列表数据")
     @PostMapping("list")
     @ResponseBody
     public TableDataInfo list(SweetIntegralActivityDrawListSearchParam listParam) {

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/sweet/dto/SweetActivityDrawExcelListDao.java

@@ -87,7 +87,7 @@ public class SweetActivityDrawExcelListDao implements Serializable, Cloneable {
         if (source.getReceivingStatus() == 2) {
             this.setReceivingStatusName("已发放");
         } else {
-            this.setReceivingStatusName("未方法");
+            this.setReceivingStatusName("未发放");
         }
         this.setCreatedAt(source.getCreatedAt());
         return this;

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/sweet/service/ISweetIntegralActivityDrawService.java

@@ -2,7 +2,7 @@ package com.liquidnet.client.admin.zhengzai.sweet.service;
 
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.service.sweet.dto.SweetActivityDrawListDao;
-import com.liquidnet.service.sweet.dto.param.admin.SweetIntegralActivityDrawListSearchParam;
+import com.liquidnet.service.sweet.dto.admin.SweetIntegralActivityDrawListSearchParam;
 import com.liquidnet.service.sweet.entity.SweetIntegralActivityDraw;
 import com.baomidou.mybatisplus.extension.service.IService;
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/sweet/service/impl/SweetIntegralActivityDrawServiceImpl.java

 package com.liquidnet.client.admin.zhengzai.sweet.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.client.admin.zhengzai.sweet.service.ISweetIntegralActivityDrawService;
 import com.liquidnet.client.admin.zhengzai.sweet.utils.SweetRedisAdminUtils;
-import com.liquidnet.commons.lang.util.BeanUtil;
 import com.liquidnet.commons.lang.util.DateUtil;
-import com.liquidnet.service.kylin.dao.BannerDetailsListDao;
 import com.liquidnet.service.sweet.dto.SweetActivityDrawListDao;
-import com.liquidnet.service.sweet.dto.param.admin.SweetIntegralActivityDrawListSearchParam;
+import com.liquidnet.service.sweet.dto.admin.SweetIntegralActivityDrawListSearchParam;
 import com.liquidnet.service.sweet.dto.vo.IntegralActivityDrawVo;
 import com.liquidnet.service.sweet.entity.SweetIntegralActivityDraw;
 import com.liquidnet.service.sweet.mapper.SweetIntegralActivityDrawMapper;
@@ -79,7 +76,7 @@ public class SweetIntegralActivityDrawServiceImpl extends ServiceImpl<SweetInteg
         );*/
         try {
             PageHelper.startPage(listParam.getPageNum(), listParam.getPageSize());
-            List<SweetActivityDrawListDao> lists = sweetIntegralActivityDrawMapper.searchLists(BeanUtil.convertBeanToMap(listParam));
+            List<SweetActivityDrawListDao> lists = sweetIntegralActivityDrawMapper.searchLists(listParam);
             return new PageInfo(lists);
         } catch (Exception e) {
             return new PageInfo();

liquidnet-bus-api/liquidnet-service-sweet-api/src/main/java/com/liquidnet/service/sweet/dto/param/admin/SweetIntegralActivityDrawListSearchParam.java → liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/dto/admin/SweetIntegralActivityDrawListSearchParam.java

-package com.liquidnet.service.sweet.dto.param.admin;
+package com.liquidnet.service.sweet.dto.admin;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/mapper/SweetIntegralActivityDrawMapper.java

 package com.liquidnet.service.sweet.mapper;
 
 import com.liquidnet.service.sweet.dto.SweetActivityDrawListDao;
+import com.liquidnet.service.sweet.dto.admin.SweetIntegralActivityDrawListSearchParam;
 import com.liquidnet.service.sweet.entity.SweetIntegralActivityDraw;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -20,5 +20,5 @@ public interface SweetIntegralActivityDrawMapper extends BaseMapper<SweetIntegra
 
     List<SweetActivityDrawListDao> selectExcelList(@Param("integralActivityId") String integralActivityId);
 
-    List<SweetActivityDrawListDao> searchLists(Map<String, Object> convertBeanToMap);
+    List<SweetActivityDrawListDao> searchLists(SweetIntegralActivityDrawListSearchParam listParam);
 }

liquidnet-bus-do/liquidnet-service-sweet-do/src/main/resources/com.liquidnet.service.sweet.mapper/SweetIntegralActivityDrawMapper.xml

@@ -3,12 +3,27 @@
 <mapper namespace="com.liquidnet.service.sweet.mapper.SweetIntegralActivityDrawMapper">
 
     <select id="selectExcelList" resultType="com.liquidnet.service.sweet.dto.SweetActivityDrawListDao">
-        select a.*, CONCAT(a.receiving_province,a.receiving_city,a.receiving_county,a.receiving_address) as receiving_address,
+        select a.*, CONCAT(a.receiving_province,a.receiving_city,a.receiving_county,a.receiving_address) as
+        receiving_address,
         u.mobile
         from sweet_integral_activity_draw as a
         left join sweet_integral_activity_prize as b on b.prize_id = a.prize_id
         left join sweet_integral_activity as c on a.integral_activity_id = c.integral_activity_id
         left join adam_user as u on u.uid = a.user_id
+        <where>
+            <if test="integralActivityId != null  and integralActivityId != ''">
+                and a.integral_activity_id = #{integralActivityId}
+            </if>
+        </where>
+        ORDER BY a.mid DESC
+    </select>
+    <select id="searchLists"
+            parameterType="com.liquidnet.service.sweet.dto.admin.SweetIntegralActivityDrawListSearchParam"
+            resultType="com.liquidnet.service.sweet.dto.SweetActivityDrawListDao">
+        select a.*,
+        u.mobile
+        from sweet_integral_activity_draw as a
+        left join adam_user as u on u.uid = a.user_id
         <where>
             <if test="mobile != null  and mobile != ''">
                 and u.mobile = #{mobile}
@@ -37,16 +52,4 @@
         </where>
         ORDER BY a.mid DESC
     </select>
-    <select id="searchLists" resultType="com.liquidnet.service.sweet.dto.SweetActivityDrawListDao">
-        select a.*,
-        u.mobile
-        from sweet_integral_activity_draw as a
-        left join adam_user as u on u.uid = a.user_id
-        <where>
-            <if test="integralActivityId != null  and integralActivityId != ''">
-                and a.integral_activity_id = #{integralActivityId}
-            </if>
-        </where>
-        ORDER BY a.mid DESC
-    </select>
 </mapper>