server/dmvisit_admin/src/main/java/com/doumee/api/business/ProblemLogController.java
@@ -7,6 +7,7 @@ import com.doumee.core.model.PageWrap; import com.doumee.core.model.PageData; import com.doumee.dao.business.model.ProblemLog; import com.doumee.dao.system.vo.ProblemLogVo; import com.doumee.service.business.ProblemLogService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -78,7 +79,7 @@ @PostMapping("/exportExcel") // @RequiresPermissions("business:problemlog:exportExcel") public void exportExcel (@RequestBody PageWrap<ProblemLog> pageWrap, HttpServletResponse response) { ExcelExporter.build(ProblemLog.class).export(problemLogService.findPage(pageWrap).getRecords(), "访客çé¢è®°å½è¡¨", response); ExcelExporter.build(ProblemLogVo.class).export(problemLogService.findPageExcel(pageWrap), "访客çé¢è®°å½è¡¨", response); } @ApiOperation("æ ¹æ®IDæ¥è¯¢") server/dmvisit_service/src/main/java/com/doumee/core/utils/Constants.java
@@ -299,7 +299,12 @@ /** ç¨æ·å¯ç¨ç¦ç¨æä¸¾å¼*/ ENABLE(0,"æ£å¸¸"), DISABLE(1,"ç¦ç¨"), FREEZE(2,"æé»/å»ç»"); FREEZE(2,"æé»/å»ç»"), /** ç¨æ·ç±»å **/ LW_FK(0,"å³å¡è®¿å®¢"), PT_FK(1,"æ®é访客"), NB_FK(2,"å é¨äººå"); private Integer value; private String des; @@ -348,6 +353,5 @@ T reqJson = mapper.readValue(json, clazz); return reqJson; } } server/dmvisit_service/src/main/java/com/doumee/dao/system/vo/ProblemLogVo.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,37 @@ package com.doumee.dao.system.vo; import com.baomidou.mybatisplus.annotation.TableField; import com.doumee.core.annotation.excel.ExcelColumn; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; @Data @ApiModel("çé¢è®°å½å¯¼åºè§å¾") public class ProblemLogVo { @ApiModelProperty(value = "çé¢äººå§å") @ExcelColumn(name="çé¢äººå§å") private String name; @ApiModelProperty(value = "çé¢äººææºå") @ExcelColumn(name="çé¢äººææºå") private String phone; @ApiModelProperty(value = "ç»ç»åç§°") @ExcelColumn(name="ç»ç»åç§°") private String companyName; @ApiModelProperty(value = "ç±»å 0å³å¡è®¿å®¢ 1æ®é访客 2å é¨äººå") @ExcelColumn(name="ç±»å") @TableField(exist = false) private String typeName; @ApiModelProperty(value = "å建æ¶é´") @ExcelColumn(name="å建æ¶é´") @JsonFormat(pattern = "yyyy-MM-dd") private Date createDate; } server/dmvisit_service/src/main/java/com/doumee/service/business/ProblemLogService.java
@@ -3,6 +3,7 @@ import com.doumee.core.model.PageData; import com.doumee.core.model.PageWrap; import com.doumee.dao.business.model.ProblemLog; import com.doumee.dao.system.vo.ProblemLogVo; import com.doumee.dao.web.reqeust.FinishAnswerDTO; import java.util.List; @@ -90,6 +91,12 @@ PageData<ProblemLog> findPage(PageWrap<ProblemLog> pageWrap); /** * å¯¼åº * @param pageWrap å页对象 */ List<ProblemLogVo> findPageExcel(PageWrap<ProblemLog> pageWrap); /** * æ¡ä»¶ç»è®¡ * * @param problemLog å®ä½å¯¹è±¡ server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemLogServiceImpl.java
@@ -16,6 +16,7 @@ import com.doumee.dao.business.model.Member; import com.doumee.dao.business.model.ProblemLog; import com.doumee.dao.business.model.Retention; import com.doumee.dao.system.vo.ProblemLogVo; import com.doumee.dao.web.reqeust.FinishAnswerDTO; import com.doumee.service.business.ProblemLogService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -29,6 +30,7 @@ import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Objects; @@ -112,6 +114,11 @@ @Override public PageData<ProblemLog> findPage(PageWrap<ProblemLog> pageWrap) { IPage<ProblemLog> problemLogIPage = dataInfo(pageWrap); return PageData.from(problemLogIPage); } private IPage<ProblemLog> dataInfo(PageWrap<ProblemLog> pageWrap) { IPage<ProblemLog> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity()); MPJLambdaWrapper<ProblemLog> queryWrapper = new MPJLambdaWrapper<>(); Utils.MP.blankToNull(pageWrap.getModel()); @@ -123,8 +130,38 @@ .eq(Objects.nonNull(pageWrap.getModel().getType()), Member::getType, pageWrap.getModel().getType()); queryWrapper.orderByDesc(ProblemLog::getCreateDate); IPage<ProblemLog> problemLogIPage = problemLogJoinMapper.selectJoinPage(page, ProblemLog.class, queryWrapper); System.out.println(problemLogIPage); return PageData.from(problemLogJoinMapper.selectJoinPage(page, ProblemLog.class, queryWrapper)); return problemLogIPage; } /** * å¯¼åº * @param pageWrap å页对象 */ public List<ProblemLogVo> findPageExcel(PageWrap<ProblemLog> pageWrap) { IPage<ProblemLog> problemLogIPage = dataInfo(pageWrap); List<ProblemLogVo> voList = new ArrayList<>(); if(null != problemLogIPage && problemLogIPage.getRecords().size() > 0) { for (ProblemLog obj:problemLogIPage.getRecords()) { ProblemLogVo vo = new ProblemLogVo(); vo.setName(obj.getName()); vo.setPhone(obj.getPhone()); vo.setCompanyName(obj.getCompanyName()); if(null != obj.getType()) { if(Constants.ZERO == obj.getType()){ vo.setTypeName(Constants.Status.LW_FK.getDes()); }else if(Constants.ONE == obj.getType()) { vo.setTypeName(Constants.Status.PT_FK.getDes()); }else { vo.setTypeName(Constants.Status.NB_FK.getDes()); } }else { vo.setTypeName(""); } vo.setCreateDate(obj.getCreateDate()); voList.add(vo); } } return voList; } @Override