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

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

@@ -170,14 +170,14 @@ public class ReadXmlApi {
         Map<String,Object> resultMap = new HashMap<>();
         if (mapList.size()>=Integer.parseInt(pageSize)){
             int max=Integer.parseInt(currPage)*Integer.parseInt(pageSize);
-            int min = (Integer.parseInt(currPage)-1)*Integer.parseInt(pageSize);
+            int min = (Integer.parseInt(currPage)-1)*Integer.parseInt(pageSize)+1;
             List list = new ArrayList();
             if (mapList.size()<max){
                 for (int i=min-1;i<mapList.size();i++){
                     list.add(mapList.get(i));
                 }
             }else {
-                for (int i=min;i<max-1;i++){
+                for (int i=min-1;i<max;i++){
 
                     list.add(mapList.get(i));
                 }

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

@@ -363,7 +363,7 @@ public interface TaskListMapper {
             "from SPECIAL_CARD left join task on SPECIAL_CARD.task_id= task.TASK_ID\n" +
             "left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = task.CARD_TYPE\n" +
             "left join COUNTY_DIC  on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
-            "left join (select task_id,nvl(count(*),0) faileCount from FAILED_CARD where FAILED_CARD.state =#{process2} and FAILED_CARD.state != FAILED_CARD.INITIATOR   group by task_id ) fc on fc.TASK_ID = task.TASK_ID\n" +
+            "left join (select task_id,nvl(count(*),0) faileCount from FAILED_CARD where FAILED_CARD.state <#{process2} and FAILED_CARD.state != FAILED_CARD.INITIATOR   group by task_id ) fc on fc.TASK_ID = task.TASK_ID\n" +
             "where SPECIAL_CARD.SPECIAL_TYPE =2 and task.TASK_STATE_ID = #{process} order by SPECIAL_CARD.ACCEPT_NO")
     public List<Map<String,Object>> selectByCountyAtAuxiliary_fast(@Param("process") long process,@Param("process2") long process2);
 
@@ -524,14 +524,14 @@ public interface TaskListMapper {
             "from SPECIAL_CARD left join task on SPECIAL_CARD.task_id= task.TASK_ID\n" +
             "left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = task.CARD_TYPE\n" +
             "left join COUNTY_DIC  on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
-            "left join (select task_id,nvl(count(*),0) faileCount from FAILED_CARD where FAILED_CARD.state =#{process2} and FAILED_CARD.state != FAILED_CARD.INITIATOR   group by task_id ) fc on fc.TASK_ID = task.TASK_ID\n" +
+            "left join (select task_id,nvl(count(*),0) faileCount from FAILED_CARD where FAILED_CARD.state <#{process2} and FAILED_CARD.state != FAILED_CARD.INITIATOR   group by task_id ) fc on fc.TASK_ID = task.TASK_ID\n" +
             "where SPECIAL_CARD.SPECIAL_TYPE =1 and task.TASK_STATE_ID = #{process} order by SPECIAL_CARD.ACCEPT_NO")
     public List<Map<String,Object>> selectByCountyAtAuxiliary_remaind(@Param("process") long process,@Param("process2") long process2);
 
     /**
      * 循环单查询
      *  辅助库 废证
-     * @param process 工序
+     * @param process2 工序
      * @return
      */
     @Select("select DISTINCT task.submit_date, FAILED_CARD.FAILED_CARD_ID task_id,'废证' CARD_TYPE,'100' CARD_TYPE_ID,task.COUNTY_CODE,\n" +
@@ -539,7 +539,7 @@ public interface TaskListMapper {
             "0 faileCount from FAILED_CARD left join task on FAILED_CARD.task_id= task.TASK_ID\n" +
             "left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = task.CARD_TYPE\n" +
             "left join COUNTY_DIC  on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
-            "where FAILED_CARD.state =#{process2} and FAILED_CARD.state != FAILED_CARD.INITIATOR    order by FAILED_CARD.ACCEPT_NO")
+            "where FAILED_CARD.state <#{process2} and FAILED_CARD.state != FAILED_CARD.INITIATOR    order by FAILED_CARD.ACCEPT_NO")
     public List<Map<String,Object>> selectByCountyAtAuxiliary_failed(@Param("process2") long process2);
 
     /**

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

@@ -289,11 +289,11 @@ public class TaskListServiceImpl implements TaskListService {
     @Transactional(rollbackFor = Exception.class)
     public Map selectByCountyAtAuxiliary2(long process) {
         //查询普通组号列表 在辅助库中
-        List<Map<String, Object>> mapList_common = taskListMapper.selectByCountyAtAuxiliary_common(process-1,process-2);
+        List<Map<String, Object>> mapList_common = taskListMapper.selectByCountyAtAuxiliary_common(process-1,process-1);
         //查询快证组号列表 在辅助库中
-        List<Map<String, Object>> mapList_fast = taskListMapper.selectByCountyAtAuxiliary_fast(process-1,process-2);
+        List<Map<String, Object>> mapList_fast = taskListMapper.selectByCountyAtAuxiliary_fast(process-1,process-1);
         //查询余证组号列表 在辅助库中
-        List<Map<String, Object>> mapList_remaind = taskListMapper.selectByCountyAtAuxiliary_remaind(process-1,process-2);
+        List<Map<String, Object>> mapList_remaind = taskListMapper.selectByCountyAtAuxiliary_remaind(process-1,process-1);
         //查询废证组号列表 在辅助库中
         List<Map<String, Object>> mapList_failed = taskListMapper.selectByCountyAtAuxiliary_failed(process-2);