From 2e7ba2bc0fbefa6ee0b44eaf1990a493795efe4a Mon Sep 17 00:00:00 2001
From: lishuai <260038442@qq.com>
Date: 星期二, 26 十二月 2023 16:33:36 +0800
Subject: [PATCH] 导出字段对接调整提交
---
server/dmvisit_admin/src/main/java/com/doumee/api/business/RetentionController.java | 3
server/dmvisit_service/src/main/java/com/doumee/service/business/RetentionService.java | 15 ++++
server/dmvisit_service/src/main/java/com/doumee/dao/system/vo/RetentionVo.java | 45 +++++++++++++++
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java | 86 +++++++++++++++++++++-------
4 files changed, 124 insertions(+), 25 deletions(-)
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/RetentionController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/RetentionController.java
index 227bfc4..6c7f937 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/RetentionController.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/RetentionController.java
@@ -8,6 +8,7 @@
import com.doumee.core.model.PageData;
import com.doumee.dao.admin.request.RetentionQuery;
import com.doumee.dao.business.model.Retention;
+import com.doumee.dao.system.vo.RetentionVo;
import com.doumee.service.business.RetentionService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -79,7 +80,7 @@
@PostMapping("/exportExcel")
//@RequiresPermissions("business:retention:exportExcel")
public void exportExcel (@RequestBody PageWrap<Retention> pageWrap, HttpServletResponse response) {
- ExcelExporter.build(Retention.class).export(retentionService.findPage(pageWrap).getRecords(), "鍦ㄥ巶浜哄憳淇℃伅 琛紙婊炵暀锛�", response);
+ ExcelExporter.build(RetentionVo.class).export(retentionService.findPageExcel(pageWrap), "鍦ㄥ巶浜哄憳淇℃伅 琛紙婊炵暀锛�", response);
}
@ApiOperation("鏍规嵁ID鏌ヨ")
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/system/vo/RetentionVo.java b/server/dmvisit_service/src/main/java/com/doumee/dao/system/vo/RetentionVo.java
new file mode 100644
index 0000000..e70f220
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/system/vo/RetentionVo.java
@@ -0,0 +1,45 @@
+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 RetentionVo {
+
+ @ApiModelProperty(value = "鍏徃缁勭粐")
+ @ExcelColumn(name="鍏徃缁勭粐")
+ @TableField(exist = false)
+ public String companyName;
+
+ @ApiModelProperty(value = "绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴鍛樺伐")
+ @ExcelColumn(name="绫诲瀷")
+ private String typeName;
+
+ @ApiModelProperty(value = "璁垮鍚嶇О")
+ @ExcelColumn(name="璁垮鍚嶇О")
+ private String name;
+
+ @ApiModelProperty(value = "鎵嬫満鍙�")
+ @ExcelColumn(name="鎵嬫満鍙�")
+ private String phone;
+
+ @ApiModelProperty(value = "韬唤璇佸彿锛圡D4鍔犲瘑锛�")
+ @ExcelColumn(name="韬唤璇佸彿")
+ private String idcardNo;
+
+ @ApiModelProperty(value = "娴峰悍闂ㄧ鍚嶇О")
+ @ExcelColumn(name="娴峰悍闂ㄧ鍚嶇О")
+ private String deviceName;
+
+ @ApiModelProperty(value = "杩涘満鏃堕棿")
+ @ExcelColumn(name="杩涘満鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date eventDate;
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/RetentionService.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/RetentionService.java
index 61487de..edd9107 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/RetentionService.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/RetentionService.java
@@ -5,6 +5,7 @@
import com.doumee.dao.admin.request.RetentionQuery;
import com.doumee.dao.business.model.Retention;
import com.doumee.dao.business.model.TrainTime;
+import com.doumee.dao.system.vo.RetentionVo;
import java.util.List;
@@ -98,6 +99,18 @@
*/
long count(Retention retention);
-
+ /**
+ * 鍏宠仈琛ㄥ垎椤垫煡璇�
+ * @param pageWrap
+ * @return
+ */
PageData<Retention> findTrainTimePage(PageWrap<Retention> pageWrap);
+
+ /**
+ * 瀵煎嚭
+ *
+ * @param pageWrap 鍒嗛〉瀵硅薄
+ * @return PageData<RetentionVo>
+ */
+ List<RetentionVo> findPageExcel(PageWrap<Retention> pageWrap);
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java
index ed14417..0120b49 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java
@@ -13,6 +13,7 @@
import com.doumee.dao.business.model.*;
import com.doumee.dao.system.SystemDictDataMapper;
import com.doumee.dao.system.model.SystemDictData;
+import com.doumee.dao.system.vo.RetentionVo;
import com.doumee.service.business.RetentionService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -193,6 +194,55 @@
@Override
public PageData<Retention> findTrainTimePage(PageWrap<Retention> pageWrap) {
+ IPage<Retention> retentionIPage = getDataInfo(pageWrap);
+ if(null != retentionIPage && retentionIPage.getRecords().size() > 0) {
+ List<String> codes = Arrays.asList(Constants.FTP_RESOURCE_PATH,Constants.MEMBER_IMG);
+ List<SystemDictData> list = systemDictDataMapper.list(codes);
+ Map<String,SystemDictData> dataMap = list.stream().collect(Collectors.toMap(SystemDictData::getLabel, Function.identity()));
+ retentionIPage.getRecords().stream().forEach(obj->{
+ obj.setFaceImg(dataMap.get(Constants.FTP_RESOURCE_PATH).getCode()
+ +dataMap.get(Constants.MEMBER_IMG).getCode()
+ +obj.getFaceImg());
+ });
+ }
+ return PageData.from(retentionIPage);
+ }
+
+ /**
+ * 瀵煎嚭
+ *
+ * @param pageWrap 鍒嗛〉瀵硅薄
+ * @return PageData<RetentionVo>
+ */
+ public List<RetentionVo> findPageExcel(PageWrap<Retention> pageWrap) {
+ IPage<Retention> retentionInfo = getDataInfo(pageWrap);
+ List<RetentionVo> retentionVoList = new ArrayList<>();
+ if(null != retentionInfo && retentionInfo.getRecords().size() > 0) {
+ for (Retention obj:retentionInfo.getRecords()) {
+ RetentionVo vo = new RetentionVo();
+ 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.setName(obj.getName());
+ vo.setPhone(obj.getPhone());
+ vo.setIdcardNo(obj.getIdcardNo());
+ vo.setEventDate(obj.getEventDate());
+ retentionVoList.add(vo);
+ }
+ }
+ return retentionVoList;
+ }
+
+ private IPage<Retention> getDataInfo(PageWrap<Retention> pageWrap) {
//鏄惁鏄暟瀛�
boolean number = Validator.isNumber(pageWrap.getModel().getKeyWords());
//鏄惁鍖呭惈涓枃
@@ -205,31 +255,21 @@
Utils.MP.blankToNull(pageWrap.getModel());
queryWrapper.leftJoin(Company.class,Company::getId,Retention::getId);
queryWrapper.selectAll(Retention.class)
- .selectAs(Company::getName,Retention::getCompanyName);
+ .selectAs(Company::getName,Retention::getCompanyName);
queryWrapper.like(number,Retention::getPhone,pageWrap.getModel().getKeyWords())
- .like((b||hasWord),Retention::getName,pageWrap.getModel().getKeyWords())
- .eq(Objects.nonNull(pageWrap.getModel().getType()),
- Retention::getType,
- pageWrap.getModel().getType())
- .like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),
- Company::getName,
- pageWrap.getModel().getCompanyName())
- .ge(Objects.nonNull(pageWrap.getModel().getStartTime()),
- Retention::getEventDate,pageWrap.getModel().getStartTime())
- .le(Objects.nonNull(pageWrap.getModel().getEndTime()),
- Retention::getEventDate,pageWrap.getModel().getStartTime());
+ .like((b||hasWord),Retention::getName,pageWrap.getModel().getKeyWords())
+ .eq(Objects.nonNull(pageWrap.getModel().getType()),
+ Retention::getType,
+ pageWrap.getModel().getType())
+ .like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),
+ Company::getName,
+ pageWrap.getModel().getCompanyName())
+ .ge(Objects.nonNull(pageWrap.getModel().getStartTime()),
+ Retention::getEventDate,pageWrap.getModel().getStartTime())
+ .le(Objects.nonNull(pageWrap.getModel().getEndTime()),
+ Retention::getEventDate,pageWrap.getModel().getStartTime());
queryWrapper.orderByDesc(Retention::getCreateDate);
IPage<Retention> retentionIPage = retentionJoinMapper.selectJoinPage(page, Retention.class, queryWrapper);
- if(null != retentionIPage && retentionIPage.getRecords().size() > 0) {
- List<String> codes = Arrays.asList(Constants.FTP_RESOURCE_PATH,Constants.MEMBER_IMG);
- List<SystemDictData> list = systemDictDataMapper.list(codes);
- Map<String,SystemDictData> dataMap = list.stream().collect(Collectors.toMap(SystemDictData::getLabel, Function.identity()));
- retentionIPage.getRecords().stream().forEach(obj->{
- obj.setFaceImg(dataMap.get(Constants.FTP_RESOURCE_PATH).getCode()
- +dataMap.get(Constants.MEMBER_IMG).getCode()
- +obj.getFaceImg());
- });
- }
- return PageData.from(retentionIPage);
+ return retentionIPage;
}
}
--
Gitblit v1.9.3