Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
T
tasktime
Project
Project
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
Graph
比较
统计图
议题
0
议题
0
列表
看板
标记
Milestones
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
注册表
注册表
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
任建彩
tasktime
Commits
0ba86f8b
提交
0ba86f8b
authored
8月 17, 2021
作者:
任建彩
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
历史记录
上级
125ed2c5
隐藏空白字符变更
内嵌
并排
正在显示
4 个修改的文件
包含
46 行增加
和
19 行删除
+46
-19
ProjectController.java
.../com/zrqx/olive/project/controller/ProjectController.java
+26
-2
TeamController.java
...ava/com/zrqx/olive/project/controller/TeamController.java
+0
-1
ProjectRecordRequest.java
.../com/zrqx/olive/project/request/ProjectRecordRequest.java
+18
-0
StatisticsProjectServiceImpl.java
...ve/project/service/impl/StatisticsProjectServiceImpl.java
+2
-16
没有找到文件。
olive-console/src/main/java/com/zrqx/olive/project/controller/ProjectController.java
浏览文件 @
0ba86f8b
package
com
.
zrqx
.
olive
.
project
.
controller
;
import
java.util.Date
;
import
java.util.List
;
import
javax.servlet.http.HttpServletRequest
;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.RequestBody
;
...
...
@@ -16,6 +18,8 @@ import com.common.CheckAdminToken;
import
com.common.CommonResult
;
import
com.common.PageParamRequest
;
import
com.github.pagehelper.PageInfo
;
import
com.zrqx.olive.project.model.ProjectRecord
;
import
com.zrqx.olive.project.request.ProjectRecordRequest
;
import
com.zrqx.olive.project.request.QueryProjectRequest
;
import
com.zrqx.olive.project.request.SaveProjectRequest
;
import
com.zrqx.olive.project.request.StatisticsProjectRequest
;
...
...
@@ -44,8 +48,8 @@ public class ProjectController {
private
ProjectRecordService
recordService
;
@Autowired
private
SystemAdminService
systemAdminService
;
@Autowired
private
CheckAdminToken
checkAdminToken
;
@Autowired
private
CheckAdminToken
checkAdminToken
;
@ApiOperation
(
value
=
"新增/修改"
,
notes
=
"新增一个"
)
@RequestMapping
(
value
=
"/save"
,
method
=
RequestMethod
.
POST
)
...
...
@@ -57,6 +61,26 @@ public class ProjectController {
}
return
CommonResult
.
success
();
}
@ApiOperation
(
value
=
"添加项目历史记录"
,
notes
=
"新增一个"
)
@RequestMapping
(
value
=
"/saveRecord"
,
method
=
RequestMethod
.
POST
)
public
CommonResult
<
Boolean
>
saveRecord
(
@RequestBody
ProjectRecordRequest
projectRecord
,
HttpServletRequest
request
)
throws
Exception
{
String
token
=
checkAdminToken
.
getTokenFormRequest
(
request
);
SystemAdminResponse
systemAdminResponse
=
systemAdminService
.
getInfoByToken
(
token
);
//添加历史记录
ProjectRecord
record
=
new
ProjectRecord
();
if
(
projectRecord
.
getType
().
equals
(
"2"
))
{
record
.
setDescribes
(
"由"
+
systemAdminResponse
.
getAccount
()+
"编辑"
);
}
else
{
record
.
setDescribes
(
"由"
+
systemAdminResponse
.
getAccount
()+
"创建"
);
}
record
.
setProjectId
(
projectRecord
.
getProjectId
());
record
.
setUserName
(
systemAdminResponse
.
getAccount
());
record
.
setUploadTime
(
new
Date
());
if
(!
recordService
.
save
(
record
))
{
return
CommonResult
.
failed
(
"添加失败"
);
}
return
CommonResult
.
success
();
}
@ApiOperation
(
value
=
"查询"
,
notes
=
"根据ID查询"
)
@GetMapping
(
value
=
"/getId"
)
public
CommonResult
<
ProjectVo
>
getById
(
String
oid
)
{
...
...
olive-console/src/main/java/com/zrqx/olive/project/controller/TeamController.java
浏览文件 @
0ba86f8b
...
...
@@ -106,7 +106,6 @@ public class TeamController {
BigDecimal
bignum3
=
team
.
getToBeAllocated
().
subtract
(
updateTeamRequest
.
getTimeList
().
get
(
i
).
getTime
());
team
.
setToBeAllocated
(
bignum3
);
if
(
teamService
.
updateById
(
team
)){
TeamRecord
record
=
new
TeamRecord
();
String
account
=
systemAdminResponse
.
getAccount
();
Department
department
=
departmentService
.
getById
(
team
.
getDepartmentId
());
...
...
olive-console/src/main/java/com/zrqx/olive/project/request/ProjectRecordRequest.java
0 → 100644
浏览文件 @
0ba86f8b
package
com
.
zrqx
.
olive
.
project
.
request
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
lombok.experimental.Accessors
;
@Data
@EqualsAndHashCode
(
callSuper
=
false
)
@Accessors
(
chain
=
true
)
@ApiModel
(
value
=
"ProjectRecordRequest对象"
,
description
=
"查询成员"
)
public
class
ProjectRecordRequest
{
@ApiModelProperty
(
"项目Id"
)
private
String
projectId
;
@ApiModelProperty
(
"1保存 2编辑"
)
private
String
type
;
}
olive-console/src/main/java/com/zrqx/olive/project/service/impl/StatisticsProjectServiceImpl.java
浏览文件 @
0ba86f8b
...
...
@@ -127,17 +127,6 @@ public class StatisticsProjectServiceImpl extends ServiceImpl<StatisticsProjectD
userMapper
.
insert
(
projectUser
);
}
}
//添加历史记录
ProjectRecord
record
=
new
ProjectRecord
();
if
(
form
.
getId
()==
null
)
{
record
.
setDescribes
(
"由"
+
systemAdminResponse
.
getAccount
()+
"创建"
);
}
else
{
record
.
setDescribes
(
"由"
+
systemAdminResponse
.
getAccount
()+
"编辑"
);
}
record
.
setProjectId
(
project
.
getId
());
record
.
setUserName
(
systemAdminResponse
.
getAccount
());
record
.
setUploadTime
(
new
Date
());
recordMapper
.
insert
(
record
);
return
true
;
}
...
...
@@ -184,16 +173,13 @@ public class StatisticsProjectServiceImpl extends ServiceImpl<StatisticsProjectD
if
(
null
!=
customerId
){
wrapper
.
eq
(
"customer_id"
,
customerId
);
}
if
(
null
!=
customerId
){
wrapper
.
eq
(
"customer_id"
,
customerId
);
}
wrapper
.
orderByDesc
(
"upload_time"
);
List
<
StatisticsProject
>
list
=
mapper
.
selectList
(
wrapper
);
for
(
StatisticsProject
statisticsProject
:
list
)
{
StatisticsProjectRequest
aqr
=
new
StatisticsProjectRequest
();
BeanUtils
.
copyProperties
(
statisticsProject
,
aqr
);
aqr
.
setStartTime
(
DateUtils
.
dateTimeToStr
(
statisticsProject
.
getStartTime
()));
aqr
.
setEndTime
(
DateUtils
.
dateTimeToStr
(
statisticsProject
.
getEndTime
()));
aqr
.
setStartTime
(
DateUtils
.
dateTimeToStr
YMD
(
statisticsProject
.
getStartTime
()));
aqr
.
setEndTime
(
DateUtils
.
dateTimeToStr
YMD
(
statisticsProject
.
getEndTime
()));
statisticsProjectRequest
.
add
(
aqr
);
}
return
statisticsProjectRequest
;
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论