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
b7431310
Commit
b7431310
authored
Aug 08, 2024
by
tianyiming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1、工程装置搜索修改
2、安装告知附件删除修改失败
parent
288959d2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
1 deletion
+7
-1
IdxBizJgRegisterInfoServiceImpl.java
.../jg/biz/service/impl/IdxBizJgRegisterInfoServiceImpl.java
+1
-1
JgInstallationNoticeServiceImpl.java
.../jg/biz/service/impl/JgInstallationNoticeServiceImpl.java
+6
-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 @
b7431310
...
@@ -1599,7 +1599,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
...
@@ -1599,7 +1599,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
// 工程装置名称模糊查询
// 工程装置名称模糊查询
if
(!
ObjectUtils
.
isEmpty
(
map
.
getString
(
PROJECT_CONTRAPTION
)))
{
if
(!
ObjectUtils
.
isEmpty
(
map
.
getString
(
PROJECT_CONTRAPTION
)))
{
BoolQueryBuilder
pBuilder
=
QueryBuilders
.
boolQuery
();
BoolQueryBuilder
pBuilder
=
QueryBuilders
.
boolQuery
();
pBuilder
.
must
(
QueryBuilders
.
termsQuery
(
"PROJECT_CONTRAPTION.keyword"
,
map
.
getString
(
PROJECT_CONTRAPTION
)
.
toLowerCase
()
));
pBuilder
.
must
(
QueryBuilders
.
termsQuery
(
"PROJECT_CONTRAPTION.keyword"
,
map
.
getString
(
PROJECT_CONTRAPTION
)));
boolMust
.
must
(
pBuilder
);
boolMust
.
must
(
pBuilder
);
}
}
builder
.
query
(
boolMust
);
builder
.
query
(
boolMust
);
...
...
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/JgInstallationNoticeServiceImpl.java
View file @
b7431310
...
@@ -892,12 +892,18 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
...
@@ -892,12 +892,18 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
// 处理图片
// 处理图片
if
(!
ValidationUtil
.
isEmpty
(
model
.
getProxyStatementAttachmentList
()))
{
if
(!
ValidationUtil
.
isEmpty
(
model
.
getProxyStatementAttachmentList
()))
{
model
.
setProxyStatementAttachment
(
JSON
.
toJSONString
(
model
.
getProxyStatementAttachmentList
()));
model
.
setProxyStatementAttachment
(
JSON
.
toJSONString
(
model
.
getProxyStatementAttachmentList
()));
}
else
{
model
.
setProxyStatementAttachment
(
""
);
}
}
if
(!
ValidationUtil
.
isEmpty
(
model
.
getInstallContractAttachmentList
()))
{
if
(!
ValidationUtil
.
isEmpty
(
model
.
getInstallContractAttachmentList
()))
{
model
.
setInstallContractAttachment
(
JSON
.
toJSONString
(
model
.
getInstallContractAttachmentList
()));
model
.
setInstallContractAttachment
(
JSON
.
toJSONString
(
model
.
getInstallContractAttachmentList
()));
}
else
{
model
.
setInstallContractAttachment
(
""
);
}
}
if
(!
ValidationUtil
.
isEmpty
(
model
.
getOtherAccessoriesList
()))
{
if
(!
ValidationUtil
.
isEmpty
(
model
.
getOtherAccessoriesList
()))
{
model
.
setOtherAccessories
(
JSON
.
toJSONString
(
model
.
getOtherAccessoriesList
()));
model
.
setOtherAccessories
(
JSON
.
toJSONString
(
model
.
getOtherAccessoriesList
()));
}
else
{
model
.
setOtherAccessories
(
""
);
}
}
// 分割省市区字段
// 分割省市区字段
...
...
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