SAI开项管理 - 开项导出Excel加级别、类别字段

master/src/main/java/com/ruoyi/project/production/controller/TSaiApplyController.java

@@ -30,8 +30,10 @@ import com.ruoyi.project.production.controller.vo.SaiApplyExportVO;
 import com.ruoyi.project.production.controller.vo.SaiApplyQueryVO;
 import com.ruoyi.project.production.domain.TSaiApply;
 import com.ruoyi.project.production.domain.TSaiApproveFile;
+import com.ruoyi.project.production.domain.TSaiCategory;
 import com.ruoyi.project.production.service.ITSaiApplyService;
 import com.ruoyi.project.production.service.ITSaiApproveFileService;
+import com.ruoyi.project.production.service.ITSaiCategoryService;
 import com.ruoyi.project.sems.domain.TApproverFile;
 import com.ruoyi.project.system.domain.*;
 import com.ruoyi.project.system.mapper.SysDeptMapper;
@@ -62,6 +64,7 @@ import java.io.IOException;
 import java.sql.Array;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * SAI开项管理Controller
@@ -103,6 +106,9 @@ public class TSaiApplyController extends BaseController
     @Autowired
     private IMailService mailService;
 
+    @Autowired
+    private ITSaiCategoryService tSaiCategoryService;
+
     /**
      * 查询SAI开项管理列表
      */
@@ -285,8 +291,6 @@ public class TSaiApplyController extends BaseController
             nameMap.put(sysUser.getUserId(), sysUser.getNickName());
             staffIdMap.put(sysUser.getUserId(), sysUser.getStaffId());
         }
-
-
         // 实体类集合
         List<TSaiApply> list = tSaiApplyService.selectTSaiApplyList(tSaiApply);
         // 导出VO集合
@@ -296,6 +300,8 @@ public class TSaiApplyController extends BaseController
         List<SysDictData> teamDivideDict = iSysDictTypeService.selectDictDataByType("TEAM_DIVIDE");
         List<SysDictData> saiUnsafeStatusDict = iSysDictTypeService.selectDictDataByType("SAI_UNSAFE_STATUS");
         List<SysDictData> saiUnsafeActionDict = iSysDictTypeService.selectDictDataByType("SAI_UNSAFE_ACTION");
+        List<TSaiCategory> tSaiCategories = tSaiCategoryService.selectTSaiCategoryList(null);
+        Map<Long, String> categoryMap = tSaiCategories.stream().collect(Collectors.toMap(TSaiCategory::getSaiCategoryId, TSaiCategory::getSaiCategoryName));
         int no = 0;  // 序号
         for (TSaiApply entity : list) {
             no++;
@@ -304,7 +310,6 @@ public class TSaiApplyController extends BaseController
             vo.setNo(no + "");
             vo.setPlantName(entity.getApplicantDeptName());
             vo.setStaffName(entity.getApplicantName());
-//            vo.setStaffId(userService.selectUserById(Long.parseLong(entity.getApplicant())).getStaffId());
             vo.setStaffId(staffIdMap.get(Long.parseLong(entity.getApplicant())));
             vo.setMonth((entity.getApplyDate().getMonth() + 1) + "");
             vo.setDate(entity.getApplyDate().getDate()+ "");
@@ -334,7 +339,6 @@ public class TSaiApplyController extends BaseController
                     String inspectorName = "";
                     for (int i = 0; i < split.length; i++) {
                         if (split[i] != null && !"null".equals(split[i])) {
-//                            inspectorName += userService.selectUserById(Long.parseLong(split[i])).getNickName();
                             inspectorName += nameMap.get(Long.parseLong(split[i]));
                             if (i < split.length - 1) {
                                 inspectorName += ",";
@@ -343,7 +347,6 @@ public class TSaiApplyController extends BaseController
                     }
                     vo.setInspectors(inspectorName);
                 } else {
-//                    vo.setInspectors(userService.selectUserById(Long.parseLong(inspectors)).getNickName());
                     vo.setInspectors(nameMap.get(Long.parseLong(inspectors)));
                 }
             }
@@ -354,12 +357,13 @@ public class TSaiApplyController extends BaseController
                 }
             }
             vo.setRemarks(entity.getRemarks());
-//            for (SysDictData sysDictData : teamDivideDict) {
-//                if (sysDictData.getDictValue().equals(entity.getApplicantTeam())) {
-//                    vo.setApplicantTeam(sysDictData.getDictLabel());
-//                }
-//            }
             vo.setRemark(null);
+            vo.setSaiLevel(entity.getSaiLevel());
+            for (Long key : categoryMap.keySet()) {
+                if (key.toString().equals(entity.getCategory())) {
+                    vo.setCategory(categoryMap.get(key));
+                }
+            }
             exportVOList.add(vo);
         }
         ExcelUtil<SaiApplyExportVO> util = new ExcelUtil<SaiApplyExportVO>(SaiApplyExportVO.class);

master/src/main/java/com/ruoyi/project/production/controller/vo/SaiApplyExportVO.java

@@ -90,6 +90,30 @@ public class SaiApplyExportVO extends BaseEntity
     @Excel(name = "备注")
     private String remark;
 
+    /** SAI级别 */
+    @Excel(name = "SAI级别")
+    private Long saiLevel;
+
+    /** SAI类别 */
+    @Excel(name = "SAI类别")
+    private String category;
+
+    public Long getSaiLevel() {
+        return saiLevel;
+    }
+
+    public void setSaiLevel(Long saiLevel) {
+        this.saiLevel = saiLevel;
+    }
+
+    public String getCategory() {
+        return category;
+    }
+
+    public void setCategory(String category) {
+        this.category = category;
+    }
+
     public String getNo() {
         return no;
     }