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
dc3e31a1
Commit
dc3e31a1
authored
Apr 14, 2025
by
刘林
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(jg):【现场问题】车用变更登记表单提交页面,无变更证明上传附件入口
parent
ea97a4bc
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
10 deletions
+15
-10
IdxBizJgRegisterInfoServiceImpl.java
.../jg/biz/service/impl/IdxBizJgRegisterInfoServiceImpl.java
+8
-6
JgChangeVehicleRegistrationUnitServiceImpl.java
...vice/impl/JgChangeVehicleRegistrationUnitServiceImpl.java
+7
-4
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 @
dc3e31a1
...
...
@@ -2574,12 +2574,14 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
pBuilder
.
must
(
QueryBuilders
.
termQuery
(
EQU_CATEGORY_CODE
,
test
));
boolMust
.
must
(
pBuilder
);
}
// 是否车用气瓶
if
(!
ObjectUtils
.
isEmpty
(
map
.
getString
(
WHETHER_VEHICLE_CYLINDER
)))
{
BoolQueryBuilder
pBuilder
=
QueryBuilders
.
boolQuery
();
String
test
=
QueryParser
.
escape
(
map
.
getString
(
WHETHER_VEHICLE_CYLINDER
));
pBuilder
.
must
(
QueryBuilders
.
termQuery
(
WHETHER_VEHICLE_CYLINDER
,
test
));
boolMust
.
must
(
pBuilder
);
//设备类别为气瓶时,添加是否车用气瓶字段
if
(
CylinderTypeEnum
.
CYLINDER
.
getCode
().
equals
(
map
.
getString
(
EQU_CATEGORY_CODE
)))
{
Optional
.
ofNullable
(
map
.
getString
(
WHETHER_VEHICLE_CYLINDER
))
.
filter
(
s
->
!
s
.
trim
().
isEmpty
())
.
ifPresent
(
cylinder
->
boolMust
.
must
(
QueryBuilders
.
boolQuery
()
.
must
(
QueryBuilders
.
termQuery
(
WHETHER_VEHICLE_CYLINDER
,
QueryParser
.
escape
(
cylinder
)))
));
}
// 是否撬装式压力容器
if
(!
ObjectUtils
.
isEmpty
(
map
.
getString
(
WHETHER_SKID_MOUNTED_PRESSURE_VESSEL
)))
{
...
...
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/JgChangeVehicleRegistrationUnitServiceImpl.java
View file @
dc3e31a1
...
...
@@ -54,15 +54,14 @@ import org.springframework.stereotype.Service;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.util.ObjectUtils
;
import
org.typroject.tyboot.core.foundation.context.RequestContext
;
import
org.typroject.tyboot.core.foundation.utils.ValidationUtil
;
import
org.typroject.tyboot.core.rdbms.service.BaseService
;
import
org.typroject.tyboot.core.restful.exception.instance.BadRequest
;
import
org.typroject.tyboot.core.restful.utils.ResponseModel
;
import
java.text.SimpleDateFormat
;
import
java.util.*
;
import
java.util.concurrent.TimeUnit
;
import
java.util.stream.Collectors
;
import
static
com
.
yeejoin
.
amos
.
boot
.
module
.
jg
.
api
.
enums
.
VehicleApanageEnum
.
XIAN_YANG
;
import
static
com
.
yeejoin
.
amos
.
boot
.
module
.
jg
.
api
.
enums
.
VehicleApanageEnum
.
XI_XIAN
;
...
...
@@ -143,8 +142,6 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
dto
.
setOrgBranchCode
(
splitMaintenanceUnitCode
[
0
]);
dto
.
setOrgBranchName
(
splitMaintenanceUnitCode
[
1
]);
}
}
@Transactional
(
rollbackFor
=
Exception
.
class
)
...
...
@@ -153,6 +150,9 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
try
{
CompanyBo
company
=
reginParams
.
getCompany
();
JgChangeVehicleRegistrationUnit
dto
=
new
JgChangeVehicleRegistrationUnit
();
if
(!
ValidationUtil
.
isEmpty
(
map
.
get
(
"changeCertificateList"
)))
{
dto
.
setChangeCertificate
(
JSON
.
toJSONString
(
map
.
get
(
"changeCertificateList"
)));
}
if
(!
ObjectUtils
.
isEmpty
(
map
.
get
(
"submit"
))
&&
SUBMIT_TYPE_FLOW
.
equals
(
map
.
get
(
"submit"
).
toString
()))
{
if
(
map
.
containsKey
(
"dataList"
))
{
List
<
Map
<
String
,
Object
>>
equipList
=
new
ArrayList
<>();
...
...
@@ -192,6 +192,9 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
// 更新
JgChangeVehicleRegistrationUnit
updateDto
=
this
.
getById
(
Long
.
parseLong
(
map
.
get
(
"sequenceNbr"
).
toString
()));
BeanUtil
.
copyProperties
(
map
,
updateDto
);
if
(!
ValidationUtil
.
isEmpty
(
map
.
get
(
"changeCertificateList"
)))
{
updateDto
.
setChangeCertificate
(
JSON
.
toJSONString
(
map
.
get
(
"changeCertificateList"
)));
}
changeData
(
updateDto
,
reginParams
.
getCompany
());
this
.
updateById
(
updateDto
);
BeanUtil
.
copyProperties
(
updateDto
,
dto
);
...
...
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