From bea5b62923e6aa74bdcfcb0957b7e56158340e9c Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Tue, 28 Oct 2025 11:31:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pad/invoicing/api/InvoicingApi.java | 19 +- .../com/nu/entity/MaterialCategoryEntity.java | 2 + .../modules/invoicing/api/IInvoicingApi.java | 4 + .../entity/ConfigMaterialCategory.java | 4 + .../mapper/ConfigMaterialCategoryMapper.java | 6 + .../xml/ConfigMaterialCategoryMapper.xml | 19 + .../IConfigMaterialCategoryService.java | 6 + .../ConfigMaterialCategoryServiceImpl.java | 400 ++++++++++++++++++ .../impl/NuInvoicingCgdMainServiceImpl.java | 18 +- 9 files changed, 476 insertions(+), 2 deletions(-) diff --git a/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingApi.java b/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingApi.java index c6ac4f7e..d320d719 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingApi.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingApi.java @@ -105,7 +105,7 @@ public class InvoicingApi { } - @ApiOperation(value="获取物料分类树", notes="获取物料分类树") + @ApiOperation(value="获取物料分类树（请购列表使用）", notes="获取物料分类树（请购列表使用）") @GetMapping(value = "/getMaterialTreeData") public Result>> getMaterialTreeData(MaterialCategoryEntity configMaterialCategory) { configMaterialCategory.setIzEnabled("0"); @@ -114,6 +114,23 @@ public class InvoicingApi { } + @ApiOperation(value="获取物料分类树（购物车使用）", notes="获取物料分类树（购物车使用）") + @GetMapping(value = "/getGwcMaterialTreeData") + public Result>> getGwcMaterialTreeData(MaterialCategoryEntity configMaterialCategory) { + configMaterialCategory.setIzEnabled("0"); + List> pageList = invoicingApi.getGwcMaterialTreeData(configMaterialCategory); + return Result.OK(pageList); + } + + @ApiOperation(value="获取物料分类树（采购单使用）", notes="获取物料分类树（采购单使用）") + @GetMapping(value = "/getCgdMaterialTreeData") + public Result>> getCgdMaterialTreeData(MaterialCategoryEntity configMaterialCategory) { + configMaterialCategory.setIzEnabled("0"); + List> pageList = invoicingApi.getCgdMaterialTreeData(configMaterialCategory); + return Result.OK(pageList); + } + + @ApiOperation(value="修改库房启用停用", notes="修改库房启用停用") @AutoLog(value = "修改库房启用停用") @PostMapping(value = "/updateKfstatus") diff --git a/nursing-unit-common/src/main/java/com/nu/entity/MaterialCategoryEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/MaterialCategoryEntity.java index a3919ef8..772c50d5 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/MaterialCategoryEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/MaterialCategoryEntity.java @@ -60,6 +60,8 @@ public class MaterialCategoryEntity implements Serializable { private Integer typeRowSpan; private Integer num; + private String nuId; + private String cgdId; private java.lang.String appIconPath; private java.lang.String appCheckIconPath; diff --git a/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/IInvoicingApi.java b/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/IInvoicingApi.java index 63e861cc..313fab07 100644 --- a/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/IInvoicingApi.java +++ b/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/IInvoicingApi.java @@ -40,4 +40,8 @@ public interface IInvoicingApi { void voidedCgdMain(CgdMainEntity cgdMainEntity); void updateWarehouserEnabled(MaterialInfoEntity materialInfoEntity); + + List> getGwcMaterialTreeData(MaterialCategoryEntity configMaterialCategory); + + List> getCgdMaterialTreeData(MaterialCategoryEntity configMaterialCategory); } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialCategory.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialCategory.java index 7ca31353..14d51c08 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialCategory.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialCategory.java @@ -95,4 +95,8 @@ public class ConfigMaterialCategory implements Serializable { @TableField(exist = false) private Integer num; + @TableField(exist = false) + private String nuId; + @TableField(exist = false) + private String cgdId;; } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/ConfigMaterialCategoryMapper.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/ConfigMaterialCategoryMapper.java index 0a1522a0..ef6d7c75 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/ConfigMaterialCategoryMapper.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/ConfigMaterialCategoryMapper.java @@ -21,4 +21,10 @@ public interface ConfigMaterialCategoryMapper extends BaseMapper selectMaterialList(Page page,@Param(Constants.WRAPPER) QueryWrapper queryWrapper); List selectIssjList(); + + List getWarehouseInfoList(@Param("params") ConfigMaterialCategory configMaterialCategory); + + List getCgdMaterialTreeData(@Param("params") ConfigMaterialCategory configMaterialCategory); + + List getGwcMaterialTreeData(@Param("params") ConfigMaterialCategory configMaterialCategory); } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialCategoryMapper.xml b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialCategoryMapper.xml index 7130ee8b..2bd54043 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialCategoryMapper.xml +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialCategoryMapper.xml @@ -26,4 +26,23 @@ select a.id,count(a.id) as num from nu_config_material_category a , nu_config_material_info b where a.id = b.category_id and (b.type_id = '' or b.type_id is null) GROUP BY a.id + + + + + + + \ No newline at end of file diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/IConfigMaterialCategoryService.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/IConfigMaterialCategoryService.java index 9e48589a..7d3b8cb2 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/IConfigMaterialCategoryService.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/IConfigMaterialCategoryService.java @@ -22,4 +22,10 @@ public interface IConfigMaterialCategoryService extends IService> getMaterialTreeData(ConfigMaterialCategory configMaterialCategory); void editQyty(ConfigMaterialCategory configMaterialCategory); + + List> getAppMaterialTreeData(ConfigMaterialCategory configMaterialCategory); + + List> getGwcMaterialTreeData(ConfigMaterialCategory configMaterialCategory); + + List> getCgdMaterialTreeData(ConfigMaterialCategory configMaterialCategory); } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/impl/ConfigMaterialCategoryServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/impl/ConfigMaterialCategoryServiceImpl.java index b0b31ff5..d2b9161f 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/impl/ConfigMaterialCategoryServiceImpl.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/impl/ConfigMaterialCategoryServiceImpl.java @@ -244,4 +244,404 @@ public class ConfigMaterialCategoryServiceImpl extends ServiceImpl> getAppMaterialTreeData(ConfigMaterialCategory configMaterialCategory) { + + List groupList = baseMapper.getWarehouseInfoList(configMaterialCategory); + + String oneId = ""; + String twoId = ""; + String threeId = ""; + for(ConfigMaterialCategory par:groupList){ + oneId = oneId + par.getCategoryId()+","; + twoId = twoId + par.getTypeId()+","; + threeId = threeId + par.getMedicationId()+","; + } + String[] oneParts = oneId.split(","); + Set oneSet = new LinkedHashSet<>(Arrays.asList(oneParts)); + oneId = String.join(",", oneSet); + + String[] twoParts = twoId.split(","); + Set twoSet = new LinkedHashSet<>(Arrays.asList(twoParts)); + twoId = String.join(",", twoSet); + + String[] threeParts = threeId.split(","); + Set threeSet = new LinkedHashSet<>(Arrays.asList(threeParts)); + threeId = String.join(",", threeSet); + + //查询护理分类信息 + QueryWrapper categoryQueryWrapper = new QueryWrapper<>(); + categoryQueryWrapper.eq(StringUtils.isNotEmpty(configMaterialCategory.getIzEnabled()),"iz_enabled",configMaterialCategory.getIzEnabled()); + categoryQueryWrapper.in("id",oneId.split(",")); + categoryQueryWrapper.eq("del_flag","0"); + categoryQueryWrapper.orderByAsc("sort"); + List list =baseMapper.selectList(categoryQueryWrapper); + + //查询护理类型信息 + QueryWrapper typeQueryWrapper = new QueryWrapper<>(); + typeQueryWrapper.eq(StringUtils.isNotEmpty(configMaterialCategory.getIzEnabled()),"iz_enabled",configMaterialCategory.getIzEnabled()); + typeQueryWrapper.in("id",twoId.split(",")); + typeQueryWrapper.eq("del_flag","0"); + List list2 = configMaterialTypeMapper.selectList(typeQueryWrapper); + + //查询用药类型信息 + QueryWrapper medicationQueryWrapper = new QueryWrapper<>(); + medicationQueryWrapper.eq(StringUtils.isNotEmpty(configMaterialCategory.getIzEnabled()),"iz_enabled",configMaterialCategory.getIzEnabled()); + medicationQueryWrapper.in("id",threeId.split(",")); + medicationQueryWrapper.eq("del_flag","0"); + List list3 = configMaterialMedicationMapper.selectList(medicationQueryWrapper); + + + + //查询物料类别下是否有物料数据 + List onesjlist =baseMapper.selectIssjList(); + + //查询物料类型下是否有物料数据 + List twosjlist =configMaterialTypeMapper.selectIssjList(); + + + + List> wllxMapList = new ArrayList>(); + for(ConfigMaterialType par : list2){ + Map wllxMap = new HashMap(); + List> yylxMapList = new ArrayList>(); + for(ConfigMaterialMedication yylxPar:list3){ + if(StringUtils.equals(yylxPar.getTypeId(),par.getId())){ + Map yylxMap = new HashMap(); + yylxMap.put("key",yylxPar.getId()); + yylxMap.put("levle","3"); + yylxMap.put("title",yylxPar.getMedicationName()); + yylxMap.put("izEnabled",yylxPar.getIzEnabled()); + yylxMap.put("categoryId",yylxPar.getCategoryId()); + yylxMap.put("typeId",yylxPar.getTypeId()); + yylxMap.put("children",""); + yylxMap.put("parentIzEnabled",par.getIzEnabled()); + yylxMap.put("icon",yylxPar.getIcon()); + yylxMapList.add(yylxMap); + } + } + int tjxj = 0; + for(ConfigMaterialType twosjPar:twosjlist){ + if (StringUtils.equals(twosjPar.getId(),par.getId())){ + tjxj = 1; + break; + } + } + wllxMap.put("tjxj",tjxj); + wllxMap.put("key",par.getId()); + wllxMap.put("parentId",par.getCategoryId()); + wllxMap.put("title",par.getTypeName()); + wllxMap.put("levle","2"); + wllxMap.put("izEnabled",par.getIzEnabled()); + wllxMap.put("children",yylxMapList); + wllxMap.put("categoryId",par.getCategoryId()); + wllxMap.put("typeId",par.getId()); + wllxMap.put("icon",par.getIcon()); + wllxMapList.add(wllxMap); + } + + List> infoMapList = new ArrayList>(); + int index = 0; + for(ConfigMaterialCategory par : list){ + index++; + Map infoMap = new HashMap(); + List> wllxMap2List = new ArrayList>(); + for(Map wllxPar : wllxMapList){ + if(StringUtils.equals(par.getId(),wllxPar.get("parentId").toString())){ + wllxPar.put("parentIzEnabled",par.getIzEnabled()); + wllxMap2List.add(wllxPar); + } + } + int tjxj = 0; + for(ConfigMaterialCategory onesjPar:onesjlist){ + if (StringUtils.equals(onesjPar.getId(),par.getId())){ + tjxj = 1; + break; + } + } + infoMap.put("tjxj",tjxj); + infoMap.put("key",par.getId()); + infoMap.put("title",par.getCategoryName()); + infoMap.put("levle","1"); + infoMap.put("izEnabled",par.getIzEnabled()); + infoMap.put("children",wllxMap2List); + infoMap.put("categoryId",par.getId()); + infoMap.put("parentIzEnabled",par.getIzEnabled()); + infoMap.put("appIconPath",par.getAppIconPath()); + infoMap.put("appCheckIconPath",par.getAppCheckIconPath()); + infoMap.put("icon",par.getIcon()); + infoMapList.add(infoMap); + } + + + + return infoMapList; + } + + @Override + public List> getGwcMaterialTreeData(ConfigMaterialCategory configMaterialCategory) { + + List groupList = baseMapper.getGwcMaterialTreeData(configMaterialCategory); + + String oneId = ""; + String twoId = ""; + String threeId = ""; + for(ConfigMaterialCategory par:groupList){ + oneId = oneId + par.getCategoryId()+","; + twoId = twoId + par.getTypeId()+","; + threeId = threeId + par.getMedicationId()+","; + } + String[] oneParts = oneId.split(","); + Set oneSet = new LinkedHashSet<>(Arrays.asList(oneParts)); + oneId = String.join(",", oneSet); + + String[] twoParts = twoId.split(","); + Set twoSet = new LinkedHashSet<>(Arrays.asList(twoParts)); + twoId = String.join(",", twoSet); + + String[] threeParts = threeId.split(","); + Set threeSet = new LinkedHashSet<>(Arrays.asList(threeParts)); + threeId = String.join(",", threeSet); + + //查询护理分类信息 + QueryWrapper categoryQueryWrapper = new QueryWrapper<>(); + categoryQueryWrapper.eq(StringUtils.isNotEmpty(configMaterialCategory.getIzEnabled()),"iz_enabled",configMaterialCategory.getIzEnabled()); + categoryQueryWrapper.in("id",oneId.split(",")); + categoryQueryWrapper.eq("del_flag","0"); + categoryQueryWrapper.orderByAsc("sort"); + List list =baseMapper.selectList(categoryQueryWrapper); + + //查询护理类型信息 + QueryWrapper typeQueryWrapper = new QueryWrapper<>(); + typeQueryWrapper.eq(StringUtils.isNotEmpty(configMaterialCategory.getIzEnabled()),"iz_enabled",configMaterialCategory.getIzEnabled()); + typeQueryWrapper.in("id",twoId.split(",")); + typeQueryWrapper.eq("del_flag","0"); + List list2 = configMaterialTypeMapper.selectList(typeQueryWrapper); + + //查询用药类型信息 + QueryWrapper medicationQueryWrapper = new QueryWrapper<>(); + medicationQueryWrapper.eq(StringUtils.isNotEmpty(configMaterialCategory.getIzEnabled()),"iz_enabled",configMaterialCategory.getIzEnabled()); + medicationQueryWrapper.in("id",threeId.split(",")); + medicationQueryWrapper.eq("del_flag","0"); + List list3 = configMaterialMedicationMapper.selectList(medicationQueryWrapper); + + + + //查询物料类别下是否有物料数据 + List onesjlist =baseMapper.selectIssjList(); + + //查询物料类型下是否有物料数据 + List twosjlist =configMaterialTypeMapper.selectIssjList(); + + + + List> wllxMapList = new ArrayList>(); + for(ConfigMaterialType par : list2){ + Map wllxMap = new HashMap(); + List> yylxMapList = new ArrayList>(); + for(ConfigMaterialMedication yylxPar:list3){ + if(StringUtils.equals(yylxPar.getTypeId(),par.getId())){ + Map yylxMap = new HashMap(); + yylxMap.put("key",yylxPar.getId()); + yylxMap.put("levle","3"); + yylxMap.put("title",yylxPar.getMedicationName()); + yylxMap.put("izEnabled",yylxPar.getIzEnabled()); + yylxMap.put("categoryId",yylxPar.getCategoryId()); + yylxMap.put("typeId",yylxPar.getTypeId()); + yylxMap.put("children",""); + yylxMap.put("parentIzEnabled",par.getIzEnabled()); + yylxMap.put("icon",yylxPar.getIcon()); + yylxMapList.add(yylxMap); + } + } + int tjxj = 0; + for(ConfigMaterialType twosjPar:twosjlist){ + if (StringUtils.equals(twosjPar.getId(),par.getId())){ + tjxj = 1; + break; + } + } + wllxMap.put("tjxj",tjxj); + wllxMap.put("key",par.getId()); + wllxMap.put("parentId",par.getCategoryId()); + wllxMap.put("title",par.getTypeName()); + wllxMap.put("levle","2"); + wllxMap.put("izEnabled",par.getIzEnabled()); + wllxMap.put("children",yylxMapList); + wllxMap.put("categoryId",par.getCategoryId()); + wllxMap.put("typeId",par.getId()); + wllxMap.put("icon",par.getIcon()); + wllxMapList.add(wllxMap); + } + + List> infoMapList = new ArrayList>(); + int index = 0; + for(ConfigMaterialCategory par : list){ + index++; + Map infoMap = new HashMap(); + List> wllxMap2List = new ArrayList>(); + for(Map wllxPar : wllxMapList){ + if(StringUtils.equals(par.getId(),wllxPar.get("parentId").toString())){ + wllxPar.put("parentIzEnabled",par.getIzEnabled()); + wllxMap2List.add(wllxPar); + } + } + int tjxj = 0; + for(ConfigMaterialCategory onesjPar:onesjlist){ + if (StringUtils.equals(onesjPar.getId(),par.getId())){ + tjxj = 1; + break; + } + } + infoMap.put("tjxj",tjxj); + infoMap.put("key",par.getId()); + infoMap.put("title",par.getCategoryName()); + infoMap.put("levle","1"); + infoMap.put("izEnabled",par.getIzEnabled()); + infoMap.put("children",wllxMap2List); + infoMap.put("categoryId",par.getId()); + infoMap.put("parentIzEnabled",par.getIzEnabled()); + infoMap.put("appIconPath",par.getAppIconPath()); + infoMap.put("appCheckIconPath",par.getAppCheckIconPath()); + infoMap.put("icon",par.getIcon()); + infoMapList.add(infoMap); + } + + + + return infoMapList; + } + + @Override + public List> getCgdMaterialTreeData(ConfigMaterialCategory configMaterialCategory) { + + List groupList = baseMapper.getCgdMaterialTreeData(configMaterialCategory); + + String oneId = ""; + String twoId = ""; + String threeId = ""; + for(ConfigMaterialCategory par:groupList){ + oneId = oneId + par.getCategoryId()+","; + twoId = twoId + par.getTypeId()+","; + threeId = threeId + par.getMedicationId()+","; + } + String[] oneParts = oneId.split(","); + Set oneSet = new LinkedHashSet<>(Arrays.asList(oneParts)); + oneId = String.join(",", oneSet); + + String[] twoParts = twoId.split(","); + Set twoSet = new LinkedHashSet<>(Arrays.asList(twoParts)); + twoId = String.join(",", twoSet); + + String[] threeParts = threeId.split(","); + Set threeSet = new LinkedHashSet<>(Arrays.asList(threeParts)); + threeId = String.join(",", threeSet); + + //查询护理分类信息 + QueryWrapper categoryQueryWrapper = new QueryWrapper<>(); + categoryQueryWrapper.eq(StringUtils.isNotEmpty(configMaterialCategory.getIzEnabled()),"iz_enabled",configMaterialCategory.getIzEnabled()); + categoryQueryWrapper.in("id",oneId.split(",")); + categoryQueryWrapper.eq("del_flag","0"); + categoryQueryWrapper.orderByAsc("sort"); + List list =baseMapper.selectList(categoryQueryWrapper); + + //查询护理类型信息 + QueryWrapper typeQueryWrapper = new QueryWrapper<>(); + typeQueryWrapper.eq(StringUtils.isNotEmpty(configMaterialCategory.getIzEnabled()),"iz_enabled",configMaterialCategory.getIzEnabled()); + typeQueryWrapper.in("id",twoId.split(",")); + typeQueryWrapper.eq("del_flag","0"); + List list2 = configMaterialTypeMapper.selectList(typeQueryWrapper); + + //查询用药类型信息 + QueryWrapper medicationQueryWrapper = new QueryWrapper<>(); + medicationQueryWrapper.eq(StringUtils.isNotEmpty(configMaterialCategory.getIzEnabled()),"iz_enabled",configMaterialCategory.getIzEnabled()); + medicationQueryWrapper.in("id",threeId.split(",")); + medicationQueryWrapper.eq("del_flag","0"); + List list3 = configMaterialMedicationMapper.selectList(medicationQueryWrapper); + + + + //查询物料类别下是否有物料数据 + List onesjlist =baseMapper.selectIssjList(); + + //查询物料类型下是否有物料数据 + List twosjlist =configMaterialTypeMapper.selectIssjList(); + + + + List> wllxMapList = new ArrayList>(); + for(ConfigMaterialType par : list2){ + Map wllxMap = new HashMap(); + List> yylxMapList = new ArrayList>(); + for(ConfigMaterialMedication yylxPar:list3){ + if(StringUtils.equals(yylxPar.getTypeId(),par.getId())){ + Map yylxMap = new HashMap(); + yylxMap.put("key",yylxPar.getId()); + yylxMap.put("levle","3"); + yylxMap.put("title",yylxPar.getMedicationName()); + yylxMap.put("izEnabled",yylxPar.getIzEnabled()); + yylxMap.put("categoryId",yylxPar.getCategoryId()); + yylxMap.put("typeId",yylxPar.getTypeId()); + yylxMap.put("children",""); + yylxMap.put("parentIzEnabled",par.getIzEnabled()); + yylxMap.put("icon",yylxPar.getIcon()); + yylxMapList.add(yylxMap); + } + } + int tjxj = 0; + for(ConfigMaterialType twosjPar:twosjlist){ + if (StringUtils.equals(twosjPar.getId(),par.getId())){ + tjxj = 1; + break; + } + } + wllxMap.put("tjxj",tjxj); + wllxMap.put("key",par.getId()); + wllxMap.put("parentId",par.getCategoryId()); + wllxMap.put("title",par.getTypeName()); + wllxMap.put("levle","2"); + wllxMap.put("izEnabled",par.getIzEnabled()); + wllxMap.put("children",yylxMapList); + wllxMap.put("categoryId",par.getCategoryId()); + wllxMap.put("typeId",par.getId()); + wllxMap.put("icon",par.getIcon()); + wllxMapList.add(wllxMap); + } + + List> infoMapList = new ArrayList>(); + int index = 0; + for(ConfigMaterialCategory par : list){ + index++; + Map infoMap = new HashMap(); + List> wllxMap2List = new ArrayList>(); + for(Map wllxPar : wllxMapList){ + if(StringUtils.equals(par.getId(),wllxPar.get("parentId").toString())){ + wllxPar.put("parentIzEnabled",par.getIzEnabled()); + wllxMap2List.add(wllxPar); + } + } + int tjxj = 0; + for(ConfigMaterialCategory onesjPar:onesjlist){ + if (StringUtils.equals(onesjPar.getId(),par.getId())){ + tjxj = 1; + break; + } + } + infoMap.put("tjxj",tjxj); + infoMap.put("key",par.getId()); + infoMap.put("title",par.getCategoryName()); + infoMap.put("levle","1"); + infoMap.put("izEnabled",par.getIzEnabled()); + infoMap.put("children",wllxMap2List); + infoMap.put("categoryId",par.getId()); + infoMap.put("parentIzEnabled",par.getIzEnabled()); + infoMap.put("appIconPath",par.getAppIconPath()); + infoMap.put("appCheckIconPath",par.getAppCheckIconPath()); + infoMap.put("icon",par.getIcon()); + infoMapList.add(infoMap); + } + + return infoMapList; + } } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java index 0af352d7..79def437 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java @@ -447,7 +447,7 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl> getMaterialTreeData(MaterialCategoryEntity materialCategoryEntity) { ConfigMaterialCategory configMaterialCategory = new ConfigMaterialCategory(); BeanUtils.copyProperties(materialCategoryEntity,configMaterialCategory); - List> pageList = configMaterialCategoryService.getMaterialTreeData(configMaterialCategory); + List> pageList = configMaterialCategoryService.getAppMaterialTreeData(configMaterialCategory); return pageList; } @@ -508,4 +508,20 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl> getGwcMaterialTreeData(MaterialCategoryEntity configMaterialCategoryEntity) { + ConfigMaterialCategory configMaterialCategory = new ConfigMaterialCategory(); + BeanUtils.copyProperties(configMaterialCategoryEntity,configMaterialCategory); + List> pageList = configMaterialCategoryService.getGwcMaterialTreeData(configMaterialCategory); + return pageList; + } + + @Override + public List> getCgdMaterialTreeData(MaterialCategoryEntity configMaterialCategoryEntity) { + ConfigMaterialCategory configMaterialCategory = new ConfigMaterialCategory(); + BeanUtils.copyProperties(configMaterialCategoryEntity,configMaterialCategory); + List> pageList = configMaterialCategoryService.getCgdMaterialTreeData(configMaterialCategory); + return pageList; + } }