From 63fa498d66c928e0802010dae9f8f9dab4876b2f Mon Sep 17 00:00:00 2001
From: lishuai <260038442@qq.com>
Date: 星期二, 26 十二月 2023 14:25:18 +0800
Subject: [PATCH] 导出字段显示
---
server/dmvisit_service/src/main/java/com/doumee/dao/system/vo/ProblemLogVo.java | 37 ++++++++++++++++++
server/dmvisit_service/src/main/java/com/doumee/core/utils/Constants.java | 8 +++-
server/dmvisit_service/src/main/java/com/doumee/service/business/ProblemLogService.java | 7 +++
server/dmvisit_admin/src/main/java/com/doumee/api/business/ProblemLogController.java | 3 +
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemLogServiceImpl.java | 41 +++++++++++++++++++-
5 files changed, 91 insertions(+), 5 deletions(-)
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/ProblemLogController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/ProblemLogController.java
index 6cd17a5..190a16e 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/ProblemLogController.java
+++ b/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鏌ヨ")
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/utils/Constants.java b/server/dmvisit_service/src/main/java/com/doumee/core/utils/Constants.java
index 069a63f..a80df90 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/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;
}
-
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/system/vo/ProblemLogVo.java b/server/dmvisit_service/src/main/java/com/doumee/dao/system/vo/ProblemLogVo.java
new file mode 100644
index 0000000..658319f
--- /dev/null
+++ b/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;
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/ProblemLogService.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/ProblemLogService.java
index 7604164..7affdb4 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/ProblemLogService.java
+++ b/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 瀹炰綋瀵硅薄
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemLogServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemLogServiceImpl.java
index 7299819..8bf9f8b 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemLogServiceImpl.java
+++ b/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
--
Gitblit v1.9.3