diff --git a/src/main/java/com/bonus/aqgqj/app/service/impl/ExperimentalAppServiceImpl.java b/src/main/java/com/bonus/aqgqj/app/service/impl/ExperimentalAppServiceImpl.java index f8cbc4e..779d2fa 100644 --- a/src/main/java/com/bonus/aqgqj/app/service/impl/ExperimentalAppServiceImpl.java +++ b/src/main/java/com/bonus/aqgqj/app/service/impl/ExperimentalAppServiceImpl.java @@ -155,31 +155,37 @@ public class ExperimentalAppServiceImpl implements ExperimentalAppService { if (StringUtils.isNotBlank(result2)) { return ServerResponse.createByErrorMsg(HttpStatus.ERROR, result2); } - BigDecimal allMony = new BigDecimal("0"); + // 添加试验信息数据 mapper.addExper(vo); // 添加试验依据信息数据 mapper.addConfigBasis(vo.getBasisVos(), vo.getId()); + //全部金额 + BigDecimal allMony = new BigDecimal("0"); + //单个设备标准金额 + BigDecimal devMony = new BigDecimal("0"); + for (int i = 0; i < vo.getExperDevVos().size(); i++) { ExperDevAppVo experDevVo = vo.getExperDevVos().get(i); experDevVo.setIsHg(setHgData(experDevVo.getDevData())); - BigDecimal bigDecimal = new BigDecimal("0"); if (i == 0) { for (ConfigItemsAppVo configItemsVo : vo.getConfigItemsVos()) { // 添加试验项数据 mapper.addExperItems(configItemsVo, vo.getId()); BigDecimal amount = new BigDecimal(configItemsVo.getAmount()); - bigDecimal=bigDecimal.add(amount); + devMony=devMony.add(amount); // 添加试验项内容数据 for (ConfigItemAppVo configItemVo : configItemsVo.getItemList()) { mapper.addExperItem(configItemVo, configItemsVo.getId()); } } } - //计算设备总金额 - experDevVo.setExperAmount(bigDecimal.toString()); + BigDecimal nowMony = new BigDecimal("0"); BigDecimal amount= new BigDecimal(experDevVo.getAmount()); - allMony=allMony.add(bigDecimal).add(amount); + nowMony.add(devMony).add(amount); + //计算设备总金额 + experDevVo.setExperAmount(nowMony.toString()); + allMony=allMony.add(nowMony); mapper.addExperDev(experDevVo, vo.getId()); List experDevItemsVos = setExperDevItemsList(vo.getExperDevVos().get(i), vo); for (ExperDevItemsAppVo experDevItemsVo : experDevItemsVos) { @@ -246,13 +252,14 @@ public class ExperimentalAppServiceImpl implements ExperimentalAppService { } //论实验全部金额 BigDecimal allMony= new BigDecimal("0"); + BigDecimal devMony = new BigDecimal("0"); //获取试验项金额 - BigDecimal bigDecimal = new BigDecimal("0"); for (ConfigItemsAppVo configItemsVo : vo.getConfigItemsVos()) { // 添加试验项数据 BigDecimal amount = new BigDecimal(configItemsVo.getAmount()); - bigDecimal=bigDecimal.add(amount); + devMony=devMony.add(amount); } + // 删除试验依据、试验样品设备、设备试验项信息、设备试验项数据 List experDevIds = mapper.getExperDevIds(vo.getId()); List experDevItemsIds = mapper.getExperDevItems(experDevIds); @@ -273,12 +280,13 @@ public class ExperimentalAppServiceImpl implements ExperimentalAppService { experDevVo.setIsHg(setHgData(experDevVo.getDevData())); // 添加试验样品数据 BigDecimal amount= new BigDecimal(experDevVo.getAmount()); - allMony=allMony.add(bigDecimal).add(amount); - experDevVo.setExperAmount(bigDecimal.toString()); + BigDecimal nowMony= new BigDecimal("0"); + nowMony=nowMony.add(devMony).add(amount); + allMony=allMony.add(nowMony); + experDevVo.setExperAmount(nowMony.toString()); mapper.addExperDev(experDevVo, vo.getId()); List experDevItemsVos = setExperDevItemsList(vo.getExperDevVos().get(i), vo); for (ExperDevItemsAppVo experDevItemsVo : experDevItemsVos) { - mapper.addExperDevItems(experDevItemsVo); List experDevItemVos = setExperDevItemList(vo.getExperDevVos().get(i), vo, experDevItemsVo); // 添加设备试验项数据 diff --git a/src/main/java/com/bonus/aqgqj/basis/service/impl/ExperimentalServiceImpl.java b/src/main/java/com/bonus/aqgqj/basis/service/impl/ExperimentalServiceImpl.java index 7e4f9bd..f21c087 100644 --- a/src/main/java/com/bonus/aqgqj/basis/service/impl/ExperimentalServiceImpl.java +++ b/src/main/java/com/bonus/aqgqj/basis/service/impl/ExperimentalServiceImpl.java @@ -151,16 +151,17 @@ public class ExperimentalServiceImpl implements ExperimentalService { mapper.addExper(vo); // 添加试验依据信息数据 mapper.addConfigBasis(vo.getBasisVos(), vo.getId()); + //试验项金额 + BigDecimal devMony = new BigDecimal("0"); for (int i = 0; i < vo.getExperDevVos().size(); i++) { ExperDevVo experDevVo = vo.getExperDevVos().get(i); experDevVo.setIsHg(setHgData(experDevVo.getDevData())); - BigDecimal bigDecimal = new BigDecimal("0"); if (i == 0) { for (ConfigItemsVo configItemsVo : vo.getConfigItemsVos()) { // 添加试验项数据 mapper.addExperItems(configItemsVo, vo.getId()); BigDecimal amount = new BigDecimal(configItemsVo.getAmount()); - bigDecimal=bigDecimal.add(amount); + devMony=devMony.add(amount); // 添加试验项内容数据 for (ConfigItemVo configItemVo : configItemsVo.getItemList()) { mapper.addExperItem(configItemVo, configItemsVo.getId()); @@ -168,9 +169,11 @@ public class ExperimentalServiceImpl implements ExperimentalService { } } //计算设备总金额 - experDevVo.setExperAmount(bigDecimal.toString()); BigDecimal amount= new BigDecimal(experDevVo.getAmount()); - allMony=allMony.add(bigDecimal).add(amount); + BigDecimal nowMony= new BigDecimal("0"); + nowMony.add(amount).add(devMony); + experDevVo.setExperAmount(nowMony.toString()); + allMony=allMony.add(nowMony); mapper.addExperDev(experDevVo, vo.getId()); List experDevItemsVos = setExperDevItemsList(vo.getExperDevVos().get(i), vo); for (ExperDevItemsVo experDevItemsVo : experDevItemsVos) { @@ -263,8 +266,10 @@ public class ExperimentalServiceImpl implements ExperimentalService { experDevVo.setIsHg(setHgData(experDevVo.getDevData())); // 添加试验样品数据 BigDecimal amount= new BigDecimal(experDevVo.getAmount()); - allMony=allMony.add(bigDecimal).add(amount); - experDevVo.setExperAmount(bigDecimal.toString()); + BigDecimal nowMony= new BigDecimal("0"); + nowMony=nowMony.add(amount).add(bigDecimal); + allMony=allMony.add(nowMony); + experDevVo.setExperAmount(nowMony.toString()); mapper.addExperDev(experDevVo, vo.getId()); List experDevItemsVos = setExperDevItemsList(vo.getExperDevVos().get(i), vo); for (ExperDevItemsVo experDevItemsVo : experDevItemsVos) {