weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

推送单据修改;菜单查询优化;

Browse Source
This commit is contained in:
王奎兴
2026-03-25 16:23:15 +08:00
parent 80d9167760
commit 2ebfd8eab9
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/scheduledTask/repository/persistence/ScheduledTaskServiceImpl.java
+5
View File
@@ -110,6 +110,9 @@ public class ScheduledTaskServiceImpl extends ServiceImpl<ScheduledTaskMapper, S
businessDataPushDTO.setSecondSubjectCode(leasePO.getSecondSubjectCode()); businessDataPushDTO.setSecondSubjectCode(leasePO.getSecondSubjectCode());
businessDataPushDTO.setServiceItemsCode(leasePO.getServiceItemsCode()); businessDataPushDTO.setServiceItemsCode(leasePO.getServiceItemsCode());
businessDataPushDTO.setDataSources(1); businessDataPushDTO.setDataSources(1);
businessDataPushDTO.setSettlementCurrency(leasePO.getSettlementCurrency());
businessDataPushDTO.setSalesmanId(leasePO.getSalesmanId());
bmsServiceFeign.businessDocumentApiSave(businessDataPushDTO); bmsServiceFeign.businessDocumentApiSave(businessDataPushDTO);
} }
log.info("定时任务整租推送到bms触发--结束"); log.info("定时任务整租推送到bms触发--结束");
@@ -156,6 +159,8 @@ public class ScheduledTaskServiceImpl extends ServiceImpl<ScheduledTaskMapper, S
businessDataPushDTO.setSecondSubjectCode(leasePO.getSecondSubjectCode()); businessDataPushDTO.setSecondSubjectCode(leasePO.getSecondSubjectCode());
businessDataPushDTO.setServiceItemsCode(leasePO.getServiceItemsCode()); businessDataPushDTO.setServiceItemsCode(leasePO.getServiceItemsCode());
businessDataPushDTO.setDataSources(1); businessDataPushDTO.setDataSources(1);
businessDataPushDTO.setSettlementCurrency(leasePO.getSettlementCurrency());
businessDataPushDTO.setSalesmanId(leasePO.getSalesmanId());
bmsServiceFeign.businessDocumentApiSave(businessDataPushDTO); bmsServiceFeign.businessDocumentApiSave(businessDataPushDTO);
} }
} }
mhd_product/src/main/java/com/linke/product/application/service/menu/MenuApplicationService.java
+6 -4
View File
@@ -575,21 +575,23 @@ public class MenuApplicationService {
navigationProduct = sysProductDomainService.getNavigationProduct(navigationMenu, longs, tenantsId); navigationProduct = sysProductDomainService.getNavigationProduct(navigationMenu, longs, tenantsId);
} }
//获取菜单类型 //获取菜单类型
List<Menu> menus = menuMapper.selectList(null);
for (NavigationVo navigationVo : navigationProduct) { for (NavigationVo navigationVo : navigationProduct) {
getMenuType(navigationVo); getMenuType(navigationVo, menus);
} }
return navigationProduct; return navigationProduct;
} }
private NavigationVo getMenuType(NavigationVo navigationVo) { private NavigationVo getMenuType(NavigationVo navigationVo,List<Menu> menus) {
Long id = navigationVo.getId(); Long id = navigationVo.getId();
Menu menu = menuMapper.selectById(id); Menu menu = menus.stream().filter(m -> m.getMenuId().equals(id)).findFirst().orElse(null);
//Menu menu = menuMapper.selectById(id);
if (menu != null) { if (menu != null) {
navigationVo.setMenuType(menu.getMenuType()); navigationVo.setMenuType(menu.getMenuType());
} }
List<NavigationVo> children = navigationVo.getChildren(); List<NavigationVo> children = navigationVo.getChildren();
if (children != null && children.size() > 0) { if (children != null && children.size() > 0) {
for (NavigationVo child : children) { for (NavigationVo child : children) {
getMenuType(child); getMenuType(child,menus);
} }
} }
return navigationVo; return navigationVo;