From 0892d843cd394f383ff50f480f7f22f2ec3829bc Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期五, 27 六月 2025 20:24:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ltkj-system/src/main/java/com/ltkj/system/service/impl/SysDeptServiceImpl.java |   95 +++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 94 insertions(+), 1 deletions(-)

diff --git a/ltkj-system/src/main/java/com/ltkj/system/service/impl/SysDeptServiceImpl.java b/ltkj-system/src/main/java/com/ltkj/system/service/impl/SysDeptServiceImpl.java
index 04b18b0..f215d8b 100644
--- a/ltkj-system/src/main/java/com/ltkj/system/service/impl/SysDeptServiceImpl.java
+++ b/ltkj-system/src/main/java/com/ltkj/system/service/impl/SysDeptServiceImpl.java
@@ -5,6 +5,8 @@
 import java.util.stream.Collectors;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.ltkj.common.constant.Constants;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -48,6 +50,18 @@
         return deptMapper.selectDeptList(dept);
     }
 
+    @Override
+    @DataScope(deptAlias = "d")
+    public List<SysDept> selectDeptList11(SysDept dept) {
+        return deptMapper.selectDeptTreeList1();
+    }
+
+    @Override
+    @DataScope(deptAlias = "d")
+    public List<SysDept> selectDeptList111(SysDept dept) {
+        return deptMapper.selectDeptTreeList11();
+    }
+
     /**
      * 鏌ヨ閮ㄩ棬鏍戠粨鏋勪俊鎭�
      *
@@ -57,6 +71,12 @@
     @Override
     public List<TreeSelect> selectDeptTreeList(SysDept dept) {
         List<SysDept> depts = SpringUtils.getAopProxy(this).selectDeptList(dept);
+        return buildDeptTreeSelect(depts);
+    }
+
+    @Override
+    public List<TreeSelect> selectDeptTreeList1(SysDept dept) {
+        List<SysDept> depts = SpringUtils.getAopProxy(this).selectDeptList11(dept);
         return buildDeptTreeSelect(depts);
     }
 
@@ -197,7 +217,6 @@
      */
     @Override
     public int insertDept(SysDept dept) {
-        // TODO: 2023/2/17  鏂板閮ㄩ棬 鏃跺�欐煡鐪嬬埗椤�
         Long parentId = dept.getParentId();
         if(null ==parentId){
             parentId=100L;
@@ -366,4 +385,78 @@
         return    deptMapper.getSysDeptYjWjCustomerList( deptid,  tjname,  tjNumber,  type,  page,  pageSize);
 //        return deptMapper.getSysDeptYjWjCustomerList(deptid,tjname,tjNumber,type,page,pageSize);
     }
+
+    @Override
+    public  Map<String,Object> getSysDeptYjWjCustomerList13(String deptid, String tjname, String tjNumber, int type, int page, int pageSize) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("deptid",deptid);
+        map.put("tjname",tjname);
+        map.put("tjNumber",tjNumber);
+        map.put("type",type);
+        map.put("page",page);
+        map.put("pageSize",pageSize);
+        List<List<?>> list = deptMapper.getSysDeptYjWjCustomerList13(map);
+//        ObjectMapper objectMapper=new ObjectMapper();
+//        try {
+//            System.out.println("缁撴灉闆嗕竴锛�"+objectMapper.writeValueAsString(list.get(0)));
+//            System.out.println("缁撴灉闆嗕簩锛�"+objectMapper.writeValueAsString(list.get(1)));
+//        } catch (JsonProcessingException e) {
+//            e.printStackTrace();
+//        }
+//        System.out.println("鍑哄弬鍙傛暟鍊硷細"+map.get("totalRows"));
+        Map<String,Object> map1=new HashMap<>();
+        map1.put("date",list);
+        map1.put("total",map.get("totalRows"));
+
+        return   map1 ;
+//        return deptMapper.getSysDeptYjWjCustomerList(deptid,tjname,tjNumber,type,page,pageSize);
+    }
+
+    @Override
+    public Map<String, Object> getSysDeptHyAndYxYjWjCustomerList13(String deptid, String tjname, String tjNumber, int type, int page, int pageSize) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("deptid",deptid);
+        map.put("tjname",tjname);
+        map.put("tjNumber",tjNumber);
+        map.put("type",type);
+        map.put("page",page);
+        map.put("pageSize",pageSize);
+        List<List<?>> list = deptMapper.getSysDeptHyAndYxYjWjCustomerList13(map);
+        Map<String,Object> map1=new HashMap<>();
+        map1.put("date",list);
+        map1.put("total",map.get("totalRows"));
+
+        return   map1 ;
+    }
+
+    @Override
+    public List<TreeSelect> selectDeptList1(SysDept dept) {
+        List<SysDept> depts = SpringUtils.getAopProxy(this).selectDeptList111(dept);
+        return buildDeptTreeSelect(depts);
+    }
+
+    @Override
+    public List<String> getJyDeptIds() {
+        return deptMapper.getJyDeptIds();
+    }
+
+    @Override
+    public List<String> getJcDeptIds() {
+        return deptMapper.getJcDeptIds();
+    }
+
+    @Override
+    public List<String> getCzDeptIds() {
+        return deptMapper.getCzDeptIds();
+    }
+
+    @Override
+    public String getprentks(String deptId) {
+        return deptMapper.getprentks(deptId);
+    }
+
+    @Override
+    public List<Long> getDeptTreeById(String deptId) {
+        return deptMapper.getDeptTreeById(deptId);
+    }
 }

--
Gitblit v1.8.0