修改查询EXCEL格口信息

src/main/java/com/yxproject/start/entity/FileNameDicEntity.java

@@ -19,6 +19,7 @@ public class FileNameDicEntity {
     private String printDate;
     private String formStartTime;
     private String formDeadline;
+    private long state;
 
     @Id
     @Column(name = "FILE_ID")
@@ -89,6 +90,15 @@ public class FileNameDicEntity {
     public void setFormDeadline(String formDeadline) {
         this.formDeadline = formDeadline;
     }
+    @Basic
+    @Column(name = "STATE")
+    public long getState() {
+        return state;
+    }
+
+    public void setState(long state) {
+        this.state = state;
+    }
 
     @Override
     public boolean equals(Object o) {
@@ -101,11 +111,12 @@ public class FileNameDicEntity {
                 Objects.equals(analysisDate, that.analysisDate) &&
                 Objects.equals(printDate, that.printDate) &&
                 Objects.equals(formStartTime, that.formStartTime) &&
+                Objects.equals(state, that.state) &&
                 Objects.equals(formDeadline, that.formDeadline);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(fileId, fileName, uploadDate, analysisDate, printDate, formStartTime, formDeadline);
+        return Objects.hash(fileId, fileName, uploadDate, analysisDate,state, printDate, formStartTime, formDeadline);
     }
 }

src/main/java/com/yxproject/start/service/impl/TaskListServiceImpl.java

@@ -57,8 +57,8 @@ public class TaskListServiceImpl implements TaskListService {
         Map<String,Object> typeMap = new LinkedHashMap<>();
         for (Map  o :maps){
             //TODO 组合JSON
-            if (typeMap.containsKey(o.get("CARD_TYPE")+"")){
-                List<Map<String,Object>> mapList= (List<Map<String,Object>>)typeMap.get("CARD_TYPE");
+            if (typeMap!=null&typeMap.containsKey(o.get("CARD_TYPE")+"")){
+                List<Map<String,Object>> mapList= (List<Map<String,Object>>)typeMap.get(o.get("CARD_TYPE"));
                 mapList.add(o);
                 typeMap.put(o.get("CARD_TYPE")+"",mapList);
             }else {
@@ -75,8 +75,8 @@ public class TaskListServiceImpl implements TaskListService {
             for (Map o:mapList) {
                 typeSum+=Integer.valueOf(o.get("VALID_COUNT") + "");
                 Map<String,Object> countyMap = new LinkedHashMap<>();
-                if (countyMap.containsKey(o.get("COUNTYNAME")+"")){
-                    List<Map<String,Object>> countyList= (List<Map<String,Object>>)countyMap.get("CARD_TYPE");
+                if (countyMap !=null&countyMap.containsKey(o.get("COUNTYNAME")+"")){
+                    List<Map<String,Object>> countyList= (List<Map<String,Object>>)countyMap.get(o.get("CARD_TYPE"));
                     countyList.add(o);
                     Integer valid_count = Integer.valueOf(o.get("VALID_COUNT") + "");
                     valid_count+=Integer.valueOf(countyMap.get("countyValidCount").toString());
@@ -108,6 +108,6 @@ public class TaskListServiceImpl implements TaskListService {
         System.out.println(maps.toString()+"---------");
 
 
-        return null;
+        return list;
     }
 }