工程质量分析

securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/vo/ProjectQualityVo.java

@@ -13,10 +13,6 @@ import java.math.BigDecimal;
 @Data
 public class ProjectQualityVo {
     private String projectName;
-    private String projectNumber;
-    private String projectAddress;
-    private String contractorName;
-    private String qualityLevel;
     private String projectManager;
     private String team;
     private String startTime;

securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/DataAnalysisController.java

@@ -40,32 +40,33 @@ public class DataAnalysisController extends BaseController {
 
     @ApiOperation("根据类型获取数据分析应用")
     @GetMapping("getDataAnalysisByType")
-    public AjaxResult getDataAnalysisByType(ScreenParamDto dto){
+    public AjaxResult getDataAnalysisByType(ScreenParamDto dto) {
         return service.getDataAnalysisByType(dto);
     }
 
     @ApiOperation(value = "数据应用分析")
     @GetMapping("getListByType")
     public TableDataInfo getListByType(ScreenParamDto dto) {
-        try{
+        try {
             startLayPage();
             List<DataAnalysisDetailVo> list = service.getListByType(dto);
             return getDataTableLayui(list);
-        }catch (Exception e){
+        } catch (Exception e) {
-            log.error(e.toString(),e);
+            log.error(e.toString(), e);
-            return getDataTableBadLayui(new ArrayList<>(),"请求出错了");
+            return getDataTableBadLayui(new ArrayList<>(), "请求出错了");
         }
     }
+
     @ApiOperation(value = "工程质量分析")
     @GetMapping("getEngqualityAnalysis")
     public TableDataInfo getEngqualityAnalysis(ScreenParamDto dto) {
-        try{
+        try {
             startLayPage();
             List<ProjectQualityVo> list = service.getEngqualityAnalysis(dto);
             return getDataTableLayui(list);
-        }catch (Exception e){
+        } catch (Exception e) {
-            log.error(e.toString(),e);
+            log.error(e.toString(), e);
-            return getDataTableBadLayui(new ArrayList<>(),"请求出错了");
+            return getDataTableBadLayui(new ArrayList<>(), "请求出错了");
         }
     }
 
@@ -73,15 +74,15 @@ public class DataAnalysisController extends BaseController {
     @GetMapping("getListByType2")
     public AjaxResult getListByType2(ScreenParamDto dto) {
         List<DataAnalysisDetailVo> list = null;
-        try{
+        try {
             list = service.getListByType(dto);
-        }catch (Exception e){
+        } catch (Exception e) {
-            log.error(e.toString(),e);
+            log.error(e.toString(), e);
         }
         return AjaxResult.success(list);
     }
 
-    @PostMapping("uploadProQuality")
+    @PostMapping("uploadProQualityFile")
     public Map<String, List<List<String>>> extractTablesFromWord(@RequestParam("file") MultipartFile file) {
         Map<String, List<List<String>>> result = new HashMap<>();
 
@@ -105,25 +106,61 @@ public class DataAnalysisController extends BaseController {
                     XWPFTable table = tables.get(i);
                     List<List<String>> tableData = new ArrayList<>();
 
-                    // 处理每一行
+                    // 从第二行开始（索引1）遍历到最后一行
-                    for (XWPFTableRow row : table.getRows()) {
+                    for (int j = 1; j < table.getRows().size(); j++) {
+                        XWPFTableRow row = table.getRows().get(j);
                         List<String> rowData = new ArrayList<>();
 
-                        // 处理每个单元格
                         for (XWPFTableCell cell : row.getTableCells()) {
                             rowData.add(cell.getText());
                         }
 
                         tableData.add(rowData);
                     }
-
                     result.put("表格" + (i + 1), tableData);
                 }
             }
+            if (!result.isEmpty()) {
+                List<List<String>> table1 = result.get("表格1");
+                List<String> 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));
+
+                int allValues = 0;
+                int passValues = 0;
+                List<List<String>> table2 = result.get("表格2");
+                for (List<String> row : table2) {
+                    for (String cell : row) {
+                        allValues++;
+                        if (cell.equals("合格"))
+                            passValues++;
+                    }
+                }
+                List<List<String>> table3 = result.get("表格3");
+                for (List<String> row : table3) {
+                    for (String cell : row) {
+                        allValues++;
+                        if (cell.equals("合格"))
+                            passValues++;
+                    }
+                }
+                List<List<String>> table4 = result.get("表格4");
+                for (List<String> row : table4) {
+                    for (String cell : row) {
+                        allValues++;
+                        if (cell.equals("合格"))
+                            passValues++;
+                    }
+                }
+                System.out.println(allValues + " haha" + passValues);
+            }
+
         } catch (Exception e) {
             throw new RuntimeException("处理Word文档时出错: " + e.getMessage(), e);
         }
-
         return result;
     }
 }

securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/DataAnalysisMapper.xml

@@ -35,10 +35,6 @@
     </select>
     <select id="getEngqualityAnalysis" resultType="com.securitycontrol.entity.screen.vo.ProjectQualityVo">
         select  project_name as projectName,
-                project_number as projectNumber,
-                project_address as projectAddress,
-                contractor_name as contractorName,
-                case when quality_level = 1 then '初级' when quality_level = 2 then '中级' else '高级' end as qualityLevel,
                 project_manager as projectManager,
                 team,
                 start_time as startTime,