From 236f80305991d3517c84e70b2645a80a52ad1294 Mon Sep 17 00:00:00 2001 From: wangwh <2397901735@qq.com> Date: Mon, 28 Oct 2024 14:42:57 +0800 Subject: [PATCH] fix: 1、添加日志记录; 2、修改请求网格系统待办接口的传参objId值为本系统caseId; 3、添加办理中时联合处置申请的网格待办。 --- dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUnitService.java | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUnitService.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUnitService.java index 36af820..1870e34 100644 --- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUnitService.java +++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUnitService.java @@ -332,10 +332,10 @@ unitSelectTerm.setLabel(ctUnit.getUnitName()); unitSelectTerm.setParentId(ctUnit.getParentId()); unitSelectTerm.setCheckable(true); - if (UserBaseConsts.UNIT_TYPE_2 == ctUnit.getUnitType()){ + if (UserBaseConsts.UNIT_TYPE_102 == ctUnit.getUnitType()){ szbmList.add(unitSelectTerm); } - if (UserBaseConsts.UNIT_TYPE_1 == ctUnit.getUnitType()){ + if (UserBaseConsts.UNIT_TYPE_101 == ctUnit.getUnitType()){ qzzzxList.add(unitSelectTerm); } } @@ -380,10 +380,10 @@ unitSelectTerm.setLabel(ctUnit.getUnitName()); unitSelectTerm.setParentId(ctUnit.getParentId()); unitSelectTerm.setCheckable(true); - if (UserBaseConsts.UNIT_TYPE_2 == ctUnit.getUnitType()){ + if (UserBaseConsts.UNIT_TYPE_102 == ctUnit.getUnitType()){ qzbmList.add(unitSelectTerm); } - if (UserBaseConsts.UNIT_TYPE_1 == ctUnit.getUnitType()){ + if (UserBaseConsts.UNIT_TYPE_101 == ctUnit.getUnitType()){ zjzzzxList.add(unitSelectTerm); } } @@ -514,10 +514,10 @@ unitSelectTerm.setLabel(ctUnit.getUnitName()); unitSelectTerm.setParentId(ctUnit.getParentId()); unitSelectTerm.setCheckable(true); - if (UserBaseConsts.UNIT_TYPE_1 == ctUnit.getUnitType()){ + if (UserBaseConsts.UNIT_TYPE_101 == ctUnit.getUnitType()){ szbmList.add(unitSelectTerm); } - if (UserBaseConsts.UNIT_TYPE_2 == ctUnit.getUnitType()){ + if (UserBaseConsts.UNIT_TYPE_102 == ctUnit.getUnitType()){ qzzzxList.add(unitSelectTerm); } } @@ -562,10 +562,10 @@ unitSelectTerm.setLabel(ctUnit.getUnitName()); unitSelectTerm.setParentId(ctUnit.getParentId()); unitSelectTerm.setCheckable(true); - if (UserBaseConsts.UNIT_TYPE_2 == ctUnit.getUnitType()){ + if (UserBaseConsts.UNIT_TYPE_102 == ctUnit.getUnitType()){ qzbmList.add(unitSelectTerm); } - if (UserBaseConsts.UNIT_TYPE_3 == ctUnit.getUnitType()){ + if (UserBaseConsts.UNIT_TYPE_103 == ctUnit.getUnitType()){ zjzzzxList.add(unitSelectTerm); } } @@ -661,7 +661,7 @@ ctUnitQueryWrapper.eq("id", unitId).select("parent_id"); CtUnit loginCtUnit = mapper.selectOne(ctUnitQueryWrapper); ctUnitQueryWrapper.clear(); - ctUnitQueryWrapper.eq("id", loginCtUnit.getParentId()).eq("unit_type", UserBaseConsts.UNIT_TYPE_1); + ctUnitQueryWrapper.eq("id", loginCtUnit.getParentId()).eq("unit_type", UserBaseConsts.UNIT_TYPE_101); CtUnit zzzxCtUnit = mapper.selectOne(ctUnitQueryWrapper); CtUnitDTO ctUnitDTO = new CtUnitDTO(); BeanUtils.copyProperties(zzzxCtUnit, ctUnitDTO); @@ -682,12 +682,12 @@ CtUnitDTO ctUnitDTO = new CtUnitDTO(); // 查询自己是否是综治中心 CtUnit loginCtUnit = mapper.selectById(unitId); - if (UserBaseConsts.UNIT_TYPE_1 == loginCtUnit.getUnitType()){ + if (UserBaseConsts.UNIT_TYPE_101 == loginCtUnit.getUnitType()){ BeanUtils.copyProperties(loginCtUnit, ctUnitDTO); }else { // 查询当前单位的上级综治中心 QueryWrapper<CtUnit> ctUnitQueryWrapper = new QueryWrapper<>(); - ctUnitQueryWrapper.eq("id", loginCtUnit.getParentId()).eq("unit_type", UserBaseConsts.UNIT_TYPE_1); + ctUnitQueryWrapper.eq("id", loginCtUnit.getParentId()).eq("unit_type", UserBaseConsts.UNIT_TYPE_101); CtUnit zzzxCtUnit = mapper.selectOne(ctUnitQueryWrapper); BeanUtils.copyProperties(zzzxCtUnit, ctUnitDTO); } -- Gitblit v1.8.0