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
babbab98
Commit
babbab98
authored
Dec 19, 2023
by
liufan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化:设备品种code值转换为文字的方式,由调接口转换改为sql转换
parent
a4b63f3d
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
12 deletions
+4
-12
IdxBizJgRegisterInfoServiceImpl.java
.../jg/biz/service/impl/IdxBizJgRegisterInfoServiceImpl.java
+0
-12
ESEquipmentCategoryDto.java
.../amos/boot/module/ymt/api/dto/ESEquipmentCategoryDto.java
+3
-0
CategoryOtherInfoMapper.xml
...api/src/main/resources/mapper/CategoryOtherInfoMapper.xml
+1
-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/IdxBizJgRegisterInfoServiceImpl.java
View file @
babbab98
...
...
@@ -575,18 +575,6 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
String
status
=
ConstructionEnum
.
getName
.
get
(
integer
);
dto2
.
put
(
CONSTRUCTIONTYPE
,
status
);
}
if
(!
ValidationUtil
.
isEmpty
(
dto2
.
get
(
EQUDEFINE
)))
{
//转化设备品种名称
String
code
=
dto2
.
get
(
EQUDEFINE
).
toString
();
List
<
EquipmentCategory
>
equipmentCategoryList
=
commonService
.
getEquipmentCategoryList
(
code
,
null
);
if
(!
ValidationUtil
.
isEmpty
(
equipmentCategoryList
))
{
String
name
=
equipmentCategoryList
.
get
(
0
).
getName
();
dto2
.
put
(
EQUDEFINE
,
name
);
}
else
{
dto2
.
put
(
EQUDEFINE
,
code
);
}
dto2
.
put
(
EQUDEFINECODE
,
code
);
}
list
.
add
(
dto2
);
}
totle
=
response
.
getInternalResponse
().
hits
().
getTotalHits
().
value
;
...
...
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/dto/ESEquipmentCategoryDto.java
View file @
babbab98
...
...
@@ -113,6 +113,9 @@ public class ESEquipmentCategoryDto {
private
String
EQU_DEFINE
;
@Field
(
type
=
FieldType
.
Text
)
private
String
EQU_DEFINE_CODE
;
@Field
(
type
=
FieldType
.
Text
)
private
String
PRODUCT_NAME
;
@Field
(
type
=
FieldType
.
Text
)
...
...
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/CategoryOtherInfoMapper.xml
View file @
babbab98
...
...
@@ -97,6 +97,7 @@
USC_UNIT_NAME,
DATE_FORMAT(USC_DATE, '%Y-%m-%d %H:%i:%s') as USC_DATE,
EQU_DEFINE,
EQU_DEFINE_CODE,
PRODUCT_NAME,
BRAND_NAME,
EQU_TYPE,
...
...
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