zjh
2 天以前 7e9ffbd3b45be78890442683b17742aa5bdccd2c
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
@@ -1413,9 +1413,12 @@
                parent.put("", remark.getXmlb());
                List<TjOrderDetail> dels = new ArrayList<>();
                if (null != tjOrderDetails && !tjOrderDetails.isEmpty()) {
                    Map<String, List<TjOrderDetail>> listMap = tjOrderDetails.stream()
                            .filter(i -> StrUtil.isNotBlank(i.getProResult()) && remark.getProsId().equals(i.getProsId()))
                            .collect(Collectors.groupingBy(TjOrderDetail::getProResult));
//                    null !=dictList &&
                    boolean isGroupOnce = false;
                    String groupOnceProResult = "";
                    if (listMap.size() == 1){
@@ -1423,8 +1426,8 @@
                        LambdaQueryWrapper<SysDictData> wrapper = new LambdaQueryWrapper<>();
                        wrapper.eq(SysDictData::getDictType,"qj_type");
                        wrapper.eq(SysDictData::getDictLabel,firstKey);
                        List<SysDictData> dictList = sysDictDataService.list();
                        if (!dictList.isEmpty()) {
                        List<SysDictData> dictList = sysDictDataService.list(wrapper);
                        if  (!dictList.isEmpty()) {
                            isGroupOnce = true;
                            groupOnceProResult = firstKey;
                        }