Commit 65490220 authored by suichenguang's avatar suichenguang

搜索框更改

parent 3901a930
......@@ -420,94 +420,94 @@ public class TaskListApi {
}
/**
*
* @param date
* @param state
* @return
*/
@RequestMapping("selectCountHistory")
public int selectCountHistory(@RequestParam("date")String date,@RequestParam("state")String state){
int count=0;
int count1;
int count2;
String c1;
String c2;
switch (state){
case "1":
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":
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":
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":
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":
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":
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":
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;
}
return count;
}
// /**
// *
// * @param date
// * @param state
// * @return
// */
// @RequestMapping("selectCountHistory")
// public int selectCountHistory(@RequestParam("date")String date,@RequestParam("state")String state){
// int count=0;
// int count1;
// int count2;
// String c1;
// String c2;
// switch (state){
// case "1":
// 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":
// 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":
// 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":
// 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":
// 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":
// 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":
// 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;
// }
// return count;
// }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment