dev #465

Merged
ysCha merged 186 commits from dev into prd-deploy 2026-04-08 10:22:57 +09:00
Showing only changes of commit a1192d4656 - Show all commits

View File

@ -262,21 +262,13 @@ public class PwrGnrSimService {
for (PwrGnrSimRoofResponse m : moduleGroupList) {
if (data.getRoofSurfaceId().equals(m.getRoofSurfaceId())) {
dSpecification += m.getTotSpecification();
if (j == 0) {
if(pwrGnrSimReq.getModule1().equals(m.getItemId())){
dModuleInput1[i] = Integer.parseInt(m.getAmount());
}else if(pwrGnrSimReq.getModule2().equals(m.getItemId())){
dModuleInput2[i] = Integer.parseInt(m.getAmount());
}else if(pwrGnrSimReq.getModule3().equals(m.getItemId())){
dModuleInput3[i] = Integer.parseInt(m.getAmount());
}
} else if (j == 1) {
dModuleInput2[i] = Integer.parseInt(m.getAmount());
} else {
dModuleInput3[i] = Integer.parseInt(m.getAmount());
}
j++;
if (m.getItemId().equals(pwrGnrSimReq.getModule1())) {
dModuleInput1[i] = Integer.parseInt(m.getAmount());
} else if (m.getItemId().equals(pwrGnrSimReq.getModule2())) {
dModuleInput2[i] = Integer.parseInt(m.getAmount());
} else if (m.getItemId().equals(pwrGnrSimReq.getModule3())) {
dModuleInput3[i] = Integer.parseInt(m.getAmount());
}
}
}
i++;