mcj:更新导入excel表格

src/main/java/com/zjty/inspect/config/FpCorsFilter.java

@@ -27,7 +27,6 @@ public class FpCorsFilter implements Filter {
         // 设置响应头的权限信息 request.getHeader("Origin")
 
         response.setHeader("Access-Control-Allow-Origin", "*");
-        String origin = request.getHeader("Origin");
 
         response.setHeader("Access-Control-Allow-Credentials", "true");
         response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, PUT, PATCH, DELETE");

src/main/java/com/zjty/inspect/config/MvcConfig.java

@@ -27,16 +27,6 @@ public class MvcConfig extends WebMvcConfigurationSupport {
         super.addInterceptors(registry);
     }
 
-//    @Override
-//    protected void addCorsMappings(CorsRegistry registry) {
-//        registry.addMapping("/**")
-//                .allowedOrigins("*")
-//                .allowedHeaders("Origin, X-Requested-With, Content-Type, Accept,session")
-//                //rest集中请求方式
-//                .allowedMethods("GET", "POST","DELETE")
-//                .allowCredentials(true);
-//    }
-
     @Override
     public void addResourceHandlers(ResourceHandlerRegistry registry) {
         registry.addResourceHandler("swagger-ui.html")

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

@@ -129,6 +129,4 @@ public class EvaluationController {
         Page<Evaluation> pageList = evaluationService.findSearch(searchMap, page, size);
         return  ResponseEntity.ok(new PageResult<Evaluation>(pageList.getTotalElements(), pageList.getContent()) );
     }
-
-
 }

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

@@ -54,8 +54,7 @@ public class InspectController {
 
     @Autowired
     private ConfigParamDao configParamDao;
-    @Autowired
-    private ExcelDataDao excelDataDao;
+
     //应用类型转换:小型0
     Integer[] small = {3, 4};
     //应用类型转换:中型2

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

@@ -61,15 +61,23 @@ public class ExcelUtil {
         if (inEva != null) {
             Reform reform = JSON.parseObject(evaluation.getInEva(), Reform.class);
             arrayList.add(exportEntity("用户名", reform.getUsername()));
-            arrayList.add(exportEntity("评估类型", reform.getAssessmentType()));
-            arrayList.add(exportEntity("替换方式", reform.getMode()));
+            if(reform.getAssessmentType()==1){
+                arrayList.add(exportEntity("评估类型", "快速评估"));
+            }else{
+                arrayList.add(exportEntity("评估类型", "详细评估"));
+            }
+            if(reform.getMode()==1){
+                arrayList.add(exportEntity("替换方式", "改造"));
+            }else{
+                arrayList.add(exportEntity("替换方式", "适配"));
+            }
             arrayList.add(exportEntity("系统名称", reform.getProjectName()));
             arrayList.add(exportEntity("代码地址", reform.getCodeUrl()));
             arrayList.add(exportEntity("文件名称", reform.getCodeName()));
             arrayList.add(exportEntity("git地址", reform.getGitUrl()));
             arrayList.add(exportEntity("模块数量", reform.getModuleNum()));
             arrayList.add(exportEntity("原开发费用", reform.getCost()));
-            arrayList.add(exportEntity("开发单位是否在本地", reform.getAddress()));
+            arrayList.add(exportEntity("开发单位是否在本地", flipYesOrNo(reform.getAddress())));
             arrayList.add(exportEntity("开发单位联系人", reform.getLocalContact()));
             arrayList.add(exportEntity("开发单位联系方式", reform.getLocalPhone()));
             arrayList.add(exportEntity("是否涉密系统", flipYesOrNo(reform.getSecret())));
@@ -89,7 +97,7 @@ public class ExcelUtil {
             SystemStructure systemStructure = reform.getSystemStructure();
 
             ExcelDataTemp deployTemp = new ExcelDataTemp();
-            excelDataTemp.setName("原应用部署环境");
+            deployTemp.setName("原应用部署环境");
             List<ExcelDataEntity> deployList = excelDataTemp.getArrayList();
             deployList.addAll(getSystemData("ecs服务器", systemStructure.getApplication()));
             deployList.addAll(getSystemData("rds服务器", systemStructure.getDatabase()));