Browse Source

等级评估功能完善

xieshengjie 3 years ago
parent
commit
0d21ae1063

+ 3 - 1
web/consumer/src/main/java/com/gyee/consumer/api/healthmanagement/LevelAssessmentApi.java

@@ -10,7 +10,9 @@ public interface LevelAssessmentApi {
     @GetMapping("/list")
     public R list(@RequestParam(value = "recorddate",required = true) String recorddate,
                   @RequestParam(value = "type",required = true) String type,
-                  @RequestParam(value = "wpid",required = true) String wpid
+                  @RequestParam(value = "wpid",required = true) String wpid,
+                  @RequestParam(value = "orderby",required = false) String orderby,
+                  @RequestParam(value = "isAsc",required = false) String isAsc
     );
 
     @GetMapping("/comparison")

+ 4 - 2
web/consumer/src/main/java/com/gyee/consumer/controller/healthmanagement/LevelAssessmentController.java

@@ -22,9 +22,11 @@ public class LevelAssessmentController {
     @GetMapping("/consumer/levelAssessment/list")
     public R list(@RequestParam(value = "recorddate",required = true) String recorddate,
                   @RequestParam(value = "type",required = true) String type,
-                  @RequestParam(value = "wpid",required = true) String wpid
+                  @RequestParam(value = "wpid",required = true) String wpid,
+                  @RequestParam(value = "orderby",required = false) String orderby,
+                  @RequestParam(value = "isAsc",required = false) String isAsc
     ){
-        return levelAssessmentApi.list(recorddate,type,wpid);
+        return levelAssessmentApi.list(recorddate,type,wpid,orderby,isAsc);
     }
 
     /**

BIN
web/consumer/target/consumer-1.0-SNAPSHOT.jar


BIN
web/consumer/target/consumer-1.0-SNAPSHOT.jar.original


+ 2 - 2
web/healthmanagement-web-hb/src/main/resources/application.yml

@@ -1,4 +1,4 @@
 spring:
   profiles:
-#    active: dev
-    active: test
+    active: dev
+#    active: test

+ 2 - 2
web/healthmanagement-web-hb/target/classes/application.yml

@@ -1,4 +1,4 @@
 spring:
   profiles:
-#    active: dev
-    active: test
+    active: dev
+#    active: test

BIN
web/healthmanagement-web-hb/target/healthmanagement-web-hb-1.0-SNAPSHOT.jar


BIN
web/healthmanagement-web-hb/target/healthmanagement-web-hb-1.0-SNAPSHOT.jar.original


+ 5 - 0
web/healthmanagement-web-hb/target/maven-archiver/pom.properties

@@ -0,0 +1,5 @@
+#Generated by Maven
+#Wed Feb 23 17:30:12 CST 2022
+version=1.0-SNAPSHOT
+groupId=com.gyee
+artifactId=healthmanagement-web-hb

+ 0 - 0
web/healthmanagement-web-hb/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst


+ 13 - 0
web/healthmanagement-web-hb/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -0,0 +1,13 @@
+D:\work\ideawork\sis\sis\web\healthmanagement-web-hb\src\main\java\com\gyee\healthmanagement\HealthmanagementMain.java
+D:\work\ideawork\sis\sis\web\healthmanagement-web-hb\src\main\java\com\gyee\healthmanagement\mapper\auto\Windturbineinfodaytop2Mapper.java
+D:\work\ideawork\sis\sis\web\healthmanagement-web-hb\src\main\java\com\gyee\healthmanagement\service\levelassessment\LevelAssessmentService.java
+D:\work\ideawork\sis\sis\web\healthmanagement-web-hb\src\main\java\com\gyee\healthmanagement\model\auto\Windturbineinfodaytop2.java
+D:\work\ideawork\sis\sis\web\healthmanagement-web-hb\src\main\java\com\gyee\healthmanagement\service\auto\IWindturbineinfodaytop2Service.java
+D:\work\ideawork\sis\sis\web\healthmanagement-web-hb\src\main\java\com\gyee\healthmanagement\service\auto\impl\Windturbineinfodaytop2ServiceImpl.java
+D:\work\ideawork\sis\sis\web\healthmanagement-web-hb\src\main\java\com\gyee\healthmanagement\controller\levelassessment\LevelAssessmentController.java
+D:\work\ideawork\sis\sis\web\healthmanagement-web-hb\src\main\java\com\gyee\healthmanagement\config\GeneratorCodeConfig.java
+D:\work\ideawork\sis\sis\web\healthmanagement-web-hb\src\main\java\com\gyee\healthmanagement\controller\auto\Windturbineinfodaytop2Controller.java
+D:\work\ideawork\sis\sis\web\healthmanagement-web-hb\src\main\java\com\gyee\healthmanagement\config\CorsConfig.java
+D:\work\ideawork\sis\sis\web\healthmanagement-web-hb\src\main\java\com\gyee\healthmanagement\config\R.java
+D:\work\ideawork\sis\sis\web\healthmanagement-web-hb\src\main\java\com\gyee\healthmanagement\config\MybatisPlusConfig.java
+D:\work\ideawork\sis\sis\web\healthmanagement-web-hb\src\main\java\com\gyee\healthmanagement\config\ResultCode.java

+ 0 - 0
web/healthmanagement-web-hb/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst