合并分支 'wyl' 到 'master'

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

@@ -396,8 +396,10 @@ public class WorkLoadUtil {
         /*
             建议：
         */
-        StringBuilder string = new StringBuilder("本系统通过源代码评估适配关键技术"+report.getTechnologyList().getTechnologyReports().size()+"项，"
-                +"其中");
+        StringBuilder string = new StringBuilder("本系统通过源代码评估适配关键技术"+report.getTechnologyList().getTechnologyReports().size()+"项，");
+        if(report.getTechnologyList().getTechnologyReports().size()>0){
+            string.append("其中");
+        }
         for(TechnologyReport technologyReport:report.getTechnologyList().getTechnologyReports()){
             string .append( technologyReport.getTechnology()+"修改项"+technologyReport.getTechnologyContents().size()+"个，");
         }
@@ -408,7 +410,7 @@ public class WorkLoadUtil {
         }else if(report.getType()==2){
             type = "适配";
         }
-        String workloadDes = "本系统通过选择"+type+"方式部署到国产化安全自主可控环境上。代码层面的关键工作量包含{开发量}*修正系数人工月（包含对不可预见的估算）";
+        String workloadDes = "本系统通过选择"+type+"方式部署到国产化安全自主可控环境上。代码层面的关键工作量包含"+nf.format(totalWorkload)+"人工月（包含对不可预见的估算）";
         report.getWorkload().setDes(workloadDes);
         double multipleHardrage = totalWorkload*r/f;
         report.getDifficultyAssessment().setDes("本系统通过源代码评估，及用户额外信息提供，认为综合难度系数："+Double.valueOf(nf.format(multipleHardrage)));