Merge branch 'dev' of…

Merge branch 'dev' of http://121.22.111.250:8000/YX_IDENT_auxiliary/YX_IDENT_beijing_auxiliary into dev

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

@@ -440,8 +440,10 @@ 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 accept_no, nvl(count(*),0) faileCount from FAILED_CARD  where FAILED_CARD.state <=#{process2} and FAILED_CARD.state != FAILED_CARD.INITIATOR  and accept_no  not in (select accept_no from special_card ) \n" +
-            "group by accept_no ) fc on substr(fc.accept_no,0,8) = group_no.group_no \n" +
+            "left join (select substr(accept_no,0,8) accept_no, nvl(sum(decode(accept_no,null,0,1)),0) faileCount from FAILED_CARD \n" +
+            "          where FAILED_CARD.state <= #{process2} and FAILED_CARD.state != FAILED_CARD.INITIATOR \n" +
+            "          and accept_no not in (select accept_no from special_card )\n" +
+            "          group by substr(accept_no,0,8) ) fc on fc.accept_no = group_no.group_no \n" +
             "left join prod_trace_t@PROD_LINK on SUBSTR(prod_trace_t.ACCEPT_NO,0,8) = group_no.GROUP_NO\n" +
             "left join prod_card_t@PROD_LINK on prod_trace_t.ACCEPT_NO =prod_card_t.ACCEPT_NO " +
             "left join PROD_GROUP_T@PROD_LINK on PROD_GROUP_T.group_no =group_no.GROUP_NO " +

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

@@ -17,7 +17,7 @@ public interface ReceiptService {
 
     public boolean createDetailedList(String UPLOAD_NO,String ACCEPT_NO,String NAME,String CARD_ID,String GAJG_DM,long RECEIPT_ID,String SEX,String signGovt);
 
-    public int selectSpecialCard(String GROUP_NO);
+//    public int selectSpecialCard(String GROUP_NO);
 
     public List<Map<String,Object>> selectByGroupNo(String groupNo);
 
@@ -25,7 +25,7 @@ public interface ReceiptService {
 
     public List<Map<String,Object>>selectReceiptListOfSpecialCard (String name);
 
-    public Map<String,Object> selectReceiptList(String id);
+//    public Map<String,Object> selectReceiptList(String id);
 
     public List<Map<String,Object>> selectDetailList(String receiptId);
 
@@ -39,7 +39,7 @@ public interface ReceiptService {
 
     public int selectCount(String GROUP_NO);
 
-    public boolean updateFinishCount(String GROUP_NO,int count);
+//    public boolean updateFinishCount(String GROUP_NO,int count);
 
     public List<Map<String,Object>> queryPoliceName(String policeCode);
 

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

@@ -41,11 +41,11 @@ public class ReceiptServiceImpl implements ReceiptService {
         return true;
     }
 
-    @Override
-    public int selectSpecialCard(String GROUP_NO) {
-        int count = receiptMapper.selectSpecialCard(GROUP_NO);
-        return count;
-    }
+//    @Override
+//    public int selectSpecialCard(String GROUP_NO) {
+//        int count = receiptMapper.selectSpecialCard(GROUP_NO);
+//        return count;
+//    }
 
 
 
@@ -67,11 +67,11 @@ public class ReceiptServiceImpl implements ReceiptService {
         return resultList;
     }
 
-    @Override
-    public Map<String, Object> selectReceiptList(String id) {
-        Map<String, Object> resultMap = receiptMapper.selectReceiptList(id);
-        return resultMap;
-    }
+//    @Override
+//    public Map<String, Object> selectReceiptList(String id) {
+//        Map<String, Object> resultMap = receiptMapper.selectReceiptList(id);
+//        return resultMap;
+//    }
 
     @Override
     public List<Map<String, Object>> selectDetailList(String receiptId) {
@@ -96,11 +96,11 @@ public class ReceiptServiceImpl implements ReceiptService {
         return count;
     }
 
-    @Override
-    public boolean updateFinishCount(String GROUP_NO, int count) {
-        receiptMapper.updateFinishCount(GROUP_NO,count);
-        return true;
-    }
+//    @Override
+//    public boolean updateFinishCount(String GROUP_NO, int count) {
+//        receiptMapper.updateFinishCount(GROUP_NO,count);
+//        return true;
+//    }
 
     @Override
     public List<Map<String, Object>> selectCountById(String id,String beginDate,String expireDate) {