修改代码

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IKylinAcitveService.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.service.kylin.dao.KylinAcitve;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务类
@@ -16,6 +18,6 @@ public interface IKylinAcitveService extends IService<KylinAcitve> {
 
     boolean addKylinAcitve(KylinAcitve kylinAcitve);
 
-    PageInfo<KylinAcitve> pageKylinAcitve(int pageSize, int pageNumber);
+    List<KylinAcitve> pageKylinAcitve(int pageSize, int pageNumber);
 
 }

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IKylinTicketActiveService.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.service.kylin.dao.KylinTicketActive;
 
+import java.util.List;
+
 /**
  * <p>
  * 跟活动绑定的券 服务类
@@ -13,7 +15,7 @@ import com.liquidnet.service.kylin.dao.KylinTicketActive;
  * @since 2022-07-12
  */
 public interface IKylinTicketActiveService extends IService<KylinTicketActive> {
-     PageInfo<KylinTicketActive> pageKylinAcitve(int pageSize, int pageNumber,String activeId);
+     List<KylinTicketActive> pageKylinAcitve(int pageSize, int pageNumber, String activeId);
 
 
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinAcitveController.java

 package com.liquidnet.client.admin.web.controller.zhengzai.kylin;
 
 
+import com.liquidnet.client.admin.common.core.controller.BaseController;
 import com.liquidnet.client.admin.common.core.domain.AjaxResult;
+import com.liquidnet.client.admin.common.core.page.TableDataInfo;
+import com.liquidnet.client.admin.common.utils.poi.ExcelUtil;
+import com.liquidnet.client.admin.zhengzai.kylin.dto.ActiveTicketExportVo;
 import com.liquidnet.client.admin.zhengzai.kylin.service.impl.KylinAcitveServiceImpl;
 import com.liquidnet.client.admin.zhengzai.kylin.service.impl.KylinTicketActiveServiceImpl;
 import com.liquidnet.service.kylin.dao.KylinAcitve;
@@ -12,6 +16,8 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * <p>
  *  前端控制器 活动有关的
@@ -22,7 +28,7 @@ import org.springframework.web.bind.annotation.*;
 @Api(tags = "活动和券的接口")
 @RestController
 @RequestMapping("/kylin-acitve")
-public class KylinAcitveController {
+public class KylinAcitveController extends BaseController {
     @Autowired
     private KylinAcitveServiceImpl kylinAcitveService;
     @Autowired
@@ -40,15 +46,29 @@ public class KylinAcitveController {
     @PostMapping("pageActive")
     @ApiOperation(value = "分页活动")
     @ResponseBody
-    public AjaxResult pageActive( @RequestParam(name = "pageSize", required = true) int pageSize,@RequestParam(name = "pageNum", required = true)int pageNum) {
-        return AjaxResult.success(kylinAcitveService.pageKylinAcitve(pageSize,pageNum));
+    public TableDataInfo pageActive( @RequestParam(name = "pageSize", required = true) int pageSize,@RequestParam(name = "pageNum", required = true)int pageNum) {
+        //return AjaxResult.success(kylinAcitveService.pageKylinAcitve(pageSize,pageNum));
+        return getDataTable( kylinAcitveService.pageKylinAcitve(pageSize,pageNum));
     }
     @PostMapping("pageActiveTicket")
     @ApiOperation(value = "分页券")
     @ResponseBody
-    public AjaxResult pageActiveTicket( @RequestParam(name = "pageSize", required = true) int pageSize,@RequestParam(name = "pageNum", required = true)int pageNum,@RequestParam(name = "activeId", required = true)String activeId) {
-        return AjaxResult.success(kylinTicketActiveService.pageKylinAcitve(pageSize,pageNum,activeId));
+    public TableDataInfo pageActiveTicket(@RequestParam(name = "pageSize", required = true) int pageSize, @RequestParam(name = "pageNum", required = true)int pageNum, @RequestParam(name = "activeId", required = true)String activeId) {
+        //return AjaxResult.success(kylinTicketActiveService.pageKylinAcitve(pageSize,pageNum,activeId));
+        return getDataTable( kylinTicketActiveService.pageKylinAcitve(pageSize,pageNum,activeId));
+    }
+    @PostMapping("exportTicket")
+    @ApiOperation(value = "导出券")
+    @ResponseBody
+    public AjaxResult exportTicket( @RequestParam(name = "activeId", required = true)String activeId,@RequestParam(name = "activeName", required = true)String activeName) {
+        List<ActiveTicketExportVo> list= kylinTicketActiveService.exportTicket(activeId);
+        if(list.size()>0){
+            ExcelUtil<ActiveTicketExportVo> util = new ExcelUtil(ActiveTicketExportVo.class);
+            return util.exportExcel(list, activeName + "");
         }
+        return error("查无信息！");
+    }
+
 
 
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinAcitveServiceImpl.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
 import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.service.kylin.dao.KylinAcitve;
 import com.liquidnet.service.kylin.dao.KylinTicketActive;
@@ -41,6 +40,8 @@ public class KylinAcitveServiceImpl extends ServiceImpl<KylinAcitveMapper, Kylin
     @Transactional
     public boolean addKylinAcitve(KylinAcitve kylinAcitve) {
         kylinAcitve.setActiveId(IDGenerator.nextSnowId());
+        kylinAcitve.setCreatedAt(LocalDateTime.now());
+        kylinAcitve.setUpdatedAt(LocalDateTime.now());
         //保存活动
         kylinAcitveMapper.insert(kylinAcitve);
         //创建券
@@ -49,17 +50,11 @@ public class KylinAcitveServiceImpl extends ServiceImpl<KylinAcitveMapper, Kylin
     }
 
     @Override
-    public PageInfo<KylinAcitve> pageKylinAcitve(int pageSize, int pageNumber) {
-        PageInfo<KylinAcitve> pageInfoTmp = null;
-        try {
+    public List<KylinAcitve>  pageKylinAcitve(int pageSize, int pageNumber) {
             PageHelper.startPage(pageNumber, pageSize);
             LambdaQueryWrapper<KylinAcitve> queryWrapper = Wrappers.lambdaQuery(KylinAcitve.class);
             List<KylinAcitve> list=kylinAcitveMapper.selectList(queryWrapper);
-            pageInfoTmp = new PageInfo(list);
-        } catch (Exception e) {
-            return new PageInfo();
-        }
-        return pageInfoTmp;
+            return list;
     }
 
     public List<KylinTicketActive> getKylinTicketActive(int number,String activeId){

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinTicketActiveServiceImpl.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
 import com.liquidnet.client.admin.zhengzai.kylin.dto.ActiveTicketExportVo;
 import com.liquidnet.service.kylin.dao.KylinTicketActive;
 import com.liquidnet.service.kylin.mapper.KylinTicketActiveMapper;
@@ -28,18 +27,12 @@ public class KylinTicketActiveServiceImpl extends ServiceImpl<KylinTicketActiveM
     @Autowired
     private KylinTicketActiveMapper kylinTicketActiveMapper;
     @Override
-    public PageInfo<KylinTicketActive> pageKylinAcitve(int pageSize, int pageNumber, String activeId) {
-        PageInfo<KylinTicketActive> pageInfoTmp = null;
-        try {
+    public List<KylinTicketActive> pageKylinAcitve(int pageSize, int pageNumber, String activeId) {
             PageHelper.startPage(pageNumber, pageSize);
             LambdaQueryWrapper<KylinTicketActive> queryWrapper = Wrappers.lambdaQuery(KylinTicketActive.class);
             queryWrapper.eq(KylinTicketActive::getActivityId,activeId);
             List<KylinTicketActive> list=kylinTicketActiveMapper.selectList(queryWrapper);
-            pageInfoTmp = new PageInfo(list);
-        } catch (Exception e) {
-            return new PageInfo();
-        }
-        return pageInfoTmp;
+            return list;
     }
 
     public List<ActiveTicketExportVo> exportTicket(String activeId) {