基准收益率修改成%整数

@@ -2137,7 +2137,7 @@ public class ProjectServiceImpl implements ProjectService {
         double totalInvestment = synthesize_no_3_6.getNo300();
         double totalInvestment = synthesize_no_3_6.getNo300();
         List<NpvData> npvDatas = new ArrayList<>();
         List<NpvData> npvDatas = new ArrayList<>();
         NpvData npvData = new NpvData();
         NpvData npvData = new NpvData();
-        npvData.setR(synthesize_no_2_6.getNo63());
+        npvData.setR(synthesize_no_2_6.getNo63()/100);
         npvData.setYear(synthesize_no_2_6.getNo62());
         npvData.setYear(synthesize_no_2_6.getNo62());
         List<Double> list = new ArrayList<>();
         List<Double> list = new ArrayList<>();
         int yearLength = npvData.getYear();
         int yearLength = npvData.getYear();
@@ -2241,7 +2241,7 @@ public class ProjectServiceImpl implements ProjectService {
             //净现金流
             //净现金流
             double NCF = annualIncome - annualOutcome - ownAddedTax;
             double NCF = annualIncome - annualOutcome - ownAddedTax;
             if (i == 0) {
             if (i == 0) {
-//                double r = 1 / Math.pow((1 + synthesize_no_2_6.getNo63()), 1);//第0年的折现因子
+//                double r = 1 / Math.pow((1 + synthesize_no_2_6.getNo63()/100), 1);//第0年的折现因子
                 NCF = -totalInvestment;
                 NCF = -totalInvestment;
             }
             }
             list.add(NCF);
             list.add(NCF);
@@ -2253,7 +2253,7 @@ public class ProjectServiceImpl implements ProjectService {
         for (int i = 0; i < list.size(); i++) {
         for (int i = 0; i < list.size(); i++) {
             npvData = new NpvData();
             npvData = new NpvData();
             npvData.setYear(yearLength);
             npvData.setYear(yearLength);
-            npvData.setR(synthesize_no_2_6.getNo63());//使用输入后修改值 (基准收益率)
+            npvData.setR(synthesize_no_2_6.getNo63()/100);//使用输入后修改值 (基准收益率)
             npvData.setRmb(list.get(i));
             npvData.setRmb(list.get(i));
             npvData.setY(1 / Math.pow((1 + npvData.getR()), i + 1));
             npvData.setY(1 / Math.pow((1 + npvData.getR()), i + 1));
             npvDatas.add(npvData);
             npvDatas.add(npvData);

@@ -677,7 +677,7 @@ public class Synthesize_no_2_6ServiceImpl extends ServiceImpl<Synthesize_no_2_6M
             computeArgDto2.setId(63);
             computeArgDto2.setId(63);
             computeArgDto2.setNamType("基准收益率");
             computeArgDto2.setNamType("基准收益率");
             computeArgDto2.setModelType(synthesize_no_2_6.getNo63());
             computeArgDto2.setModelType(synthesize_no_2_6.getNo63());
-            computeArgDto2.setName("");
+            computeArgDto2.setName("%");
             computeArgDtos.add(computeArgDto2);
             computeArgDtos.add(computeArgDto2);
             ComputeArgDto computeArgDto3 = new ComputeArgDto();
             ComputeArgDto computeArgDto3 = new ComputeArgDto();
             computeArgDto3.setId(62);
             computeArgDto3.setId(62);