From 9499c91f60e9a39be9950acde473626c985af6f3 Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Thu, 24 Jul 2025 20:45:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E8=B4=A8=E9=87=8F=E5=88=86?= =?UTF-8?q?=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DataAnalysisController.java | 47 ++++++++----------- .../service/impl/DataAnalysisServiceImpl.java | 4 +- .../resources/mapper/DataAnalysisMapper.xml | 4 +- 3 files changed, 24 insertions(+), 31 deletions(-) diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/DataAnalysisController.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/DataAnalysisController.java index e7fbd6f..62631d6 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/DataAnalysisController.java +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/DataAnalysisController.java @@ -42,6 +42,7 @@ public class DataAnalysisController extends BaseController { @Resource(name = "DataAnalysisMapper") private DataAnalysisMapper mapper; + @ApiOperation("根据类型获取数据分析应用") @GetMapping("getDataAnalysisByType") public AjaxResult getDataAnalysisByType(ScreenParamDto dto) { @@ -129,9 +130,10 @@ public class DataAnalysisController extends BaseController { List list = table1.get(0); ProjectQualityVo vo = new ProjectQualityVo(); vo.setProjectName(list.get(0)); - vo.setProjectManager(list.get(1)); - vo.setTeam(list.get(2)); - vo.setStartTime(list.get(3)); + vo.setCheckItems(list.get(1)); + vo.setProjectManager(list.get(2)); + vo.setTeam(list.get(3)); + vo.setStartTime(list.get(4)); int allValues = 0; int passValues = 0; @@ -139,40 +141,31 @@ public class DataAnalysisController extends BaseController { List> table2 = result.get("表格2"); allValues = allValues + table2.size(); for (List row : table2) { - for (String cell : row) { - if (cell.equals("合格")) { - passValues++; - } else if (cell.equals("不合格")) { - noPassReason.append(row.get(row.size() - 1)); - noPassReason.append(","); - } + if (row.get(1).equals("合格")) { + passValues++; + } else if (row.get(1).equals("不合格")) { + noPassReason.append(row.get(row.size() - 1)); + noPassReason.append(","); } } List> table3 = result.get("表格3"); allValues = allValues + table3.size(); for (List row : table3) { - for (String cell : row) { - if (cell.equals("合格")) { - passValues++; - } else if (cell.equals("不合格")) { - noPassReason.append(row.get(row.size() - 1)); - noPassReason.append(","); - } + if (row.get(1).equals("合格")) { + passValues++; + } else if (row.get(1).equals("不合格")) { + noPassReason.append(row.get(row.size() - 1)); + noPassReason.append(","); } - String lastValue = row.get(row.size() - 1); - noPassReason.append(lastValue); - noPassReason.append(","); } List> table4 = result.get("表格4"); allValues = allValues + table4.size(); for (List row : table4) { - for (String cell : row) { - if (cell.equals("合格")) { - passValues++; - } else if (cell.equals("不合格")) { - noPassReason.append(row.get(row.size() - 1)); - noPassReason.append(","); - } + if (row.get(1).equals("合格")) { + passValues++; + } else if (row.get(1).equals("不合格")) { + noPassReason.append(row.get(row.size() - 1)); + noPassReason.append(","); } } vo.setCheckNum(new BigDecimal(allValues)); diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/DataAnalysisServiceImpl.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/DataAnalysisServiceImpl.java index 076fbde..4b4e2c6 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/DataAnalysisServiceImpl.java +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/DataAnalysisServiceImpl.java @@ -66,8 +66,8 @@ public class DataAnalysisServiceImpl implements DataAnalysisService { // 转换为百分制分数（乘以 100） BigDecimal score = result.multiply(new BigDecimal("100")); - //保留0位小数，变成整数分 - BigDecimal integerScore = score.setScale(0, RoundingMode.HALF_UP); + //保留2位小数 + BigDecimal integerScore = score.setScale(2, RoundingMode.HALF_UP); // 转换为百分比格式（自动 ×100 并加上 %） NumberFormat percentFormat = NumberFormat.getPercentInstance(Locale.getDefault()); diff --git a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/DataAnalysisMapper.xml b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/DataAnalysisMapper.xml index a485122..ca55201 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/DataAnalysisMapper.xml +++ b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/DataAnalysisMapper.xml @@ -2,8 +2,8 @@ - INSERT INTO tb_project_quality(project_name, project_manager, team, start_time, check_num, pass_num,unqualified_items) - VALUES (#{projectName}, #{projectManager}, #{team}, #{startTime}, #{checkNum}, #{passNum}, #{unqualifiedItems}) + INSERT INTO tb_project_quality(project_name, project_manager, team, start_time, check_num, pass_num,unqualified_items,check_items) + VALUES (#{projectName}, #{projectManager}, #{team}, #{startTime}, #{checkNum}, #{passNum}, #{unqualifiedItems},#{checkItems})