Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/yxproject/start/api/UserApi.java

@@ -49,6 +49,12 @@ public class UserApi {
     private CardBodyService cardBodyService;
     @Autowired
     private GroupListService groupListService;
+    @Autowired
+    private CityListService cityListService;
+    @Autowired
+    private CountyService countyService;
+    @Autowired
+    private TypeListService typeListService;
 
 //    @Autowired
 //    private ReadCountyListXMLService readCountyListXMLService;
@@ -338,44 +344,10 @@ public class UserApi {
      *
      * @return
      */
-    @RequestMapping("getCountyListByTaskListId")
-//    @RequiresPermissions("userInfo.add")//权限管理;
-    public String getCountyListInfoByTaskListID(@RequestParam("taskListID") String taskListId, HttpServletResponse resp) {
-        List<CountyListEntity> countyListEntity =  countyListService.findCountyListByTaskListID(taskListId);
-        YXJSONResponse yxjsonResponse = new YXJSONResponse();
-        resp.setCharacterEncoding("UTF-8");
-        yxjsonResponse.outPutSuccess(countyListEntity);
-        Map map = new HashMap();
-//      map.put("MakeType",productionTaskListEntity);
-        return yxjsonResponse.toJSONString();
-    }
-
-    /**
-     * 通过状态查询区县列表;
-     *
-     * @returns
-     */
-    @RequestMapping("getCountyListByTaskStateId")
-//    @RequiresPermissions("userInfo.add")//权限管理;
-    public String findCountyListByTaskStateId(@RequestParam("taskStateId") String TaskStateId, HttpServletResponse resp) {
-        List<CountyListEntity> countyListEntity =  countyListService.findCountyListByTaskStateId(TaskStateId);
-        YXJSONResponse yxjsonResponse = new YXJSONResponse();
-        resp.setCharacterEncoding("UTF-8");
-        yxjsonResponse.outPutSuccess(countyListEntity);
-        Map map = new HashMap();
-//      map.put("MakeType",productionTaskListEntity);
-        return yxjsonResponse.toJSONString();
-    }
-
-    /**
-     * 通过制证类型查询区县列表;
-     *
-     * @returns
-     */
-    @RequestMapping("getCountyListByCardType")
+    @RequestMapping("getCountyList")
 //    @RequiresPermissions("userInfo.add")//权限管理;
-    public String getCountyListByCardType(@RequestParam("cardType") String cardType, HttpServletResponse resp) {
-        List<CountyListEntity> countyListEntity =  countyListService.findCountyListByCardType(cardType);
+    public String getCountyListInfoByTaskListID(@RequestParam("taskListId") String taskListId,@RequestParam("taskStateId") String taskStateId,@RequestParam("cardType") String cardType, HttpServletResponse resp) {
+        List<CountyEntity> countyListEntity =  countyService.findCountyList(taskListId,taskStateId,cardType);
         YXJSONResponse yxjsonResponse = new YXJSONResponse();
         resp.setCharacterEncoding("UTF-8");
         yxjsonResponse.outPutSuccess(countyListEntity);
@@ -443,7 +415,7 @@ public class UserApi {
     @RequestMapping("getTypeListByTaskStateId")
 //    @RequiresPermissions("userInfo.add")//权限管理;
     public String getTypeListByTaskStateId(@RequestParam("taskStateId") String taskStateId, HttpServletResponse resp) {
-        List<TypeListEntity> typeListEntity = taskService.findTypeListByTaskStateId(taskStateId);
+        List<TypeListEntity> typeListEntity = typeListService.findTypeListByTaskStateId(taskStateId);
         YXJSONResponse yxjsonResponse = new YXJSONResponse();
         resp.setCharacterEncoding("UTF-8");
         yxjsonResponse.outPutSuccess(typeListEntity);
@@ -457,34 +429,18 @@ public class UserApi {
      *
      * @return
      */
-    @RequestMapping("getCityListByTaskStateId")
+    @RequestMapping("getCityList")
 //    @RequiresPermissions("userInfo.add")//权限管理;
-    public String getCityListByTaskStateId(@RequestParam("taskStateId") String taskStateId, HttpServletResponse resp) {
-        List <Map <String, Object>> taskEntity = taskService.findCityListByTaskStateId(taskStateId);
+    public String getCityListByTaskStateId(@RequestParam("taskStateId") String taskStateId,@RequestParam("cardType") String cardType, HttpServletResponse resp) {
+        List <CityListEntity> cityListEntity = cityListService.findCityList(taskStateId,cardType);
         YXJSONResponse yxjsonResponse = new YXJSONResponse();
         resp.setCharacterEncoding("UTF-8");
-        yxjsonResponse.outPutSuccess(taskEntity);
+        yxjsonResponse.outPutSuccess(cityListEntity);
         Map map = new HashMap();
 //      map.put("MakeType",productionTaskListEntity);
         return yxjsonResponse.toJSONString();
     }
 
-    /**
-     * 查询CityList通过制证类型;
-     *
-     * @return
-     */
-    @RequestMapping("getCityListByCardType")
-//    @RequiresPermissions("userInfo.add")//权限管理;
-    public String getCityListByCardType(@RequestParam("cardType") String cardType, HttpServletResponse resp) {
-        List <Map <String, Object>> taskEntity = taskService.findCityListByCardType(cardType);
-        YXJSONResponse yxjsonResponse = new YXJSONResponse();
-        resp.setCharacterEncoding("UTF-8");
-        yxjsonResponse.outPutSuccess(taskEntity);
-        Map map = new HashMap();
-//      map.put("MakeType",productionTaskListEntity);
-        return yxjsonResponse.toJSONString();
-    }
 
     /**
      * 查询派出所申领表通过保存时间;
@@ -610,8 +566,8 @@ public class UserApi {
      */
     @RequestMapping("updateInStorageDate")
 //    @RequiresPermissions("userInfo.add")//权限管理;
-    public String updateInStorageDate(@RequestParam("taskId") String taskId,@RequestParam("inStorageCount") String inStorageCount,@RequestParam("outStorageCount") String outStorageCount, HttpServletResponse resp) {
-        int i = taskService.updateStorageDate(taskId,inStorageCount,outStorageCount);
+    public String updateInStorageDate(@RequestParam("taskListId") String taskListId,@RequestParam("inStorageCount") String inStorageCount,@RequestParam("outStorageCount") String outStorageCount, HttpServletResponse resp) {
+        int i = taskService.updateStorageDate(taskListId,inStorageCount,outStorageCount);
         YXJSONResponse yxjsonResponse = new YXJSONResponse();
         resp.setCharacterEncoding("UTF-8");
         yxjsonResponse.outPutSuccess(i + "更新成功");

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

+package com.yxproject.start.entity;
+
+import javax.persistence.*;
+import java.util.Objects;
+
+
+/**
+ * Created by Administrator on 2018/12/19.
+ */
+@Entity
+@Table(name = "COUNTY", schema = "DAHAI")
+public class CountyEntity {
+
+    private String county_Code;
+    private long finish_Count;
+    private long in_Storage_Count;
+    private long out_Storage_Count;
+    private String countyName;
+    private long downloadCount;
+    private long electric_writeCount;
+
+    @Id
+    @Column(name = "county_Code", nullable = true, length = 20)
+    public String getCounty_Code() {
+        return county_Code;
+    }
+
+    public void setCounty_Code(String county_Code) {
+        this.county_Code = county_Code;
+    }
+
+    @Basic
+    @Column(name = "finish_Count", nullable = true, precision = 0)
+    public long getFinish_Count() {
+        return finish_Count;
+    }
+
+    public void setFinish_Count(long finish_Count) {
+        this.finish_Count = finish_Count;
+    }
+
+    @Basic
+    @Column(name = "in_Storage_Count", nullable = true, precision = 0)
+    public long getIn_Storage_Count() {
+        return in_Storage_Count;
+    }
+
+    public void setIn_Storage_Count(long in_Storage_Count) {
+        this.in_Storage_Count = in_Storage_Count;
+    }
+
+    @Basic
+    @Column(name = "out_Storage_Count", nullable = true, precision = 0)
+    public long getOut_Storage_Count() {
+        return out_Storage_Count;
+    }
+
+    public void setOut_Storage_Count(long out_Storage_Count) {
+        this.out_Storage_Count = out_Storage_Count;
+    }
+
+    @Basic
+    @Column(name = "countyName", nullable = true, length = 20)
+    public String getCountyName() {
+        return countyName;
+    }
+
+    public void setCountyName(String countyName) {
+        this.countyName = countyName;
+    }
+
+    @Basic
+    @Column(name = "downloadCount", nullable = true, precision = 0)
+    public long getDownloadCount() {
+        return downloadCount;
+    }
+
+    public void setDownloadCount(long downloadCount) {
+        this.downloadCount = downloadCount;
+    }
+
+    @Basic
+    @Column(name = "electric_writeCount", nullable = true, precision = 0)
+    public long getElectric_writeCount() {
+        return electric_writeCount;
+    }
+
+    public void setElectric_writeCount(long electric_writeCount) {
+        this.electric_writeCount = electric_writeCount;
+    }
+
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        CountyEntity that = (CountyEntity) o;
+        return electric_writeCount == that.electric_writeCount &&
+                downloadCount == that.downloadCount &&
+                finish_Count == that.finish_Count &&
+                in_Storage_Count == that.in_Storage_Count &&
+                out_Storage_Count == that.out_Storage_Count &&
+                Objects.equals(countyName, that.countyName) &&
+                Objects.equals(county_Code, that.county_Code);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(electric_writeCount, downloadCount, finish_Count, in_Storage_Count, out_Storage_Count,countyName,county_Code);
+    }
+
+
+}

src/main/java/com/yxproject/start/mapper/CountyListMapper.java

 package com.yxproject.start.mapper;
 
+import com.yxproject.start.entity.CountyEntity;
 import com.yxproject.start.entity.CountyListEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -14,9 +15,7 @@ import java.util.Map;
 
 @Mapper
 public interface CountyListMapper {
-    public List<CountyListEntity> findCountyListByTaskListID(String taskListId);
-    public List<CountyListEntity> findCountyListByTaskStateId(String taskStateId);
-    public List<CountyListEntity> findCountyListByCardType(String cardType);
+    public List<CountyEntity> findCountyList(@Param("taskListId") String taskListId,@Param("taskStateId") String taskStateId,@Param("cardType") String cardType);
     public int updateBoundCount(@Param("county_List_Id") String county_List_Id,@Param("out_Storage_Count") String out_Storage_Count,@Param("in_Storage_Count") String in_Storage_Count);
     public List<CountyListEntity> getConnectList( @Param("startDate")String startDate , @Param("endDate") String endDate);
     public List<CountyListEntity> findStorageCountByTaskListId(String taskListId);

src/main/java/com/yxproject/start/mapper/TaskMapper.java

@@ -20,8 +20,7 @@ public interface TaskMapper {
     public int replaceExceptionInformation(TaskEntity taskEntity);
     public int totalNum (int i);
     public List<TypeListEntity> findTypeListByTaskStateId(String taskStateId);
-    public List<Map<String,Object>> findCityListByTaskStateId(String taskStateId);
-    public List<Map<String,Object>> findCityListByCardType(String cardType);
-    public int updateOutStorageDate( @Param("taskId")String taskId, @Param("inStorageCount")String inStorageCount, @Param("outStorageCount")String outStorageCount);
-    public int updateInStorageDate(String taskId,String inStorageCount,String outStorageCount);
+    public List <CityListEntity> findCityList(@Param("taskStateId") String taskStateId,@Param("cardType") String cardType);
+    public int updateOutStorageDate( @Param("taskListId")String taskId, @Param("inStorageCount")String inStorageCount, @Param("outStorageCount")String outStorageCount);
+    public int updateInStorageDate(String taskListId,String inStorageCount,String outStorageCount);
 }

src/main/java/com/yxproject/start/service/CountyListService.java

@@ -8,10 +8,7 @@ import java.util.Map;
 
 public interface CountyListService {
 
-    public List<CountyListEntity> findCountyListByTaskListID(String taskListId);
-    public List<CountyListEntity> findCountyListByTaskStateId(String taskStateId);
     public List<CountyListEntity> getConnectList(String startDate,String endDate);
-    public List<CountyListEntity> findCountyListByCardType(String cardType);
     public List<CountyListEntity> findStorageCountByTaskListId(String taskListId);
     public int reviseBoundCount(String county_List_Id, String out_Storage_Count, String in_Storage_Count);
 }

src/main/java/com/yxproject/start/service/TaskService.java

@@ -28,13 +28,9 @@ public interface TaskService {
 
     public int addExceptionState(TaskEntity state);
 
-    public int updateStorageDate(String taskId,String inStorageCount,String outStorageCount);
+    public int updateStorageDate(String taskListId,String inStorageCount,String outStorageCount);
 
-    public List<TypeListEntity> findTypeListByTaskStateId(String taskStateId);
 
-    public List<Map<String,Object>> findCityListByTaskStateId(String taskStateId);
-
-    public List<Map<String,Object>> findCityListByCardType(String cardType);
 
 }
 

src/main/java/com/yxproject/start/service/TypeListService.java

+package com.yxproject.start.service;
+
+import com.yxproject.start.entity.TypeListEntity;
+
+import java.util.List;
+
+/**
+ * Created by Administrator on 2018/12/19.
+ */
+public interface TypeListService {
+
+    public List<TypeListEntity> findTypeListByTaskStateId( String taskStateId);
+}

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

@@ -19,23 +19,6 @@ public class CountyListServiceImpl implements CountyListService {
     @Autowired
     public CountyListMapper countyListMapper;
 
-    @Override
-    public List<CountyListEntity> findCountyListByTaskListID(String taskListId) {
-        List<CountyListEntity> byTaskListID = countyListMapper.findCountyListByTaskListID(taskListId);
-        return  byTaskListID;
-    }
-
-    @Override
-    public List <CountyListEntity> findCountyListByTaskStateId(String taskStateId) {
-        List<CountyListEntity> TaskStateId = countyListMapper.findCountyListByTaskStateId(taskStateId);
-        return TaskStateId;
-    }
-
-    @Override
-    public List <CountyListEntity> findCountyListByCardType( String cardType ) {
-        List<CountyListEntity> CardType = countyListMapper.findCountyListByCardType(cardType);
-        return CardType;
-    }
 
     @Override
     public int reviseBoundCount(String county_List_Id, String out_Storage_Count, String in_Storage_Count) {

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

@@ -439,67 +439,19 @@ public class TaskServiceImpl implements TaskService {
      * @return
      */
     @Override
-    public int updateStorageDate(String taskId,String inStorageCount,String outStorageCount ) {
+    public int updateStorageDate(String taskListId,String inStorageCount,String outStorageCount ) {
         int i=0;
         i= taskMapper.totalNum(i);
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddhhmmss");
         if (inStorageCount.equals(i)){
-            return taskMapper.updateInStorageDate(taskId,inStorageCount,outStorageCount);
+            return taskMapper.updateInStorageDate(taskListId,inStorageCount,outStorageCount);
         }
         if(outStorageCount.equals(i)){
-            return taskMapper.updateOutStorageDate(taskId,inStorageCount,outStorageCount);
+            return taskMapper.updateOutStorageDate(taskListId,inStorageCount,outStorageCount);
         }
         return 0;
     }
 
-    /**
-     * 通过状态查找TypeList
-     * @param
-     * @return
-     */
-    @Override
-    public List<TypeListEntity> findTypeListByTaskStateId( String taskStateId ) {
-        List<TypeListEntity> typeListEntity = taskMapper.findTypeListByTaskStateId(taskStateId);
-//        List <Map <String, Object>> list = new ArrayList <>();
-//        int i;
-//        for(i=0; i<TaskStateId.size();i++){
-//            Map <String, Object> map = new HashMap <>();
-//            map.put("typeCode",TaskStateId.   ("TASK.CARD_TYPE"));
-//            map.put("typeCount",TaskStateId.("count(CARD_TYPE_ID)"));
-//            map.put("typeName",TaskStateId.("CARD_TYPE_DIC.CARD_TYPE"));
-//            list.add(map);
-//        }
-//        for (Map map: typeListByTaskStateId) {
-//            Map <String, Object> newMap = new HashMap <>();
-//            newMap.put("typeCode",map.get("TYPE_CODE"));
-//            newMap.put("typeCount",map.get("TYPE_COUNT"));
-//            newMap.put("typeName",map.get("TYPE_NAME"));
-//            list.add(newMap);
-//        }
-        return typeListEntity;
-    }
-
-    /**
-     * 通过状态查找CityList
-     * @param
-     * @return
-     */
-    @Override
-    public List <Map <String, Object>> findCityListByTaskStateId( String taskStateId ) {
-        List <Map <String, Object>> TaskStateId =taskMapper.findCityListByTaskStateId(taskStateId);
-        return TaskStateId;
-    }
-
-    /**
-     * 通过制证类型查找CityList
-     * @param
-     * @return
-     */
-    @Override
-    public List <Map <String, Object>> findCityListByCardType( String cardType ) {
-        List <Map <String, Object>> CardType =taskMapper.findCityListByCardType(cardType);
-        return CardType;
-    }
 
     /**
      * 测试查询

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

+package com.yxproject.start.service.impl;
+
+import com.yxproject.start.entity.TypeListEntity;
+import com.yxproject.start.mapper.TaskMapper;
+import com.yxproject.start.service.TypeListService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Created by Administrator on 2018/12/19.
+ */
+@Service
+public class TypeListServiceImpl implements TypeListService {
+
+    @Autowired
+    public TaskMapper taskMapper;
+
+    /**
+     * 通过状态查找TypeList
+     * @param
+     * @return
+     */
+    @Override
+    public List<TypeListEntity> findTypeListByTaskStateId( String taskStateId ) {
+        List<TypeListEntity> typeListEntity = taskMapper.findTypeListByTaskStateId(taskStateId);
+        return typeListEntity;
+    }
+}

src/main/resources/mapper/CountyListMapper.xml

@@ -14,17 +14,26 @@
     <!--<insert id="addPermissionByMap" parameterType="com.yxproject.start.entity.SysPermission">-->
     <!--Insert into DAHAI.SYS_PERMISSION (ID,AVAILABLE,NAME,PARENT_ID,PARENT_IDS,PERMISSION,RESOURCE_TYPE,URL) values (PERMISSION_seq.nextval,0,#{name},#{parentId},#{parentIds},#{permission},#{resourceType},#{url})-->
     <!--</insert>-->
-    <select id="findCountyListByTaskListID" resultType="com.yxproject.start.entity.CountyListEntity" parameterType="String">
-    SELECT  * FROM  COUNTY_LIST where TASK_ID=#{task_Id}
+    <select id="findCountyList" resultType="com.yxproject.start.entity.CountyEntity" parameterType="String">
+    SELECT  COUNTY_LIST.COUNTY_CODE,FINISH_COUNT,IN_STORAGE_COUNT,OUT_STORAGE_COUNT,COUNTY_DIC.COUNTYNAME FROM  COUNTY_LIST
+        LEFT JOIN TASK ON COUNTY_LIST.TASK_ID = TASK.TASK_ID
+        LEFT JOIN COUNTY_DIC ON COUNTY_LIST.COUNTY_CODE = COUNTY_DIC.COUNTY_CODE
+    where TASK.TASK_ID=#{taskListId} or TASK.CARD_TYPE=#{cardType} or TASK.TASK_STATE_ID=#{taskStateId}
     </select>
 
-    <select id="findCountyListByTaskStateId" resultType="com.yxproject.start.entity.CountyListEntity" parameterType="String">
-        SELECT  * FROM  COUNTY_LIST left join TASK on COUNTY_LIST.TASK_ID = TASK.TASK_ID where TASK_STATE_ID=#{task_State_Id}
-    </select>
+    <!--<select id="findCountyListByTaskStateId" resultType="com.yxproject.start.entity.CountyEntity" parameterType="String">-->
+        <!--SELECT  COUNTY_LIST.COUNTY_CODE,FINISH_COUNT,IN_STORAGE_COUNT,OUT_STORAGE_COUNT,COUNTYNAME FROM  COUNTY_LIST-->
+            <!--LEFT JOIN TASK ON COUNTY_LIST.TASK_ID = TASK.TASK_ID-->
+            <!--LEFT JOIN COUNTY_DIC ON COUNTY_LIST.COUNTY_CODE = COUNTY_DIC.COUNTY_CODE-->
+        <!--where TASK.TASK_STATE_ID=#{task_State_Id}-->
+    <!--</select>-->
 
-    <select id="findCountyListByCardType" resultType="com.yxproject.start.entity.CountyListEntity" parameterType="String">
-        SELECT  * FROM  COUNTY_LIST left join TASK on COUNTY_LIST.TASK_ID = TASK.TASK_ID left join CARD_TYPE_DIC on TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID where CARD_TYPE_DIC.CARD_TYPE=#{card_Type}
-    </select>
+    <!--<select id="findCountyListByCardType" resultType="com.yxproject.start.entity.CountyEntity" parameterType="String">-->
+        <!--SELECT COUNTY_LIST.COUNTY_CODE,FINISH_COUNT,IN_STORAGE_COUNT,OUT_STORAGE_COUNT,COUNTYNAME FROM  COUNTY_LIST-->
+            <!--LEFT JOIN TASK ON COUNTY_LIST.TASK_ID = TASK.TASK_ID-->
+            <!--LEFT JOIN COUNTY_DIC ON COUNTY_LIST.COUNTY_CODE = COUNTY_DIC.COUNTY_CODE-->
+        <!--where TASK.CARD_TYPE=#{card_Type}-->
+    <!--</select>-->
 
     <update id="updateBoundCount" parameterType="String" >
         update COUNTY_LIST SET OUT_STORAGE_COUNT =#{out_Storage_Count},IN_STORAGE_COUNT =#{in_Storage_Count} where COUNTY_LIST_ID =#{county_List_Id}

src/main/resources/mapper/TaskMapper.xml

@@ -73,7 +73,7 @@
     </update>
 
     <select id="totalNum" resultType="Integer">
-    select nvl(SUM(VAILD_COUNT),0) FROM GROUP_NO
+    select nvl(SUM(VALID_COUNT),0) FROM GROUP_NO
     </select>
 
     <update id="updateOutStorageDate" parameterType="String">
@@ -91,19 +91,11 @@
         GROUP BY CARD_TYPE_DIC.CARD_TYPE,TASK.CARD_TYPE
     </select>
 
-    <select id="findCityListByCardType" resultType="java.util.HashMap">
-        select CARD_TYPE,TASK.CITYCODE,CITYNAME,sum(VAILD_COUNT),sum(INVALID_COUNT),COUNT(GROUP_NO),GROUP_NO,TASK.TASK_ID,OLD_CARD_TYPE,SUBMIT_DATE,ISSUED_DATE,PRINT_STATE,DOWNLOAD_DATE,PRINT_OUT_DATE,POSITION_DATE,OUT_WORKSHOP_DATE,QUALITY_PEOPLE_NAME,QUALITY_TEST_DATE,EXCEPTION_INFORMATION,OUT_STORAGE_DATE,IN_STORAGE_DATE,TASK_STATE_ID,IS_EXCEPTION,PRINTER_ID from TASK
-            left join (select sum(VAILD_COUNT),sum(INVALID_COUNT),COUNT(GROUP_NO),TASK_ID,GROUP_NO,SPECIAL_CARD_COUNT,VAILD_COUNT,INVALID_COUNT from GROUP_NO group by TASK_ID,GROUP_NO,SPECIAL_CARD_COUNT,VAILD_COUNT,INVALID_COUNT ) GROUP_NO on GROUP_NO.TASK_ID = TASK.TASK_ID
-            left join (SELECT CITYCODE,CITYNAME FROM CITY_DIC) CITY_DIC on CITY_DIC.CITYCODE = TASK.CITYCODE
-        where CARD_TYPE=#{card_Type}
-        GROUP BY CARD_TYPE,TASK.CITYCODE,CITYNAME,GROUP_NO,TASK.TASK_ID,OLD_CARD_TYPE,SUBMIT_DATE,ISSUED_DATE,PRINT_STATE,DOWNLOAD_DATE,PRINT_OUT_DATE,POSITION_DATE,OUT_WORKSHOP_DATE,QUALITY_PEOPLE_NAME,QUALITY_TEST_DATE,EXCEPTION_INFORMATION,OUT_STORAGE_DATE,IN_STORAGE_DATE,TASK_STATE_ID,IS_EXCEPTION,PRINTER_ID
-    </select>
-
-    <select id="findCityListByTaskStateId" resultType="java.util.HashMap">
-        select CARD_TYPE,TASK.CITYCODE,CITYNAME,sum(VAILD_COUNT),sum(INVALID_COUNT),COUNT(GROUP_NO),GROUP_NO,TASK.TASK_ID,OLD_CARD_TYPE,SUBMIT_DATE,ISSUED_DATE,PRINT_STATE,DOWNLOAD_DATE,PRINT_OUT_DATE,POSITION_DATE,OUT_WORKSHOP_DATE,QUALITY_PEOPLE_NAME,QUALITY_TEST_DATE,EXCEPTION_INFORMATION,OUT_STORAGE_DATE,IN_STORAGE_DATE,TASK_STATE_ID,IS_EXCEPTION,PRINTER_ID from TASK
-            left join (select sum(VAILD_COUNT),sum(INVALID_COUNT),COUNT(GROUP_NO),TASK_ID,GROUP_NO,SPECIAL_CARD_COUNT,VAILD_COUNT,INVALID_COUNT from GROUP_NO group by TASK_ID,GROUP_NO,SPECIAL_CARD_COUNT,VAILD_COUNT,INVALID_COUNT ) GROUP_NO on GROUP_NO.TASK_ID = TASK.TASK_ID
-            left join (SELECT CITYCODE,CITYNAME FROM CITY_DIC) CITY_DIC on CITY_DIC.CITYCODE = TASK.CITYCODE
-        where TASK_STATE_ID=#{task_State_Id}
+    <select id="findCityList" resultType="com.yxproject.start.entity.CityListEntity">
+        SELECT CARD_TYPE,TASK.CITYCODE,CITYNAME AS cityName,sum(VALID_COUNT) AS validCount,sum(INVALID_COUNT) AS invalidCount,COUNT(GROUP_NO) AS groupCount,GROUP_NO AS groupNo,TASK.TASK_ID,OLD_CARD_TYPE,SUBMIT_DATE,ISSUED_DATE,PRINT_STATE,DOWNLOAD_DATE,PRINT_OUT_DATE,POSITION_DATE,OUT_WORKSHOP_DATE,QUALITY_PEOPLE_NAME,QUALITY_TEST_DATE,EXCEPTION_INFORMATION,OUT_STORAGE_DATE,IN_STORAGE_DATE,TASK_STATE_ID,IS_EXCEPTION,PRINTER_ID from (select sum(VALID_COUNT),sum(INVALID_COUNT),COUNT(GROUP_NO),TASK_ID,GROUP_NO,SPECIAL_CARD_COUNT,VALID_COUNT,INVALID_COUNT from GROUP_NO group by TASK_ID,GROUP_NO,SPECIAL_CARD_COUNT,VALID_COUNT,INVALID_COUNT ) GROUP_NO
+        left join TASK on GROUP_NO.TASK_ID = TASK.TASK_ID
+        left join (SELECT CITYCODE,CITYNAME FROM CITY_DIC) CITY_DIC on CITY_DIC.CITYCODE = TASK.CITYCODE
+        where CARD_TYPE=#{cardType} or TASK_STATE_ID = #{taskStateId}
         GROUP BY CARD_TYPE,TASK.CITYCODE,CITYNAME,GROUP_NO,TASK.TASK_ID,OLD_CARD_TYPE,SUBMIT_DATE,ISSUED_DATE,PRINT_STATE,DOWNLOAD_DATE,PRINT_OUT_DATE,POSITION_DATE,OUT_WORKSHOP_DATE,QUALITY_PEOPLE_NAME,QUALITY_TEST_DATE,EXCEPTION_INFORMATION,OUT_STORAGE_DATE,IN_STORAGE_DATE,TASK_STATE_ID,IS_EXCEPTION,PRINTER_ID
     </select>