补提交

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

@@ -2,12 +2,10 @@ package cn.wise.sc.cement.business.controller;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.wise.sc.cement.business.entity.NonStandardValue;
 import cn.wise.sc.cement.business.entity.NormProduction;
 import cn.wise.sc.cement.business.entity.NormProductionStatistics;
 import cn.wise.sc.cement.business.model.BaseResponse;
 import cn.wise.sc.cement.business.model.PageQuery;
-import cn.wise.sc.cement.business.model.vo.NonStandardValueVo;
 import cn.wise.sc.cement.business.model.vo.NormProductionVo;
 import cn.wise.sc.cement.business.model.vo.ProductionVo;
 import cn.wise.sc.cement.business.model.vo.WorkloadStatisticsVo;
@@ -24,10 +22,7 @@ import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-
 import javax.servlet.http.HttpServletResponse;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashSet;

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

@@ -3,7 +3,6 @@ package cn.wise.sc.cement.business.model.vo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-
 import java.io.Serializable;
 import java.util.Map;
 

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/NormProductionServiceImpl.java

@@ -629,7 +629,7 @@ public class NormProductionServiceImpl extends ServiceImpl<NormProductionMapper,
         workloadStatisticsVo.setType(0);
         workloadStatisticsVo.setMap(map1);
         WorkloadStatisticsVo workloadStatisticsVo2 = new WorkloadStatisticsVo();
-        workloadStatisticsVo.setType(1);
+        workloadStatisticsVo2.setType(1);
         workloadStatisticsVo2.setMap(map2);
         List<WorkloadStatisticsVo> rts = new ArrayList<>(2);
         rts.add(workloadStatisticsVo);