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
6a3e133b
Commit
6a3e133b
authored
Jun 21, 2025
by
suhuiguang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(重要提醒):业务新增提醒开发联调
1.前端历史登记类型调整,格式不一样
parent
164bfadd
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
8 deletions
+14
-8
EditEquipParseService.java
.../jg/biz/reminder/biz/editEquip/EditEquipParseService.java
+10
-6
EditEquipReminderAdapter.java
.../biz/reminder/biz/editEquip/EditEquipReminderAdapter.java
+3
-2
JgUseRegistrationServiceImpl.java
...ule/jg/biz/service/impl/JgUseRegistrationServiceImpl.java
+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/reminder/biz/editEquip/EditEquipParseService.java
View file @
6a3e133b
package
com
.
yeejoin
.
amos
.
boot
.
module
.
jg
.
biz
.
reminder
.
biz
.
editEquip
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.yeejoin.amos.boot.biz.common.entity.TzsBaseEntity
;
import
com.yeejoin.amos.boot.module.jg.biz.edit.process.equip.CommonEquipDataProcessService
;
import
com.yeejoin.amos.boot.module.jg.biz.reminder.dto.MatchItemDto
;
import
com.yeejoin.amos.boot.module.jg.biz.reminder.service.CommonReminderService
;
import
com.yeejoin.amos.boot.module.jg.biz.service.impl.IdxBizJgRegisterInfoServiceImpl
;
import
com.yeejoin.amos.boot.module.jg.biz.service.impl.IdxBizJgUseInfoServiceImpl
;
...
...
@@ -14,12 +12,8 @@ import lombok.RequiredArgsConstructor;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.stereotype.Component
;
import
java.util.HashMap
;
import
java.util.LinkedHashMap
;
import
java.util.Map
;
import
static
com
.
yeejoin
.
amos
.
boot
.
module
.
jg
.
biz
.
service
.
impl
.
IdxBizJgRegisterInfoServiceImpl
.*;
@Component
@RequiredArgsConstructor
@Getter
...
...
@@ -44,6 +38,16 @@ public class EditEquipParseService {
}
}
public
String
getRegTypeFromJson
(
String
dataSource
)
{
if
(
dataSource
.
contains
(
"jg_his_black"
))
{
return
"2"
;
}
else
if
(
dataSource
.
contains
(
"jg_his"
))
{
return
"1"
;
}
else
{
return
"0"
;
}
}
public
Map
<
String
,
Object
>
getEquipDetailByRecord
(
String
record
)
{
return
equipDataProcessService
.
getEquipDetailByRecord
(
record
);
...
...
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/reminder/biz/editEquip/EditEquipReminderAdapter.java
View file @
6a3e133b
...
...
@@ -70,12 +70,13 @@ public class EditEquipReminderAdapter extends DefaultReminder {
public
MatchItemDto
setMatchItem
(
String
bizId
,
Map
<
String
,
Object
>
formData
)
{
MatchItemDto
matchItemDto
=
MatchItemDto
.
builder
().
build
();
IdxBizJgRegisterInfo
registerInfo
=
JSON
.
parseObject
(
JSON
.
toJSONString
(
formData
),
IdxBizJgRegisterInfo
.
class
);
IdxBizJgUseInfo
idxBizJgUseInfo
=
JSON
.
parseObject
(
JSON
.
toJSONString
(
formData
),
IdxBizJgUseInfo
.
class
);
matchItemDto
.
setEquList
(
registerInfo
.
getEquList
());
matchItemDto
.
setEquCategory
(
registerInfo
.
getEquCategory
());
matchItemDto
.
setEquDefine
(
registerInfo
.
getEquDefine
());
matchItemDto
.
setWhetherVehicleCylinder
(
StringUtils
.
isNotEmpty
(
registerInfo
.
getWhetherVehicleCylinder
())
?
registerInfo
.
getWhetherVehicleCylinder
()
:
"0"
);
matchItemDto
.
setIsRegister
(
editEquipParseService
.
getIsRegister
(
bizId
));
matchItemDto
.
setRegType
(
editEquipParseService
.
getRegTypeF
orEdit
(
bizId
));
matchItemDto
.
setIsRegister
(
idxBizJgUseInfo
.
getIsIntoManagement
()
&&
StringUtils
.
isNotEmpty
(
registerInfo
.
getUseOrgCode
()
));
matchItemDto
.
setRegType
(
editEquipParseService
.
getRegTypeF
romJson
(
idxBizJgUseInfo
.
getDataSource
()
));
return
matchItemDto
;
}
...
...
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/JgUseRegistrationServiceImpl.java
View file @
6a3e133b
...
...
@@ -4210,6 +4210,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
useInfo
.
setProvince
(
"610000"
);
useInfo
.
setProvinceName
(
"陕西省"
);
useInfo
.
setCity
(
String
.
valueOf
(
map
.
get
(
"city"
)));
useInfo
.
setUseInnerCode
(
String
.
valueOf
(
map
.
get
(
"useInnerCode"
)));
useInfo
.
setCityName
(
useCityName
);
useInfo
.
setCounty
(
String
.
valueOf
(
map
.
get
(
"county"
)));
useInfo
.
setCountyName
(
useCountyName
);
...
...
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