push

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

@@ -231,7 +231,7 @@ public interface TaskListMapper {
             "from group_no left join task on group_no.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 task.TASK_STATE_ID = #{process} order by group_no.GROUP_NO")
     public List<Map<String,Object>> selectByCountyAtAuxiliary_common(@Param("process") long process,@Param("process2") long process2);
 
@@ -418,7 +418,7 @@ public interface TaskListMapper {
             "from group_no left join task on group_no.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  \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  \n" +
             "group by task_id ) fc \n" +
             "on fc.TASK_ID = task.TASK_ID\n" +
             "left join prod_trace_t@PROD_LINK on SUBSTR(prod_trace_t.ACCEPT_NO,0,8) = group_no.GROUP_NO\n" +
@@ -442,7 +442,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);
 
@@ -582,7 +582,7 @@ public interface TaskListMapper {
             "left join COUNTY_DIC  on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
             "left join prod_trace_t@PROD_LINK on prod_trace_t.ACCEPT_NO = SPECIAL_CARD.ACCEPT_NO\n" +
             "left join (select task_id,nvl(count(*),0) faileCount from FAILED_CARD  \n" +
-            "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 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 prod_card_t@PROD_LINK on prod_trace_t.ACCEPT_NO =prod_card_t.ACCEPT_NO\n" +
             "left join GAJG_DM on GAJG_DM.GAJG_DM = substr(prod_card_t.upload_no,0,9) " +
             " left join RECEIPT_LIST on RECEIPT_LIST.QR_CODE = special_card.accept_no " +
@@ -603,7 +603,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 =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);
 
@@ -825,7 +825,7 @@ public interface TaskListMapper {
             "left join COUNTY_DIC  on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
             "left join prod_trace_t@PROD_LINK on prod_trace_t.ACCEPT_NO = SPECIAL_CARD.ACCEPT_NO\n" +
             "left join (select task_id,nvl(count(*),0) faileCount from FAILED_CARD  \n" +
-            "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 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 prod_card_t@PROD_LINK on prod_trace_t.ACCEPT_NO =prod_card_t.ACCEPT_NO\n" +
             "left join GAJG_DM on GAJG_DM.GAJG_DM = substr(prod_card_t.upload_no,0,9)" +
             " left join RECEIPT_LIST on RECEIPT_LIST.QR_CODE = special_card.accept_no  " +