Commit cd8e18c0 authored by mengbali153's avatar mengbali153

标准产值

parent fc0eef77
...@@ -164,6 +164,7 @@ public class NormProductionController { ...@@ -164,6 +164,7 @@ public class NormProductionController {
finalNormProduction.setPosition(productionVo.getPosition()); finalNormProduction.setPosition(productionVo.getPosition());
finalNormProduction.setTime(productionVo.getTime()); finalNormProduction.setTime(productionVo.getTime());
finalNormProduction.setGroupId(productionVo.getGroupId()); finalNormProduction.setGroupId(productionVo.getGroupId());
finalNormProduction.setGroupName(productionVo.getGroupName());
Double newFinalValue=productionVo.getProductionTotalValue()+finalNormProduction.getProductionTotalValue(); Double newFinalValue=productionVo.getProductionTotalValue()+finalNormProduction.getProductionTotalValue();
finalNormProduction.setProductionTotalValue(newFinalValue); finalNormProduction.setProductionTotalValue(newFinalValue);
......
...@@ -120,7 +120,6 @@ public class NormProduction implements Serializable { ...@@ -120,7 +120,6 @@ public class NormProduction implements Serializable {
private BigDecimal workTimeCoefficient; private BigDecimal workTimeCoefficient;
private Integer type; private Integer type;
private String groupTeamName; private String groupTeamName;
private Integer groupId;
} }
} }
...@@ -38,4 +38,6 @@ public class ProductionVo implements Serializable { ...@@ -38,4 +38,6 @@ public class ProductionVo implements Serializable {
private Double productionTotalValue = 0D; private Double productionTotalValue = 0D;
@ApiModelProperty("部门id") @ApiModelProperty("部门id")
private Integer groupId; private Integer groupId;
@ApiModelProperty("部门名")
private String groupName;
} }
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