lishuai
2023-12-26 63fa498d66c928e0802010dae9f8f9dab4876b2f
导出字段显示
已添加1个文件
已修改4个文件
96 ■■■■■ 文件已修改
server/dmvisit_admin/src/main/java/com/doumee/api/business/ProblemLogController.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/dmvisit_service/src/main/java/com/doumee/core/utils/Constants.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/dmvisit_service/src/main/java/com/doumee/dao/system/vo/ProblemLogVo.java 37 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/dmvisit_service/src/main/java/com/doumee/service/business/ProblemLogService.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemLogServiceImpl.java 41 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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