Skip to content

Y
YX_IDENT_beijing_auxiliary_YD
Commit 4f27d009 authored by liboyang's avatar liboyang
Browse files
Options

Merge remote-tracking branch 'origin/dev' into dev

parents b6b82219 65490220
Show whitespace changes
Inline Side-by-side
Showing with 88 additions and 88 deletions
src/main/java/com/yxproject/start/api/TaskListApi.java
View file @ 4f27d009
...@@ -420,94 +420,94 @@ public class TaskListApi { ...@@ -420,94 +420,94 @@ public class TaskListApi {
} }
/** // /**
* // *
* @param date // * @param date
* @param state // * @param state
* @return // * @return
*/ // */
@RequestMapping("selectCountHistory") // @RequestMapping("selectCountHistory")
public int selectCountHistory(@RequestParam("date")String date,@RequestParam("state")String state){ // public int selectCountHistory(@RequestParam("date")String date,@RequestParam("state")String state){
int count=0; // int count=0;
int count1; // int count1;
int count2; // int count2;
String c1; // String c1;
String c2; // String c2;
switch (state){ // switch (state){
case "1": // case "1":
c1=taskListService.selectCountIssue(date); // c1=taskListService.selectCountIssue(date);
c2=taskListService.selectCountConcora2(date); // c2=taskListService.selectCountConcora2(date);
if (c2==null||c2.equals("")){ // if (c2==null||c2.equals("")){
c2="0"; // c2="0";
} // }
count1= Integer.parseInt(c1); // count1= Integer.parseInt(c1);
count2= Integer.parseInt(c2); // count2= Integer.parseInt(c2);
count = count1+count2; // count = count1+count2;
return count; // return count;
//
case "2": // case "2":
c1=taskListService.selectCountPrintOut(date); // c1=taskListService.selectCountPrintOut(date);
c2=taskListService.selectCountPrintOut2(date); // c2=taskListService.selectCountPrintOut2(date);
if (c2==null||c2.equals("")){ // if (c2==null||c2.equals("")){
c2="0"; // c2="0";
} // }
count1 =Integer.parseInt(c1); // count1 =Integer.parseInt(c1);
count2=Integer.parseInt(c2); // count2=Integer.parseInt(c2);
count = count1+count2; // count = count1+count2;
return count; // return count;
case "3": // case "3":
c1=taskListService.selectCountPosition(date); // c1=taskListService.selectCountPosition(date);
c2=taskListService.selectCountPosition2(date); // c2=taskListService.selectCountPosition2(date);
if (c2==null||c2.equals("")){ // if (c2==null||c2.equals("")){
c2="0"; // c2="0";
} // }
count1=Integer.parseInt(c1); // count1=Integer.parseInt(c1);
count2=Integer.parseInt(c2); // count2=Integer.parseInt(c2);
count = count1+count2; // count = count1+count2;
return count; // return count;
case "4": // case "4":
c1=taskListService.selectCountConcora(date); // c1=taskListService.selectCountConcora(date);
c2=taskListService.selectCountConcora2(date); // c2=taskListService.selectCountConcora2(date);
if (c2==null||c2.equals("")){ // if (c2==null||c2.equals("")){
c2="0"; // c2="0";
} // }
count1 = Integer.parseInt(c1); // count1 = Integer.parseInt(c1);
count2= Integer.parseInt(c2); // count2= Integer.parseInt(c2);
count = count1+count2; // count = count1+count2;
return count; // return count;
case "5": // case "5":
c1=taskListService.selectCountPunching(date); // c1=taskListService.selectCountPunching(date);
c2=taskListService.selectCountPunching2(date); // c2=taskListService.selectCountPunching2(date);
if (c2==null||c2.equals("")){ // if (c2==null||c2.equals("")){
c2="0"; // c2="0";
} // }
count1 =Integer.parseInt(c1); // count1 =Integer.parseInt(c1);
count2=Integer.parseInt(c2); // count2=Integer.parseInt(c2);
count = count1+count2; // count = count1+count2;
return count; // return count;
case "6": // case "6":
c1=taskListService.selectCountSorting(date); // c1=taskListService.selectCountSorting(date);
c2=taskListService.selectCountSorting2(date); // c2=taskListService.selectCountSorting2(date);
if (c2==null||c2.equals("")){ // if (c2==null||c2.equals("")){
c2="0"; // c2="0";
} // }
count1=Integer.parseInt(c1); // count1=Integer.parseInt(c1);
count2=Integer.parseInt(c2); // count2=Integer.parseInt(c2);
count =count1+count2; // count =count1+count2;
return count; // return count;
case "7": // case "7":
c1=taskListService.selectCountQuality(date); // c1=taskListService.selectCountQuality(date);
c2=taskListService.selectCountQuality2(date); // c2=taskListService.selectCountQuality2(date);
if (c2==null||c2.equals("")){ // if (c2==null||c2.equals("")){
c2="0"; // c2="0";
} // }
count1=Integer.parseInt(c1); // count1=Integer.parseInt(c1);
count2=Integer.parseInt(c2); // count2=Integer.parseInt(c2);
count=count1+count2; // count=count1+count2;
return count; // return count;
} // }
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