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
599bbaac
Commit
599bbaac
authored
Jun 30, 2021
by
tangwei
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'developer' of
http://172.16.10.76/moa/amos-boot-biz
into developer
parents
5c4150ae
d367acda
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
1 deletion
+5
-1
PowerTransferServiceImpl.java
...module/jcs/biz/service/impl/PowerTransferServiceImpl.java
+1
-1
BeanDtoVoUtils.java
...eejoin/amos/boot/module/jcs/biz/utils/BeanDtoVoUtils.java
+4
-0
No files found.
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/PowerTransferServiceImpl.java
View file @
599bbaac
...
...
@@ -102,7 +102,7 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
// 获取任务派发模板
Template
template
=
templateService
.
getOne
(
new
QueryWrapper
<
Template
>().
eq
(
"type"
,
alertCalled
.
getAlertType
()));
alertCalled
.
getAlertType
())
.
eq
(
"format"
,
false
)
);
String
content
=
template
.
getContent
();
Map
<
String
,
String
>
definitions
=
new
HashMap
<>();
initDefinitions
(
definitions
,
alertCalled
,
powerTransferDto
);
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/utils/BeanDtoVoUtils.java
View file @
599bbaac
...
...
@@ -59,6 +59,7 @@ public class BeanDtoVoUtils {
if
(
source
==
null
)
{
return
null
;
}
try
{
// 创建新的对象实例
FireExpertsDto
target
=
FireExpertsDto
.
class
.
newInstance
();
...
...
@@ -112,6 +113,9 @@ public class BeanDtoVoUtils {
//由出生日期获得年龄
public
static
int
getAge
(
Date
birthDay
)
{
if
(
birthDay
==
null
){
return
0
;
}
Calendar
cal
=
Calendar
.
getInstance
();
if
(
cal
.
before
(
birthDay
))
{
...
...
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