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
825ac0e2
Commit
825ac0e2
authored
Jul 01, 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
b76b7d0e
2dc6511a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletion
+3
-1
WaterResourceController.java
...ot/module/jcs/biz/controller/WaterResourceController.java
+2
-0
BeanDtoVoUtils.java
...eejoin/amos/boot/module/jcs/biz/utils/BeanDtoVoUtils.java
+1
-1
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/controller/WaterResourceController.java
View file @
825ac0e2
...
@@ -136,6 +136,8 @@ public class WaterResourceController extends BaseController {
...
@@ -136,6 +136,8 @@ public class WaterResourceController extends BaseController {
@PathVariable
(
value
=
"sequenceNbr"
)
Long
sequenceNbr
)
{
@PathVariable
(
value
=
"sequenceNbr"
)
Long
sequenceNbr
)
{
// 更新基本信息
// 更新基本信息
model
.
setSequenceNbr
(
sequenceNbr
);
model
.
setSequenceNbr
(
sequenceNbr
);
model
.
setRealityImg
(
JSONArray
.
toJSONString
(
model
.
getRealityImgList
()));
model
.
setOrientationImg
(
JSONArray
.
toJSONString
(
model
.
getOrientationImgList
()));
WaterResourceDto
waterResourceDto
=
waterResourceServiceImpl
.
updateWithModel
(
model
);
WaterResourceDto
waterResourceDto
=
waterResourceServiceImpl
.
updateWithModel
(
model
);
// 更新属性信息
// 更新属性信息
String
resourceType
=
model
.
getResourceType
();
String
resourceType
=
model
.
getResourceType
();
...
...
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 @
825ac0e2
...
@@ -111,7 +111,7 @@ public class BeanDtoVoUtils {
...
@@ -111,7 +111,7 @@ public class BeanDtoVoUtils {
}
}
});
});
}
}
// 根据LocalDate来计算年龄
// 根据LocalDate来计算年龄
public
static
int
getAge
(
Date
birthDay
)
{
public
static
int
getAge
(
Date
birthDay
)
{
if
(
birthDay
==
null
)
{
if
(
birthDay
==
null
)
{
...
...
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