Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
T
tasktime
Project
Project
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
Graph
比较
统计图
议题
0
议题
0
列表
看板
标记
Milestones
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
注册表
注册表
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
任建彩
tasktime
Commits
44716688
提交
44716688
authored
9月 10, 2021
作者:
任建彩
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
优化
上级
a38c85b5
隐藏空白字符变更
内嵌
并排
正在显示
6 个修改的文件
包含
44 行增加
和
16 行删除
+44
-16
ProjectController.java
.../com/zrqx/olive/project/controller/ProjectController.java
+6
-1
StatisticsProjectDao.java
...java/com/zrqx/olive/project/dao/StatisticsProjectDao.java
+9
-1
StatisticsProjectService.java
.../zrqx/olive/project/service/StatisticsProjectService.java
+10
-0
StatisticsProjectServiceImpl.java
...ve/project/service/impl/StatisticsProjectServiceImpl.java
+8
-6
TeamServiceImpl.java
.../com/zrqx/olive/project/service/impl/TeamServiceImpl.java
+8
-8
TimeApplyChangeDao.java
...java/com/zrqx/olive/timeApply/dao/TimeApplyChangeDao.java
+3
-0
没有找到文件。
olive-console/src/main/java/com/zrqx/olive/project/controller/ProjectController.java
浏览文件 @
44716688
...
...
@@ -30,6 +30,7 @@ import com.zrqx.olive.project.request.StatisticsProjectRequest;
import
com.zrqx.olive.project.service.ProjectRecordService
;
import
com.zrqx.olive.project.service.StatisticsProjectService
;
import
com.zrqx.olive.project.vo.ProjectListVo
;
import
com.zrqx.olive.project.vo.ProjectListVo1
;
import
com.zrqx.olive.project.vo.ProjectRecordListVo
;
import
com.zrqx.olive.project.vo.ProjectVo
;
import
com.zrqx.olive.system.response.SystemAdminResponse
;
...
...
@@ -133,7 +134,11 @@ public class ProjectController {
public
CommonResult
<
CommonPage
<
ProjectListVo
>>
query
(
QueryProjectRequest
form
,
PageParamRequest
pageParamRequest
){
return
CommonResult
.
success
(
CommonPage
.
restPage
(
service
.
page
(
form
,
pageParamRequest
)));
}
@ApiOperation
(
value
=
"查询全部项目"
,
notes
=
"分页查询"
)
@GetMapping
(
value
=
"/projectList"
)
public
CommonResult
<
List
<
ProjectListVo1
>>
list
(
QueryProjectRequest
form
){
return
CommonResult
.
success
(
service
.
list
(
form
));
}
@ApiOperation
(
value
=
"查询项目"
,
notes
=
"查询项目"
)
@RequestMapping
(
value
=
"/listProject"
,
method
=
RequestMethod
.
GET
)
@ApiImplicitParam
(
name
=
"customerId"
,
value
=
"客户ID"
)
...
...
olive-console/src/main/java/com/zrqx/olive/project/dao/StatisticsProjectDao.java
浏览文件 @
44716688
...
...
@@ -9,10 +9,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import
com.zrqx.olive.project.model.StatisticsProject
;
import
com.zrqx.olive.project.request.QueryProjectRequest
;
import
com.zrqx.olive.project.vo.ProjectListVo
;
import
com.zrqx.olive.project.vo.ProjectListVo1
;
public
interface
StatisticsProjectDao
extends
BaseMapper
<
StatisticsProject
>
{
@Select
(
"<script>"
+
"select id,project,customer_id,name,status,DATE_FORMAT(start_time,'%Y-%m-%d') start_time,total_apply_time total,"
+
"select id,project,customer
,customer
_id,name,status,DATE_FORMAT(start_time,'%Y-%m-%d') start_time,total_apply_time total,"
+
"DATE_FORMAT(end_time,'%Y-%m-%d') end_time,px,presale,to_be_allocated FROM t_statistics_project where 1=1 "
// 项目负责人
+
"<if test = 'form.name !=\"\" and form.name !=null'> "
...
...
@@ -37,5 +38,12 @@ public interface StatisticsProjectDao extends BaseMapper<StatisticsProject> {
+
"SELECT max(px) FROM t_statistics_project "
+
"</script>"
)
Integer
selectByMaxSort
();
@Select
(
"<script>"
+
"select id,project,px FROM t_statistics_project where 1=1 "
+
"<if test = 'form.project !=\"\" and form.project !=null'> "
+
"AND project like concat('%',#{form.project},'%')"
+
"</if>"
+
"</script>"
)
List
<
ProjectListVo1
>
list
(
QueryProjectRequest
form
);
}
olive-console/src/main/java/com/zrqx/olive/project/service/StatisticsProjectService.java
浏览文件 @
44716688
...
...
@@ -10,6 +10,7 @@ import com.zrqx.olive.project.request.QueryProjectRequest;
import
com.zrqx.olive.project.request.SaveProjectRequest
;
import
com.zrqx.olive.project.request.StatisticsProjectRequest
;
import
com.zrqx.olive.project.vo.ProjectListVo
;
import
com.zrqx.olive.project.vo.ProjectListVo1
;
import
com.zrqx.olive.project.vo.ProjectVo
;
import
com.zrqx.olive.system.response.SystemAdminResponse
;
...
...
@@ -59,5 +60,14 @@ public interface StatisticsProjectService extends IService<StatisticsProject> {
* @date 2021年8月16日
*/
List
<
StatisticsProjectRequest
>
listProject
(
String
customerId
);
/**
* 查询全部
* @Title: StatisticsProjectService.java
* @Package com.zrqx.olive.project.service
* @Description: TODO
* @author 任建彩
* @date 2021年9月8日
*/
List
<
ProjectListVo1
>
list
(
QueryProjectRequest
form
);
}
olive-console/src/main/java/com/zrqx/olive/project/service/impl/StatisticsProjectServiceImpl.java
浏览文件 @
44716688
...
...
@@ -34,6 +34,7 @@ import com.zrqx.olive.project.request.SaveProjectRequest;
import
com.zrqx.olive.project.request.StatisticsProjectRequest
;
import
com.zrqx.olive.project.service.StatisticsProjectService
;
import
com.zrqx.olive.project.vo.ProjectListVo
;
import
com.zrqx.olive.project.vo.ProjectListVo1
;
import
com.zrqx.olive.project.vo.ProjectVo
;
import
com.zrqx.olive.system.response.SystemAdminResponse
;
import
com.zrqx.olive.timeApply.dao.TimeApplyChangeDao
;
...
...
@@ -62,17 +63,12 @@ public class StatisticsProjectServiceImpl extends ServiceImpl<StatisticsProjectD
public
PageInfo
<
ProjectListVo
>
page
(
QueryProjectRequest
form
,
PageParamRequest
pageParamRequest
)
{
//开启分页
if
(
pageParamRequest
.
getOrderBy
()==
null
)
{
pageParamRequest
.
setOrderBy
(
"
px desc,upload_time
desc"
);
pageParamRequest
.
setOrderBy
(
"
start_time desc,px
desc"
);
}
Page
<
StatisticsProject
>
startPage
=
PageHelper
.
startPage
(
pageParamRequest
.
getPage
(),
pageParamRequest
.
getLimit
(),
pageParamRequest
.
getOrderBy
());
List
<
ProjectListVo
>
list
=
mapper
.
queryProjectPage
(
form
);
for
(
ProjectListVo
projectListVo
:
list
)
{
Customer
customer
=
dao
.
selectById
(
projectListVo
.
getCustomerId
());
if
(
customer
!=
null
)
{
projectListVo
.
setCustomer
(
customer
.
getCustomer
());
projectListVo
.
setStatus_Name
(
ProjectStatusEnum
.
getName
(
projectListVo
.
getStatus
()));
}
//项目的消耗总工时
BigDecimal
consume
=
taskService
.
queryConsume
(
projectListVo
.
getId
(),
null
,
null
,
projectListVo
.
getPresale
());
if
(
consume
!=
null
)
{
...
...
@@ -208,4 +204,10 @@ public class StatisticsProjectServiceImpl extends ServiceImpl<StatisticsProjectD
}
return
statisticsProjectRequest
;
}
@Override
public
List
<
ProjectListVo1
>
list
(
QueryProjectRequest
form
)
{
// TODO Auto-generated method stub
return
mapper
.
list
(
form
)
;
}
}
olive-console/src/main/java/com/zrqx/olive/project/service/impl/TeamServiceImpl.java
浏览文件 @
44716688
...
...
@@ -59,6 +59,14 @@ public class TeamServiceImpl extends ServiceImpl<TeamDao, Team> implements Team
List
<
Team
>
list
=
teamDao
.
selectList
(
qw
);
if
(
list
.
size
()>
0
)
{
for
(
Team
team
:
list
)
{
BigDecimal
consume
=
taskService
.
queryConsume
(
team
.
getProjectId
(),
null
,
team
.
getDepartmentId
(),
null
);
if
(
consume
!=
null
)
{
team
.
setConsume
(
consume
);
}
BigDecimal
querySurplus
=
taskService
.
querySurplus
(
team
.
getProjectId
(),
null
,
team
.
getDepartmentId
());
if
(
querySurplus
!=
null
)
{
team
.
setSurplus
(
team
.
getTotal
().
subtract
(
querySurplus
));
}
TeamRequest
aqr
=
new
TeamRequest
();
BeanUtils
.
copyProperties
(
team
,
aqr
);
aqr
.
setUploadTime
(
DateUtils
.
dateTimeToStr
(
team
.
getUploadTime
()));
...
...
@@ -69,14 +77,6 @@ public class TeamServiceImpl extends ServiceImpl<TeamDao, Team> implements Team
aqr
.
setMemberNumber
(
selectList
.
size
());
}
teamRequest
.
add
(
aqr
);
BigDecimal
consume
=
taskService
.
queryConsume
(
team
.
getProjectId
(),
null
,
team
.
getDepartmentId
(),
null
);
if
(
consume
!=
null
)
{
team
.
setConsume
(
consume
);
}
BigDecimal
querySurplus
=
taskService
.
querySurplus
(
team
.
getProjectId
(),
null
,
team
.
getDepartmentId
());
if
(
querySurplus
!=
null
)
{
team
.
setSurplus
(
team
.
getTotal
().
subtract
(
querySurplus
));
}
}
}
return
new
PageInfo
<
TeamRequest
>(
teamRequest
);
...
...
olive-console/src/main/java/com/zrqx/olive/timeApply/dao/TimeApplyChangeDao.java
浏览文件 @
44716688
...
...
@@ -133,6 +133,7 @@ public interface TimeApplyChangeDao extends BaseMapper<TimeApplyChange>{
+
" and status2 = 5"
+
"</if>"
+
"</if>"
+
" order by c.create_time desc"
+
"</script>"
)
List
<
TimeApplyChangeVo
>
selectTimeApplyChange
(
@Param
(
"form"
)
TimeApplyChangeForm
form
);
...
...
@@ -144,6 +145,7 @@ public interface TimeApplyChangeDao extends BaseMapper<TimeApplyChange>{
+
"<if test = 'form.status == 3'>"
+
" and status2 = 3 "
+
"</if>"
+
" order by c.create_time desc"
+
"</script>"
)
List
<
TimeApplyChangeVo
>
pageTimeApply1
(
@Param
(
"form"
)
TimeApplyChangeForm
form
);
...
...
@@ -155,6 +157,7 @@ public interface TimeApplyChangeDao extends BaseMapper<TimeApplyChange>{
+
"<if test = 'form.status == 3'>"
+
" and status2 = 3 "
+
"</if>"
+
" order by c.create_time desc"
+
"</script>"
)
List
<
TimeApplyChangeVo
>
pageTimeApply2
(
@Param
(
"form"
)
TimeApplyChangeForm
form
);
@Select
(
"<script>"
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论