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
2dc03f4f
Commit
2dc03f4f
authored
Oct 13, 2025
by
tianyiming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
00603902
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
CommonBaseMapper.java
...s/boot/module/statistics/api/mapper/CommonBaseMapper.java
+1
-1
CommonBaseMapper.xml
...istics-api/src/main/resources/mapper/CommonBaseMapper.xml
+1
-1
ComprehensiveStatisticalAnalysisServiceImpl.java
...ice/impl/ComprehensiveStatisticalAnalysisServiceImpl.java
+1
-1
No files found.
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/mapper/CommonBaseMapper.java
View file @
2dc03f4f
...
@@ -13,5 +13,5 @@ public interface CommonBaseMapper {
...
@@ -13,5 +13,5 @@ public interface CommonBaseMapper {
String
getOrgCodeByCompanyCode
(
String
companyCode
);
String
getOrgCodeByCompanyCode
(
String
companyCode
);
String
getCompanyCodeByOrgCode
(
String
company
Code
);
String
getCompanyCodeByOrgCode
(
String
org
Code
);
}
}
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/resources/mapper/CommonBaseMapper.xml
View file @
2dc03f4f
...
@@ -7,6 +7,6 @@
...
@@ -7,6 +7,6 @@
</select>
</select>
<select
id=
"getCompanyCodeByOrgCode"
resultType=
"java.lang.String"
>
<select
id=
"getCompanyCodeByOrgCode"
resultType=
"java.lang.String"
>
select companyCode from privilege_company where org_code = #{org
_c
ode} limit 1
select companyCode from privilege_company where org_code = #{org
C
ode} limit 1
</select>
</select>
</mapper>
</mapper>
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/ComprehensiveStatisticalAnalysisServiceImpl.java
View file @
2dc03f4f
...
@@ -410,7 +410,7 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
...
@@ -410,7 +410,7 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
JSONArray
unitType
=
filterParams
.
getJSONArray
(
"unitType"
);
JSONArray
unitType
=
filterParams
.
getJSONArray
(
"unitType"
);
if
(!
ObjectUtils
.
isEmpty
(
unitType
))
{
if
(!
ObjectUtils
.
isEmpty
(
unitType
))
{
if
(
unitType
.
contains
(
"检验机构"
)
||
unitType
.
contains
(
"检测机构"
))
{
if
(
unitType
.
contains
(
"检验机构"
)
||
unitType
.
contains
(
"检测机构"
))
{
String
officeRegion
=
commonMapper
.
get
OrgCodeByCompany
Code
(
orgCode
);
String
officeRegion
=
commonMapper
.
get
CompanyCodeByOrg
Code
(
orgCode
);
BoolQueryBuilder
queryBuilder1
=
QueryBuilders
.
boolQuery
();
BoolQueryBuilder
queryBuilder1
=
QueryBuilders
.
boolQuery
();
BoolQueryBuilder
queryBuilder2
=
QueryBuilders
.
boolQuery
();
BoolQueryBuilder
queryBuilder2
=
QueryBuilders
.
boolQuery
();
queryBuilder1
.
must
(
QueryBuilders
.
termQuery
(
"superviseOrgCode"
,
"50"
))
queryBuilder1
.
must
(
QueryBuilders
.
termQuery
(
"superviseOrgCode"
,
"50"
))
...
...
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