Merge remote-tracking branch 'origin/master'

gradeevaluation/src/main/java/com/gyee/gradeevaluation/controller/gradeevaluation/OutputController.java

@@ -188,10 +188,12 @@ public class OutputController {
     @CrossOrigin(origins = "*", maxAge = 3600)
     public R dayilyList(@RequestParam(value = "tid",required = true)Integer tid,
                         @RequestParam(value = "wpid",required = false)String wpid,
-                        @RequestParam(value = "date",required = false)String date){
-        List<Object> resultList = outputService.dayilyList(tid,wpid,date);
+                        @RequestParam(value = "date",required = false)String date,
+                        @RequestParam(value = "wt1",required = false)String wt1,
+                        @RequestParam(value = "wt2",required = false)String wt2){
+        List<Object> resultList = outputService.dayilyList(tid,wpid,date,wt1,wt2);
         if (StringUtils.isNotNull(resultList)) {
-            return R.ok().data(resultList);
+            return R.ok((long) resultList.size()).data(resultList);
         }else{
             return R.error().message("访问失败");
         }
@@ -206,10 +208,12 @@ public class OutputController {
     @CrossOrigin(origins = "*", maxAge = 3600)
     public R monthlyList(@RequestParam(value = "tid",required = true)Integer tid,
                         @RequestParam(value = "wpid",required = false)String wpid,
-                        @RequestParam(value = "date",required = false)String date){
-        List<Object> resultList = outputService.monthlyList(tid,wpid,date);
+                        @RequestParam(value = "date",required = false)String date,
+                         @RequestParam(value = "wt1",required = false)String wt1,
+                         @RequestParam(value = "wt2",required = false)String wt2){
+        List<Object> resultList = outputService.monthlyList(tid,wpid,date,wt1,wt2);
         if (StringUtils.isNotNull(resultList)) {
-            return R.ok().data(resultList);
+            return R.ok((long) resultList.size()).data(resultList);
         }else{
             return R.error().message("访问失败");
         }
@@ -223,10 +227,12 @@ public class OutputController {
     @CrossOrigin(origins = "*", maxAge = 3600)
     public R yearlyList(@RequestParam(value = "tid",required = true)Integer tid,
                           @RequestParam(value = "wpid",required = false)String wpid,
-                          @RequestParam(value = "date",required = false)String date){
-        List<Object> resultList = outputService.yearlyList(tid,wpid,date);
+                          @RequestParam(value = "date",required = false)String date,
+                        @RequestParam(value = "wt1",required = false)String wt1,
+                        @RequestParam(value = "wt2",required = false)String wt2){
+        List<Object> resultList = outputService.yearlyList(tid,wpid,date,wt1,wt2);
         if (StringUtils.isNotNull(resultList)) {
-            return R.ok().data(resultList);
+            return R.ok((long) resultList.size()).data(resultList);
         }else{
             return R.error().message("访问失败");
         }

gradeevaluation/src/main/java/com/gyee/gradeevaluation/service/gradeevaluation/OutputService.java

@@ -115,12 +115,15 @@ public class OutputService {
     }
 
 
-    public List<Object> dayilyList(Integer tid, String wpid, String date) {
+    public List<Object> dayilyList(Integer tid, String wpid, String date,String wt1,String wt2) {
         QueryWrapper<Dailyratingmain> qw = new QueryWrapper<>();
         List<Object> resultList = new ArrayList<>();
         if (null != wpid){
             qw.eq("wpid",wpid);
         }
+        if (null != wt1 && null != wt2){
+            qw.in("wtid",wt1,wt2);
+        }
         if (null != date){
             qw.eq("recorddate", DateUtils.parseDate(date));
         }
@@ -160,8 +163,10 @@ public class OutputService {
             } catch (Exception e) {
                 e.printStackTrace();
             }
+
             resultList.add(blo);
         });
+
         return resultList;
     }
 
@@ -185,7 +190,7 @@ public class OutputService {
     }
 
 
-    public List<Object> monthlyList(Integer tid, String wpid, String date) {
+    public List<Object> monthlyList(Integer tid, String wpid, String date,String wt1,String wt2) {
 
         QueryWrapper<Monthlyratingmain> qw = new QueryWrapper<>();
         List<Object> resultList = new ArrayList<>();
@@ -196,6 +201,9 @@ public class OutputService {
         if (null != wpid){
             qw.eq("wpid",wpid);
         }
+        if (null != wt1 && null != wt2){
+            qw.in("wtid",wt1,wt2);
+        }
         if (null != date){
             qw.eq("year", year);
             qw.eq("month",month);
@@ -243,7 +251,7 @@ public class OutputService {
         return resultList;
     }
 
-    public List<Object> yearlyList(Integer tid, String wpid, String date) {
+    public List<Object> yearlyList(Integer tid, String wpid, String date,String wt1,String wt2) {
 
         QueryWrapper<Yearlyratingmain> qw = new QueryWrapper<>();
         List<Object> resultList = new ArrayList<>();
@@ -252,6 +260,9 @@ public class OutputService {
         if (null != wpid){
             qw.eq("wpid",wpid);
         }
+        if (null != wt1 && null != wt2){
+            qw.in("wtid",wt1,wt2);
+        }
         if (null != date){
             qw.eq("year", year);
         }