Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
T
tasktime
Project
Project
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
Graph
比较
统计图
议题
0
议题
0
列表
看板
标记
Milestones
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
注册表
注册表
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
任建彩
tasktime
Commits
fa68b86e
提交
fa68b86e
authored
9月 03, 2021
作者:
任建彩
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
bug
上级
7c085701
显示空白字符变更
内嵌
并排
正在显示
5 个修改的文件
包含
11 行增加
和
11 行删除
+11
-11
TeamMemberRelationServiceImpl.java
...e/project/service/impl/TeamMemberRelationServiceImpl.java
+1
-1
TimeApplyChangeDao.java
...java/com/zrqx/olive/timeApply/dao/TimeApplyChangeDao.java
+4
-4
TimeApplyChangeServiceImpl.java
...ve/timeApply/service/impl/TimeApplyChangeServiceImpl.java
+2
-1
TaskController.java
.../java/com/zrqx/olive/ttask/controller/TaskController.java
+1
-0
TaskDao.java
...nsole/src/main/java/com/zrqx/olive/ttask/dao/TaskDao.java
+3
-5
没有找到文件。
olive-console/src/main/java/com/zrqx/olive/project/service/impl/TeamMemberRelationServiceImpl.java
浏览文件 @
fa68b86e
...
...
@@ -81,7 +81,7 @@ public class TeamMemberRelationServiceImpl extends ServiceImpl<TeamMemberRelatio
relation
.
setUploadTime
(
new
Date
());
relationDao
.
insert
(
relation
);
}
else
{
TeamMemberRelation
relation
=
new
TeamMemberRelation
(
);
TeamMemberRelation
relation
=
relationDao
.
selectById
(
request
.
getId
()
);
relation
.
setAccountId
(
request
.
getAccountId
());
relation
.
setRoleName
(
request
.
getRoleName
());
relation
.
setProjectId
(
request
.
getProjectId
());
...
...
olive-console/src/main/java/com/zrqx/olive/timeApply/dao/TimeApplyChangeDao.java
浏览文件 @
fa68b86e
...
...
@@ -19,7 +19,7 @@ import com.zrqx.olive.timeApply.vo.TimeApplyVo;
public
interface
TimeApplyChangeDao
extends
BaseMapper
<
TimeApplyChange
>{
String
PARAM_VALUE
=
"select c.id,a.id projectId,a.project,a.name,c.change_time,c.status1
changeStatus1,c.status2 changeS
tatus2"
String
PARAM_VALUE
=
"select c.id,a.id projectId,a.project,a.name,c.change_time,c.status1
,c.s
tatus2"
+
",DATE_FORMAT(c.create_time,'%Y-%m-%d %H:%i:%s') create_time,DATE_FORMAT(a.start_time,'%Y-%m-%d') start_time,"
+
"DATE_FORMAT(a.end_time,'%Y-%m-%d') end_time "
+
"from t_statistics_project a left join time_apply_change c on a.id = c.project_id where 1=1 "
;
...
...
@@ -27,21 +27,21 @@ public interface TimeApplyChangeDao extends BaseMapper<TimeApplyChange>{
@Select
(
"<script>"
+
PARAM_VALUE
+
" and (c.status1 = '0' or c.status2 = '3') "
+
" group by
c
.id "
+
" group by
a
.id "
+
"</script>"
)
List
<
TimeApplyVo
>
pageTimeApplyChange1
();
@Select
(
"<script>"
+
PARAM_VALUE
+
" and c.status1 = '0' "
+
" group by
c
.id "
+
" group by
a
.id "
+
"</script>"
)
List
<
TimeApplyVo
>
pageTimeApplyChange2
();
@Select
(
"<script>"
+
PARAM_VALUE
+
" and c.status2 = 3 "
+
" group by
c
.id "
+
" group by
a
.id "
+
"</script>"
)
List
<
TimeApplyVo
>
pageTimeApplyChange3
();
...
...
olive-console/src/main/java/com/zrqx/olive/timeApply/service/impl/TimeApplyChangeServiceImpl.java
浏览文件 @
fa68b86e
...
...
@@ -207,7 +207,8 @@ public class TimeApplyChangeServiceImpl extends ServiceImpl<TimeApplyChangeDao,T
PageHelper
.
startPage
(
pageParamRequest
.
getPage
(),
pageParamRequest
.
getLimit
());
List
<
TimeApplyChangeVo
>
list
=
new
ArrayList
<
TimeApplyChangeVo
>();
//获取登录人
String
value
=
(
String
)
request
.
getSession
().
getAttribute
(
"timeApplyMember"
);
String
value
=
systemAdminResponse
.
getAccount
();
if
(
"0"
.
equals
(
form
.
getStatus
())
&&
StringUtils
.
isNotBlank
(
value
))
{
if
(
"duan"
.
equals
(
value
))
{
list
=
timeApplyChangeMapper
.
selectTimeApplyChange
(
form
);
...
...
olive-console/src/main/java/com/zrqx/olive/ttask/controller/TaskController.java
浏览文件 @
fa68b86e
...
...
@@ -266,6 +266,7 @@ public class TaskController {
task
.
setUpdateTime
(
new
Date
());
task
.
setCreateTime
(
new
Date
());
qw
.
like
(
"id"
,
form
.
getTaskId
());
task
.
setCompleteTime
(
new
Date
());
taskService
.
updateById
(
task
);
// 保存附件到任务里
if
(
form
.
getFile
()
!=
null
)
{
...
...
olive-console/src/main/java/com/zrqx/olive/ttask/dao/TaskDao.java
浏览文件 @
fa68b86e
...
...
@@ -179,7 +179,7 @@ public interface TaskDao extends BaseMapper<Task> {
+
" AND a.project_id = #{id} "
+
"</if>"
+
"<if test = 'departmentId!=null and departmentId!=\"\"'> "
+
" AND a.department_id = #{
i
d} "
+
" AND a.department_id = #{
departmentI
d} "
+
"</if>"
+
"<if test = 'userId!=null and userId!=\"\"'> "
+
" AND a.user_id = #{userId} "
...
...
@@ -194,17 +194,15 @@ public interface TaskDao extends BaseMapper<Task> {
BigDecimal
queryConsume
(
String
id
,
Integer
userId
,
Integer
departmentId
,
String
presale
);
@Select
(
"<script>"
+
" select sum(working_hours) FROM t_task a where 1=1 "
+
" and (task_status=1 or task_status=2 or task_status=3)"
+
"<if test = 'id!=null and id!=\"\"'> "
+
" AND a.project_id = #{id} "
+
" and (task_status=1 or task_status=2)"
+
"</if>"
+
"<if test = 'departmentId!=null and departmentId!=\"\"'> "
+
" AND a.department_id = #{id} "
+
" and (task_status=1 or task_status=2)"
+
" AND a.department_id = #{departmentId} "
+
"</if>"
+
"<if test = 'userId!=null and userId!=\"\"'> "
+
" AND a.user_id = #{userId} "
+
" and (task_status=1 or task_status=2 or task_status=3)"
+
"</if>"
+
"</script>"
)
BigDecimal
querySurplus
(
String
id
,
Integer
userId
,
Integer
departmentId
);
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论