Merge branch 'master' of http://111.203.232.171:8888/zhutianwei/tianjin-cement

cement-business/src/main/java/cn/wise/sc/cement/business/controller/NormProductionController.java

@@ -164,6 +164,7 @@ public class NormProductionController {
                         finalNormProduction.setPosition(productionVo.getPosition());
                         finalNormProduction.setTime(productionVo.getTime());
                         finalNormProduction.setGroupId(productionVo.getGroupId());
+                        finalNormProduction.setGroupName(productionVo.getGroupName());
 
                         Double newFinalValue=productionVo.getProductionTotalValue()+finalNormProduction.getProductionTotalValue();
                         finalNormProduction.setProductionTotalValue(newFinalValue);

cement-business/src/main/java/cn/wise/sc/cement/business/entity/NormProduction.java

@@ -120,7 +120,6 @@ public class NormProduction implements Serializable {
         private BigDecimal workTimeCoefficient;
         private Integer type;
         private String groupTeamName;
-        private Integer groupId;
     }
 
 }

cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/ProductionVo.java

@@ -38,4 +38,6 @@ public class ProductionVo implements Serializable {
     private Double productionTotalValue = 0D;
     @ApiModelProperty("部门id")
     private Integer groupId;
+    @ApiModelProperty("部门名")
+    private String groupName;
 }