个人画像大屏修改

srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphAuditDetailsController.java

@@ -266,14 +266,6 @@ public class CphAuditDetailsController extends BaseController {
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         return success(cphAuditDetailsService.selectCphAuditDetailsById(id));
     }
-    /**
-     * 查询个人思想品得加分项申请
-     */
-    @PostMapping("/getcphiamByOne/{stuNo}")
-    public TableDataInfo getcphiamByOne(@PathVariable("stuNo") String stuNo) {
-        List<CphAuditDetails> list=cphAuditDetailsService.getcphiamByOne(stuNo);
-        return getDataTable(list);
-    }
 
     /**
      * 新增审核明细

srs-admin/src/main/java/com/srs/web/controller/comprehensive/SrsCqScoreController.java

@@ -5,6 +5,7 @@ import java.util.List;
 import java.util.Map;
 import javax.servlet.http.HttpServletResponse;
 
+import com.srs.comprehensive.domain.CphAuditDetails;
 import com.srs.comprehensive.domain.Dto.CphExport;
 import com.srs.comprehensive.domain.SrsCqScore;
 import com.srs.comprehensive.domain.SrsMajors;
@@ -235,13 +236,6 @@ public class SrsCqScoreController extends BaseController {
 
     }
 
-    @GetMapping("/getOwn")
-    public AjaxResult getOwn() {
-        String stuNo = getUsername();
-        return success(srsCqScoreService.getOwn(stuNo));
-    }
-
-
     /**
      * 导出学生综合素质评分表列表
      */
@@ -337,4 +331,41 @@ public class SrsCqScoreController extends BaseController {
         return getDataTable(list);
     }
 
+    /**
+     * 查询个人思想品得加分项申请
+     */
+    @PostMapping("/getcphiamByOne/{stuNo}")
+    public TableDataInfo getcphiamByOne(@PathVariable("stuNo") String stuNo) {
+        List<CphAuditDetails> list=srsCqScoreService.getcphiamByOne(stuNo);
+        return getDataTable(list);
+    }
+    @GetMapping("/getOwncphiamByOne")
+    public TableDataInfo getOwncphiamByOne() {
+        List<CphAuditDetails> list=srsCqScoreService.getcphiamByOne(getUsername());
+        return getDataTable(list);
+    }
+
+    /**
+     * 查询个人素质综合信息
+     */
+    @GetMapping("/getStuData")
+    public TableDataInfo getStuData(String stuNo) {
+        List<SrsCqScore> list=srsCqScoreService.getStuData(stuNo);
+        return getDataTable(list);
+    }
+    @GetMapping("/getOwnData")
+    public TableDataInfo getOwnData() {
+        List<SrsCqScore> list=srsCqScoreService.getStuData(getUsername());
+        return getDataTable(list);
+    }
+    //查询综合素质分数
+    @GetMapping("/getOwn")
+    public TableDataInfo getOwn() {
+        String stuNo = getUsername();
+        return getDataTable(srsCqScoreService.getOwn2(stuNo));
+    }
+    @GetMapping("/getStu")
+    public TableDataInfo getStu(String stuNo){
+        return getDataTable(srsCqScoreService.getOwn2(stuNo));
+    }
 }

srs-admin/src/main/resources/application.yml

@@ -81,15 +81,15 @@ spring:
   # redis 配置
   redis:
     # 地址
-    host: localhost     #正式环境redis
-#    host: 47.112.118.149 #测试开发地址
+#    host: localhost     #正式环境redis
+    host: 47.112.118.149 #测试开发地址
 #     端口，默认为6379
     port: 6379
     # 数据库索引
     database: 0
     # 密码SSSS
-#    password: Houpuyfb   #测试开发密码
-    password:       #正式环境密码
+    password: Houpuyfb   #测试开发密码
+#     password:       #正式环境密码
     # 连接超时时间
     timeout: 10s
     lettuce: