Browse Source

人员评分导出开发

anderx 1 year ago
parent
commit
4cc63b7b29

+ 3 - 3
src/main/java/com/goafanti/common/mapper/TaskScoreMapper.xml

@@ -205,11 +205,11 @@
             <if test="roleId != null">
                 and r.id =#{roleId}
             </if>
-            <if test="positionId != null">
-                and a.position =#{positionId}
+            <if test="position != null">
+                and a.position =#{position}
             </if>
             <if test="status != null">
-                and a.status =#{status}
+                and a.status = #{status}
             </if>
         </where>
     </sql>

+ 10 - 0
src/main/java/com/goafanti/order/bo/TaskScore/InputTaskScore.java

@@ -18,6 +18,8 @@ public class InputTaskScore {
      * 职位编号
      */
     private String position;
+
+    private Integer status;
     /**
      * 页数
      */
@@ -27,6 +29,14 @@ public class InputTaskScore {
      */
     private Integer pageSize;
 
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
     public String getName() {
         return name;
     }

+ 2 - 2
src/main/java/com/goafanti/order/controller/TaskScoreController.java

@@ -113,8 +113,8 @@ public class TaskScoreController extends BaseController {
      * @param in 参数
      */
     @GetMapping("/list/export")
-    public Result<OutAdminTaskScore> listExport(InputTaskScore in) {
-        return new Result<>().data(this.taskScoreService.listExport(in));
+    public Result listExport(InputTaskScore in) {
+        return this.taskScoreService.listExport(in);
     }
 
 

+ 2 - 1
src/main/java/com/goafanti/order/service/TaskScoreService.java

@@ -1,5 +1,6 @@
 package com.goafanti.order.service;
 
+import com.goafanti.common.bo.Result;
 import com.goafanti.common.model.TaskScore;
 import com.goafanti.order.bo.TaskScore.InputTaskScore;
 
@@ -58,5 +59,5 @@ public interface TaskScoreService {
 
     TaskScore queryByTid(Integer tid);
 
-    Object listExport(InputTaskScore in);
+    Result listExport(InputTaskScore in);
 }

+ 11 - 5
src/main/java/com/goafanti/order/service/impl/TaskScoreServiceImpl.java

@@ -1,5 +1,6 @@
 package com.goafanti.order.service.impl;
 
+import com.goafanti.common.bo.Result;
 import com.goafanti.common.dao.AdminProjectStatisticsMapper;
 import com.goafanti.common.dao.TOrderNewMapper;
 import com.goafanti.common.dao.TOrderTaskMapper;
@@ -8,12 +9,14 @@ import com.goafanti.common.model.AdminProjectStatistics;
 import com.goafanti.common.model.TOrderNew;
 import com.goafanti.common.model.TOrderTask;
 import com.goafanti.common.model.TaskScore;
+import com.goafanti.common.utils.excel.NewExcelUtil;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.order.bo.TOrderTaskBo;
 import com.goafanti.order.bo.TaskScore.InputTaskScore;
 import com.goafanti.order.bo.TaskScore.OutAdminTaskScore;
 import com.goafanti.order.service.TaskScoreService;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -40,6 +43,9 @@ public class TaskScoreServiceImpl extends BaseMybatisDao<TaskScoreMapper> implem
     private TOrderNewMapper tOrderNewMapper;
     @Resource
     private AdminProjectStatisticsMapper adminProjectStatisticsMapper;
+    @Value(value = "${upload.path}")
+    private final String	uploadPath			= null;
+
 
 
     @Override
@@ -207,11 +213,11 @@ public class TaskScoreServiceImpl extends BaseMybatisDao<TaskScoreMapper> implem
     }
 
     @Override
-    public Object listExport(InputTaskScore in) {
-        in.setPageSize(99999);
-        List<OutAdminTaskScore> list = taskScoreMapper.findAdminTaskScoreList(in);
-
-        return null;
+    public Result listExport(InputTaskScore in) {
+        Map<String, Object> params = pushMap(in);
+        List<OutAdminTaskScore> list = (List<OutAdminTaskScore>) findList("findAdminTaskScoreList",params, 1, 99999);
+        NewExcelUtil excel = new NewExcelUtil(OutAdminTaskScore.class);
+        return excel.exportExcel(list, "人员评分列表", uploadPath);
     }
 
 }