Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
T
tasktime
Project
Project
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
Graph
比较
统计图
议题
0
议题
0
列表
看板
标记
Milestones
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
注册表
注册表
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
任建彩
tasktime
Commits
17ad924f
提交
17ad924f
authored
9月 02, 2021
作者:
任建彩
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
bug
上级
3407b40d
显示空白字符变更
内嵌
并排
正在显示
6 个修改的文件
包含
20 行增加
和
12 行删除
+20
-12
StatisticsProjectServiceImpl.java
...ve/project/service/impl/StatisticsProjectServiceImpl.java
+5
-3
TeamMemberRelationServiceImpl.java
...e/project/service/impl/TeamMemberRelationServiceImpl.java
+3
-3
TeamServiceImpl.java
.../com/zrqx/olive/project/service/impl/TeamServiceImpl.java
+2
-2
TaskDao.java
...nsole/src/main/java/com/zrqx/olive/ttask/dao/TaskDao.java
+7
-1
TaskService.java
...c/main/java/com/zrqx/olive/ttask/service/TaskService.java
+1
-1
TaskServiceImpl.java
...ava/com/zrqx/olive/ttask/service/imp/TaskServiceImpl.java
+2
-2
没有找到文件。
olive-console/src/main/java/com/zrqx/olive/project/service/impl/StatisticsProjectServiceImpl.java
浏览文件 @
17ad924f
...
@@ -59,7 +59,7 @@ public class StatisticsProjectServiceImpl extends ServiceImpl<StatisticsProjectD
...
@@ -59,7 +59,7 @@ public class StatisticsProjectServiceImpl extends ServiceImpl<StatisticsProjectD
@Override
@Override
public
PageInfo
<
ProjectListVo
>
page
(
QueryProjectRequest
form
,
PageParamRequest
pageParamRequest
)
{
public
PageInfo
<
ProjectListVo
>
page
(
QueryProjectRequest
form
,
PageParamRequest
pageParamRequest
)
{
if
(
pageParamRequest
.
getOrderBy
()==
null
)
{
if
(
pageParamRequest
.
getOrderBy
()==
null
)
{
pageParamRequest
.
setOrderBy
(
"px desc
,upload_time desc
"
);
pageParamRequest
.
setOrderBy
(
"px desc"
);
}
}
//开启分页
//开启分页
PageHelper
.
startPage
(
pageParamRequest
.
getPage
(),
pageParamRequest
.
getLimit
());
PageHelper
.
startPage
(
pageParamRequest
.
getPage
(),
pageParamRequest
.
getLimit
());
...
@@ -71,12 +71,14 @@ public class StatisticsProjectServiceImpl extends ServiceImpl<StatisticsProjectD
...
@@ -71,12 +71,14 @@ public class StatisticsProjectServiceImpl extends ServiceImpl<StatisticsProjectD
projectListVo
.
setCustomer
(
customer
.
getCustomer
());
projectListVo
.
setCustomer
(
customer
.
getCustomer
());
projectListVo
.
setStatus_Name
(
ProjectStatusEnum
.
getName
(
projectListVo
.
getStatus
()));
projectListVo
.
setStatus_Name
(
ProjectStatusEnum
.
getName
(
projectListVo
.
getStatus
()));
}
}
BigDecimal
consume
=
taskService
.
queryConsume
(
projectListVo
.
getId
(),
null
,
null
);
//项目的消耗总工时
BigDecimal
consume
=
taskService
.
queryConsume
(
projectListVo
.
getId
(),
null
,
null
,
projectListVo
.
getPresale
());
if
(
consume
!=
null
)
{
if
(
consume
!=
null
)
{
if
(
projectListVo
.
getTotal
()!=
null
)
{
if
(
projectListVo
.
getTotal
()!=
null
)
{
projectListVo
.
setConsume
(
projectListVo
.
getTotal
().
subtract
(
consume
)
);
projectListVo
.
setConsume
(
consume
);
}
}
}
}
//项目的剩余总工时
BigDecimal
querySurplus
=
taskService
.
querySurplus
(
projectListVo
.
getId
(),
null
,
null
);
BigDecimal
querySurplus
=
taskService
.
querySurplus
(
projectListVo
.
getId
(),
null
,
null
);
if
(
querySurplus
!=
null
)
{
if
(
querySurplus
!=
null
)
{
if
(
projectListVo
.
getTotal
()!=
null
)
{
if
(
projectListVo
.
getTotal
()!=
null
)
{
...
...
olive-console/src/main/java/com/zrqx/olive/project/service/impl/TeamMemberRelationServiceImpl.java
浏览文件 @
17ad924f
...
@@ -42,8 +42,6 @@ public class TeamMemberRelationServiceImpl extends ServiceImpl<TeamMemberRelatio
...
@@ -42,8 +42,6 @@ public class TeamMemberRelationServiceImpl extends ServiceImpl<TeamMemberRelatio
@Autowired
@Autowired
private
SystemRoleDao
roleDao
;
private
SystemRoleDao
roleDao
;
@Autowired
@Autowired
private
SystemAdminDao
systemAdminDao
;
@Autowired
private
TeamDao
teamDao
;
private
TeamDao
teamDao
;
@Autowired
@Autowired
private
DepartmentDao
dao
;
private
DepartmentDao
dao
;
...
@@ -54,8 +52,10 @@ public class TeamMemberRelationServiceImpl extends ServiceImpl<TeamMemberRelatio
...
@@ -54,8 +52,10 @@ public class TeamMemberRelationServiceImpl extends ServiceImpl<TeamMemberRelatio
public
List
<
TeamMemberListVo
>
getByMember
(
QueryTeamMemberRequest
request
)
{
public
List
<
TeamMemberListVo
>
getByMember
(
QueryTeamMemberRequest
request
)
{
List
<
TeamMemberListVo
>
list
=
relationDao
.
getByMember
(
request
);
List
<
TeamMemberListVo
>
list
=
relationDao
.
getByMember
(
request
);
for
(
TeamMemberListVo
teamMemberListVo
:
list
)
{
for
(
TeamMemberListVo
teamMemberListVo
:
list
)
{
BigDecimal
consume
=
taskService
.
queryConsume
(
teamMemberListVo
.
getProjectId
(),
teamMemberListVo
.
getId
(),
null
);
//当前消耗总工时
BigDecimal
consume
=
taskService
.
queryConsume
(
teamMemberListVo
.
getProjectId
(),
teamMemberListVo
.
getId
(),
null
,
null
);
teamMemberListVo
.
setConsume
(
consume
);
teamMemberListVo
.
setConsume
(
consume
);
//当前剩余总工时
BigDecimal
total
=
taskService
.
querySurplus
(
teamMemberListVo
.
getProjectId
(),
teamMemberListVo
.
getId
(),
null
);
BigDecimal
total
=
taskService
.
querySurplus
(
teamMemberListVo
.
getProjectId
(),
teamMemberListVo
.
getId
(),
null
);
teamMemberListVo
.
setTotal
(
total
);
teamMemberListVo
.
setTotal
(
total
);
}
}
...
...
olive-console/src/main/java/com/zrqx/olive/project/service/impl/TeamServiceImpl.java
浏览文件 @
17ad924f
...
@@ -69,9 +69,9 @@ public class TeamServiceImpl extends ServiceImpl<TeamDao, Team> implements Team
...
@@ -69,9 +69,9 @@ public class TeamServiceImpl extends ServiceImpl<TeamDao, Team> implements Team
aqr
.
setMemberNumber
(
selectList
.
size
());
aqr
.
setMemberNumber
(
selectList
.
size
());
}
}
teamRequest
.
add
(
aqr
);
teamRequest
.
add
(
aqr
);
BigDecimal
consume
=
taskService
.
queryConsume
(
team
.
getProjectId
(),
null
,
team
.
getDepartmentId
());
BigDecimal
consume
=
taskService
.
queryConsume
(
team
.
getProjectId
(),
null
,
team
.
getDepartmentId
()
,
null
);
if
(
consume
!=
null
)
{
if
(
consume
!=
null
)
{
team
.
setConsume
(
team
.
getTotal
().
subtract
(
consume
)
);
team
.
setConsume
(
consume
);
}
}
BigDecimal
querySurplus
=
taskService
.
querySurplus
(
team
.
getProjectId
(),
null
,
team
.
getDepartmentId
());
BigDecimal
querySurplus
=
taskService
.
querySurplus
(
team
.
getProjectId
(),
null
,
team
.
getDepartmentId
());
if
(
querySurplus
!=
null
)
{
if
(
querySurplus
!=
null
)
{
...
...
olive-console/src/main/java/com/zrqx/olive/ttask/dao/TaskDao.java
浏览文件 @
17ad924f
...
@@ -102,8 +102,14 @@ public interface TaskDao extends BaseMapper<Task> {
...
@@ -102,8 +102,14 @@ public interface TaskDao extends BaseMapper<Task> {
+
"<if test = 'userId!=null and userId!=\"\"'> "
+
"<if test = 'userId!=null and userId!=\"\"'> "
+
" AND a.user_id = #{userId} "
+
" AND a.user_id = #{userId} "
+
"</if>"
+
"</if>"
+
"<if test = 'presale==1'> "
+
" AND a.status = 2 "
+
"</if>"
+
"<if test = 'presale==2'> "
+
" AND a.status = 1 "
+
"</if>"
+
"</script>"
)
+
"</script>"
)
BigDecimal
queryConsume
(
String
id
,
Integer
userId
,
Integer
departmentId
);
BigDecimal
queryConsume
(
String
id
,
Integer
userId
,
Integer
departmentId
,
String
presale
);
@Select
(
"<script>"
@Select
(
"<script>"
+
" select sum(working_hours) FROM t_task a where 1=1 "
+
" select sum(working_hours) FROM t_task a where 1=1 "
+
"<if test = 'id!=null and id!=\"\"'> "
+
"<if test = 'id!=null and id!=\"\"'> "
...
...
olive-console/src/main/java/com/zrqx/olive/ttask/service/TaskService.java
浏览文件 @
17ad924f
...
@@ -41,7 +41,7 @@ public interface TaskService extends IService<Task> {
...
@@ -41,7 +41,7 @@ public interface TaskService extends IService<Task> {
CommonResult
<
Object
>
imporTask
(
MultipartFile
file
,
TaskForm
taskRequest
)
throws
BaseException
,
IOException
;
CommonResult
<
Object
>
imporTask
(
MultipartFile
file
,
TaskForm
taskRequest
)
throws
BaseException
,
IOException
;
BigDecimal
queryConsume
(
String
id
,
Integer
userId
,
Integer
departmentId
);
BigDecimal
queryConsume
(
String
id
,
Integer
userId
,
Integer
departmentId
,
String
presale
);
BigDecimal
querySurplus
(
String
id
,
Integer
userId
,
Integer
departmentId
);
BigDecimal
querySurplus
(
String
id
,
Integer
userId
,
Integer
departmentId
);
}
}
olive-console/src/main/java/com/zrqx/olive/ttask/service/imp/TaskServiceImpl.java
浏览文件 @
17ad924f
...
@@ -245,9 +245,9 @@ public class TaskServiceImpl extends ServiceImpl<TaskDao, Task> implements TaskS
...
@@ -245,9 +245,9 @@ public class TaskServiceImpl extends ServiceImpl<TaskDao, Task> implements TaskS
}
}
@Override
@Override
public
BigDecimal
queryConsume
(
String
id
,
Integer
userId
,
Integer
departmentId
)
{
public
BigDecimal
queryConsume
(
String
id
,
Integer
userId
,
Integer
departmentId
,
String
presale
)
{
return
dao
.
queryConsume
(
id
,
userId
,
departmentId
);
return
dao
.
queryConsume
(
id
,
userId
,
departmentId
,
presale
);
}
}
public
BigDecimal
querySurplus
(
String
id
,
Integer
userId
,
Integer
departmentId
)
{
public
BigDecimal
querySurplus
(
String
id
,
Integer
userId
,
Integer
departmentId
)
{
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论