Merge branch 'sprint/S1' into develop

demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/service/cps/CpsQuestionGetService.java

@@ -73,7 +73,9 @@ public class CpsQuestionGetService extends AbsEAIService {
         List<Long> collectIds = questionInfo.stream().map(o -> MapUtils.getLong(o, "id")).collect(Collectors.toList());
         LambdaQueryChainWrapper<CpsQuestionInfo> lambdaQuery = cpsQuestionInfoService.lambdaQuery().in(CpsQuestionInfo::getId, collectIds);
 
-        switch (option) {
+        String status = eaiRequest.getString("status");
+
+        /*switch (option) {
             case "1":
                 lambdaQuery.eq(CpsQuestionInfo::getStatus1, MapUtils.getInteger(questionInfo.get(0), "status1"));
                 break;
@@ -92,6 +94,27 @@ public class CpsQuestionGetService extends AbsEAIService {
             case "6":
                 lambdaQuery.eq(CpsQuestionInfo::getStatus6, MapUtils.getInteger(questionInfo.get(0), "status6"));
                 break;
+        }*/
+
+        switch (option) {
+            case "1":
+                lambdaQuery.eq(CpsQuestionInfo::getStatus1, status);
+                break;
+            case "2":
+                lambdaQuery.eq(CpsQuestionInfo::getStatus2, status);
+                break;
+            case "3":
+                lambdaQuery.eq(CpsQuestionInfo::getStatus3, status);
+                break;
+            case "4":
+                lambdaQuery.eq(CpsQuestionInfo::getStatus4, status);
+                break;
+            case "5":
+                lambdaQuery.eq(CpsQuestionInfo::getStatus5, status);
+                break;
+            case "6":
+                lambdaQuery.eq(CpsQuestionInfo::getStatus6, status);
+                break;
         }
 
         return buildOK("question_info", lambdaQuery.list());