From 1d6cd0c69a479c25246f6dc7f63f8d2b1321b28c Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Tue, 20 Feb 2024 15:37:46 +0800 Subject: [PATCH] =?UTF-8?q?1.=E8=80=83=E6=A0=B8-=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E8=80=83=E6=A0=B8=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supervise/vo/ExportIndicatorsVO.java | 40 +++++++++++++++++++ .../controller/IndicatorsController.java | 18 +++++++++ .../supervise/mapper/IndicatorsMapper.java | 4 ++ .../supervise/mapper/IndicatorsMapper.xml | 39 ++++++++++++++++++ .../supervise/service/IIndicatorsService.java | 6 +++ .../service/impl/IndicatorsServiceImpl.java | 35 ++++++++++++++++ 6 files changed, 142 insertions(+) create mode 100644 blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/ExportIndicatorsVO.java diff --git a/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/ExportIndicatorsVO.java b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/ExportIndicatorsVO.java new file mode 100644 index 000000000..dfb19b673 --- /dev/null +++ b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/ExportIndicatorsVO.java @@ -0,0 +1,40 @@ +package com.logpm.supervise.vo; + +import com.alibaba.excel.annotation.ExcelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class ExportIndicatorsVO implements Serializable { + + @ExcelProperty(value = "考核指标归属部门") + private String createDeptName; + private Long createDept; + @ExcelProperty(value = "考核范围") + private String examineDeptName; + private Long examineDeptId; + @ExcelProperty(value = "指标分类") + private String parentClassifyName; + @ExcelProperty(value = "指标分类描述") + private String parentClassifyDesc; + @ExcelProperty(value = "指标分类备注") + private String parentClassifyRemark; + @ExcelProperty(value = "指标名称") + private String classifyName; + @ExcelProperty(value = "指标描述") + private String classifyDesc; + @ExcelProperty(value = "考核描述") + private String indicatorsRemark; + @ExcelProperty(value = "积分值") + private String point; + @ExcelProperty(value = "考核时间") + private String createTime; + @ExcelProperty(value = "考评人") + private String createUserName; + private Long createUser; + @ExcelProperty(value = "考核部门") + private String assessDeptName; + @ExcelProperty(value = "考核人") + private String assessUserName; +} diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/controller/IndicatorsController.java b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/controller/IndicatorsController.java index 8f29b9965..8d65bcc98 100644 --- a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/controller/IndicatorsController.java +++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/controller/IndicatorsController.java @@ -3,17 +3,22 @@ package com.logpm.supervise.controller; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.logpm.supervise.dto.IndicatorsDTO; import com.logpm.supervise.service.IIndicatorsService; +import com.logpm.supervise.vo.ExportIndicatorsVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.common.exception.CustomerException; +import org.springblade.core.excel.util.ExcelUtil; import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.DateUtil; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; +import java.util.List; import java.util.Objects; @Slf4j @@ -117,4 +122,17 @@ public class IndicatorsController { } } + @PostMapping("/exportIndicatorsList") + @ApiOperationSupport(order = 5) + @ApiOperation(value = "导出考核", notes = "传入indicatorsDTO") + public void exportIndicatorsList(@RequestBody IndicatorsDTO indicatorsDTO, HttpServletResponse response) { + String method = "##############exportIndicatorsList: "; + log.info(method+"更新指标 参数={}",indicatorsDTO); + + List exportIndicatorsVOS = indicatorsService.exportIndicatorsList(indicatorsDTO); + + ExcelUtil.export(response,"考核积分列表" + DateUtil.time(),"考核积分列表",exportIndicatorsVOS,ExportIndicatorsVO.class); + } + + } diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.java b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.java index c187a1d05..e948d9deb 100644 --- a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.java +++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.java @@ -5,11 +5,13 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.logpm.supervise.dto.IndicatorsDTO; import com.logpm.supervise.entity.IndicatorsEntity; +import com.logpm.supervise.vo.ExportIndicatorsVO; import com.logpm.supervise.vo.IndicatorsVO; import com.logpm.supervise.vo.api.BeIndicatorsVO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; import java.util.Map; @Mapper @@ -42,4 +44,6 @@ public interface IndicatorsMapper extends BaseMapper { * @return */ BeIndicatorsVO selectMyPoints(@Param("params")Map params); + + List selectExportList(@Param("params") IndicatorsDTO indicatorsDTO); } diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.xml b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.xml index ff7b1d49c..a20698343 100644 --- a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.xml +++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.xml @@ -93,4 +93,43 @@ ]]> + + + + diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/IIndicatorsService.java b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/IIndicatorsService.java index 3add7bcf7..f5d05e58b 100644 --- a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/IIndicatorsService.java +++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/IIndicatorsService.java @@ -2,9 +2,12 @@ package com.logpm.supervise.service; import com.logpm.supervise.dto.IndicatorsDTO; import com.logpm.supervise.entity.IndicatorsEntity; +import com.logpm.supervise.vo.ExportIndicatorsVO; import org.springblade.core.mp.base.BaseService; import org.springblade.core.tool.api.R; +import java.util.List; + public interface IIndicatorsService extends BaseService { R findIndicatorsList(IndicatorsDTO indicatorsDTO); @@ -13,4 +16,7 @@ public interface IIndicatorsService extends BaseService { R updateIndicators(IndicatorsDTO indicatorsDTO); void deleteById(Long id); + + List exportIndicatorsList(IndicatorsDTO indicatorsDTO); + } diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/IndicatorsServiceImpl.java b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/IndicatorsServiceImpl.java index 4559d60fa..96a0c125e 100644 --- a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/IndicatorsServiceImpl.java +++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/IndicatorsServiceImpl.java @@ -8,13 +8,16 @@ import com.logpm.supervise.entity.IndicatorsEntity; import com.logpm.supervise.mapper.IndicatorsMapper; import com.logpm.supervise.service.IIndicatorsAnnexService; import com.logpm.supervise.service.IIndicatorsService; +import com.logpm.supervise.vo.ExportIndicatorsVO; import com.logpm.supervise.vo.IndicatorsVO; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.common.utils.CommonUtil; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.tool.api.R; +import org.springblade.system.entity.User; import org.springblade.system.feign.IDeptClient; +import org.springblade.system.feign.IUserClient; import org.springframework.stereotype.Service; import java.util.Date; @@ -30,6 +33,8 @@ public class IndicatorsServiceImpl extends BaseServiceImpl exportIndicatorsList(IndicatorsDTO indicatorsDTO) { + + String startDateStr = indicatorsDTO.getStartDateStr(); + String endDateStr = indicatorsDTO.getEndDateStr(); + String createDeptName = indicatorsDTO.getCreateDeptName(); + + Long createDept = deptClient.findIdByName(createDeptName); + + Date start = CommonUtil.getStartByDateStr(startDateStr); + Date end = CommonUtil.getEndByDateStr(endDateStr); + indicatorsDTO.setStart(start); + indicatorsDTO.setEnd(end); + indicatorsDTO.setCreateDept(createDept); + + List list = baseMapper.selectExportList(indicatorsDTO); + + for (ExportIndicatorsVO exportIndicatorsVO : list) { + Long deptId = exportIndicatorsVO.getCreateDept(); + String deptName = deptClient.findNameById(deptId); + exportIndicatorsVO.setCreateDeptName(deptName); + Long createUser = exportIndicatorsVO.getCreateUser(); + R userR = userClient.userInfoById(createUser); + String userName = userR.getData().getName(); + exportIndicatorsVO.setCreateUserName(userName); + } + + return list; + } + }