产值详情用户筛选bug

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

@@ -9,12 +9,14 @@ import cn.wise.sc.cement.business.model.PageQuery;
 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;
+import cn.wise.sc.cement.business.service.INonStandardValueService;
 import cn.wise.sc.cement.business.service.INormProductionService;
 import cn.wise.sc.cement.business.util.PageUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -29,6 +31,7 @@ import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -45,7 +48,8 @@ public class NormProductionController {
 
     final
     INormProductionService iNormProductionService;
-
+    @Autowired
+    INonStandardValueService inonStandardValueService;
     public NormProductionController(INormProductionService iNormProductionService) {
         this.iNormProductionService = iNormProductionService;
     }
@@ -128,8 +132,13 @@ public class NormProductionController {
             endTime = DateUtil.parseDate(end).getTime();
         }
         List<NormProduction.NormProductionDetail> data = iNormProductionService.normProductionDetails(userId, startTime, endTime);
-        if (data.size() != 0) {
-            Page<NormProduction.NormProductionDetail> rts = PageUtil.listConvertToPage(data, pageQuery);
+
+        List<NormProduction.NormProductionDetail> collect = data
+                .stream()
+                .filter(arg -> arg.getUserId().intValue() == userId)
+                .collect(Collectors.toList());
+        if (collect.size() != 0) {
+            Page<NormProduction.NormProductionDetail> rts = PageUtil.listConvertToPage(collect, pageQuery);
             return BaseResponse.okData(rts);
         }
         return BaseResponse.errorMsg("没有找到相关数据!");

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

@@ -25,7 +25,6 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-
 import javax.servlet.http.HttpServletResponse;
 import java.util.HashMap;
 import java.util.List;

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

@@ -346,22 +346,13 @@ public class NormProductionServiceImpl extends ServiceImpl<NormProductionMapper,
          *   1.获取处理派发表数据,获取标准产值配置,查询处理项。
          * */
         //获取标准产值数据
-        QueryWrapper<SampleDistribution> qwDis = new QueryWrapper<>();
-        QueryWrapper<SampleHandle> qwHan = new QueryWrapper<>();
-        QueryWrapper<SampleCheckTeam> qwCT = new QueryWrapper<>();
         Map<String, Object> params = new HashMap<>(2);
         if (userId != null && userId > 0) {
-            qwDis.eq("user_id", userId);
-            qwHan.eq("user_id", userId);
-            qwCT.eq("user_id", userId);
             params.put("user_id", userId);
         }
         if (start != null && end != null) {
             DateTime startTime = DateUtil.date(start);
             DateTime endTime = DateUtil.date(end);
-            qwDis.between("finish_time", startTime, endTime);
-            qwHan.between("finish_time", startTime, endTime);
-            qwCT.between("finish_time", startTime, endTime);
             params.put("start_time", DateUtil.format(startTime, "yyyy-MM-dd"));
             params.put("end_time", DateUtil.format(endTime, "yyyy-MM-dd"));
         }