Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
T
tianjin-cement
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
竹天卫
tianjin-cement
Commits
7c6a177c
Commit
7c6a177c
authored
Oct 09, 2020
by
mengbali153
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
能力管理--联调
历史档案--联调 非标产值--联调
parent
f1aea923
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
7 deletions
+11
-7
NonStandardApply.java
...a/cn/wise/sc/cement/business/entity/NonStandardApply.java
+3
-0
NonStandardApplyMapper.xml
.../sc/cement/business/mapper/xml/NonStandardApplyMapper.xml
+0
-1
NonStandardApplyQuery.java
...sc/cement/business/model/query/NonStandardApplyQuery.java
+3
-0
NonStandardApplyVo.java
.../wise/sc/cement/business/model/vo/NonStandardApplyVo.java
+3
-0
NonStandardApplyServiceImpl.java
...nt/business/service/impl/NonStandardApplyServiceImpl.java
+2
-6
No files found.
cement-business/src/main/java/cn/wise/sc/cement/business/entity/NonStandardApply.java
View file @
7c6a177c
...
@@ -48,6 +48,9 @@ public class NonStandardApply implements Serializable {
...
@@ -48,6 +48,9 @@ public class NonStandardApply implements Serializable {
@ApiModelProperty
(
"开始时间"
)
@ApiModelProperty
(
"开始时间"
)
private
LocalDate
startTime
;
private
LocalDate
startTime
;
@ApiModelProperty
(
"结束时间"
)
private
LocalDate
endTime
;
@ApiModelProperty
(
"工作描述"
)
@ApiModelProperty
(
"工作描述"
)
private
String
workDescription
;
private
String
workDescription
;
...
...
cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/NonStandardApplyMapper.xml
View file @
7c6a177c
...
@@ -56,7 +56,6 @@
...
@@ -56,7 +56,6 @@
END
END
)as 状态,
)as 状态,
na.work_type as 工作类别,
na.work_type as 工作类别,
na.start_time as 开始时间,
na.work_description as 工作描述
na.work_description as 工作描述
FROM nonstandard_apply na
FROM nonstandard_apply na
LEFT JOIN sys_user su ON su.id = na.user_id
LEFT JOIN sys_user su ON su.id = na.user_id
...
...
cement-business/src/main/java/cn/wise/sc/cement/business/model/query/NonStandardApplyQuery.java
View file @
7c6a177c
...
@@ -30,6 +30,9 @@ public class NonStandardApplyQuery {
...
@@ -30,6 +30,9 @@ public class NonStandardApplyQuery {
@ApiModelProperty
(
name
=
"startTime"
,
value
=
"开始时间"
)
@ApiModelProperty
(
name
=
"startTime"
,
value
=
"开始时间"
)
private
LocalDate
startTime
;
private
LocalDate
startTime
;
@ApiModelProperty
(
name
=
"endTime"
,
value
=
"结束时间"
)
private
LocalDate
endTime
;
@ApiModelProperty
(
name
=
"workDescription"
,
value
=
"工作描述"
)
@ApiModelProperty
(
name
=
"workDescription"
,
value
=
"工作描述"
)
private
String
workDescription
;
private
String
workDescription
;
...
...
cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/NonStandardApplyVo.java
View file @
7c6a177c
...
@@ -37,6 +37,9 @@ public class NonStandardApplyVo {
...
@@ -37,6 +37,9 @@ public class NonStandardApplyVo {
@ApiModelProperty
(
"开始时间"
)
@ApiModelProperty
(
"开始时间"
)
private
LocalDate
startTime
;
private
LocalDate
startTime
;
@ApiModelProperty
(
"结束时间"
)
private
LocalDate
endTime
;
@ApiModelProperty
(
"工作描述"
)
@ApiModelProperty
(
"工作描述"
)
private
String
workDescription
;
private
String
workDescription
;
...
...
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/NonStandardApplyServiceImpl.java
View file @
7c6a177c
...
@@ -72,10 +72,7 @@ public class NonStandardApplyServiceImpl extends ServiceImpl<NonStandardApplyMap
...
@@ -72,10 +72,7 @@ public class NonStandardApplyServiceImpl extends ServiceImpl<NonStandardApplyMap
public
BaseResponse
<
NonStandardApply
>
create
(
NonStandardApplyQuery
query
)
{
public
BaseResponse
<
NonStandardApply
>
create
(
NonStandardApplyQuery
query
)
{
NonStandardApply
cama
=
new
NonStandardApply
();
NonStandardApply
cama
=
new
NonStandardApply
();
BeanUtils
.
copyProperties
(
query
,
cama
);
BeanUtils
.
copyProperties
(
query
,
cama
);
Double
a
=
cama
.
getReportedHours
();
cama
.
setStatistical
(
cama
.
getStartTime
()
+
"/"
+
cama
.
getEndTime
());
Double
b
=
a
/
24
+
1
;
long
c
=
new
Double
(
b
).
longValue
();
cama
.
setStatistical
(
cama
.
getStartTime
()
+
"/"
+
cama
.
getStartTime
().
plusDays
(
c
));
nonStandardApplyMapper
.
insert
(
cama
);
nonStandardApplyMapper
.
insert
(
cama
);
return
BaseResponse
.
okData
(
cama
);
return
BaseResponse
.
okData
(
cama
);
}
}
...
@@ -145,8 +142,7 @@ public class NonStandardApplyServiceImpl extends ServiceImpl<NonStandardApplyMap
...
@@ -145,8 +142,7 @@ public class NonStandardApplyServiceImpl extends ServiceImpl<NonStandardApplyMap
headers
[
4
]
=
"上报工时"
;
headers
[
4
]
=
"上报工时"
;
headers
[
5
]
=
"状态"
;
headers
[
5
]
=
"状态"
;
headers
[
6
]
=
"工作类别"
;
headers
[
6
]
=
"工作类别"
;
headers
[
7
]
=
"开始时间"
;
headers
[
7
]
=
"工作描述"
;
headers
[
8
]
=
"工作描述"
;
List
<
Object
[]>
datas
=
new
ArrayList
<>(
list
.
size
());
List
<
Object
[]>
datas
=
new
ArrayList
<>(
list
.
size
());
for
(
Map
<
String
,
Object
>
m
:
list
)
{
for
(
Map
<
String
,
Object
>
m
:
list
)
{
...
...
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