Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
W
work_service
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
licc
work_service
Commits
18581f97
Commit
18581f97
authored
Feb 01, 2021
by
cq990612
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化代码结构
parent
a0372417
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
37 additions
and
12 deletions
+37
-12
WorkCollectMapper.xml
...gy-mapper/src/main/resources/mapper/WorkCollectMapper.xml
+9
-5
SubtotalDto.java
...del/src/main/java/cn/wisenergy/model/dto/SubtotalDto.java
+5
-0
WorkTimeOrderDto.java
...rc/main/java/cn/wisenergy/model/dto/WorkTimeOrderDto.java
+2
-4
WorkCollectServiceImpl.java
...ava/cn/wisenergy/service/impl/WorkCollectServiceImpl.java
+18
-0
WorkTimeOrderServiceImpl.java
...a/cn/wisenergy/service/impl/WorkTimeOrderServiceImpl.java
+3
-3
No files found.
wisenergy-mapper/src/main/resources/mapper/WorkCollectMapper.xml
View file @
18581f97
...
...
@@ -11,18 +11,19 @@
<result
column=
"status"
property=
"status"
/>
<result
column=
"create_time"
property=
"createTime"
/>
<result
column=
"modify_time"
property=
"modifyTime"
/>
<result
column=
"reject_time"
property=
"rejectTime"
/>
</resultMap>
<sql
id=
"vals"
>
#{userId},#{workDay},#{totalTime},#{status},now(),now()
#{userId},#{workDay},#{totalTime},#{status},
#{rejectTime},
now(),now()
</sql>
<!-- 通用查询结果列 -->
<sql
id=
"Base_Column_List"
>
id, user_id, work_day, total_time, status,
create_time, modify_time
id, user_id, work_day, total_time, status,
reject_time, create_time, modify_time,
</sql>
<sql
id=
"cols_exclude_id"
>
user_id, work_day, total_time, status, create_time, modify_time
user_id, work_day, total_time, status,
reject_time,
create_time, modify_time
</sql>
<sql
id=
"table"
>
...
...
@@ -46,10 +47,13 @@
<set>
<if
test=
"null != status"
>
status=#{status},
status=#{status},
</if>
<if
test=
"null !=totalTime"
>
total_time = #{totalTime},
total_time = #{totalTime},
</if>
<if
test=
"3 ==status "
>
reject_time = now(),
</if>
modify_time = now()
</set>
...
...
wisenergy-model/src/main/java/cn/wisenergy/model/dto/SubtotalDto.java
View file @
18581f97
...
...
@@ -31,4 +31,9 @@ public class SubtotalDto {
@ApiModelProperty
(
name
=
"rejectMonth"
,
value
=
"当月被驳回待处理条数"
)
private
Integer
rejectMonth
;
@ApiModelProperty
(
name
=
"modifyTime"
,
value
=
"驳回时间"
)
private
Integer
modifyTime
;
}
wisenergy-model/src/main/java/cn/wisenergy/model/dto/WorkTimeOrderDto.java
View file @
18581f97
...
...
@@ -61,9 +61,7 @@ public class WorkTimeOrderDto {
@ApiModelProperty
(
name
=
"isOvertime"
,
value
=
"0:正常工时,1:加班"
)
private
Integer
isOvertime
;
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
"yyyy-MM-dd"
)
@ApiModelProperty
(
name
=
"modifyTime"
,
value
=
"驳回时间"
)
private
Date
modifyTime
;
@ApiModelProperty
(
name
=
"rejectTime"
,
value
=
"驳回时间"
)
private
Date
rejectTime
;
}
wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkCollectServiceImpl.java
View file @
18581f97
package
cn
.
wisenergy
.
service
.
impl
;
import
cn.wisenergy.common.utils.DateUtil
;
import
cn.wisenergy.common.utils.exception.BASE_RESP_CODE_ENUM
;
import
cn.wisenergy.common.utils.exception.BaseCustomException
;
import
cn.wisenergy.mapper.WorkCollectMapper
;
import
cn.wisenergy.mapper.WorkTimeOrderMapper
;
import
cn.wisenergy.model.app.WorkCollect
;
import
cn.wisenergy.model.app.WorkSubmitAdopt
;
import
cn.wisenergy.model.app.WorkTimeOrder
;
import
cn.wisenergy.model.dto.CalendarDto
;
import
cn.wisenergy.model.dto.SubtotalDto
;
import
cn.wisenergy.service.WorkCollectService
;
import
cn.wisenergy.service.WorkSubmitAdoptService
;
import
cn.wisenergy.service.WorkTimeOrderService
;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
lombok.extern.slf4j.Slf4j
;
...
...
@@ -50,6 +53,9 @@ public class WorkCollectServiceImpl implements WorkCollectService {
@Autowired
private
WorkTimeOrderMapper
workTimeOrderMapper
;
@Autowired
private
WorkSubmitAdoptService
workSubmitAdoptService
;
/**
* 功能: 查询某年月的填报情况
...
...
@@ -95,6 +101,18 @@ public class WorkCollectServiceImpl implements WorkCollectService {
if
(
workCollect
!=
null
)
{
subtotalDto
.
setStatus
(
workCollect
.
getStatus
());
}
int
modifyTime
=
1
;
Date
date
=
new
Date
();
WorkSubmitAdopt
submitAdopt
=
workSubmitAdoptService
.
getById
(
1
);
if
(
3
==
workCollect
.
getStatus
())
{
Date
rejectTime
=
workCollect
.
getRejectTime
();
rejectTime
=
DateUtil
.
convertStrToDate
(
DateUtil
.
convertDateToStr
(
rejectTime
,
"yyyy-MM-dd"
),
"yyyy-MM-dd"
);
System
.
out
.
println
(
modifyTime
);
if
(
date
.
getTime
()
-
rejectTime
.
getTime
()
>
submitAdopt
.
getSubmitTime
()
*
24
*
60
*
60
*
1000
)
{
modifyTime
=
0
;
}
}
subtotalDto
.
setModifyTime
(
modifyTime
);
return
subtotalDto
;
}
...
...
wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkTimeOrderServiceImpl.java
View file @
18581f97
...
...
@@ -264,9 +264,9 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
}
}
if
(
REJECTED
.
equals
(
dto
.
getStatus
())
||
RE_SUBMIT
.
equals
(
dto
.
getStatus
()))
{
Date
modifyTime
=
DateUtil
.
convertStrToDate
(
DateUtil
.
convertDateToStr
(
workTimeOrderMapper
.
selectById
(
dto
.
getWorkId
()).
getModify
Time
(),
"yyyy-MM-dd"
),
"yyyy-MM-dd"
);
System
.
out
.
println
(
modifyTime
);
if
(
date
.
getTime
()
-
modify
Time
.
getTime
()
>
submitTime
*
24
*
60
*
60
*
1000
)
{
Date
rejectTime
=
DateUtil
.
convertStrToDate
(
DateUtil
.
convertDateToStr
(
workTimeOrderMapper
.
selectById
(
dto
.
getWorkId
()).
getReject
Time
(),
"yyyy-MM-dd"
),
"yyyy-MM-dd"
);
if
(
date
.
getTime
()
-
reject
Time
.
getTime
()
>
submitTime
*
24
*
60
*
60
*
1000
)
{
throw
new
BaseCustomException
(
BASE_RESP_CODE_ENUM
.
WORK_DAY_THAN_DATE
);
}
}
...
...
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