Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
项目统一框架
amos-boot-biz
Commits
8b7197dc
Commit
8b7197dc
authored
Mar 10, 2026
by
tianbo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(equip-claim): 添加待认领设备使用单位信用代码过滤功能
- 在待认领设备查询中过滤掉已在平台注册的使用单位统一社会信用代码对应数据
parent
039a3022
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
2 deletions
+11
-2
EquipClaimServiceImpl.java
...oot/module/jg/biz/service/impl/EquipClaimServiceImpl.java
+6
-2
TzBaseEnterpriseInfoMapper.java
...oot/module/ymt/api/mapper/TzBaseEnterpriseInfoMapper.java
+1
-0
TzBaseEnterpriseInfoMapper.xml
.../src/main/resources/mapper/TzBaseEnterpriseInfoMapper.xml
+4
-0
No files found.
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/EquipClaimServiceImpl.java
View file @
8b7197dc
...
...
@@ -36,8 +36,8 @@ import com.yeejoin.amos.boot.module.jg.biz.service.*;
import
com.yeejoin.amos.boot.module.jg.biz.utils.CodeUtil
;
import
com.yeejoin.amos.boot.module.ymt.api.entity.*
;
import
com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum
;
import
com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentEnum
;
import
com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentClassifityEnum
;
import
com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentEnum
;
import
com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum
;
import
com.yeejoin.amos.boot.module.ymt.api.mapper.*
;
import
com.yeejoin.amos.feign.privilege.model.AgencyUserModel
;
...
...
@@ -55,7 +55,6 @@ import org.elasticsearch.index.query.QueryBuilders;
import
org.elasticsearch.search.SearchHit
;
import
org.elasticsearch.search.builder.SearchSourceBuilder
;
import
org.elasticsearch.search.sort.SortOrder
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.util.ObjectUtils
;
...
...
@@ -187,6 +186,11 @@ public class EquipClaimServiceImpl {
dBuilder
.
must
(
QueryBuilders
.
matchQuery
(
IS_INTO_MANAGEMENT
,
false
));
boolMust
.
must
(
dBuilder
);
// TODO 待认领设备使用单位单位统一社会信用代码如果已在系统中存在则不显示
List
<
String
>
unitCreditCodes
=
tzBaseEnterpriseInfoMapper
.
getUseUnitCreditCodes
();
if
(!
ValidationUtil
.
isEmpty
(
unitCreditCodes
))
{
boolMust
.
mustNot
(
QueryBuilders
.
termsQuery
(
"USE_UNIT_CREDIT_CODE.keyword"
,
unitCreditCodes
));
}
// -------------------------------- 参数过滤
this
.
buildSetSearchParams
(
params
,
boolMust
);
...
...
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/mapper/TzBaseEnterpriseInfoMapper.java
View file @
8b7197dc
...
...
@@ -124,4 +124,5 @@ public interface TzBaseEnterpriseInfoMapper extends BaseMapper<TzBaseEnterpriseI
*/
List
<
TzBaseEnterpriseInfoDto
>
queryInspectionUnitListByUseUnitCode
(
@Param
(
"unitCode"
)
String
unitCode
,
@Param
(
"openBizType"
)
String
openBizType
);
List
<
String
>
getUseUnitCreditCodes
();
}
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/TzBaseEnterpriseInfoMapper.xml
View file @
8b7197dc
...
...
@@ -418,4 +418,8 @@
and info.is_delete = '0'
and exists (SELECT 1 from tz_jyjc_opening_application where unit_code = #{unitCode} and status = '已完成' and open_biz_type = #{openBizType})
</select>
<select
id=
"getUseUnitCreditCodes"
resultType=
"java.lang.String"
>
select use_unit_code from tz_base_enterprise_info where unit_type like '%使用单位%' or unit_type like '%个人主体%'
</select>
</mapper>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment