合并分支 'czq' 到 'master'

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

@@ -188,6 +188,8 @@ public class InspectController {
         将马晨俊的数据放入输出的表单
          */
         AssessmentReport assessmentReport = new AssessmentReport();
+        //适配还是改造
+        assessmentReport.setType(reform.getMode());
         SysScale sysScale = new SysScale();
         Scale scale = new Scale();
         //文件数量

src/main/java/com/zjty/inspect/entity/AssessmentReport.java

@@ -53,31 +53,31 @@ public class AssessmentReport {
     /**
      * 原系统规模
      */
-    private SysScale sysScale;
+    private SysScale sysScale = new SysScale();
 
     /**
      * 关键技术及替换策略建议
      */
-    private TechnologyList technologyList;
+    private TechnologyList technologyList = new TechnologyList();
 
     /**
      * 基础工作量评估
      */
-    private Workload workload;
+    private Workload workload = new Workload();
 
     /**
      * 额外依赖申请
      */
-    private Apply apply;
+    private Apply apply = new Apply();
 
     /**
      * 适配难度评估
      */
-    private DifficultyAssessment difficultyAssessment;
+    private DifficultyAssessment difficultyAssessment = new DifficultyAssessment();
 
     /**
      * 造价估算
      */
-    private ManufacturingCost manufacturingCost;
+    private ManufacturingCost manufacturingCost = new ManufacturingCost();
 
 }

src/main/java/com/zjty/inspect/entity/DifficultyAssessment.java

@@ -24,25 +24,25 @@ public class DifficultyAssessment {
     /**
      * 系统部署架构难度
      */
-    private FrameDifficulty frameDifficulty;
+    private FrameDifficulty frameDifficulty = new FrameDifficulty();
 
     /**
      * 浏览器难度
      */
-    private BrowserDifficulty browserDifficulty;
+    private BrowserDifficulty browserDifficulty = new BrowserDifficulty();
 
     /**
      * 中间件难度
      */
-    private MiddlewareDifficulty middlewareDifficulty;
+    private MiddlewareDifficulty middlewareDifficulty = new MiddlewareDifficulty();
 
     /**
      * 数据库难度
      */
-    private DatabaseDifficulty databaseDifficulty;
+    private DatabaseDifficulty databaseDifficulty = new DatabaseDifficulty();
 
     /**
      * 本地程序难度
      */
-    private ProgramDifficulty programDifficulty;
+    private ProgramDifficulty programDifficulty = new ProgramDifficulty();
 }

src/main/java/com/zjty/inspect/entity/ManufacturingCost.java

@@ -18,26 +18,26 @@ public class ManufacturingCost {
     /**
      * 人工单价
      */
-    private Estimate artificial;
+    private Estimate artificial = new Estimate();
 
     /**
      * 基础工作量
      */
-    private Estimate workLoad;
+    private Estimate workLoad = new Estimate();
 
     /**
      * 难度系数
      */
-    private Estimate degreeOfDifficulty;
+    private Estimate degreeOfDifficulty = new Estimate();
 
     /**
      * 额外依赖服务申请
      */
-    private Estimate apply;
+    private Estimate apply = new Estimate();
 
     /**
      * 预算费用
      */
-    private Estimate budgetaryCost;
+    private Estimate budgetaryCost = new Estimate();
 
 }

src/main/java/com/zjty/inspect/entity/SysScale.java

@@ -18,15 +18,15 @@ public class SysScale {
     /**
      * 代码
      */
-    private Scale code;
+    private Scale code = new Scale();
 
     /**
      * 文件
      */
-    private Scale file;
+    private Scale file = new Scale();
 
     /**
      * 模块
      */
-    private Scale mode;
+    private Scale mode = new Scale();
 }

src/main/java/com/zjty/inspect/entity/Workload.java

@@ -36,20 +36,20 @@ public class Workload {
     /**
      * 开发
      */
-    private Basis development;
+    private Basis development = new Basis();
 
     /**
      * 测试
      */
-    private Basis test;
+    private Basis test = new Basis();
 
     /**
      * 部署
      */
-    private Basis deploy;
+    private Basis deploy = new Basis();
 
     /**
      * 合计
      */
-    private Basis total;
+    private Basis total = new Basis();
 }