采样

lige

2023-09-13 1e8505dbe7ba0984c12e220fb71b5a13fcecf96d

采样

 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java

@@ -88,18 +88,33 @@
        LambdaQueryWrapper<TjSampling>wq=new LambdaQueryWrapper<>();
        List<Map<String,Object>> arrayList=new ArrayList<>();
        wq.orderByDesc(TjSampling::getApplicationTime);
        if(null !=beginTime && !"".equals(beginTime) && null !=endTime && !"".equals(endTime)) wq.between(TjSampling::getApplicationTime,beginTime,endTime);
        if (null != beginTime && !"".equals(beginTime) && null != endTime && !"".equals(endTime))
            wq.between(TjSampling::getApplicationTime, beginTime, endTime);
        if(null !=tjNum){
            wq.eq(TjSampling::getTjNum,tjNum);
            wq.eq(TjSampling::getIsSignFor, isSignFor);
            List<TjSampling> list = tjSamplingService.list(wq);
            List<Map<String, Object>> extracted = extracted(arrayList, list,pageNum,pageSize);
            return AjaxResult.success(extracted);

            //________________________解决搜索数据不对
            Map<String, Object> map = new HashMap<>();
            map.put("list", extracted);
            map.put("total", arrayList.size());
            return AjaxResult.success(map);
            //________________________解决搜索数据不对
        }
        if(null !=name){
            wq.like(TjSampling::getCusName,name);
            wq.eq(TjSampling::getIsSignFor, isSignFor);
            List<TjSampling> list = tjSamplingService.list(wq);
            List<Map<String, Object>> extracted = extracted(arrayList, list,pageNum,pageSize);
            return AjaxResult.success(extracted);

            //________________________解决搜索数据不对
            Map<String, Object> map = new HashMap<>();
            map.put("list", extracted);
            map.put("total", arrayList.size());
            return AjaxResult.success(map);
            //________________________解决搜索数据不对
        }
        List<Map<String, Object>> cacheMapValue =null;
        if(isSignFor==0) {
@@ -109,7 +124,7 @@
             cacheMapValue = redisCache.getCacheMapValue("sampling", "wqs");
        }
        asyncService.saveSampling();
        List<Map<String,Object>>  collect =new ArrayList<>();
        List<Map<String, Object>> collect = null;
        Map<String,Object>map=new HashMap<>();
        if(null ==cacheMapValue || cacheMapValue.size()==0){
            wq.eq(TjSampling::getIsSignFor,isSignFor);
@@ -120,11 +135,7 @@
            collect = cacheMapValue.stream().skip((long) (pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
            map.put("total",cacheMapValue.size());
        }
        if (collect!=null){
            map.put("list",collect);
        }else {
            map.put("list",new ArrayList<Map<String,Object>>());
        }

        return AjaxResult.success(map);
    }
@@ -221,7 +232,6 @@
    public AjaxResult remove(@PathVariable String[] ids) {
        return toAjax(tjSamplingService.deleteTjSamplingByIds(ids));
    }



    /**