合并分支 'wyl' 到 'master'

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

@@ -377,15 +377,15 @@ public class WorkLoadUtil {
         //开发修正系数 （本地难度系数-1）+（浏览器难度系数-1）
         double developmentCorrectionFactor = eProgram-1+multipleBrowser-1;
         logger.info("开发修正系数 （本地难度系数-1）+（浏览器难度系数-1）："+developmentCorrectionFactor);
-        report.getWorkload().getDevelopment().setCorrectionFactor(Double.valueOf(nf.format(developmentCorrectionFactor)));
+        report.getWorkload().getDevelopment().setCorrectionFactor(Double.valueOf(nf.format(1+developmentCorrectionFactor)));
         //测试修正系数 （系统部署难度-1）+（浏览器-1）
         double testCorrectionFactor = multipleFramework-1+multipleBrowser-1;
         logger.info("测试修正系数 （系统部署难度-1）+（浏览器-1）:"+testCorrectionFactor);
-        report.getWorkload().getTest().setCorrectionFactor(Double.valueOf(nf.format(testCorrectionFactor)));
+        report.getWorkload().getTest().setCorrectionFactor(Double.valueOf(nf.format(1+testCorrectionFactor)));
         //部署修正系数 （迁移）/100+（系统部署-1）+中间件部署-1+数据库部署-1
         double deploymentCorrectionFactor = calculate/100+multipleFramework-1+multipleMiddle-1+eDatabase-1;
         logger.info("部署修正系数 （迁移）/100+（系统部署-1）+中间件部署-1+数据库部署-1:"+deploymentCorrectionFactor);
-        report.getWorkload().getDeploy().setCorrectionFactor(Double.valueOf(nf.format(deploymentCorrectionFactor)));
+        report.getWorkload().getDeploy().setCorrectionFactor(Double.valueOf(nf.format(1+deploymentCorrectionFactor)));
         //开发的开发量 J*（开发修正系数+0.4）
         double developmentWorkload = j*(developmentCorrectionFactor+0.4);
         logger.info("开发的开发量 J*（开发修正系数+0.4）:"+developmentWorkload);