Skip to content

H
haoban-manage3.0
Commit 30cd2f3d by 徐高华
Options

朋友圈bug

parent 5e97b6d6
Showing with 12 additions and 32 deletions
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/moment/MomentClerkExcelHandler.java
package com.gic.haoban.manage.web.controller.moment; package com.gic.haoban.manage.web.controller.moment;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.gic.api.base.commons.BasePageInfo;
import com.gic.api.base.commons.Page; import com.gic.api.base.commons.Page;
import com.gic.api.base.commons.ServiceResponse; import com.gic.api.base.commons.ServiceResponse;
import com.gic.commons.util.DateUtil; import com.gic.commons.util.DateUtil;
import com.gic.commons.util.EntityUtil; import com.gic.commons.util.EntityUtil;
import com.gic.enterprise.api.dto.EnterpriseDTO;
import com.gic.enterprise.api.dto.StoreDTO; import com.gic.enterprise.api.dto.StoreDTO;
import com.gic.enterprise.api.service.StoreService; import com.gic.enterprise.api.service.StoreService;
import com.gic.haoban.manage.api.dto.moment.QwMomentPlanAttendDTO; import com.gic.haoban.manage.api.dto.moment.QwMomentPlanAttendDTO;
import com.gic.haoban.manage.api.dto.moment.QwMomentPlanDTO; import com.gic.haoban.manage.api.dto.moment.QwMomentPlanDTO;
import com.gic.haoban.manage.api.qdto.moment.PlanClerkListQDTO; import com.gic.haoban.manage.api.qdto.moment.PlanClerkListQDTO;
import com.gic.haoban.manage.api.qdto.moment.PlanDataListQDTO;
import com.gic.haoban.manage.api.qdto.moment.QwMomentPlanQDTO;
import com.gic.haoban.manage.api.service.moment.QwMomentApiService; import com.gic.haoban.manage.api.service.moment.QwMomentApiService;
import com.gic.haoban.manage.web.vo.moment.MomentClerkExcelVO; import com.gic.haoban.manage.web.vo.moment.MomentClerkExcelVO;
import com.gic.haoban.manage.web.vo.moment.MomentPlanExcelVO;
import com.gic.web.common.download.DownloadHandlerAbstract; import com.gic.web.common.download.DownloadHandlerAbstract;
import com.gic.web.common.download.context.Context; import com.gic.web.common.download.context.Context;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
...@@ -37,9 +32,8 @@ public class MomentClerkExcelHandler extends DownloadHandlerAbstract<MomentClerk ...@@ -37,9 +32,8 @@ public class MomentClerkExcelHandler extends DownloadHandlerAbstract<MomentClerk
@Override @Override
public List<MomentClerkExcelVO> getData(Context context, String json, Integer currentPage) { public List<MomentClerkExcelVO> getData(Context context, String json, Integer currentPage) {
PlanClerkListQDTO qdto = JSON.parseObject(json, PlanClerkListQDTO.class); PlanClerkListQDTO qdto = JSON.parseObject(json, PlanClerkListQDTO.class);
BasePageInfo pageInfo = new BasePageInfo() ; qdto.setPageSize(this.getPageSize());
pageInfo.setPageSize(this.getPageSize()); qdto.setPageNum(currentPage);
pageInfo.setPageNum(currentPage);
ServiceResponse<QwMomentPlanDTO> detaiResp = this.qwMomentApiService.detail(qdto.getPlanId()) ; ServiceResponse<QwMomentPlanDTO> detaiResp = this.qwMomentApiService.detail(qdto.getPlanId()) ;
boolean isEnd = detaiResp.getResult().getStatusFlag()==2 || detaiResp.getResult().getEndDate().getTime()<System.currentTimeMillis() ; boolean isEnd = detaiResp.getResult().getStatusFlag()==2 || detaiResp.getResult().getEndDate().getTime()<System.currentTimeMillis() ;
ServiceResponse<Page<QwMomentPlanAttendDTO>> pageResp = this.qwMomentApiService.attendList(qdto); ServiceResponse<Page<QwMomentPlanAttendDTO>> pageResp = this.qwMomentApiService.attendList(qdto);
......
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/moment/MomentDataExcelHandler.java
package com.gic.haoban.manage.web.controller.moment; package com.gic.haoban.manage.web.controller.moment;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.gic.api.base.commons.BasePageInfo;
import com.gic.api.base.commons.Page; import com.gic.api.base.commons.Page;
import com.gic.api.base.commons.ServiceResponse; import com.gic.api.base.commons.ServiceResponse;
import com.gic.commons.util.DateUtil; import com.gic.commons.util.DateUtil;
import com.gic.commons.util.EntityUtil; import com.gic.commons.util.EntityUtil;
import com.gic.enterprise.api.dto.EnterpriseDTO;
import com.gic.enterprise.api.dto.StoreDTO; import com.gic.enterprise.api.dto.StoreDTO;
import com.gic.enterprise.api.service.StoreService; import com.gic.enterprise.api.service.StoreService;
import com.gic.haoban.manage.api.dto.moment.QwMomentPlanDTO;
import com.gic.haoban.manage.api.dto.moment.QwMomentPlanDataDTO; import com.gic.haoban.manage.api.dto.moment.QwMomentPlanDataDTO;
import com.gic.haoban.manage.api.qdto.moment.PlanDataListQDTO; import com.gic.haoban.manage.api.qdto.moment.PlanDataListQDTO;
import com.gic.haoban.manage.api.qdto.moment.QwMomentPlanQDTO;
import com.gic.haoban.manage.api.service.moment.QwMomentApiService; import com.gic.haoban.manage.api.service.moment.QwMomentApiService;
import com.gic.haoban.manage.web.vo.moment.MomentDataExcelVO; import com.gic.haoban.manage.web.vo.moment.MomentDataExcelVO;
import com.gic.haoban.manage.web.vo.moment.MomentPlanExcelVO;
import com.gic.haoban.manage.web.vo.moment.QwMomentPlanDataVO;
import com.gic.member.api.dto.es.MemberDataDTO; import com.gic.member.api.dto.es.MemberDataDTO;
import com.gic.web.common.download.DownloadHandlerAbstract; import com.gic.web.common.download.DownloadHandlerAbstract;
import com.gic.web.common.download.context.Context; import com.gic.web.common.download.context.Context;
...@@ -43,9 +37,8 @@ public class MomentDataExcelHandler extends DownloadHandlerAbstract<MomentDataEx ...@@ -43,9 +37,8 @@ public class MomentDataExcelHandler extends DownloadHandlerAbstract<MomentDataEx
@Override @Override
public List<MomentDataExcelVO> getData(Context context, String json, Integer currentPage) { public List<MomentDataExcelVO> getData(Context context, String json, Integer currentPage) {
PlanDataListQDTO qdto = JSON.parseObject(json, PlanDataListQDTO.class); PlanDataListQDTO qdto = JSON.parseObject(json, PlanDataListQDTO.class);
BasePageInfo pageInfo = new BasePageInfo() ; qdto.setPageSize(this.getPageSize());
pageInfo.setPageSize(this.getPageSize()); qdto.setPageNum(currentPage);
pageInfo.setPageNum(currentPage);
ServiceResponse<Page<QwMomentPlanDataDTO>> pageResp = this.qwMomentApiService.dataList(qdto); ServiceResponse<Page<QwMomentPlanDataDTO>> pageResp = this.qwMomentApiService.dataList(qdto);
List<MomentDataExcelVO> voList = new ArrayList<>(); List<MomentDataExcelVO> voList = new ArrayList<>();
if (null != pageResp && CollectionUtils.isNotEmpty(pageResp.getResult().getResult())) { if (null != pageResp && CollectionUtils.isNotEmpty(pageResp.getResult().getResult())) {
......
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/moment/MomentPlanExcelHandler.java
package com.gic.haoban.manage.web.controller.moment; package com.gic.haoban.manage.web.controller.moment;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.gic.api.base.commons.BasePageInfo;
import com.gic.api.base.commons.Page; import com.gic.api.base.commons.Page;
import com.gic.api.base.commons.ServiceResponse; import com.gic.api.base.commons.ServiceResponse;
import com.gic.commons.util.EntityUtil; import com.gic.commons.util.EntityUtil;
import com.gic.enterprise.api.dto.EnterpriseDTO;
import com.gic.haoban.manage.api.dto.moment.QwMomentPlanDTO; import com.gic.haoban.manage.api.dto.moment.QwMomentPlanDTO;
import com.gic.haoban.manage.api.qdto.moment.QwMomentPlanQDTO; import com.gic.haoban.manage.api.qdto.moment.QwMomentPlanQDTO;
import com.gic.haoban.manage.api.service.moment.QwMomentApiService; import com.gic.haoban.manage.api.service.moment.QwMomentApiService;
...@@ -30,9 +28,8 @@ public class MomentPlanExcelHandler extends DownloadHandlerAbstract<MomentPlanE ...@@ -30,9 +28,8 @@ public class MomentPlanExcelHandler extends DownloadHandlerAbstract<MomentPlanE
@Override @Override
public List<MomentPlanExcelVO> getData(Context context, String json, Integer currentPage) { public List<MomentPlanExcelVO> getData(Context context, String json, Integer currentPage) {
QwMomentPlanQDTO qdto = JSON.parseObject(json, QwMomentPlanQDTO.class); QwMomentPlanQDTO qdto = JSON.parseObject(json, QwMomentPlanQDTO.class);
BasePageInfo pageInfo = new BasePageInfo() ; qdto.setPageSize(this.getPageSize());
pageInfo.setPageSize(this.getPageSize()); qdto.setPageNum(currentPage);
pageInfo.setPageNum(currentPage);
ServiceResponse<Page<QwMomentPlanDTO>> pageResp = this.qwMomentApiService.planList(qdto); ServiceResponse<Page<QwMomentPlanDTO>> pageResp = this.qwMomentApiService.planList(qdto);
List<MomentPlanExcelVO> voList = new ArrayList<>(); List<MomentPlanExcelVO> voList = new ArrayList<>();
if (null != pageResp && CollectionUtils.isNotEmpty(pageResp.getResult().getResult())) { if (null != pageResp && CollectionUtils.isNotEmpty(pageResp.getResult().getResult())) {
......
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/moment/QwMomentController.java
...@@ -4,7 +4,6 @@ import cn.hutool.core.date.DatePattern; ...@@ -4,7 +4,6 @@ import cn.hutool.core.date.DatePattern;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.gic.api.base.commons.BasePageInfo;
import com.gic.api.base.commons.JSONResponse; import com.gic.api.base.commons.JSONResponse;
import com.gic.api.base.commons.Page; import com.gic.api.base.commons.Page;
import com.gic.api.base.commons.ServiceResponse; import com.gic.api.base.commons.ServiceResponse;
...@@ -441,9 +440,8 @@ public class QwMomentController { ...@@ -441,9 +440,8 @@ public class QwMomentController {
WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser(); WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
qdto.setWxEnterpriseId(loginUser.getWxEnterpriseId()); qdto.setWxEnterpriseId(loginUser.getWxEnterpriseId());
qdto.setEnterpriseId(loginUser.getEnterpriseId()); qdto.setEnterpriseId(loginUser.getEnterpriseId());
BasePageInfo basePageInfo = new BasePageInfo(); qdto.setPageNum(1);
basePageInfo.setPageNum(1); qdto.setPageSize(1);
basePageInfo.setPageSize(1);
ServiceResponse<Page<QwMomentPlanDataDTO>> pageResp = this.qwMomentApiService.dataList(qdto); ServiceResponse<Page<QwMomentPlanDataDTO>> pageResp = this.qwMomentApiService.dataList(qdto);
final int totalCount = pageResp.getResult().getTotalCount(); final int totalCount = pageResp.getResult().getTotalCount();
if (totalCount == 0) { if (totalCount == 0) {
...@@ -498,9 +496,8 @@ public class QwMomentController { ...@@ -498,9 +496,8 @@ public class QwMomentController {
WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser(); WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
qdto.setWxEnterpriseId(loginUser.getWxEnterpriseId()); qdto.setWxEnterpriseId(loginUser.getWxEnterpriseId());
qdto.setEnterpriseId(loginUser.getEnterpriseId()); qdto.setEnterpriseId(loginUser.getEnterpriseId());
BasePageInfo basePageInfo = new BasePageInfo(); qdto.setPageNum(1);
basePageInfo.setPageNum(1); qdto.setPageSize(1);
basePageInfo.setPageSize(1);
ServiceResponse<Page<QwMomentPlanDTO>> pageResp = this.qwMomentApiService.planList(qdto); ServiceResponse<Page<QwMomentPlanDTO>> pageResp = this.qwMomentApiService.planList(qdto);
final int totalCount = pageResp.getResult().getTotalCount(); final int totalCount = pageResp.getResult().getTotalCount();
if (totalCount == 0) { if (totalCount == 0) {
...@@ -553,9 +550,8 @@ public class QwMomentController { ...@@ -553,9 +550,8 @@ public class QwMomentController {
WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser(); WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
qdto.setWxEnterpriseId(loginUser.getWxEnterpriseId()); qdto.setWxEnterpriseId(loginUser.getWxEnterpriseId());
qdto.setEnterpriseId(loginUser.getEnterpriseId()); qdto.setEnterpriseId(loginUser.getEnterpriseId());
BasePageInfo basePageInfo = new BasePageInfo(); qdto.setPageNum(1);
basePageInfo.setPageNum(1); qdto.setPageSize(1);
basePageInfo.setPageSize(1);
ServiceResponse<Page<QwMomentPlanAttendDTO>> pageResp = this.qwMomentApiService.attendList(qdto); ServiceResponse<Page<QwMomentPlanAttendDTO>> pageResp = this.qwMomentApiService.attendList(qdto);
final int totalCount = pageResp.getResult().getTotalCount(); final int totalCount = pageResp.getResult().getTotalCount();
if (totalCount == 0) { if (totalCount == 0) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment