|
@@ -155,11 +155,15 @@ public class StatementCompanyComprehensiveService extends CrudService<StatementC
|
|
|
String kpnum3 = "0";
|
|
|
String kpnum4 = "0";
|
|
|
for(StatementCompanyComprehensiveInfo info:reportFormList2){
|
|
|
- if (info.getOfficeName().equals("工程五部")){
|
|
|
+ if (info.getOfficeName().equals("工程五部") || info.getOfficeName().equals("工程一部")){
|
|
|
BigDecimal bd = new BigDecimal(info.getField2());
|
|
|
// 使用setScale方法进行四舍五入,保留两位小数
|
|
|
BigDecimal roundedBd = bd.setScale(2, RoundingMode.HALF_UP);
|
|
|
info.setField2(roundedBd.toString());
|
|
|
+ BigDecimal bd1 = new BigDecimal(info.getField4());
|
|
|
+ // 使用setScale方法进行四舍五入,保留两位小数
|
|
|
+ BigDecimal roundedBd1 = bd1.setScale(2, RoundingMode.HALF_UP);
|
|
|
+ info.setField4(roundedBd1.toString());
|
|
|
}
|
|
|
//转BigDecimal 处理
|
|
|
kpnum1 = new BigDecimal(info.getField1()).add(new BigDecimal(kpnum1)).toString();
|
|
@@ -185,6 +189,12 @@ public class StatementCompanyComprehensiveService extends CrudService<StatementC
|
|
|
String bxnum1 = "0";
|
|
|
String bxnum2 = "0";
|
|
|
for(StatementCompanyComprehensiveInfo info:reportFormList3){
|
|
|
+ if (info.getOfficeName().equals("工程五部") || info.getOfficeName().equals("工程一部")){
|
|
|
+ BigDecimal bd1 = new BigDecimal(info.getField2());
|
|
|
+ // 使用setScale方法进行四舍五入,保留两位小数
|
|
|
+ BigDecimal roundedBd1 = bd1.setScale(2, RoundingMode.HALF_UP);
|
|
|
+ info.setField2(roundedBd1.toString());
|
|
|
+ }
|
|
|
//转BigDecimal 处理
|
|
|
bxnum1 = new BigDecimal(info.getField1()).add(new BigDecimal(bxnum1)).toString();
|
|
|
bxnum2 = new BigDecimal(info.getField2()).add(new BigDecimal(bxnum2)).toString();
|