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
93fa9c3e
Commit
93fa9c3e
authored
Feb 03, 2021
by
cq990612
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化代码结构
parent
17c813a7
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
115 additions
and
4 deletions
+115
-4
CalendarDto.java
...del/src/main/java/cn/wisenergy/model/dto/CalendarDto.java
+2
-1
ManagerProjectsDto.java
.../main/java/cn/wisenergy/model/dto/ManagerProjectsDto.java
+79
-0
GetManagerProjectsVo.java
...main/java/cn/wisenergy/model/vo/GetManagerProjectsVo.java
+28
-0
WorkProjectService.java
...rc/main/java/cn/wisenergy/service/WorkProjectService.java
+3
-0
application-dev.yml
wisenergy-web-admin/src/main/resources/application-dev.yml
+2
-2
application.yml
wisenergy-web-admin/src/main/resources/application.yml
+1
-1
No files found.
wisenergy-model/src/main/java/cn/wisenergy/model/dto/CalendarDto.java
View file @
93fa9c3e
package
cn
.
wisenergy
.
model
.
dto
;
package
cn
.
wisenergy
.
model
.
dto
;
import
io.swagger.annotations.ApiImplicitParams
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
lombok.Data
;
import
lombok.experimental.Accessors
;
import
java.io.Serializable
;
import
java.io.Serializable
;
import
java.util.Date
;
import
java.util.Date
;
...
@@ -13,6 +13,7 @@ import java.util.Date;
...
@@ -13,6 +13,7 @@ import java.util.Date;
* @QQ1799796883
* @QQ1799796883
*/
*/
@Data
@Data
@Accessors
(
chain
=
true
)
@ApiModel
(
value
=
"CalendarDto"
,
description
=
"日历展示类"
)
@ApiModel
(
value
=
"CalendarDto"
,
description
=
"日历展示类"
)
public
class
CalendarDto
implements
Serializable
{
public
class
CalendarDto
implements
Serializable
{
...
...
wisenergy-model/src/main/java/cn/wisenergy/model/dto/ManagerProjectsDto.java
0 → 100644
View file @
93fa9c3e
package
cn
.
wisenergy
.
model
.
dto
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
lombok.experimental.Accessors
;
import
java.io.Serializable
;
import
java.math.BigDecimal
;
import
java.util.Date
;
@Data
@Accessors
(
chain
=
true
)
@EqualsAndHashCode
(
callSuper
=
false
)
@ApiModel
(
value
=
"ManagerProjectsDto"
,
description
=
"管理的项目/商机"
)
public
class
ManagerProjectsDto
implements
Serializable
{
private
static
final
long
serialVersionUID
=
-
7790290335357240530L
;
@ApiModelProperty
(
name
=
"id"
,
value
=
"主键id"
)
@TableId
(
value
=
"id"
,
type
=
IdType
.
AUTO
)
private
Integer
id
;
@ApiModelProperty
(
name
=
"oaProjectId"
,
value
=
"OA中的项目编号"
)
private
String
oaProjectId
;
@ApiModelProperty
(
name
=
"projectName"
,
value
=
"项目名称"
)
private
String
projectName
;
@ApiModelProperty
(
name
=
"type"
,
value
=
"1:项目,2:商机"
)
private
Integer
type
;
@ApiModelProperty
(
name
=
"managerId"
,
value
=
"项目经理userId"
)
private
Integer
managerId
;
@ApiModelProperty
(
name
=
"deptId"
,
value
=
"部门id"
)
private
Integer
deptId
;
@ApiModelProperty
(
name
=
"workTime"
,
value
=
"工时预算"
)
private
Integer
workTime
;
@ApiModelProperty
(
name
=
"costBudget"
,
value
=
"成本预算,以万为单位"
)
private
BigDecimal
costBudget
;
@ApiModelProperty
(
name
=
"isConclusion"
,
value
=
"是否结项 :0:项目已结束、1:项目未结束"
)
private
Integer
isConclusion
;
@ApiModelProperty
(
name
=
"startTime"
,
value
=
"项目开始时间"
)
private
Date
startTime
;
@ApiModelProperty
(
name
=
"endTime"
,
value
=
"项目结束时间"
)
private
Date
endTime
;
@ApiModelProperty
(
name
=
"createTime"
,
value
=
"创建时间"
)
private
Date
createTime
;
@ApiModelProperty
(
name
=
"modifyTime"
,
value
=
"修改时间"
)
private
Date
modifyTime
;
//其他
@ApiModelProperty
(
name
=
"Participants"
,
value
=
"参与人员"
)
private
String
Participants
;
@ApiModelProperty
(
name
=
"currentLaborCost"
,
value
=
"当前工时成本"
)
private
String
currentLaborCost
;
@ApiModelProperty
(
name
=
"totalCurrentWorkingHours"
,
value
=
"当前工时总计"
)
private
String
totalCurrentWorkingHours
;
@ApiModelProperty
(
name
=
"isItOverdue"
,
value
=
"是否超期"
)
private
String
isItOverdue
;
@ApiModelProperty
(
name
=
"isThereABudgetChange"
,
value
=
"是否有预算更变"
)
private
String
isThereABudgetChange
;
}
wisenergy-model/src/main/java/cn/wisenergy/model/vo/GetManagerProjectsVo.java
0 → 100644
View file @
93fa9c3e
package
cn
.
wisenergy
.
model
.
vo
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
@Data
@EqualsAndHashCode
(
callSuper
=
false
)
@ApiModel
(
value
=
"GetManagerProjectsVo"
,
description
=
"获取管理项目VO"
)
public
class
GetManagerProjectsVo
{
@ApiModelProperty
(
name
=
"page"
,
value
=
"当前页"
)
private
Integer
page
;
@ApiModelProperty
(
name
=
"pageSize"
,
value
=
"一页的记录数"
)
private
Integer
pageSize
;
@ApiModelProperty
(
name
=
"userId"
,
value
=
"用户id"
)
private
Integer
userId
;
@ApiModelProperty
(
name
=
"projectId"
,
value
=
"项目id"
)
private
Integer
projectId
;
@ApiModelProperty
(
name
=
"isConclusion"
,
value
=
"是否结项:0:结项,1:未结束"
)
private
Integer
isConclusion
;
}
wisenergy-service/src/main/java/cn/wisenergy/service/WorkProjectService.java
View file @
93fa9c3e
...
@@ -40,4 +40,7 @@ public interface WorkProjectService {
...
@@ -40,4 +40,7 @@ public interface WorkProjectService {
* @return
* @return
*/
*/
List
<
WorkProject
>
getUserManageProjects
(
Integer
userId
);
List
<
WorkProject
>
getUserManageProjects
(
Integer
userId
);
}
}
wisenergy-web-admin/src/main/resources/application-dev.yml
View file @
93fa9c3e
...
@@ -3,9 +3,9 @@ spring:
...
@@ -3,9 +3,9 @@ spring:
type
:
com.alibaba.druid.pool.DruidDataSource
type
:
com.alibaba.druid.pool.DruidDataSource
druid
:
druid
:
driver-class-name
:
com.mysql.cj.jdbc.Driver
driver-class-name
:
com.mysql.cj.jdbc.Driver
url
:
jdbc:mysql://
localhost
:3306/work_hours?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8
url
:
jdbc:mysql://
192.168.110.84
:3306/work_hours?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8
username
:
root
username
:
root
password
:
123456
password
:
admin!@#123
initial-size
:
10
initial-size
:
10
max-active
:
100
max-active
:
100
min-idle
:
10
min-idle
:
10
...
...
wisenergy-web-admin/src/main/resources/application.yml
View file @
93fa9c3e
...
@@ -3,7 +3,7 @@ server:
...
@@ -3,7 +3,7 @@ server:
uri-encoding
:
UTF-8
uri-encoding
:
UTF-8
max-threads
:
1000
max-threads
:
1000
min-spare-threads
:
30
min-spare-threads
:
30
port
:
808
0
port
:
808
1
connection-timeout
:
5000ms
connection-timeout
:
5000ms
spring
:
spring
:
...
...
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