zjh
2023-11-01 11a7f9174d77eae87e45c43668e9746139dca036
zjh 2023/11/01--2
2个文件已修改
18 ■■■■■ 已修改文件
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjNewFlowingWaterController.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
@@ -707,15 +707,20 @@
            return AjaxResult.error("获取用户信息错误");
        }
        if(redisCache.hasHKey("getOrderDetailByProParentId"+tjNumber,proParentId)){
            Map<String, Object> mapValue = redisCache.getCacheMapValue("getOrderDetailByProParentId" + tjNumber, proParentId);
            return AjaxResult.success(mapValue);
        }
//        if(redisCache.hasHKey("getOrderDetailByProParentId"+tjNumber,proParentId)){
//            Map<String, Object> mapValue = redisCache.getCacheMapValue("getOrderDetailByProParentId" + tjNumber, proParentId);
//            return AjaxResult.success(mapValue);
//        }
        TjOrderRemark remark = remarkService.getTjOrderRemarkByTjNumAndProParentId(tjNumber, proParentId);
        List<TjProject> proParentList = projectService.getTjProjectListBySoneId(proParentId);
        if (null == proParentList) {
            return AjaxResult.error("该项目下暂时没数据");
        if (null == proParentList || proParentList.size()==0) {
            Map<String, Object> map = new HashMap<>();
            map.put("xiaoJieIds", null);
            map.put("sons", projectService.list(new LambdaQueryWrapper<TjProject>().eq(TjProject::getProId,proParentId)));
            map.put("xiaoJie", null);
            map.put("remark", remark.getRemark());
            return AjaxResult.success(map);
        }
        List<Long> proParentIdList = proParentList.stream().map(TjProject::getProId).collect(Collectors.toList());
        TjOrder one = orderService.getOrderByTjNum(tjNumber);
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjNewFlowingWaterController.java
@@ -181,7 +181,6 @@
            }else {
                detail.setProId(vo.getTjPro());
            }
            detail.setProId(vo.getTjPro());
            detail.setProType("0");
            detailService.save(detail);