Merge branch 'lj-project' of git.yfzx.zjtys.com.cn:912-system/monitor/inspect into lj-project

src/main/java/com/zjty/inspect/controller/EvaluationController.java

@@ -91,6 +91,17 @@ public class EvaluationController {
         }
         return ServerResponse.ok(null);
     }
+    @ApiOperation("根据报告id查询excel输入")
+    @GetMapping(value = "/in/excel/{id}")
+    public ServerResponse<List<ExcelDataTemp>> exportInName(@PathVariable String id) {
+        Evaluation evaluation = evaluationService.findById(id);
+        if (evaluation != null) {
+            List<ExcelDataTemp> excelDataTemp = ExcelUtil.parseExcel2Entity(evaluation);
+            return ServerResponse.ok(excelDataTemp);
+        } else {
+            return ServerResponse.ok(new ArrayList<>());
+        }
+    }
 
     /**
      * 修改评估报告

src/main/java/com/zjty/inspect/controller/InspectController.java

@@ -435,10 +435,6 @@ public class InspectController {
         }
     }
 
-
-
-
-
     @PostMapping("/gitdownload")
     private ServerResponse gitDownloads(String gitAddress, String username, String password) {
         try {
@@ -452,6 +448,8 @@ public class InspectController {
     @PostMapping("/importExcelToRapidAssessment")
     private ServerResponse<Reform> uploadFileToInspect(MultipartFile file, String username) throws IOException {
         Reform reform = ExcelUtil.parseExcel(file.getInputStream(),file.getOriginalFilename());
+
+
         reform.setUsername(username);
         return ServerResponse.ok(reform);
     }

src/main/java/com/zjty/inspect/enums/ApplicationType.java

@@ -45,7 +45,6 @@ public enum ApplicationType {
 
     private Integer code;
     private String name;
-    private Integer other;
 
     ApplicationType() {
     }

src/main/java/com/zjty/inspect/utils/ExcelUtil.java

@@ -351,7 +351,7 @@ public class ExcelUtil {
         String safe = getExcelCell(90, 2, sheetAt);
         database1.setSafe(yesOrNo(safe));
         String performance = getExcelCell(91, 2, sheetAt);
-        if (!"无".equals(performance)) {
+        if (!"".equals(performance) && !"无".equals(performance)) {
             database1.setPerformance(1);
         }
         reform.setDatabase(database1);
@@ -399,9 +399,6 @@ public class ExcelUtil {
                 case "在线视频播放类：请在备注中填写插件名和版本":
                     browser.setMedia(1);
                     break;
-                default:
-                    browser.setOtherDemand(1);
-                    break;
             }
             browserPlugs.add(browserPlug);
         }
@@ -412,7 +409,7 @@ public class ExcelUtil {
         if (!"".equals(apply)) {
             apply1.setCost(Double.valueOf(apply));
         }
-        String remark = getExcelCell(110, 3, sheetAt);
+        String remark = getExcelCell(110, 4, sheetAt);
         apply1.setReason(remark);
         reform.setApply(apply1);
         SystemStructure systemStructure = new SystemStructure();

src/main/java/com/zjty/inspect/utils/WpsUtil.java

@@ -473,7 +473,11 @@ public class WpsUtil {
                 int i1 = i + 1;
                 if (len > i) {
                     if (!StringUtils.isEmpty(list.get(i).getName())) {
-                        keyValue.put(name + i1, list.get(i).getName());
+                        if(!StringUtils.isEmpty(list.get(i).getDes())){
+                            keyValue.put(name + i1, list.get(i).getDes());
+                        }else{
+                            keyValue.put(name + i1, list.get(i).getName());
+                        }
                     } else {
                         keyValue.put(name + i1, "无");
                     }