Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
D
device-back
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
1
议题
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
Matrix
device-back
Commits
b2dd7a69
提交
b2dd7a69
authored
8月 04, 2021
作者:
133
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[清退] update task title
上级
31ef9a1d
隐藏空白字符变更
内嵌
并排
正在显示
1 个修改的文件
包含
4 行增加
和
4 行删除
+4
-4
RepelBusinessServiceImpl.java
...evice/sendback/service/impl/RepelBusinessServiceImpl.java
+4
-4
没有找到文件。
dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/impl/RepelBusinessServiceImpl.java
浏览文件 @
b2dd7a69
...
@@ -213,7 +213,7 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
...
@@ -213,7 +213,7 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
long
time
=
System
.
currentTimeMillis
();
long
time
=
System
.
currentTimeMillis
();
Integer
count
=
deviceLibraryService
.
countAllRepel
(
deviceRepel
.
getFieldingIds
(),
unitsService
.
findBySubordinateUnitName
(
units1
.
getUnitId
()),
seqNumbers
,
lifeStatus
);
Integer
count
=
deviceLibraryService
.
countAllRepel
(
deviceRepel
.
getFieldingIds
(),
unitsService
.
findBySubordinateUnitName
(
units1
.
getUnitId
()),
seqNumbers
,
lifeStatus
);
if
(
count
!=
0
)
{
if
(
count
!=
0
)
{
TaskBto
taskBto1
=
cityRepelTask
(
unisId
,
deviceRepelDetailService
.
saveDeviceRepelDetail
(
deviceRepelDetail
).
getId
(),
units1
.
getName
()
+
"清退
型号为"
+
StringSplitUtil
.
stringListToString
(
deviceRepel
.
getModels
().
stream
()
TaskBto
taskBto1
=
cityRepelTask
(
unisId
,
deviceRepelDetailService
.
saveDeviceRepelDetail
(
deviceRepelDetail
).
getId
(),
"["
+
units1
.
getName
()+
"]"
+
"
型号为"
+
StringSplitUtil
.
stringListToString
(
deviceRepel
.
getModels
().
stream
()
.
distinct
()
.
distinct
()
.
collect
(
Collectors
.
toList
()))
+
"设备"
,
taskBto
.
getId
(),
userId
);
.
collect
(
Collectors
.
toList
()))
+
"设备"
,
taskBto
.
getId
(),
userId
);
list
.
add
(
new
RepelTaskStatistical
(
deviceRepel1
.
getId
(),
taskBto
.
getId
(),
taskBto1
.
getId
(),
0
,
area1
.
getName
(),
repelStatusJudgeCount
(
deviceRepel
.
getRepelStatus
(),
count
),
""
));
list
.
add
(
new
RepelTaskStatistical
(
deviceRepel1
.
getId
(),
taskBto
.
getId
(),
taskBto1
.
getId
(),
0
,
area1
.
getName
(),
repelStatusJudgeCount
(
deviceRepel
.
getRepelStatus
(),
count
),
""
));
...
@@ -232,7 +232,7 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
...
@@ -232,7 +232,7 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
deviceRepelDetail
.
setRepelType
(
2
);
deviceRepelDetail
.
setRepelType
(
2
);
Integer
count
=
deviceLibraryService
.
countAllRepel
(
deviceRepel
.
getFieldingIds
(),
directlUnderUnitNames
,
seqNumbers
,
lifeStatus
);
Integer
count
=
deviceLibraryService
.
countAllRepel
(
deviceRepel
.
getFieldingIds
(),
directlUnderUnitNames
,
seqNumbers
,
lifeStatus
);
if
(
directlUnderUnit
.
get
()
&&
count
!=
0
)
{
if
(
directlUnderUnit
.
get
()
&&
count
!=
0
)
{
TaskBto
taskBto2
=
directlyUnderTask
(
units
.
getUnitId
(),
deviceRepelDetailService
.
saveDeviceRepelDetail
(
deviceRepelDetail
).
getId
(),
taskBto
.
getId
(),
"
省直属单位清退
型号为"
+
StringSplitUtil
.
stringListToString
(
deviceRepel
.
getModels
().
stream
()
TaskBto
taskBto2
=
directlyUnderTask
(
units
.
getUnitId
(),
deviceRepelDetailService
.
saveDeviceRepelDetail
(
deviceRepelDetail
).
getId
(),
taskBto
.
getId
(),
"
[省直属相关单位]
型号为"
+
StringSplitUtil
.
stringListToString
(
deviceRepel
.
getModels
().
stream
()
.
distinct
()
.
distinct
()
.
collect
(
Collectors
.
toList
()))
+
"设备"
,
userId
);
.
collect
(
Collectors
.
toList
()))
+
"设备"
,
userId
);
list
.
add
(
new
RepelTaskStatistical
(
deviceRepel1
.
getId
(),
taskBto
.
getId
(),
taskBto2
.
getId
(),
0
,
"省直属"
,
repelStatusJudgeCount
(
deviceRepel
.
getRepelStatus
(),
count
),
""
));
list
.
add
(
new
RepelTaskStatistical
(
deviceRepel1
.
getId
(),
taskBto
.
getId
(),
taskBto2
.
getId
(),
0
,
"省直属"
,
repelStatusJudgeCount
(
deviceRepel
.
getRepelStatus
(),
count
),
""
));
...
@@ -248,7 +248,7 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
...
@@ -248,7 +248,7 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
count
=
deviceLibraryService
.
countAllRepel
(
deviceRepel
.
getFieldingIds
(),
strings
,
seqNumbers
,
lifeStatus
);
count
=
deviceLibraryService
.
countAllRepel
(
deviceRepel
.
getFieldingIds
(),
strings
,
seqNumbers
,
lifeStatus
);
log
.
info
(
"[清退] 本级装备件数{}"
,
count
);
log
.
info
(
"[清退] 本级装备件数{}"
,
count
);
if
(
correspondingLevel
.
get
()
&&
count
!=
0
)
{
if
(
correspondingLevel
.
get
()
&&
count
!=
0
)
{
TaskBto
taskBto1
=
oneselfTask
(
units
.
getUnitId
(),
deviceRepelDetailService
.
saveDeviceRepelDetail
(
deviceRepelDetail1
).
getId
(),
taskBto
.
getId
(),
"
省本级清退
型号为"
+
StringSplitUtil
.
stringListToString
(
deviceRepel
.
getModels
().
stream
()
TaskBto
taskBto1
=
oneselfTask
(
units
.
getUnitId
(),
deviceRepelDetailService
.
saveDeviceRepelDetail
(
deviceRepelDetail1
).
getId
(),
taskBto
.
getId
(),
"
[省本级]
型号为"
+
StringSplitUtil
.
stringListToString
(
deviceRepel
.
getModels
().
stream
()
.
distinct
()
.
distinct
()
.
collect
(
Collectors
.
toList
()))
+
"设备"
,
userId
);
.
collect
(
Collectors
.
toList
()))
+
"设备"
,
userId
);
list
.
add
(
new
RepelTaskStatistical
(
deviceRepel1
.
getId
(),
taskBto
.
getId
(),
taskBto1
.
getId
(),
0
,
"省本级"
,
repelStatusJudgeCount
(
deviceRepel
.
getRepelStatus
(),
count
),
""
));
list
.
add
(
new
RepelTaskStatistical
(
deviceRepel1
.
getId
(),
taskBto
.
getId
(),
taskBto1
.
getId
(),
0
,
"省本级"
,
repelStatusJudgeCount
(
deviceRepel
.
getRepelStatus
(),
count
),
""
));
...
@@ -308,7 +308,7 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
...
@@ -308,7 +308,7 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
}
}
DeviceRepel
deviceRepel1
=
deviceRepelService
.
saveDeviceRepel
(
deviceRepel
);
DeviceRepel
deviceRepel1
=
deviceRepelService
.
saveDeviceRepel
(
deviceRepel
);
TaskBto
taskBto
=
cityTotalTask
(
units
.
getUnitId
(),
deviceRepel1
.
getId
(),
units
.
getName
()
+
"清退
型号为"
+
StringSplitUtil
.
stringListToString
(
deviceRepel
.
getModels
().
stream
()
TaskBto
taskBto
=
cityTotalTask
(
units
.
getUnitId
(),
deviceRepel1
.
getId
(),
"["
+
units
.
getName
()+
"]"
+
"
型号为"
+
StringSplitUtil
.
stringListToString
(
deviceRepel
.
getModels
().
stream
()
.
distinct
()
.
distinct
()
.
collect
(
Collectors
.
toList
()))
+
"设备统计任务"
,
taskId
,
userId
);
.
collect
(
Collectors
.
toList
()))
+
"设备统计任务"
,
taskId
,
userId
);
// addMessage(new MessageBto(taskBto.getId(),taskBto.getBusinessType(),user.getName()+"转发清退任务["+deviceRepel1.getTitle()+"]",gainThisUser(userId,units.getUnitId())));
// addMessage(new MessageBto(taskBto.getId(),taskBto.getBusinessType(),user.getName()+"转发清退任务["+deviceRepel1.getTitle()+"]",gainThisUser(userId,units.getUnitId())));
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论