From aa5843438ef0f95a1072c555b6928bb570a6fe76 Mon Sep 17 00:00:00 2001 From: jyang_jun Date: Wed, 18 Oct 2023 16:07:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../index/controller/IndexVController.java | 102 ++++--- .../src/main/resources/static/img/login.html | 2 +- .../src/main/resources/static/logo.jpg | Bin 40864 -> 37022 bytes .../src/main/resources/static/logo1.jpg | Bin 0 -> 40864 bytes .../src/main/resources/templates/index.html | 2 +- .../main/resources/templates/index/v/sum.html | 253 ------------------ .../src/main/resources/templates/login.html | 2 +- 7 files changed, 53 insertions(+), 308 deletions(-) create mode 100644 ruoyi-admin/src/main/resources/static/logo1.jpg diff --git a/ruoyi-admin/src/main/java/com/ruoyi/index/controller/IndexVController.java b/ruoyi-admin/src/main/java/com/ruoyi/index/controller/IndexVController.java index 9de354e..eea96cc 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/index/controller/IndexVController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/index/controller/IndexVController.java @@ -94,53 +94,54 @@ public class IndexVController extends BaseController { @GetMapping("/sum") public String sum(ModelMap mmap, String platformId, String projectId, Integer year, Long index) { - if (ShiroUtils.getSysUser() == null && getSession().getAttribute("loginName") == null) { - return "redirect:/"; - } - String plats = (String) getSession().getAttribute("plats"); - if (ShiroUtils.getSysUser() == null && StringUtils.isEmpty(plats)) { - return prefix + "/noauth"; - } - platformId = reset(platformId); - projectId = reset(projectId); - // String psql = "select * from dim_platform order by platform_name"; - String psql = "select * from R1917GroupPlatform order by Sequence desc"; - if (ShiroUtils.getSysUser() == null) { - psql = "select * from R1917GroupPlatform where id in ('" + plats.replaceAll(",", "','") + "')"; - if (("," + plats + ",").indexOf("," + platformId + ",") < 0) { - platformId = plats.split(",")[0]; - } - } else { - if (ShiroUtils.getSysUser().getDept().getParentId() != 0) { - platformId = ShiroUtils.getSysUser().getDeptId().toString(); - // psql = "select * from dim_platform where id='" + platformId + "'"; - psql = "select * from R1917GroupPlatform where id='" + platformId + "'"; - - } - } - mmap.put("indexs", indexVService.selectIndexVList(null)); - mmap.put("indexId", index); - List> platforms = ssMapper.selectDetail(psql); - mmap.put("platforms", platforms); - if (StringUtils.isEmpty(platformId)) { - platformId = platforms.get(0).get("ID").toString(); - } - mmap.put("platformId", platformId); - mmap.put("projects", listProject(platformId)); - mmap.put("projectId", projectId); - mmap.put("year", year); - - if (index != null) { - IndexV v = indexVService.selectIndexVById(index); - mmap.put("v", v); - - Map summap = new HashMap<>(); - mmap.put("sList", getSList(summap, platformId, projectId, year, v)); - - String valueString = new StrSubstitutor(summap).replace(v.getFormula()); - mmap.put("value", getValue(valueString)); - - } +// if (ShiroUtils.getSysUser() == null && getSession().getAttribute("loginName") == null) { +// return "redirect:/"; +// } +// String plats = (String) getSession().getAttribute("plats"); +// if (ShiroUtils.getSysUser() == null && StringUtils.isEmpty(plats)) { +// return prefix + "/noauth"; +// } +// platformId = reset(platformId); +// projectId = reset(projectId); +// // String psql = "select * from dim_platform order by platform_name"; +// String psql = "select * from R1917GroupPlatform order by Sequence desc"; +// if (ShiroUtils.getSysUser() == null) { +// psql = "select * from R1917GroupPlatform where id in ('" + plats.replaceAll(",", "','") + "')"; +// if (("," + plats + ",").indexOf("," + platformId + ",") < 0) { +// platformId = plats.split(",")[0]; +// } +// } else { +// if (ShiroUtils.getSysUser().getDept().getParentId() != 0) { +// platformId = ShiroUtils.getSysUser().getDeptId().toString(); +// // psql = "select * from dim_platform where id='" + platformId + "'"; +// psql = "select * from R1917GroupPlatform where id='" + platformId + "'"; +// +// } +// } +// mmap.put("indexs", indexVService.selectIndexVList(null)); +// mmap.put("indexId", index); +//// List> platforms = ssMapper.selectDetail(psql); +// List> platforms = new ArrayList<>(); +// mmap.put("platforms", platforms); +// if (StringUtils.isEmpty(platformId)) { +// platformId = platforms.get(0).get("ID").toString(); +// } +// mmap.put("platformId", "1"); +// mmap.put("projects", ""); +// mmap.put("projectId", ""); +// mmap.put("year", year); +// +// if (index != null) { +//// IndexV v = indexVService.selectIndexVById(index); +// mmap.put("v", "1"); +// +// // Map summap = new HashMap<>(); +// mmap.put("sList", ""); +// +// // String valueString = new StrSubstitutor(summap).replace(v.getFormula()); +// mmap.put("value", ""); +// +// } return prefix + "/sum"; } @@ -346,11 +347,8 @@ public class IndexVController extends BaseController { @PostMapping("/listProject") @ResponseBody public List> listProject(String platformId) { - return ssMapper.selectDetail( - // "select * from dwd_asset_project where platform_id='" + reset(platformId) + - // "' order by project_name"); - "SELECT p.ID as ID,p.ProjectAbbr as ProjectName from R1917BIRoomProject p where p.IsDelete=0 and p.GroupPlatformId='" - + reset(platformId) + "' order by p.Sequence"); + List> list = new ArrayList<>(); + return list; } private String getValue(String valueString) { diff --git a/ruoyi-admin/src/main/resources/static/img/login.html b/ruoyi-admin/src/main/resources/static/img/login.html index e2cfcd5..b224f57 100644 --- a/ruoyi-admin/src/main/resources/static/img/login.html +++ b/ruoyi-admin/src/main/resources/static/img/login.html @@ -26,7 +26,7 @@
diff --git a/ruoyi-admin/src/main/resources/templates/index/v/sum.html b/ruoyi-admin/src/main/resources/templates/index/v/sum.html index 44dedd2..4042b0f 100644 --- a/ruoyi-admin/src/main/resources/templates/index/v/sum.html +++ b/ruoyi-admin/src/main/resources/templates/index/v/sum.html @@ -9,273 +9,20 @@

展示指标查询

-
-
-
    -
  • - 公司： -
    • -
  • - 项目： -
    • -
  • - 指标： -
    • -
  • - 年度： -
    • -
  • -  查看 -  重置 -
    • -
-
-
-
- -
-

[[${v.name}]]：[[${value}]] [[${v.unit}]]

-
-
- 指标说明 -
-
-

-
-
-
-
- 指标公式 -
-
-

-
-
- - -
-
- 备注 -
-
-

-
-
- -

基础指标：

-
- - - - - - - - - - - - - - - - - - - - -
基础指标名称 - 说明 - - 基础指标值 - - 举例 -
查看
-
-

底层数据： 导出

- - -
-
-
    -
  • -
    • -
-
-
-
-
-
- [[${s.detail.size()}]]条 -
- -
-
-
-
- - - - - - -
- - -
-
-
- - - - diff --git a/ruoyi-admin/src/main/resources/templates/login.html b/ruoyi-admin/src/main/resources/templates/login.html index c079279..fa935c8 100644 --- a/ruoyi-admin/src/main/resources/templates/login.html +++ b/ruoyi-admin/src/main/resources/templates/login.html @@ -26,7 +26,7 @@