From aee5abdde781ab426771f2024d57e3429aa2b95a Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 15 十月 2025 10:29:40 +0800
Subject: [PATCH] 最新版本541200007

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java |   23 ++++++++++++++++++++---
 1 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java
index e357e36..5bb5632 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java
@@ -1,5 +1,6 @@
 package com.doumee.service.business.impl;
 
+import com.doumee.biz.system.SystemDictDataBiz;
 import com.doumee.core.constants.ResponseStatus;
 import com.doumee.core.exception.BusinessException;
 import com.doumee.service.business.third.model.LoginUserInfo;
@@ -14,6 +15,8 @@
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.yulichang.query.MPJQueryWrapper;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.checkerframework.checker.units.qual.C;
@@ -37,6 +40,8 @@
 @Service
 public class CategoryServiceImpl implements CategoryService {
 
+    @Autowired
+    private SystemDictDataBiz systemDictDataBiz;
     @Autowired
     private CategoryMapper categoryMapper;
 
@@ -153,9 +158,18 @@
     @Override
     public PageData<Category> findPage(PageWrap<Category> pageWrap) {
         IPage<Category> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
-        QueryWrapper<Category> queryWrapper = new QueryWrapper<>();
+        MPJLambdaWrapper<Category> queryWrapper = new MPJLambdaWrapper<>();
         Utils.MP.blankToNull(pageWrap.getModel());
-        queryWrapper.lambda().eq(Category::getIsdeleted,Constants.ZERO)
+        String prefixUrl = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode() +
+                systemDictDataBiz.queryByCode(Constants.FTP,Constants.BANNER_IMG).getCode();
+        queryWrapper.selectAll(Category.class );
+        if(Constants.equalsInteger(pageWrap.getModel().getType(),Constants.FOUR)){
+            //濡傛灉鏄富绾胯矾锛屾煡璇㈢嚎璺暟鍜屽鎴锋暟
+            queryWrapper.select( "(select count(1) from jk_line b where b.isdeleted=0 and b.CATEGORY_ID = t.id)",Category::getLineNum);
+            queryWrapper.select( "(select count(1) from jk_customer b left join jk_line c on b.line_id=c.id where c.isdeleted=0 and b.isdeleted=0 and c.CATEGORY_ID = t.id)",Category::getCustomerNum);
+            queryWrapper.select( "(select count(1) from jk_customer b left join jk_line c on b.line_id=c.id where c.isdeleted=0 and b.isdeleted=0 and c.CATEGORY_ID = t.id b.DISTANCE_STATUS = 1)",Category::getCustomerDoneNum);
+        }
+        queryWrapper.eq(Category::getIsdeleted,Constants.ZERO)
                 .eq(Objects.nonNull(pageWrap.getModel().getType()),Category::getType,pageWrap.getModel().getType())
                 .like(StringUtils.isNotBlank(pageWrap.getModel().getName()),Category::getName,pageWrap.getModel().getName())
                 .isNull(Category::getParentId)
@@ -171,6 +185,9 @@
             category.setChildCategoryList(
                     categoryList.stream().filter(i->Constants.equalsInteger(i.getParentId(),category.getId())).collect(Collectors.toList())
             );
+            if(StringUtils.isNotBlank(category.getImgurl())){
+                category.setImgurlFull(prefixUrl + category.getImgurl());
+            }
         }
 
         return categoryPageData;
@@ -229,7 +246,7 @@
 
         List<Category> categories = categoryMapper.selectList(wrapper);
         if (org.apache.commons.collections.CollectionUtils.isNotEmpty(categories)){
-            throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(),"鍒嗙被淇℃伅宸插瓨鍦�");
+            throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(),"淇℃伅宸插瓨鍦�");
         }
     }
 }

--
Gitblit v1.9.3