Merge branch 'large_screen_display_feature' into dev

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/ActivityLuckyDrawBiz.java

@@ -65,14 +65,14 @@ public class ActivityLuckyDrawBiz extends BaseBiz<ActivityLuckyDrawMapper, Activ
     }
 
     public void exportActivityLuckDrawData(ActivityLuckDrawFindDTO activityLuckDrawFindDTO, ServletOutputStream outputStream) throws IOException {
-        List<ActivityLuckyDraw> activityLuckyDraws = listActivityLuckDraw(activityLuckDrawFindDTO);
+        List<ActivityLuckyDrawListVo> activityLuckyDraws = listActivityLuckDraw(activityLuckDrawFindDTO);
         ExcelUtils excelUtils = new ExcelUtils("报名列表");
         XSSFWorkbook hssfWorkbook = excelUtils.getHssfWorkbook();
         XSSFSheet sheet = excelUtils.getSheet();
 
         Row headerRow = sheet.createRow(0);
         CellStyle headerCellStyle = excelUtils.createHeaderCellStyle();
-        String[] headers = {"姓名","电话","人数","报名时间"};
+        String[] headers = {"姓名","电话","身份","上级姓名","上级电话","人数","报名时间"};
         excelUtils.createHeader(headerRow,0,headers,headerCellStyle);
 
         CellStyle generalCellStyle = excelUtils.createGeneralCellStyle();
@@ -85,23 +85,24 @@ public class ActivityLuckyDrawBiz extends BaseBiz<ActivityLuckyDrawMapper, Activ
 
     }
 
-    private List<String[]> getActivityLuckDrawDataList(List<ActivityLuckyDraw> activityLuckyDraws){
+    private List<String[]> getActivityLuckDrawDataList(List<ActivityLuckyDrawListVo> activityLuckyDraws){
          List<String[]> activityLuckDrawDataList = new ArrayList<>(activityLuckyDraws.size());
-        for (ActivityLuckyDraw activityLuckyDraw : activityLuckyDraws) {
+        for (ActivityLuckyDrawListVo activityLuckyDraw : activityLuckyDraws) {
             String[] activityLuckDrawData = getActivityLuckDrawData(activityLuckyDraw);
             activityLuckDrawDataList.add(activityLuckDrawData);
         }
         return activityLuckDrawDataList;
     }
 
-    private String[] getActivityLuckDrawData(ActivityLuckyDraw activityLuckyDraw){
+    private String[] getActivityLuckDrawData(ActivityLuckyDrawListVo activityLuckyDraw){
         Date crtTime = activityLuckyDraw.getCrtTime();
         String timeStr = DateUtil.format(crtTime, "yyyy-MM-dd HH:mm:ss");
-        return new String[]{activityLuckyDraw.getUserName(),activityLuckyDraw.getPhone(),activityLuckyDraw.getTicketNum()+"",timeStr};
+        return new String[]{activityLuckyDraw.getUserName(),activityLuckyDraw.getPhone(),activityLuckyDraw.getPositionName(),activityLuckyDraw.getParentName(),activityLuckyDraw.getParentPhone(),activityLuckyDraw.getTicketNum()+"",timeStr};
     }
 
-    public List<ActivityLuckyDraw> listActivityLuckDraw(ActivityLuckDrawFindDTO activityLuckDrawFindDTO){
-        List<ActivityLuckyDraw> activityLuckyDraws = mapper.listLuckDrawWithPage(activityLuckDrawFindDTO);
+    public List<ActivityLuckyDrawListVo> listActivityLuckDraw(ActivityLuckDrawFindDTO activityLuckDrawFindDTO){
+        Query query = new Query(activityLuckDrawFindDTO);
+        List<ActivityLuckyDrawListVo> activityLuckyDraws = mapper.getAllByPage(query.getSuper());
         if (CollectionUtils.isEmpty(activityLuckyDraws)){
             return Collections.EMPTY_LIST;
         }

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/rest/admin/ActivityLuckyDrawAdminController.java

@@ -8,10 +8,8 @@ import com.xxfc.platform.activity.dto.ActivityLuckDrawFindDTO;
 import com.xxfc.platform.activity.vo.ActivityLuckyDrawListVo;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
@@ -25,7 +23,7 @@ import java.time.format.DateTimeFormatter;
  * @data 2019/12/3 16:51
  */
 
-@RestController
+@Controller
 @RequestMapping("admin/activityLuckyDraw")
 @RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class ActivityLuckyDrawAdminController {
@@ -38,6 +36,7 @@ public class ActivityLuckyDrawAdminController {
      * @return
      */
     @PostMapping("/page")
+    @ResponseBody
     public ObjectRestResponse<PageDataVO<ActivityLuckyDrawListVo>> listActivtyLuckyDrawWithPage(@RequestBody ActivityLuckDrawFindDTO activityLuckDrawFindDTO) {
         return activityLuckyDrawBiz.getAll(activityLuckDrawFindDTO);
     }