Commit 27032be5 authored by qinhu's avatar qinhu

产值补提交

parent 448d7353
...@@ -181,8 +181,8 @@ public class NormProductionController { ...@@ -181,8 +181,8 @@ public class NormProductionController {
} }
List<ProductionVo> newRts = new ArrayList<>(); List<ProductionVo> newRts = new ArrayList<>();
for (Integer groupId1 : ids) { for (Integer groupId1 : ids) {
ProductionVo finalNormProduction = new ProductionVo();
for (ProductionVo productionVo : rts) { for (ProductionVo productionVo : rts) {
ProductionVo finalNormProduction = new ProductionVo();
if (productionVo.getGroupId().intValue() == groupId1) { if (productionVo.getGroupId().intValue() == groupId1) {
finalNormProduction.setUserId(productionVo.getUserId()); finalNormProduction.setUserId(productionVo.getUserId());
finalNormProduction.setUserName(productionVo.getUserName()); finalNormProduction.setUserName(productionVo.getUserName());
...@@ -197,14 +197,14 @@ public class NormProductionController { ...@@ -197,14 +197,14 @@ public class NormProductionController {
finalNormProduction.setProductionTotalValue(newFinalValue); finalNormProduction.setProductionTotalValue(newFinalValue);
Double newNonProductionValue = productionVo.getNonProductionValue() + finalNormProduction.getNonProductionValue(); Double newNonProductionValue = productionVo.getNonProductionValue() + finalNormProduction.getNonProductionValue();
finalNormProduction.setNonProductionValue(newNonProductionValue); finalNormProduction.setProductionValue(newNonProductionValue);
Double newProductionValue = productionVo.getProductionValue() + finalNormProduction.getProductionValue(); Double newProductionValue = productionVo.getProductionValue() + finalNormProduction.getProductionValue();
finalNormProduction.setProductionValue(newProductionValue); finalNormProduction.setNonProductionValue(newProductionValue);
}
} }
newRts.add(finalNormProduction); newRts.add(finalNormProduction);
} }
}
rts = newRts; rts = newRts;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment