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
3a5ad7e1
Commit
3a5ad7e1
authored
Jan 25, 2021
by
nie'hong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
swagger注解
parent
f45d8848
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
59 additions
and
3 deletions
+59
-3
ApprovalStatistics.java
.../main/java/cn/wisenergy/model/dto/ApprovalStatistics.java
+6
-0
DayWorkTimeAndType.java
.../main/java/cn/wisenergy/model/dto/DayWorkTimeAndType.java
+12
-0
MonthlyWorkingHoursStatistics.java
...cn/wisenergy/model/dto/MonthlyWorkingHoursStatistics.java
+9
-1
StatisticsTableDto.java
.../main/java/cn/wisenergy/model/dto/StatisticsTableDto.java
+20
-1
WorkTimeAndCostCollect.java
...n/java/cn/wisenergy/model/dto/WorkTimeAndCostCollect.java
+12
-1
No files found.
wisenergy-model/src/main/java/cn/wisenergy/model/dto/ApprovalStatistics.java
View file @
3a5ad7e1
package
cn
.
wisenergy
.
model
.
dto
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
java.io.Serializable
;
...
...
@@ -10,21 +12,25 @@ import java.io.Serializable;
* @create: 2021-01-19 16:00
**/
@Data
@ApiModel
(
value
=
"ApprovalStatistics"
,
description
=
"月审批情况"
)
public
class
ApprovalStatistics
implements
Serializable
{
private
static
final
long
serialVersionUID
=
-
8541322571924444314L
;
/**
* 已审批条数
*/
@ApiModelProperty
(
name
=
"approvalCount"
,
value
=
"已审批条数"
)
private
Integer
approvalCount
;
/**
* 未审批条数
*/
@ApiModelProperty
(
name
=
"notApprovalCount"
,
value
=
"未审批条数"
)
private
Integer
notApprovalCount
;
/**
* 驳回未重报
*/
@ApiModelProperty
(
name
=
"rejectNotSubmit"
,
value
=
"驳回未重报数量"
)
private
Integer
rejectNotSubmit
;
}
wisenergy-model/src/main/java/cn/wisenergy/model/dto/DayWorkTimeAndType.java
View file @
3a5ad7e1
package
cn
.
wisenergy
.
model
.
dto
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
java.io.Serializable
;
...
...
@@ -10,16 +12,26 @@ import java.io.Serializable;
* @create: 2021-01-20 13:36
**/
@Data
@ApiModel
(
value
=
"DayWorkTimeAndType"
,
description
=
"一天的工时信息"
)
public
class
DayWorkTimeAndType
implements
Serializable
{
private
static
final
long
serialVersionUID
=
1198786417184957375L
;
/**
* 日期中的日
*/
@ApiModelProperty
(
name
=
"day"
,
value
=
"日期中的日"
)
private
Integer
day
;
/**
* 工时类型,0:正常,1:请假,2:调休
*/
@ApiModelProperty
(
name
=
"type"
,
value
=
"工时类型,0:正常,1:请假,2:调休"
)
private
Integer
type
;
/**
* 工时
*/
@ApiModelProperty
(
name
=
"workTime"
,
value
=
"工时"
)
private
Integer
workTime
;
}
wisenergy-model/src/main/java/cn/wisenergy/model/dto/MonthlyWorkingHoursStatistics.java
View file @
3a5ad7e1
package
cn
.
wisenergy
.
model
.
dto
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
java.io.Serializable
;
...
...
@@ -10,32 +12,38 @@ import java.io.Serializable;
* @create: 2021-01-19 15:47
**/
@Data
@ApiModel
(
value
=
"MonthlyWorkingHoursStatistics"
,
description
=
"统计本月的填报信息"
)
public
class
MonthlyWorkingHoursStatistics
implements
Serializable
{
private
static
final
long
serialVersionUID
=
-
8216457470821285624L
;
/**
* 工单类型:商机/项目
*/
@ApiModelProperty
(
name
=
"projectType"
,
value
=
"工单类型:商机/项目"
)
private
String
projectType
;
/**
* 填报次数
*/
@ApiModelProperty
(
name
=
"count"
,
value
=
"填报次数"
)
private
Integer
count
;
/**
* 填报工时
*/
@ApiModelProperty
(
name
=
"workTime"
,
value
=
"填报工时"
)
private
Integer
workTime
;
/**
* 未填报天数
*/
@ApiModelProperty
(
name
=
"notFilledCount"
,
value
=
"未填报天数"
)
private
Integer
notFilledCount
;
/**
*
被驳回次
数
*
现存被驳回
数
*/
@ApiModelProperty
(
name
=
"rejectCount"
,
value
=
"现存被驳回数"
)
private
Integer
rejectCount
;
...
...
wisenergy-model/src/main/java/cn/wisenergy/model/dto/StatisticsTableDto.java
View file @
3a5ad7e1
package
cn
.
wisenergy
.
model
.
dto
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
java.io.Serializable
;
import
java.util.List
;
/**
* @description: 月汇总信息
* @description: 月汇总信息
(天-工时)
* @author: nh
* @create: 2021-01-19 17:22
**/
@Data
@ApiModel
(
value
=
"StatisticsTableDto"
,
description
=
"月汇总信息(天-工时)"
)
public
class
StatisticsTableDto
implements
Serializable
{
private
static
final
long
serialVersionUID
=
-
7581698349760684467L
;
/**
* 用户主键
*/
@ApiModelProperty
(
name
=
"userId"
,
value
=
"用户主键"
)
private
Integer
userId
;
/**
* 部门名称
*/
@ApiModelProperty
(
name
=
"deptName"
,
value
=
"部门名称"
)
private
String
deptName
;
/**
* 用户姓名
*/
@ApiModelProperty
(
name
=
"userName"
,
value
=
"用户姓名"
)
private
String
userName
;
/**
* 一天工时类型和工时的集合
*/
@ApiModelProperty
(
name
=
"dayWorkTimeAndTypeList"
,
value
=
"一天填报的工时类型和工时的集合"
)
List
<
DayWorkTimeAndType
>
dayWorkTimeAndTypeList
;
}
wisenergy-model/src/main/java/cn/wisenergy/model/dto/WorkTimeAndCostCollect.java
View file @
3a5ad7e1
package
cn
.
wisenergy
.
model
.
dto
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
java.io.Serializable
;
import
java.math.BigDecimal
;
/**
* @description: 项目
工时和工时成本
* @description: 项目
的工时和工时成本统计
* @author: nh
* @create: 2021-01-22 11:57
**/
@Data
@ApiModel
(
value
=
"WorkTimeAndCostCollect"
,
description
=
"项目的工时和工时成本统计"
)
public
class
WorkTimeAndCostCollect
implements
Serializable
{
private
static
final
long
serialVersionUID
=
7207732278277982917L
;
/**
* 类型:项目/商机
*/
@ApiModelProperty
(
name
=
"type"
,
value
=
"类型:商机/项目"
)
private
String
type
;
/**
* 部门名称
*/
@ApiModelProperty
(
name
=
"deptName"
,
value
=
"部门名称"
)
private
String
deptName
;
/**
* 部门主键
*/
@ApiModelProperty
(
name
=
"deptId"
,
value
=
"部门主键"
)
private
Integer
deptId
;
/**
* 项目名称
*/
@ApiModelProperty
(
name
=
"projectName"
,
value
=
"项目名称"
)
private
String
projectName
;
/**
* 开始统计日期
*/
@ApiModelProperty
(
name
=
"firstTime"
,
value
=
"开始统计的日期"
)
private
String
firstTime
;
/**
*最后统计日期
*/
@ApiModelProperty
(
name
=
"lastTime"
,
value
=
"最后统计的日期"
)
private
String
lastTime
;
/**
* 工时总计:人/天
*/
@ApiModelProperty
(
name
=
"totalTime"
,
value
=
"工时总计"
)
private
BigDecimal
totalTime
;
/**
* 工时成本
*/
@ApiModelProperty
(
name
=
"cost"
,
value
=
"工时成本"
)
private
Integer
cost
;
}
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