1.考核-导出考核列表

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;
+}

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<ExportIndicatorsVO> exportIndicatorsVOS = indicatorsService.exportIndicatorsList(indicatorsDTO);
+
+		ExcelUtil.export(response,"考核积分列表" + DateUtil.time(),"考核积分列表",exportIndicatorsVOS,ExportIndicatorsVO.class);
+	}
+
+
 }

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<IndicatorsEntity> {
 	 * @return
 	 */
 	BeIndicatorsVO selectMyPoints(@Param("params")Map<String, Object> params);
+
+	List<ExportIndicatorsVO> selectExportList(@Param("params") IndicatorsDTO indicatorsDTO);
 }

blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.xml

@@ -93,4 +93,43 @@
         ]]>
     </select>
 
+
+    <select id="selectExportList" resultType="com.logpm.supervise.vo.ExportIndicatorsVO">
+        select si.create_dept createDept,
+        sc.name classifyName,
+        sc.description classifyDesc,
+        si.remark indicatorsRemark,
+        sc.examine_dept_id examineDeptId,
+        sc.examine_dept_name examineDeptName,
+        psc.name parentClassifyName,
+        psc.description parentClassifyDesc,
+        psc.remark parentClassifyRemark,
+        si.assess_dept_name assessDeptName,
+        si.assess_user_name assessUserName,
+        si.point point,
+        si.create_time createTime,
+        si.create_user createUser
+        from sup_indicators si
+        left join sup_classify sc on sc.id = si.classify_id
+        left join sup_classify psc on psc.id = sc.p_id
+        where 1=1
+        and si.is_deleted = 0
+        <if test="param.assessDept != null">
+            and si.assess_dept = #{param.assessDept}
+        </if>
+        <if test="param.parentClassifyId != null">
+            and psc.id = #{param.parentClassifyId}
+        </if>
+        <if test="param.start != null">
+            and si.create_time &gt;= #{param.start}
+        </if>
+        <if test="param.end != null">
+            and si.create_time &lt;= #{param.end}
+        </if>
+        <if test="param.createDept != null">
+            and si.create_dept = #{param.createDept}
+        </if>
+    </select>
+
+
 </mapper>

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<IndicatorsEntity> {
 	R findIndicatorsList(IndicatorsDTO indicatorsDTO);
 
@@ -13,4 +16,7 @@ public interface IIndicatorsService extends BaseService<IndicatorsEntity> {
 	R updateIndicators(IndicatorsDTO indicatorsDTO);
 
     void deleteById(Long id);
+
+	List<ExportIndicatorsVO> exportIndicatorsList(IndicatorsDTO indicatorsDTO);
+
 }

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<IndicatorsMapper, Ind
 
 	private final IDeptClient deptClient;
 
+	private final IUserClient userClient;
+
 	@Override
 	public R findIndicatorsList(IndicatorsDTO indicatorsDTO) {
 
@@ -108,4 +113,34 @@ public class IndicatorsServiceImpl extends BaseServiceImpl<IndicatorsMapper, Ind
 
 	}
 
+	@Override
+	public List<ExportIndicatorsVO> 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<ExportIndicatorsVO> 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<User> userR = userClient.userInfoById(createUser);
+			String userName = userR.getData().getName();
+			exportIndicatorsVO.setCreateUserName(userName);
+		}
+
+		return list;
+	}
+
 }