diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/expenseAccount/ExpenseAccountApplicationService.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/expenseAccount/ExpenseAccountApplicationService.java index fda2a0f89..d1c391c38 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/expenseAccount/ExpenseAccountApplicationService.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/expenseAccount/ExpenseAccountApplicationService.java @@ -580,6 +580,19 @@ public class ExpenseAccountApplicationService { return expenseAccountDomainService.getInfoByCode2(subjectCode,topOrganizationId); } + /** + * 根据编码和组织ID查询费用科目信息 + */ + public ExpenseAccountPO getInfoByOrgAndCode(String subjectCode, Long organizationId) { + if(!StringUtils.isNotEmpty(subjectCode)){ + throw new ServiceException("费用科目编码不能为空"); + } + if(organizationId == null){ + throw new ServiceException("组织ID不能为空"); + } + return expenseAccountDomainService.getInfoByOrgAndCode(subjectCode, organizationId); + } + public List selectExpenseAccount(SearchExpenseAccountDO searchExpenseAccountDO){ setDataPermissionForSearch(searchExpenseAccountDO); return expenseAccountDomainService.selectExpenseAccount(searchExpenseAccountDO); diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/expenseAccount/repository/facade/IExpenseAccountService.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/expenseAccount/repository/facade/IExpenseAccountService.java index 471864449..22a775ee1 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/expenseAccount/repository/facade/IExpenseAccountService.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/expenseAccount/repository/facade/IExpenseAccountService.java @@ -58,6 +58,11 @@ public interface IExpenseAccountService extends IService */ ExpenseAccountPO getInfoByCode(ExpenseAccountDO expenseAccountDO); + /** + * 根据费用科目code和组织ID查询费用信息 + */ + ExpenseAccountPO getInfoByOrgAndCode(ExpenseAccountDO expenseAccountDO); + public List selectExpenseAccount(SearchExpenseAccountDO searchExpenseAccountDO); public List selectOtherExpenseAccount(SearchExpenseAccountDO searchExpenseAccountDO); diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/expenseAccount/repository/mapper/ExpenseAccountMapper.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/expenseAccount/repository/mapper/ExpenseAccountMapper.java index 98bb772a3..4ca46665a 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/expenseAccount/repository/mapper/ExpenseAccountMapper.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/expenseAccount/repository/mapper/ExpenseAccountMapper.java @@ -39,6 +39,11 @@ public interface ExpenseAccountMapper extends BaseMapper */ ExpenseAccountPO getInfoByCode(@Param("expenseAccountDO") ExpenseAccountDO expenseAccountDO); + /** + * 根据费用科目code和组织ID查询费用信息 + */ + ExpenseAccountPO getInfoByOrgAndCode(@Param("expenseAccountDO") ExpenseAccountDO expenseAccountDO); + public List selectExpenseAccount(@Param("searchExpenseAccountDO") SearchExpenseAccountDO searchExpenseAccountDO); public List selectOtherExpenseAccount(@Param("searchExpenseAccountDO") SearchExpenseAccountDO searchExpenseAccountDO); diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/expenseAccount/repository/persistence/ExpenseAccountImpl.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/expenseAccount/repository/persistence/ExpenseAccountImpl.java index a65c6dd7d..a8d42f8bc 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/expenseAccount/repository/persistence/ExpenseAccountImpl.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/expenseAccount/repository/persistence/ExpenseAccountImpl.java @@ -129,6 +129,11 @@ public class ExpenseAccountImpl extends ServiceImpl selectExpenseAccount(SearchExpenseAccountDO searchExpenseAccountDO){ return expenseAccountService.selectExpenseAccount(searchExpenseAccountDO); } diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/facade/expenseAccount/ExpenseAccountApi.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/facade/expenseAccount/ExpenseAccountApi.java index 8810a7c34..9d6d5d3bf 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/facade/expenseAccount/ExpenseAccountApi.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/facade/expenseAccount/ExpenseAccountApi.java @@ -328,5 +328,13 @@ public class ExpenseAccountApi extends BaseController{ return AjaxResult.success(expenseAccountPO); } + @ApiOperation("根据code和组织ID获取数据") + @GetMapping(value = "/getInfoByOrgAndCode") + public AjaxResult getInfoByOrgAndCode(@RequestParam("subjectCode") String subjectCode,@RequestParam("organizationId") Long organizationId) + { + ExpenseAccountPO expenseAccountPO = expenseAccountApplicationService.getInfoByOrgAndCode(subjectCode, organizationId); + return AjaxResult.success(expenseAccountPO); + } + } \ No newline at end of file diff --git a/mhd-modules/mhd-system/src/main/resources/mapper/basic/ExpenseAccountMapper.xml b/mhd-modules/mhd-system/src/main/resources/mapper/basic/ExpenseAccountMapper.xml index d34d5d030..9be035d7b 100644 --- a/mhd-modules/mhd-system/src/main/resources/mapper/basic/ExpenseAccountMapper.xml +++ b/mhd-modules/mhd-system/src/main/resources/mapper/basic/ExpenseAccountMapper.xml @@ -151,6 +151,22 @@ LIMIT 1 +