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/api/FailedCardApi.java

@@ -175,7 +175,6 @@ public class FailedCardApi {
                 JSONObject jsonObject = (JSONObject) jsonarray.get(i);
                 //查询生成任务单需要的数据
                 Map<String, Object> dataMap = failedCardService.selectTaskListById(jsonObject.getString("idCard"));
-//                TODO 会报空指针异常
                 String countyCode = dataMap.get("COUNTY_CODE").toString();
                 Long cardType = (Long) dataMap.get("CARD_TYPE_ID");
                 taskEntity.setCountyCode(countyCode);

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

@@ -467,7 +467,7 @@ public interface TaskListMapper {
             "sum(decode(prod_trace_t.CHECK_DATE,null,0,1)) CHECK_count, task.submit_date, task.task_id,\n" +
             "CARD_TYPE_DIC.CARD_TYPE, CARD_TYPE_DIC.CARD_TYPE_ID,COUNTY_DIC.COUNTY_CODE, COUNTY_DIC.COUNTYNAME, \n" +
             "group_no.VALID_COUNT,group_no.INVALID_COUNT, group_no.SPECIAL_CARD_COUNT,group_no.GROUP_NO, \n" +
-            "fc.faileCount faileCount from group_no \n" +
+            "nvl(fc.faileCount,0) faileCount from group_no \n" +
             "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" +
@@ -1172,7 +1172,7 @@ public interface TaskListMapper {
             "sum(decode(prod_trace_t.CHECK_DATE,null,0,1)) CHECK_count,\n" +
             "task.submit_date,FAILED_CARD.failed_card_id task_id,'废证' CARD_TYPE,'100' CARD_TYPE_ID,COUNTY_DIC.COUNTY_CODE,\n" +
             "COUNTY_DIC.COUNTYNAME, 1 VALID_COUNT, 0 INVALID_COUNT,0 SPECIAL_CARD_COUNT,\n" +
-            "FAILED_CARD.ACCEPT_NO group_No, 0 faileCount\n" +
+            "FAILED_CARD.ACCEPT_NO group_No, '0' faileCount\n" +
             "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" +

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

@@ -1151,11 +1151,11 @@ public class TaskListServiceImpl implements TaskListService {
                     typeSum += Integer.valueOf(countyMap.get("VALID_COUNT") + "");
                     typeSum -= Integer.valueOf(countyMap.get("SPECIAL_CARD_COUNT") + "");
                     //工位类型总数减去废证数
-                    typeSum -= Integer.valueOf((("null".equals(countyMap.get("FAILECOUNT").toString()+"")?"0":countyMap.get("FAILECOUNT").toString())));
+                    typeSum -= Integer.valueOf((("null".equals(countyMap.get("FAILECOUNT")+"")?"0":countyMap.get("FAILECOUNT")+"")));
                     validCount += Integer.valueOf(countyMap.get("VALID_COUNT") + "");
                     invalidCount += Integer.valueOf(countyMap.get("INVALID_COUNT") + "");
                     specialCount += Integer.valueOf(countyMap.get("SPECIAL_CARD_COUNT") + "");
-                    faileCount += Integer.valueOf(countyMap.get("FAILECOUNT") + "");
+                    faileCount += Integer.valueOf((("null".equals(countyMap.get("FAILECOUNT")+"")?"0":countyMap.get("FAILECOUNT")+"")));
                     eWriteCount += Integer.valueOf(countyMap.get("E_WRITER_COUNT") + "");
                     recheckCount += Integer.valueOf(countyMap.get("FINISH_COUNT") + "");
                     checkCount += Integer.valueOf(countyMap.get("CHECK_COUNT") + "");