zjh20250728-1

zjh

昨天 c919ac59b5cc871a124f298663ecd365779e6bd4

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

@@ -1644,7 +1644,7 @@
                        LambdaQueryWrapper<SysDictData> wrapper = new LambdaQueryWrapper<>();
                        wrapper.eq(SysDictData::getDictType,"qj_type");
                        wrapper.eq(SysDictData::getDictLabel,firstKey);
                        List<SysDictData> dictList = sysDictDataService.list();
                        List<SysDictData> dictList = sysDictDataService.list(wrapper);
                        if (!dictList.isEmpty()) {
                            isGroupOnce = true;
                            groupOnceProResult = firstKey;
@@ -1819,20 +1819,26 @@
        try {
            if (StrUtil.isNotBlank(tjNum)) {
                TjOrder one = orderService.getOrderByTjNum(tjNum);

                List<Map<String, Object>> maps = new ArrayList<>();
                if (one == null) {
                    return AjaxResult.error("暂无数据！！");
                }
                yichangxiangmu(tjNum);
                LambdaQueryWrapper<TjOrderYcxm> wq = new LambdaQueryWrapper<>();
                wq.eq(TjOrderYcxm::getTjh, tjNum);
                List<TjOrderYcxm> list = ycxmService.list(wq);
                if (null != list && !list.isEmpty()) {
                    Collections.reverse(list);
                    return getOrderYcxmList(list);
                } else {
                List<TjOrderYcxm> tjOrderYcxmList= ycxmService.selectListByTjh(tjNum);
                if(null!=tjOrderYcxmList&&!tjOrderYcxmList.isEmpty()){
                    LambdaQueryWrapper<TjOrderYcxm> wq = new LambdaQueryWrapper<>();
                    wq.eq(TjOrderYcxm::getTjh, tjNum);
                    List<TjOrderYcxm> list = ycxmService.list(wq);
                    if (null != list && !list.isEmpty()) {
                        Collections.reverse(list);
                        return getOrderYcxmList(list);
                    }else {
                        return AjaxResult.success(maps);
                    }
                }else {
                    return zongjianyishengchakanyichangxiangmu(tjNum);
                }

            }
            return AjaxResult.error();
        } catch (Exception ex) {
@@ -2082,7 +2088,7 @@
            }

        } catch (Exception ex) {
            log.error(ex.getMessage());
//            log.error(ex.getMessage());
        }
    }