From cb671ac6fcbdff936395e405aa6abc1e47636609 Mon Sep 17 00:00:00 2001 From: liuwu <975499773@qq.com> Date: Tue, 5 Sep 2023 16:09:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TAmentPartyAffairsController.java | 28 +++++++++++++++++++ .../base/mapper/TAmentPartyAffairsMapper.java | 2 ++ .../service/ITAmentPartyAffairsService.java | 2 ++ .../impl/TAmentPartyAffairsServiceImpl.java | 5 ++++ .../templates/base/affairs/affairs.html | 5 +++- .../mapper/base/TAmentPartyAffairsMapper.xml | 23 +++++++++++++++ 6 files changed, 64 insertions(+), 1 deletion(-) diff --git a/cyx-admin/src/main/java/com/cyx/web/base/controller/TAmentPartyAffairsController.java b/cyx-admin/src/main/java/com/cyx/web/base/controller/TAmentPartyAffairsController.java index 0702992..b3a1a60 100644 --- a/cyx-admin/src/main/java/com/cyx/web/base/controller/TAmentPartyAffairsController.java +++ b/cyx-admin/src/main/java/com/cyx/web/base/controller/TAmentPartyAffairsController.java @@ -4,6 +4,8 @@ import java.util.Date; import java.util.List; import java.util.Map; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; import com.cyx.common.annotation.Log; import com.cyx.common.core.controller.BaseController; import com.cyx.common.core.domain.AjaxResult; @@ -218,6 +220,32 @@ public class TAmentPartyAffairsController extends BaseController return getDataTable(list); } + @GetMapping("/deptTree") + @ResponseBody + public Object deptTree(TAmentPartyAffairs tAmentPartyAffairs) + { + JSONArray array =new JSONArray(); + List> list = tAmentPartyAffairsService.deptTree(tAmentPartyAffairs); + list.forEach(l->{ + JSONObject p = new JSONObject(); + p.put("id",l.get("id")); + p.put("pId",0); + p.put("name",l.get("type")); + p.put("title",l.get("type")); + p.put("open",false); + p.put("checked",false); + array.add(p); + JSONArray array1 = JSONArray.parseArray("["+l.get("json")+"]"); + array1.forEach(a->{ + JSONObject o = (JSONObject) a; + o.put("pId",l.get("id")); + o.put("type",l.get("type")); + array.add(o); + }); + }); + return array; + } + /** * 查询党务列表 */ diff --git a/cyx-admin/src/main/java/com/cyx/web/base/mapper/TAmentPartyAffairsMapper.java b/cyx-admin/src/main/java/com/cyx/web/base/mapper/TAmentPartyAffairsMapper.java index fef587e..7d44a49 100644 --- a/cyx-admin/src/main/java/com/cyx/web/base/mapper/TAmentPartyAffairsMapper.java +++ b/cyx-admin/src/main/java/com/cyx/web/base/mapper/TAmentPartyAffairsMapper.java @@ -80,4 +80,6 @@ public interface TAmentPartyAffairsMapper List warnList(TAmentPartyAffairs tAmentPartyAffairs); List approveList(TAmentPartyAffairs tAmentPartyAffairs); + + List> deptTree(TAmentPartyAffairs tAmentPartyAffairs); } diff --git a/cyx-admin/src/main/java/com/cyx/web/base/service/ITAmentPartyAffairsService.java b/cyx-admin/src/main/java/com/cyx/web/base/service/ITAmentPartyAffairsService.java index 7935679..bbdef00 100644 --- a/cyx-admin/src/main/java/com/cyx/web/base/service/ITAmentPartyAffairsService.java +++ b/cyx-admin/src/main/java/com/cyx/web/base/service/ITAmentPartyAffairsService.java @@ -80,4 +80,6 @@ public interface ITAmentPartyAffairsService List warnList(TAmentPartyAffairs tAmentPartyAffairs); List approveList(TAmentPartyAffairs tAmentPartyAffairs); + + List> deptTree(TAmentPartyAffairs tAmentPartyAffairs); } diff --git a/cyx-admin/src/main/java/com/cyx/web/base/service/impl/TAmentPartyAffairsServiceImpl.java b/cyx-admin/src/main/java/com/cyx/web/base/service/impl/TAmentPartyAffairsServiceImpl.java index 2c980b2..42ea4a6 100644 --- a/cyx-admin/src/main/java/com/cyx/web/base/service/impl/TAmentPartyAffairsServiceImpl.java +++ b/cyx-admin/src/main/java/com/cyx/web/base/service/impl/TAmentPartyAffairsServiceImpl.java @@ -62,6 +62,11 @@ public class TAmentPartyAffairsServiceImpl implements ITAmentPartyAffairsService return tAmentPartyAffairsMapper.approveList(tAmentPartyAffairs); } + @Override + public List> deptTree(TAmentPartyAffairs tAmentPartyAffairs){ + return tAmentPartyAffairsMapper.deptTree(tAmentPartyAffairs); + } + /** * 新增党务 * diff --git a/cyx-admin/src/main/resources/templates/base/affairs/affairs.html b/cyx-admin/src/main/resources/templates/base/affairs/affairs.html index fcc4075..f9ba565 100644 --- a/cyx-admin/src/main/resources/templates/base/affairs/affairs.html +++ b/cyx-admin/src/main/resources/templates/base/affairs/affairs.html @@ -33,7 +33,7 @@
    - +
  • @@ -303,6 +303,7 @@ }); function queryDeptTree(){ var url = ctx + "base/user/deptTreeData"; + // var url = ctx + "base/affairs/deptTree"; var options = { url: url, expandLevel: 2, @@ -311,7 +312,9 @@ $.tree.init(options); function zOnClick(event, treeId, treeNode) { + console.log(treeNode) $("#deptId").val(treeNode.id); + $("#type").val(treeNode.type); $("#parentId").val(treeNode.pId); $.table.search(); } diff --git a/cyx-system/src/main/resources/mapper/base/TAmentPartyAffairsMapper.xml b/cyx-system/src/main/resources/mapper/base/TAmentPartyAffairsMapper.xml index dc79456..0666207 100644 --- a/cyx-system/src/main/resources/mapper/base/TAmentPartyAffairsMapper.xml +++ b/cyx-system/src/main/resources/mapper/base/TAmentPartyAffairsMapper.xml @@ -131,6 +131,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by finish_date + +