合并分支 'wyl' 到 'master'

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

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

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

@@ -250,16 +250,6 @@ public class WorkLoadUtil {
         //总计J = F（马） * 人工费
         double j = f/r;
         logger.info("f:"+f+"r:"+r+"总计J："+j);
-        /*
-            计算以下三项，拼接字符串，完成关键技术及替换策略建议：
-        */
-        //关键技术xx个
-        //本地程序开发项xx个
-        //中间件依赖修改项xx个
-        String string = "本系统通过源代码评估适配关键技术"+report.getTechnologyList().getTechnologyReports().size()+"项，"
-                +"其中本地程序开发修改项"+report.getDifficultyAssessment().getProgramDifficulty().getDependOnNum().size()+"项，"
-                +"中间件依赖修改项"+report.getDifficultyAssessment().getMiddlewareDifficulty().getDependOnNum().size()+"个....";
-        report.getWorkload().setDes(string);
         /*
             先计算难度，再算基础工作量
         */
@@ -368,9 +358,6 @@ public class WorkLoadUtil {
         logger.info("本地程序工作量2*j"+j+"*(综合难度-1)："+programWorkload);
         programDifficulty.setLoad(Double.valueOf(nf.format(programWorkload)));
 
-        //综合难度未知***************************
-        double multipleHardrage = 0.0;
-        report.getDifficultyAssessment().setDes("本系统通过源代码评估，及用户额外信息提供，认为综合难度系数："+multipleHardrage);
         /*
             基础工作量评估
         */
@@ -404,6 +391,26 @@ public class WorkLoadUtil {
         report.getWorkload().getTotal().setDevelopmentVolume(Double.valueOf(nf.format(totalWorkload)));
         report.getWorkload().getTotal().setCorrectionFactor(-1);
 
+
+        /*
+            建议：
+        */
+        StringBuilder string = new StringBuilder("本系统通过源代码评估适配关键技术"+report.getTechnologyList().getTechnologyReports().size()+"项，"
+                +"其中");
+        for(TechnologyReport technologyReport:report.getTechnologyList().getTechnologyReports()){
+            string .append( technologyReport.getTechnology()+"修改项"+technologyReport.getTechnologyContents().size()+"个，");
+        }
+        report.getTechnologyList().setDes(string.substring(0,string.length()-1)+"。");
+        String type = "";
+        if(report.getType()==1){
+            type = "改造";
+        }else if(report.getType()==2){
+            type = "适配";
+        }
+        String workloadDes = "本系统通过选择"+type+"方式部署到国产化安全自主可控环境上。代码层面的关键工作量包含{开发量}*修正系数人工月（包含对不可预见的估算）";
+        report.getWorkload().setDes(workloadDes);
+        double multipleHardrage = totalWorkload*r/f;
+        report.getDifficultyAssessment().setDes("本系统通过源代码评估，及用户额外信息提供，认为综合难度系数："+Double.valueOf(nf.format(multipleHardrage)));
         /**
          * 人工单价、基础工作量（人月）、难度系数、额外申请（万元）、预算费用 的计算值
          */
@@ -415,11 +422,15 @@ public class WorkLoadUtil {
         report.getManufacturingCost().getDegreeOfDifficulty().setAdjustment(Double.valueOf(nf.format(multipleHardrage)));
         report.getManufacturingCost().getApply().setCalculation(Double.valueOf(nf.format(reform.getApply().getCost()==-1?0:reform.getApply().getCost())));
         report.getManufacturingCost().getApply().setAdjustment(0);
-        report.getManufacturingCost().getBudgetaryCost().setCalculation(Double.valueOf(nf.format(r*totalWorkload+reform.getApply().getCost())));
+        Double totalManey = Double.valueOf(nf.format(r * totalWorkload + (reform.getApply().getCost() == -1 ? 0 : reform.getApply().getCost())));
+        report.getManufacturingCost().getBudgetaryCost().setCalculation(totalManey);
         report.getManufacturingCost().getBudgetaryCost().setAdjustment(Double.valueOf(nf.format(r*totalWorkload)));
         logger.info("人工费："+r+"万元");
         logger.info("额外申请"+(reform.getApply().getCost()==-1?0:reform.getApply().getCost())+"万元");
         logger.info("费用总计"+(r*totalWorkload+reform.getApply().getCost()));
+
+        report.setBudget(totalManey.toString());
+
         //修正系数+1
         //额外申请原因
     }