孔广洋 / synthesize_energy_project · 提交

转到一个项目

作者 wwmin
提交 66802a6e1cab1266ad9d2bf7d8e7486159b74716 1 个父辈 b3a007d5

修改文字

内嵌 并排对比
正在显示 1 个修改的文件 包含 8 行增加 和 8 行删除
@@ -74,7 +74,7 @@ public class Synthesize_no_2_6ServiceImpl extends ServiceImpl<Synthesize_no_2_6M @@ -74,7 +74,7 @@ public class Synthesize_no_2_6ServiceImpl extends ServiceImpl<Synthesize_no_2_6M
74 * 光伏发电 74 * 光伏发电
75 */ 75 */
76 ComputeArgDto computeArgDto = new ComputeArgDto(); 76 ComputeArgDto computeArgDto = new ComputeArgDto();
77 - computeArgDto.setNamType("铺设比例"); 77 + computeArgDto.setNamType("有效铺设量");
78 computeArgDto.setId(16); 78 computeArgDto.setId(16);
79 computeArgDto.setModelType(synthesize_no_2_6.getNo16()); 79 computeArgDto.setModelType(synthesize_no_2_6.getNo16());
80 computeArgDto.setName("W/m²"); 80 computeArgDto.setName("W/m²");
@@ -667,12 +667,12 @@ public class Synthesize_no_2_6ServiceImpl extends ServiceImpl<Synthesize_no_2_6M @@ -667,12 +667,12 @@ public class Synthesize_no_2_6ServiceImpl extends ServiceImpl<Synthesize_no_2_6M
667 */ 667 */
668 computeArg2DtoList = new ArrayList<>(); 668 computeArg2DtoList = new ArrayList<>();
669 List<ComputeArgDto> computeArgDtos = new ArrayList<>(); 669 List<ComputeArgDto> computeArgDtos = new ArrayList<>();
670 - ComputeArgDto computeArgDto1 = new ComputeArgDto();  
671 - computeArgDto1.setId(64);  
672 - computeArgDto1.setNamType("增值税率");  
673 - computeArgDto1.setModelType(synthesize_no_2_6.getNo64());  
674 - computeArgDto1.setName("");  
675 - computeArgDtos.add(computeArgDto1); 670 +// ComputeArgDto computeArgDto1 = new ComputeArgDto();
  671 +// computeArgDto1.setId(64);
  672 +// computeArgDto1.setNamType("增值税率");
  673 +// computeArgDto1.setModelType(synthesize_no_2_6.getNo64());
  674 +// computeArgDto1.setName("");
  675 +// computeArgDtos.add(computeArgDto1);
676 ComputeArgDto computeArgDto2 = new ComputeArgDto(); 676 ComputeArgDto computeArgDto2 = new ComputeArgDto();
677 computeArgDto2.setId(63); 677 computeArgDto2.setId(63);
678 computeArgDto2.setNamType("基准收益率"); 678 computeArgDto2.setNamType("基准收益率");
@@ -687,7 +687,7 @@ public class Synthesize_no_2_6ServiceImpl extends ServiceImpl<Synthesize_no_2_6M @@ -687,7 +687,7 @@ public class Synthesize_no_2_6ServiceImpl extends ServiceImpl<Synthesize_no_2_6M
687 computeArgDtos.add(computeArgDto3); 687 computeArgDtos.add(computeArgDto3);
688 ComputeArgDto computeArgDto4 = new ComputeArgDto(); 688 ComputeArgDto computeArgDto4 = new ComputeArgDto();
689 computeArgDto4.setId(61); 689 computeArgDto4.setId(61);
690 - computeArgDto4.setNamType("建设期"); 690 + computeArgDto4.setNamType("建设期(≤1年)");
691 computeArgDto4.setModelType(Double.valueOf(synthesize_no_2_6.getNo61())); 691 computeArgDto4.setModelType(Double.valueOf(synthesize_no_2_6.getNo61()));
692 computeArgDto4.setName("年"); 692 computeArgDto4.setName("年");
693 computeArgDtos.add(computeArgDto4); 693 computeArgDtos.add(computeArgDto4);