合并分支 'wyl' 到 'master'

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

@@ -24,5 +24,5 @@ public class Apply {
     /**
      * 原因
      */
-    private String reason = "***********";
+    private String reason = "";
 }

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

@@ -20,12 +20,12 @@ public class DatabaseDifficulty {
     /**
      * 系统评估
      */
-    private double systemEvaluation = 1.1;
+    //private double systemEvaluation = 1.1;
 
     /**
      * 额外信息
      */
-    private double message = 1.1;
+    //private double message = 1.1;
 
     /**
      * 综合难度

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

@@ -20,12 +20,12 @@ public class ProgramDifficulty {
     /**
      * 系统评估
      */
-    private double systemEvaluation = 1.1;
+    //private double systemEvaluation = 1.1;
 
     /**
      * 额外信息
      */
-    private double message = 1.1;
+    //private double message = 1.1;
 
     /**
      * 综合难度

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

@@ -347,7 +347,8 @@ public class WorkLoadUtil {
         ProgramDifficulty programDifficulty = report.getDifficultyAssessment().getProgramDifficulty();
         int totalNum = 0;
         for(DependOnNum dependOnNum:programDifficulty.getDependOnNum()){
-            System.out.println(dependOnNum.getName());
+//            System.out.println(dependOnNum.getName());
+//            System.out.println(dependOnNum.getNum());
             if(dependOnNum.getNum()!=-1){
                 totalNum += dependOnNum.getNum();
             }
@@ -396,6 +397,7 @@ public class WorkLoadUtil {
         double totalWorkload = developmentWorkload+testWorkload+deploymentWorkload;
         logger.info("合计的开发量 总数:"+totalWorkload);
         report.getWorkload().getTotal().setDevelopmentVolume(totalWorkload);
+        report.getWorkload().getTotal().setCorrectionFactor(-1);
 
         /**
          * 人工单价、基础工作量（人月）、难度系数、额外申请（万元）、预算费用 的计算值
@@ -413,6 +415,8 @@ public class WorkLoadUtil {
         logger.info("人工费："+r+"万元");
         logger.info("额外申请"+(reform.getApply().getCost()==-1?0:reform.getApply().getCost())+"万元");
         logger.info("费用总计"+(r*totalWorkload+reform.getApply().getCost()));
+        //修正系数+1
+        //额外申请原因
     }
 
     public static void main(String[] args) {

src/main/resources/application-dev.properties

@@ -53,7 +53,7 @@ spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 spring.datasource.url=jdbc:mysql://localhost:3306/adaptation?useSSL=false&serverTimezone=UTC&autoReconnect=true&characterEncoding=utf-8
 #spring.datasource.url=jdbc:mysql://120.55.57.35:3306/adaptation?characterEncoding=utf-8
 spring.datasource.username=root
-spring.datasource.password=123456
+spring.datasource.password=root
 
 maven.home=/usr/share/maven
 maven.command=dependency:tree -DoutputType=txt -DoutputFile=