资金账户添加归属公司

hx-account/src/main/java/com/fjhx/account/entity/account/dto/AccountManagementDto.java

@@ -21,4 +21,9 @@ public class AccountManagementDto extends AccountManagement {
     private List<AccountRemainder> accountRemainderList;
 
     private String tenantId;
+
+    /**
+     * 归属公司名称
+     */
+    private String corporationName;
 }

hx-account/src/main/java/com/fjhx/account/entity/account/vo/AccountManagementVo.java

@@ -7,11 +7,16 @@ import lombok.Setter;
 /**
  * 账户-管理表列表查询返回值实体
  *
- * @author 
+ * @author
  * @since 2023-04-06
  */
 @Getter
 @Setter
 public class AccountManagementVo extends AccountManagement {
 
+    /**
+     * 归属公司名称
+     */
+    private String corporationName;
+
 }

hx-account/src/main/java/com/fjhx/account/service/account/impl/AccountManagementServiceImpl.java

@@ -19,6 +19,8 @@ import com.fjhx.account.service.account.AccountManagementService;
 import com.fjhx.account.service.account.AccountRemainderService;
 import com.fjhx.account.service.account.AccountRunningWaterService;
 import com.fjhx.common.constant.SourceConstant;
+import com.fjhx.common.entity.corporation.po.Corporation;
+import com.fjhx.common.service.corporation.CorporationService;
 import com.fjhx.tenant.entity.dict.dto.DictTenantDataSelectDto;
 import com.fjhx.tenant.entity.dict.vo.DictTenantDataVo;
 import com.fjhx.tenant.service.dict.DictTenantDataService;
@@ -54,6 +56,8 @@ public class AccountManagementServiceImpl extends ServiceImpl<AccountManagementM
 
     @Autowired
     private DictTenantDataService dictTenantDataService;
+    @Autowired
+    private CorporationService corporationService;
 
 
     /**
@@ -63,15 +67,20 @@ public class AccountManagementServiceImpl extends ServiceImpl<AccountManagementM
     public Page<AccountManagementVo> getPage(AccountManagementSelectDto dto) {
         LambdaQueryWrapper<AccountManagement> wrapper = Wrappers.<AccountManagement>lambdaQuery();
         //根据关键字查询（查询的字段有账户别名、账户名称、账号）
-        if (StringUtils.isNotEmpty(dto.getKeyword())){
-            wrapper.and(wrapper1 ->{
-                wrapper1.like(AccountManagement::getName,dto.getKeyword()).or()
-                .like(AccountManagement::getAlias,dto.getKeyword()).or()
-                .like(AccountManagement::getAccountOpening,dto.getKeyword()).or()
-                        .like(AccountManagement::getOpeningBank,dto.getKeyword());
-            } );
+        if (StringUtils.isNotEmpty(dto.getKeyword())) {
+            wrapper.and(wrapper1 -> {
+                wrapper1.like(AccountManagement::getName, dto.getKeyword()).or()
+                        .like(AccountManagement::getAlias, dto.getKeyword()).or()
+                        .like(AccountManagement::getAccountOpening, dto.getKeyword()).or()
+                        .like(AccountManagement::getOpeningBank, dto.getKeyword());
+            });
         }
         Page<AccountManagementVo> page = baseMapper.getPage(dto.getPage(), wrapper);
+        List<AccountManagementVo> records = page.getRecords();
+        //赋值归属公司名称
+        corporationService.attributeAssign(records, AccountManagementVo::getCorporationId, (item, corporation) -> {
+            item.setCorporationName(corporation.getName());
+        });
         return page;
     }
 
@@ -87,6 +96,11 @@ public class AccountManagementServiceImpl extends ServiceImpl<AccountManagementM
         List<AccountRemainder> accountRemainderList = accountRemainderService.list(Wrappers.<AccountRemainder>lambdaQuery()
                 .eq(AccountRemainder::getAccountManagementId, id));
         result.setAccountRemainderList(accountRemainderList);
+        //赋值归属公司名称
+        Corporation corporation = corporationService.getById(result.getCorporationId());
+        if (ObjectUtil.isNotEmpty(corporation)) {
+            result.setCorporationName(corporation.getName());
+        }
         return result;
     }