From 4d3a6aa0ca35186810f0356615f2d4c489766f88 Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Mon, 21 Apr 2025 17:07:33 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=95=B0=E6=8D=AE=E6=BA=90?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E3=80=81=E6=9C=BA=E6=9E=84=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E3=80=81=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E6=9C=BA=E6=9E=84=E8=8E=B7=E5=8F=96=E7=9B=B8=E5=85=B3=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/controller/SysDepartController.java | 4 ++-- .../org/jeecg/modules/system/entity/SysDepart.java | 4 ++++ .../modules/system/model/SysDepartTreeModel.java | 14 +++++++++++++- .../modules/system/service/ISysDepartService.java | 3 ++- .../system/service/impl/SysDepartServiceImpl.java | 7 ++++++- 5 files changed, 27 insertions(+), 5 deletions(-) diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java index a10a886..d24b7a2 100644 --- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java +++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java @@ -132,10 +132,10 @@ public class SysDepartController { * @return */ @RequestMapping(value = "/queryDepartTreeSync", method = RequestMethod.GET) - public Result> queryDepartTreeSync(@RequestParam(name = "pid", required = false) String parentId,@RequestParam(name = "ids", required = false) String ids, @RequestParam(name = "primaryKey", required = false) String primaryKey) { + public Result> queryDepartTreeSync(@RequestParam(name = "pid", required = false) String parentId,@RequestParam(name = "ids", required = false) String ids, @RequestParam(name = "primaryKey", required = false) String primaryKey, @RequestParam(name = "platType", required = false) String platType) { Result> result = new Result<>(); try { - List list = sysDepartService.queryTreeListByPid(parentId,ids, primaryKey); + List list = sysDepartService.queryTreeListByPid(parentId,ids, primaryKey,platType); result.setResult(list); result.setSuccess(true); } catch (Exception e) { diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepart.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepart.java index 20aa716..e7b90c4 100644 --- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepart.java +++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepart.java @@ -54,6 +54,10 @@ public class SysDepart implements Serializable { /**机构编码*/ @Excel(name="机构编码",width=15) private String orgCode; + /**业务平台类型*/ + @Excel(name="业务平台类型",width=15) + @Dict(dicCode = "iz_test_site") + private String platType; /**运营开始时间*/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/model/SysDepartTreeModel.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/model/SysDepartTreeModel.java index ed1fac3..3c6c8ad 100644 --- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/model/SysDepartTreeModel.java +++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/model/SysDepartTreeModel.java @@ -39,6 +39,8 @@ public class SysDepartTreeModel implements Serializable{ private String parentId; + private String platType; + private String departName; private String departNameEn; @@ -103,6 +105,7 @@ public class SysDepartTreeModel implements Serializable{ this.title = sysDepart.getDepartName(); this.id = sysDepart.getId(); this.parentId = sysDepart.getParentId(); + this.platType = sysDepart.getPlatType(); this.departName = sysDepart.getDepartName(); this.departNameEn = sysDepart.getDepartNameEn(); this.departNameAbbr = sysDepart.getDepartNameAbbr(); @@ -199,6 +202,14 @@ public class SysDepartTreeModel implements Serializable{ this.parentId = parentId; } + public String getPlatType() { + return platType; + } + + public void setPlatType(String platType) { + this.platType = platType; + } + public static long getSerialVersionUID() { return serialVersionUID; } @@ -411,6 +422,7 @@ public class SysDepartTreeModel implements Serializable{ SysDepartTreeModel model = (SysDepartTreeModel) o; return Objects.equals(id, model.id) && Objects.equals(parentId, model.parentId) && + Objects.equals(platType, model.platType) && Objects.equals(departName, model.departName) && Objects.equals(departNameEn, model.departNameEn) && Objects.equals(departNameAbbr, model.departNameAbbr) && @@ -444,7 +456,7 @@ public class SysDepartTreeModel implements Serializable{ @Override public int hashCode() { - return Objects.hash(id, parentId, departName, departNameEn, departNameAbbr, + return Objects.hash(id, parentId, platType, departName, departNameEn, departNameAbbr, departOrder, description, orgCategory, orgType, orgCode, operationStartTime, operationEndTime, contractStartTime, contractEndTime, mobile, fax, address, memo, status, delFlag, qywxIdentifier, diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartService.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartService.java index 5bf5289..b85f5a9 100644 --- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartService.java +++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartService.java @@ -141,9 +141,10 @@ public interface ISysDepartService extends IService{ * @param parentId 父id * @param ids 多个部门id * @param primaryKey 主键字段（id或者orgCode） + * @param platType syjg试验机构 ywjg业务机构 * @return */ - List queryTreeListByPid(String parentId,String ids, String primaryKey); + List queryTreeListByPid(String parentId,String ids, String primaryKey,String platType); /** * 获取某个部门的所有父级部门的ID diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java index e05061c..b3fe7ef 100644 --- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java +++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java @@ -597,10 +597,11 @@ public class SysDepartServiceImpl extends ServiceImpl queryTreeListByPid(String parentId,String ids, String primaryKey) { + public List queryTreeListByPid(String parentId,String ids, String primaryKey,String platType) { Consumer> square = i -> { if (oConvertUtils.isNotEmpty(ids)) { if (CommonConstant.DEPART_KEY_ORG_CODE.equals(primaryKey)) { @@ -628,6 +629,10 @@ public class SysDepartServiceImpl extends ServiceImpl list = list(lqw); //update-begin---author:wangshuai ---date:20220316 for：[JTC-119]在部门管理菜单下设置部门负责人 创建用户的时候不需要处理 //设置用户id,让前台显示