Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
P
pms-ci-test
概览
概览
详情
活动
周期分析
版本库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
问题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程表
图表
维基
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
test-ci
pms-ci-test
Commits
1b165851
提交
1b165851
authored
7月 04, 2023
作者:
xiaowang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
修改包
上级
eed4af2d
隐藏空白字符变更
内嵌
并排
正在显示
1 个修改的文件
包含
23 行增加
和
16 行删除
+23
-16
BackstageTaskServiceImpl.java
...va/com/mmc/pms/service/impl/BackstageTaskServiceImpl.java
+23
-16
没有找到文件。
src/main/java/com/mmc/pms/service/impl/BackstageTaskServiceImpl.java
浏览文件 @
1b165851
...
...
@@ -58,7 +58,6 @@ public class BackstageTaskServiceImpl implements BackstageTaskService {
@Autowired
private
RedisTemplate
redisTemplate
;
@Override
public
ResultBody
addWorkService
(
ServiceVO
param
,
Integer
userAccountId
)
{
ServiceDO
serviceDO
=
new
ServiceDO
(
param
,
userAccountId
);
...
...
@@ -82,13 +81,16 @@ public class BackstageTaskServiceImpl implements BackstageTaskService {
}
@Override
public
ResultBody
<
ServiceDTO
>
queryById
(
Integer
id
,
HttpServletRequest
request
)
{
public
ResultBody
<
ServiceDTO
>
queryById
(
Integer
id
,
HttpServletRequest
request
)
{
ServiceDO
serviceDO
=
backstageTaskServiceDao
.
queryById
(
id
);
String
token
=
userAppApi
.
getCompanyInfoById
(
serviceDO
.
getCompanyId
(),
request
.
getHeader
(
"token"
));
String
token
=
userAppApi
.
getCompanyInfoById
(
serviceDO
.
getCompanyId
(),
request
.
getHeader
(
"token"
));
JSONObject
jsonObject
=
JSONObject
.
parseObject
(
token
);
CompanyInfoDTO
companyInfoDTO
=
JSON
.
parseObject
(
String
.
valueOf
((
JSONObject
)
jsonObject
.
get
(
"result"
)),
CompanyInfoDTO
.
class
);
CompanyInfoDTO
companyInfoDTO
=
JSON
.
parseObject
(
String
.
valueOf
((
JSONObject
)
jsonObject
.
get
(
"result"
)),
CompanyInfoDTO
.
class
);
String
companyName
=
companyInfoDTO
.
getCompanyName
();
ServiceDTO
serviceDTO
=
new
ServiceDTO
(
serviceDO
,
companyName
);
ServiceDTO
serviceDTO
=
new
ServiceDTO
(
serviceDO
,
companyName
);
Map
<
Integer
,
String
>
categoriesNameMap
=
getCategoriesNameByIds
(
Arrays
.
asList
(
serviceDTO
.
getApplicationId
(),
serviceDTO
.
getIndustryId
()));
...
...
@@ -102,8 +104,6 @@ public class BackstageTaskServiceImpl implements BackstageTaskService {
return
ResultBody
.
success
(
serviceDTO
);
}
private
Map
<
Integer
,
String
>
getCategoriesNameByIds
(
List
<
Integer
>
ids
)
{
if
(
CollectionUtils
.
isEmpty
(
ids
))
{
return
new
HashMap
<>();
...
...
@@ -121,7 +121,8 @@ public class BackstageTaskServiceImpl implements BackstageTaskService {
}
@Override
public
PageResult
queryServiceManagerList
(
ServiceQO
param
,
Integer
userAccountId
,
CompanyInfoVO
companyInfoVO
)
{
public
PageResult
queryServiceManagerList
(
ServiceQO
param
,
Integer
userAccountId
,
CompanyInfoVO
companyInfoVO
)
{
int
count
=
backstageTaskServiceDao
.
count
(
param
);
if
(
count
==
0
)
{
return
PageResult
.
buildPage
(
param
.
getPageNo
(),
param
.
getPageSize
(),
count
);
...
...
@@ -174,9 +175,9 @@ public class BackstageTaskServiceImpl implements BackstageTaskService {
return
PageResult
.
buildPage
(
param
.
getPageNo
(),
param
.
getPageSize
(),
count
);
}
List
<
ServiceDO
>
pageList
=
backstageTaskServiceDao
.
queryPageByLimit
(
param
,
categoriesIds
,
userIds
);
backstageTaskServiceDao
.
queryPageByLimit
(
param
,
categoriesIds
,
userIds
);
List
<
WorkServiceDTO
>
workServiceDTOList
=
getWorkServiceDTOS
(
pageList
,
request
);
List
<
WorkServiceDTO
>
workServiceDTOList
=
getWorkServiceDTOS
(
pageList
,
request
);
return
PageResult
.
buildPage
(
pageNo
,
param
.
getPageSize
(),
count
,
workServiceDTOList
);
}
...
...
@@ -203,20 +204,26 @@ public class BackstageTaskServiceImpl implements BackstageTaskService {
@Override
public
ResultBody
queryByIdCount
(
Integer
companyId
)
{
return
ResultBody
.
success
(
backstageTaskServiceDao
.
queryByIdCount
(
companyId
));
return
ResultBody
.
success
(
backstageTaskServiceDao
.
queryByIdCount
(
companyId
));
}
private
List
<
WorkServiceDTO
>
getWorkServiceDTOS
(
List
<
ServiceDO
>
pageList
,
HttpServletRequest
request
)
{
String
companyInfoVOS
=
userAppApi
.
listCompanyPage
(
new
CompanyInfoQO
(
1
,
100000
),
request
.
getHeader
(
"token"
)
);
private
List
<
WorkServiceDTO
>
getWorkServiceDTOS
(
List
<
ServiceDO
>
pageList
,
HttpServletRequest
request
)
{
String
companyInfoVOS
=
userAppApi
.
listCompanyPage
(
new
CompanyInfoQO
(
1
,
100000
),
request
.
getHeader
(
"token"
));
JSONObject
jsonObject
=
JSON
.
parseObject
(
companyInfoVOS
);
JSONObject
jsonObject1
=
JSON
.
parseObject
(
String
.
valueOf
(
jsonObject
.
get
(
"result"
)));
List
<
CompanyInfoVO
>
companyInfoList
=
new
Gson
().
fromJson
(
new
Gson
().
toJson
(
jsonObject1
.
get
(
"list"
)),
new
TypeToken
<
List
<
CompanyInfoVO
>>(){}.
getType
());
List
<
CompanyInfoVO
>
companyInfoList
=
new
Gson
()
.
fromJson
(
new
Gson
().
toJson
(
jsonObject1
.
get
(
"list"
)),
new
TypeToken
<
List
<
CompanyInfoVO
>>()
{}.
getType
());
String
companyName
=
""
;
List
<
WorkServiceDTO
>
workServiceDTOList
=
new
ArrayList
<>();
for
(
ServiceDO
item
:
pageList
)
{
for
(
CompanyInfoVO
companyInfoVO
:
companyInfoList
)
{
if
(
item
.
getCompanyId
().
equals
(
companyInfoVO
.
getId
())){
companyName
=
companyInfoVO
.
getCompanyName
();
if
(
item
.
getCompanyId
().
equals
(
companyInfoVO
.
getId
()))
{
companyName
=
companyInfoVO
.
getCompanyName
();
}
}
List
<
InspComtDO
>
inspComtDOS
=
generateComments
(
item
);
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论