haozq
/
ah_sz_gqj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改金额

This commit is contained in:
haozq 2024-09-12 13:30:21 +08:00
parent 1b0df9249b
commit c8a8ec0a21
2 changed files with 30 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/main/java/com/bonus/aqgqj/app/service/impl/ExperimentalAppServiceImpl.java
View File

@ -155,31 +155,37 @@ public class ExperimentalAppServiceImpl implements ExperimentalAppService {
if (StringUtils.isNotBlank(result2)) { if (StringUtils.isNotBlank(result2)) {
return ServerResponse.createByErrorMsg(HttpStatus.ERROR, result2); return ServerResponse.createByErrorMsg(HttpStatus.ERROR, result2);
} }
BigDecimal allMony = new BigDecimal("0");
// 添加试验信息数据 // 添加试验信息数据
mapper.addExper(vo); mapper.addExper(vo);
// 添加试验依据信息数据 // 添加试验依据信息数据
mapper.addConfigBasis(vo.getBasisVos(), vo.getId()); 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++) { for (int i = 0; i < vo.getExperDevVos().size(); i++) {
ExperDevAppVo experDevVo = vo.getExperDevVos().get(i); ExperDevAppVo experDevVo = vo.getExperDevVos().get(i);
experDevVo.setIsHg(setHgData(experDevVo.getDevData())); experDevVo.setIsHg(setHgData(experDevVo.getDevData()));
BigDecimal bigDecimal = new BigDecimal("0");
if (i == 0) { if (i == 0) {
for (ConfigItemsAppVo configItemsVo : vo.getConfigItemsVos()) { for (ConfigItemsAppVo configItemsVo : vo.getConfigItemsVos()) {
// 添加试验项数据 // 添加试验项数据
mapper.addExperItems(configItemsVo, vo.getId()); mapper.addExperItems(configItemsVo, vo.getId());
BigDecimal amount = new BigDecimal(configItemsVo.getAmount()); BigDecimal amount = new BigDecimal(configItemsVo.getAmount());
bigDecimal=bigDecimal.add(amount); devMony=devMony.add(amount);
// 添加试验项内容数据 // 添加试验项内容数据
for (ConfigItemAppVo configItemVo : configItemsVo.getItemList()) { for (ConfigItemAppVo configItemVo : configItemsVo.getItemList()) {
mapper.addExperItem(configItemVo, configItemsVo.getId()); mapper.addExperItem(configItemVo, configItemsVo.getId());
} }
} }
} }
//计算设备总金额 BigDecimal nowMony = new BigDecimal("0");
experDevVo.setExperAmount(bigDecimal.toString());
BigDecimal amount= new BigDecimal(experDevVo.getAmount()); 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()); mapper.addExperDev(experDevVo, vo.getId());
List<ExperDevItemsAppVo> experDevItemsVos = setExperDevItemsList(vo.getExperDevVos().get(i), vo); List<ExperDevItemsAppVo> experDevItemsVos = setExperDevItemsList(vo.getExperDevVos().get(i), vo);
for (ExperDevItemsAppVo experDevItemsVo : experDevItemsVos) { for (ExperDevItemsAppVo experDevItemsVo : experDevItemsVos) {
@ -246,13 +252,14 @@ public class ExperimentalAppServiceImpl implements ExperimentalAppService {
} }
//论实验全部金额 //论实验全部金额
BigDecimal allMony= new BigDecimal("0"); BigDecimal allMony= new BigDecimal("0");
BigDecimal devMony = new BigDecimal("0");
//获取试验项金额 //获取试验项金额
BigDecimal bigDecimal = new BigDecimal("0");
for (ConfigItemsAppVo configItemsVo : vo.getConfigItemsVos()) { for (ConfigItemsAppVo configItemsVo : vo.getConfigItemsVos()) {
// 添加试验项数据 // 添加试验项数据
BigDecimal amount = new BigDecimal(configItemsVo.getAmount()); BigDecimal amount = new BigDecimal(configItemsVo.getAmount());
bigDecimal=bigDecimal.add(amount); devMony=devMony.add(amount);
} }
// 删除试验依据、试验样品设备、设备试验项信息、设备试验项数据 // 删除试验依据、试验样品设备、设备试验项信息、设备试验项数据
List<Long> experDevIds = mapper.getExperDevIds(vo.getId()); List<Long> experDevIds = mapper.getExperDevIds(vo.getId());
List<Long> experDevItemsIds = mapper.getExperDevItems(experDevIds); List<Long> experDevItemsIds = mapper.getExperDevItems(experDevIds);
@ -273,12 +280,13 @@ public class ExperimentalAppServiceImpl implements ExperimentalAppService {
experDevVo.setIsHg(setHgData(experDevVo.getDevData())); experDevVo.setIsHg(setHgData(experDevVo.getDevData()));
// 添加试验样品数据 // 添加试验样品数据
BigDecimal amount= new BigDecimal(experDevVo.getAmount()); BigDecimal amount= new BigDecimal(experDevVo.getAmount());
allMony=allMony.add(bigDecimal).add(amount); BigDecimal nowMony= new BigDecimal("0");
experDevVo.setExperAmount(bigDecimal.toString()); nowMony=nowMony.add(devMony).add(amount);
allMony=allMony.add(nowMony);
experDevVo.setExperAmount(nowMony.toString());
mapper.addExperDev(experDevVo, vo.getId()); mapper.addExperDev(experDevVo, vo.getId());
List<ExperDevItemsAppVo> experDevItemsVos = setExperDevItemsList(vo.getExperDevVos().get(i), vo); List<ExperDevItemsAppVo> experDevItemsVos = setExperDevItemsList(vo.getExperDevVos().get(i), vo);
for (ExperDevItemsAppVo experDevItemsVo : experDevItemsVos) { for (ExperDevItemsAppVo experDevItemsVo : experDevItemsVos) {
mapper.addExperDevItems(experDevItemsVo); mapper.addExperDevItems(experDevItemsVo);
List<ExperDevItemAppVo> experDevItemVos = setExperDevItemList(vo.getExperDevVos().get(i), vo, experDevItemsVo); List<ExperDevItemAppVo> experDevItemVos = setExperDevItemList(vo.getExperDevVos().get(i), vo, experDevItemsVo);
// 添加设备试验项数据 // 添加设备试验项数据

17
src/main/java/com/bonus/aqgqj/basis/service/impl/ExperimentalServiceImpl.java
View File

@ -151,16 +151,17 @@ public class ExperimentalServiceImpl implements ExperimentalService {
mapper.addExper(vo); mapper.addExper(vo);
// 添加试验依据信息数据 // 添加试验依据信息数据
mapper.addConfigBasis(vo.getBasisVos(), vo.getId()); mapper.addConfigBasis(vo.getBasisVos(), vo.getId());
//试验项金额
BigDecimal devMony = new BigDecimal("0");
for (int i = 0; i < vo.getExperDevVos().size(); i++) { for (int i = 0; i < vo.getExperDevVos().size(); i++) {
ExperDevVo experDevVo = vo.getExperDevVos().get(i); ExperDevVo experDevVo = vo.getExperDevVos().get(i);
experDevVo.setIsHg(setHgData(experDevVo.getDevData())); experDevVo.setIsHg(setHgData(experDevVo.getDevData()));
BigDecimal bigDecimal = new BigDecimal("0");
if (i == 0) { if (i == 0) {
for (ConfigItemsVo configItemsVo : vo.getConfigItemsVos()) { for (ConfigItemsVo configItemsVo : vo.getConfigItemsVos()) {
// 添加试验项数据 // 添加试验项数据
mapper.addExperItems(configItemsVo, vo.getId()); mapper.addExperItems(configItemsVo, vo.getId());
BigDecimal amount = new BigDecimal(configItemsVo.getAmount()); BigDecimal amount = new BigDecimal(configItemsVo.getAmount());
bigDecimal=bigDecimal.add(amount); devMony=devMony.add(amount);
// 添加试验项内容数据 // 添加试验项内容数据
for (ConfigItemVo configItemVo : configItemsVo.getItemList()) { for (ConfigItemVo configItemVo : configItemsVo.getItemList()) {
mapper.addExperItem(configItemVo, configItemsVo.getId()); mapper.addExperItem(configItemVo, configItemsVo.getId());
@ -168,9 +169,11 @@ public class ExperimentalServiceImpl implements ExperimentalService {
} }
} }
//计算设备总金额 //计算设备总金额
experDevVo.setExperAmount(bigDecimal.toString());
BigDecimal amount= new BigDecimal(experDevVo.getAmount()); 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()); mapper.addExperDev(experDevVo, vo.getId());
List<ExperDevItemsVo> experDevItemsVos = setExperDevItemsList(vo.getExperDevVos().get(i), vo); List<ExperDevItemsVo> experDevItemsVos = setExperDevItemsList(vo.getExperDevVos().get(i), vo);
for (ExperDevItemsVo experDevItemsVo : experDevItemsVos) { for (ExperDevItemsVo experDevItemsVo : experDevItemsVos) {
@ -263,8 +266,10 @@ public class ExperimentalServiceImpl implements ExperimentalService {
experDevVo.setIsHg(setHgData(experDevVo.getDevData())); experDevVo.setIsHg(setHgData(experDevVo.getDevData()));
// 添加试验样品数据 // 添加试验样品数据
BigDecimal amount= new BigDecimal(experDevVo.getAmount()); BigDecimal amount= new BigDecimal(experDevVo.getAmount());
allMony=allMony.add(bigDecimal).add(amount); BigDecimal nowMony= new BigDecimal("0");
experDevVo.setExperAmount(bigDecimal.toString()); nowMony=nowMony.add(amount).add(bigDecimal);
allMony=allMony.add(nowMony);
experDevVo.setExperAmount(nowMony.toString());
mapper.addExperDev(experDevVo, vo.getId()); mapper.addExperDev(experDevVo, vo.getId());
List<ExperDevItemsVo> experDevItemsVos = setExperDevItemsList(vo.getExperDevVos().get(i), vo); List<ExperDevItemsVo> experDevItemsVos = setExperDevItemsList(vo.getExperDevVos().get(i), vo);
for (ExperDevItemsVo experDevItemsVo : experDevItemsVos) { for (ExperDevItemsVo experDevItemsVo : experDevItemsVos) {