对比导出

src/main/java/com/common/workflow/web/rest/ExcelResource.java

@@ -106,25 +106,33 @@ public class ExcelResource {
         Map<String, List<?>> classes = new HashMap<>();
         List<ContrastExcelVM> reportList = new ArrayList<>();
         List<ContrastExcelVM> reportList1 = new ArrayList<>();
+        List<ContrastExcelVM> reportList2 = new ArrayList<>();
         ArrayList<LinkedHashMap<String,Object>> list = (ArrayList<LinkedHashMap<String,Object>>) wordTemplateVM.getDatas().get("data");
         for(LinkedHashMap<String,Object> entry : list){
             ContrastExcelVM contrastExcelVM = new ContrastExcelVM();
             contrastExcelVM.setSupplierName(entry.get("SupplierName").toString());
             contrastExcelVM.setInFlag(entry.get("InFlag").toString().equals("1") ? "准入" : entry.get("InFlag").toString().equals("2") ? "暂停" : "取消");
             contrastExcelVM.setAccessCardNo(entry.get("AccessCardNo").toString());
-            contrastExcelVM.setSupplierTypeCode(entry.get("SupplierTypeCode").toString().equals("01") ? "物资类" : entry.get("SupplierTypeCode").toString().equals("02") ? "服务类" : "基建类");
+            contrastExcelVM.setSupplierTypeCode(entry.get("SupplierTypeCode").toString().equals("01") ? "物资类" : entry.get("SupplierTypeCode").toString().equals("02") ? "基建类" : "服务类");
             contrastExcelVM.setLegalPerson(entry.get("LegalPerson").toString());
             contrastExcelVM.setRegCapital(entry.get("RegCapital").toString());
             contrastExcelVM.setMobile(entry.get("Mobile").toString());
+            contrastExcelVM.setSubCnt(entry.get("SubCnt").toString());
+            contrastExcelVM.setNoSubCnt(entry.get("NoSubCnt").toString());
             contrastExcelVM.setChecked(entry.get("Checked").toString().equals("1") ? "否" : "是");
-            if (entry.get("Checked").toString().equals("1")) {
-                reportList.add(contrastExcelVM);
+            if (entry.get("MinClassId").toString().equals("0")) {
+                reportList2.add(contrastExcelVM);
             } else {
-                reportList1.add(contrastExcelVM);
+                if (entry.get("Checked").toString().equals("1")) {
+                    reportList.add(contrastExcelVM);
+                } else {
+                    reportList1.add(contrastExcelVM);
+                }
             }
         }
         classes.put("class_two", reportList);
         classes.put("class_one", reportList1);
+        classes.put("class_three", reportList2);
         Map<String, String> data = new HashMap<>();
         data.put("title", "资质导入对比表");
 

src/main/java/com/common/workflow/web/rest/vm/ContrastExcelVM.java

@@ -27,6 +27,12 @@ public class ContrastExcelVM {
     @ExcelField(title = "是否缺资质", order = 8)
     private String checked;
 
+    @ExcelField(title = "准入范围数量", order = 9)
+    private String subCnt;
+
+    @ExcelField(title = "对不上数量", order = 10)
+    private String noSubCnt;
+
     public String getInFlag() {
         return inFlag;
     }
@@ -90,4 +96,12 @@ public class ContrastExcelVM {
     public void setChecked(String checked) {
         this.checked = checked;
     }
+
+    public String getSubCnt() { return subCnt; }
+
+    public void setSubCnt(String subCnt) { this.subCnt = subCnt; }
+
+    public String getNoSubCnt() { return noSubCnt; }
+
+    public void setNoSubCnt(String noSubCnt) { this.noSubCnt = noSubCnt; }
 }