搜索框更改

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

@@ -431,41 +431,78 @@ public class TaskListApi {
         int count=0;
         int count1;
         int count2;
+        String c1;
+        String c2;
         switch (state){
             case "1":
-                 count1= Integer.parseInt(taskListService.selectCountIssue(date));
-                 count2= Integer.parseInt(taskListService.selectCountIssue2(date));
+                 c1=taskListService.selectCountIssue(date);
+                 c2=taskListService.selectCountConcora2(date);
+                if (c2==null||c2.equals("")){
+                    c2="0";
+                }
+                 count1= Integer.parseInt(c1);
+                 count2= Integer.parseInt(c2);
                  count = count1+count2;
                 return count;
 
             case "2":
-                 count1 =Integer.parseInt(taskListService.selectCountPrintOut(date));
-                 count2=Integer.parseInt(taskListService.selectCountPrintOut2(date));
+                 c1=taskListService.selectCountPrintOut(date);
+                c2=taskListService.selectCountPrintOut2(date);
+                if (c2==null||c2.equals("")){
+                    c2="0";
+                }
+                 count1 =Integer.parseInt(c1);
+                 count2=Integer.parseInt(c2);
                  count = count1+count2;
                  return count;
             case "3":
-                count1=Integer.parseInt(taskListService.selectCountPosition(date));
-                count2=Integer.parseInt(taskListService.selectCountPosition2(date));
+                c1=taskListService.selectCountPosition(date);
+                c2=taskListService.selectCountPosition2(date);
+                if (c2==null||c2.equals("")){
+                    c2="0";
+                }
+                count1=Integer.parseInt(c1);
+                count2=Integer.parseInt(c2);
                 count = count1+count2;
                 return count;
             case "4":
-                count1 = Integer.parseInt(taskListService.selectCountConcora(date));
-                count2= Integer.parseInt(taskListService.selectCountConcora2(date));
+                c1=taskListService.selectCountConcora(date);
+                c2=taskListService.selectCountConcora2(date);
+                if (c2==null||c2.equals("")){
+                    c2="0";
+                }
+                count1 = Integer.parseInt(c1);
+                count2= Integer.parseInt(c2);
                 count = count1+count2;
                 return count;
             case "5":
-                count1 =Integer.parseInt(taskListService.selectCountPunching(date));
-                count2=Integer.parseInt(taskListService.selectCountPunching2(date));
+                c1=taskListService.selectCountPunching(date);
+                c2=taskListService.selectCountPunching2(date);
+                if (c2==null||c2.equals("")){
+                    c2="0";
+                }
+                count1 =Integer.parseInt(c1);
+                count2=Integer.parseInt(c2);
                 count = count1+count2;
                 return count;
             case "6":
-                count1=Integer.parseInt(taskListService.selectCountSorting(date));
-                count2=Integer.parseInt(taskListService.selectCountSorting2(date));
+                c1=taskListService.selectCountSorting(date);
+                c2=taskListService.selectCountSorting2(date);
+                if (c2==null||c2.equals("")){
+                    c2="0";
+                }
+                count1=Integer.parseInt(c1);
+                count2=Integer.parseInt(c2);
                 count =count1+count2;
                 return count;
             case "7":
-                count1=Integer.parseInt(taskListService.selectCountQuality(date));
-                count2=Integer.parseInt(taskListService.selectCountQuality2(date));
+                c1=taskListService.selectCountQuality(date);
+                c2=taskListService.selectCountQuality2(date);
+                if (c2==null||c2.equals("")){
+                    c2="0";
+                }
+                count1=Integer.parseInt(c1);
+                count2=Integer.parseInt(c2);
                 count=count1+count2;
                 return count;
         }