zjh20250718

zjh

昨天 cdd1ef49773e49dd91d19f9d02c82fb70e9f658c

zjh20250718

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

@@ -234,7 +234,7 @@

    private void tbjianyan(String s,String dqyyyqbm) {
        try {
            List<Aws> awsList = testMapper.getWsxmLtkjHysqdByLisViBySLAVEWS(s);
     /*       List<Aws> awsList = testMapper.getWsxmLtkjHysqdByLisViBySLAVEWS(s);
            if(null !=awsList && !awsList.isEmpty()){
                log.info("外送项目个数->{} 结果",awsList.size());
                log.info(awsList.toString());
@@ -242,14 +242,14 @@
                log.info("删除外送项目成功");
                awsService.saveBatch(awsList);
                log.info("保存外送项目成功");
            }
            }*/
            List<LtkjHysqd> hysqdList = testMapper.getCcXZxYyLtkjHysqdByLisVi(s,dqyyyqbm);
            log.info("原hysqdList->{} 结果", JSONUtil.parseObj(hysqdList));
            List<LtkjHysqd> wssq = testMapper.getWsxmLtkjHysqdByLisVi(s);
      /*      List<LtkjHysqd> wssq = testMapper.getWsxmLtkjHysqdByLisVi(s);
            if(null !=wssq && !wssq.isEmpty()){
                log.info("外送项个->{} 结果",wssq.toString());
                hysqdList.addAll(wssq);
            }
            }*/
            if (null != hysqdList && !hysqdList.isEmpty()) {
                log.info("现hysqdList->{} 结果", JSONUtil.parseObj(hysqdList));
                for (LtkjHysqd hysqd : hysqdList) {
@@ -260,8 +260,8 @@
                    }
                    if (ltkjHysqdService.save(hysqd)) {
                        List<LtkjHybgd> hybgdList = testMapper.getCcXZxYyLtkjHybgdByLisVi(hysqd.getTmh());
                        List<LtkjHybgd> wsbg = testMapper.getWsxmLtkjHybgdByLisVi(s);
                        if(null !=wsbg && !wsbg.isEmpty())hybgdList.addAll(wsbg);
//                        List<LtkjHybgd> wsbg = testMapper.getWsxmLtkjHybgdByLisVi(s);
//                        if(null !=wsbg && !wsbg.isEmpty())hybgdList.addAll(wsbg);
                        ltkjHybgdService.saveBatch(hybgdList);
                    }
                }

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

@@ -167,6 +167,8 @@
        List<TjUserAdvice> list = userAdviceService.list(wq0);
        List<TjAdvice> kjbqPage = new ArrayList<>();
        Map<String,Object> map = new HashMap<>();
        map.put("total", 0);
        map.put("records", null);
        if (null != list && !list.isEmpty()) {
            for (TjUserAdvice advice : list) {
                TjAdvice advice1 = tjAdviceService.getById(advice.getAdviceId());
@@ -177,13 +179,16 @@
            }
            List<TjAdvice> adviceList =null;
            if(StringUtil.isNotBlank( nr)){
                adviceList = kjbqPage.stream().filter(kjbq -> StringUtil.isNotBlank(kjbq.getTitle()) && kjbq.getTitle().contains(nr))
                        .skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
                adviceList = kjbqPage.stream().filter(kjbq -> StringUtil.isNotBlank(kjbq.getTitle()) && kjbq.getTitle().contains(nr)).collect(Collectors.toList());
                List<TjAdvice> tjAdviceList = adviceList.stream().skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
                map.put("total", adviceList.size());
                map.put("records", tjAdviceList);
            }else {
                adviceList = kjbqPage.stream().skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
                map.put("total", kjbqPage.size());
                map.put("records", adviceList);
            }
            map.put("total", kjbqPage.size());
            map.put("records", adviceList);

            return AjaxResult.success(map);
        }
        return AjaxResult.success("该用户暂时没有常用建议!");