|
...
|
...
|
@@ -74,7 +74,7 @@ public class Synthesize_no_2_6ServiceImpl extends ServiceImpl<Synthesize_no_2_6M |
|
|
|
* 光伏发电
|
|
|
|
*/
|
|
|
|
ComputeArgDto computeArgDto = new ComputeArgDto();
|
|
|
|
computeArgDto.setNamType("铺设比例");
|
|
|
|
computeArgDto.setNamType("有效铺设量");
|
|
|
|
computeArgDto.setId(16);
|
|
|
|
computeArgDto.setModelType(synthesize_no_2_6.getNo16());
|
|
|
|
computeArgDto.setName("W/m²");
|
|
...
|
...
|
@@ -667,12 +667,12 @@ public class Synthesize_no_2_6ServiceImpl extends ServiceImpl<Synthesize_no_2_6M |
|
|
|
*/
|
|
|
|
computeArg2DtoList = new ArrayList<>();
|
|
|
|
List<ComputeArgDto> computeArgDtos = new ArrayList<>();
|
|
|
|
ComputeArgDto computeArgDto1 = new ComputeArgDto();
|
|
|
|
computeArgDto1.setId(64);
|
|
|
|
computeArgDto1.setNamType("增值税率");
|
|
|
|
computeArgDto1.setModelType(synthesize_no_2_6.getNo64());
|
|
|
|
computeArgDto1.setName("");
|
|
|
|
computeArgDtos.add(computeArgDto1);
|
|
|
|
// ComputeArgDto computeArgDto1 = new ComputeArgDto();
|
|
|
|
// computeArgDto1.setId(64);
|
|
|
|
// computeArgDto1.setNamType("增值税率");
|
|
|
|
// computeArgDto1.setModelType(synthesize_no_2_6.getNo64());
|
|
|
|
// computeArgDto1.setName("");
|
|
|
|
// computeArgDtos.add(computeArgDto1);
|
|
|
|
ComputeArgDto computeArgDto2 = new ComputeArgDto();
|
|
|
|
computeArgDto2.setId(63);
|
|
|
|
computeArgDto2.setNamType("基准收益率");
|
|
...
|
...
|
@@ -687,7 +687,7 @@ public class Synthesize_no_2_6ServiceImpl extends ServiceImpl<Synthesize_no_2_6M |
|
|
|
computeArgDtos.add(computeArgDto3);
|
|
|
|
ComputeArgDto computeArgDto4 = new ComputeArgDto();
|
|
|
|
computeArgDto4.setId(61);
|
|
|
|
computeArgDto4.setNamType("建设期");
|
|
|
|
computeArgDto4.setNamType("建设期(≤1年)");
|
|
|
|
computeArgDto4.setModelType(Double.valueOf(synthesize_no_2_6.getNo61()));
|
|
|
|
computeArgDto4.setName("年");
|
|
|
|
computeArgDtos.add(computeArgDto4);
|
...
|
...
|
|
