push

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

@@ -614,15 +614,14 @@ public class TaskListServiceImpl implements TaskListService {
                 int specialCount=0;
                 int eWriteCount=0;
                 int faileCount=0;
-                int policeCount =0;
+                String countyName =null;
+                String countyCode =null;
                 Object submitDate = null;
-                String policeCode =null;
-                String policeName = null;
                 List<Map<String, Object>> countyMapList = mapList.get(taskId);
                 for (Map<String,Object> countyMap:countyMapList){
                     submitDate = countyMap.get("SUBMIT_DATE");
-                    policeCode = countyMap.get("POLICE_CODE")+"";
-                    policeName = countyMap.get("GAMC")+"";
+                    countyCode = countyMap.get("COUNTY_CODE")+"";
+                    countyName = countyMap.get("COUNTYNAME")+"";
                     typeName = countyMap.get("CARD_TYPE_ID") + "";
                     typeSum+=Integer.valueOf(countyMap.get("VALID_COUNT") + "");
                     typeSum-=Integer.valueOf(countyMap.get("SPECIAL_CARD_COUNT") + "");
@@ -631,7 +630,6 @@ public class TaskListServiceImpl implements TaskListService {
                     specialCount+=Integer.valueOf(countyMap.get("SPECIAL_CARD_COUNT") + "");
                     faileCount+=Integer.valueOf(countyMap.get("FAILECOUNT") + "");
                     eWriteCount+=Integer.valueOf(countyMap.get("E_WRITER_COUNT") + "");
-                    policeCount+=Integer.valueOf(countyMap.get("POLICE_COUNT") + "");
                 }
                 if (countyMapList.size()==1){
                     countyMapGroup.put("groupNum",countyMapList.get(0).get("GROUP_NO"));
@@ -656,21 +654,20 @@ public class TaskListServiceImpl implements TaskListService {
                 }
                 countyMapGroup.put("faileCount",faileCount);
                 countyMapGroup.put("specialCount",specialCount);
-                countyMapGroup.put("policeCode",policeCode);
+                countyMapGroup.put("countyCode",countyCode);
                 countyMapGroup.put("taskId",taskId);
                 countyMapGroup.put("groupList",countyMapList);
                 countyMapGroup.put("saveDate",submitDate);
-                countyMapGroup.put("policeName",policeName);
+                countyMapGroup.put("countyName",countyName);
                 countyMapGroup.put("eWriteCount",eWriteCount);
                 countyMapGroup.put("countyValidCount",validCount);
                 countyMapGroup.put("countyInvalidCount",invalidCount);
-                countyMapGroup.put("policeCount",policeCount);
                 countyList.add(countyMapGroup);
             }
             mapType.put("typeCode",typeName);
             mapType.put("typeSum",typeSum );
             mapType.put("typeName", type);
-            mapType.put("policeList",countyList);
+            mapType.put("countyList",countyList);
             typeList.add(mapType);
         }
         return typeList;