zjh 2023/11/01--2

zjh

2023-11-01 11a7f9174d77eae87e45c43668e9746139dca036

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

@@ -540,7 +540,8 @@
            return AjaxResult.success("操作失败");
        }
        for (TjOrderRemark orderRemark : remarklList) {
            if (null != orderRemark.getSummaryList() && orderRemark.getSummaryList().size()>0 ) {
            List<String> summaryList = orderRemark.getSummaryList();
            if (null != summaryList && summaryList.size()>0 && !summaryList.contains(null) ) {
                orderRemark.setSummary(Joiner.on(";").join(orderRemark.getSummaryList()));
            }
            LambdaQueryWrapper<TjOrder> qw = new LambdaQueryWrapper<>();
@@ -581,7 +582,6 @@
                        }
                    }
                }
                //-----------------------------------end
                asyncService.updateOrdeltile(tjOrderDetailList, sysUser, order);
                LambdaQueryWrapper<TjOrderDetail> qww = new LambdaQueryWrapper<>();
                qww.eq(TjOrderDetail::getOrderId, order.getOrderId());
@@ -600,7 +600,7 @@
                    remarkService.save(remark);
                } else {
                    one.setRemark(orderRemark.getRemark());
                    if (orderRemark.getSummaryList() != null) {
                    if (null != summaryList && summaryList.size()>0 && !summaryList.contains(null)) {
                        one.setSummary(Joiner.on(";").join(orderRemark.getSummaryList()));
                    }
                    one.setDeptId(orderRemark.getDeptId());
@@ -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);