Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
B
bigdatainterservice
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
曹鹏
bigdatainterservice
Commits
8d248499
Commit
8d248499
authored
Aug 15, 2019
by
wangling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
伴随结果接口添加任务状态
parent
9d030483
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
22 additions
and
116 deletions
+22
-116
src/main/java/com/founder/interservice/mapper/xzxt/TrackTogetherMapper.java
+1
-1
src/main/java/com/founder/interservice/tracktraveltogether/controller/TrackTogetherContoller.java
+7
-0
src/main/java/com/founder/interservice/tracktraveltogether/service/TrackTogetherService.java
+1
-0
src/main/java/com/founder/interservice/tracktraveltogether/service/impl/TrackTogetherServiceImpl.java
+5
-0
src/main/resources/mybatis/mapper/xzxt/TrackTogetkerTaskMapper.xml
+5
-0
src/main/resources/static/js/skhsJgzs.js
+3
-115
No files found.
src/main/java/com/founder/interservice/mapper/xzxt/TrackTogetherMapper.java
View file @
8d248499
...
...
@@ -25,5 +25,5 @@ public interface TrackTogetherMapper {
//删除时空伴随任务
int
deleteTrackTogetkerTaskByTaskId
(
String
taskId
);
TrackTogetherTask
queryTaskByTaskid
(
String
taskId
);
}
src/main/java/com/founder/interservice/tracktraveltogether/controller/TrackTogetherContoller.java
View file @
8d248499
...
...
@@ -424,7 +424,9 @@ public class TrackTogetherContoller {
@RequestParam
(
value
=
"rows"
,
defaultValue
=
"0"
)
int
rows
){
Map
<
String
,
Object
>
resultMap
=
new
HashMap
<>();
List
<
RegionalTaskResultDetail
>
detailList
=
new
ArrayList
<>();
TrackTogetherTask
togetherTask
=
new
TrackTogetherTask
();
int
totalCount
=
0
;
String
state
=
""
;
try
{
EasyUIPage
easyUIPage
=
new
EasyUIPage
();
easyUIPage
.
setPage
(
page
);
...
...
@@ -438,6 +440,7 @@ public class TrackTogetherContoller {
}
detailList
=
trackTogetherService
.
getTogetherResultDetailList
(
taskParam
);
totalCount
=
trackTogetherService
.
getTogetherResultDetailListTotalCount
(
taskParam
);
togetherTask
=
trackTogetherService
.
queryTaskByTaskid
(
taskParam
.
getTaskId
());
if
(
null
!=
detailList
&&
detailList
.
size
()
>
0
)
{
for
(
RegionalTaskResultDetail
tsaf
:
detailList
)
{
String
zjhm
=
tsaf
.
getZjhm
();
...
...
@@ -465,8 +468,12 @@ public class TrackTogetherContoller {
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
}
if
(!
""
.
equals
(
togetherTask
.
getState
())
&&
togetherTask
.
getState
()
!=
null
){
state
=
togetherTask
.
getState
();
}
resultMap
.
put
(
"total"
,
totalCount
);
resultMap
.
put
(
"rows"
,
detailList
);
resultMap
.
put
(
"state"
,
state
);
return
resultMap
;
}
/**
...
...
src/main/java/com/founder/interservice/tracktraveltogether/service/TrackTogetherService.java
View file @
8d248499
...
...
@@ -55,4 +55,5 @@ public interface TrackTogetherService {
public
String
getIMSIFromNum
(
String
num
);
TrackTogetherTask
queryTaskByTaskid
(
String
taskId
);
}
src/main/java/com/founder/interservice/tracktraveltogether/service/impl/TrackTogetherServiceImpl.java
View file @
8d248499
...
...
@@ -569,4 +569,9 @@ public class TrackTogetherServiceImpl implements TrackTogetherService {
}
return
imsi
;
}
@Override
public
TrackTogetherTask
queryTaskByTaskid
(
String
taskId
)
{
return
trackTogetherMapper
.
queryTaskByTaskid
(
taskId
);
}
}
src/main/resources/mybatis/mapper/xzxt/TrackTogetkerTaskMapper.xml
View file @
8d248499
...
...
@@ -65,4 +65,8 @@
<delete
id=
"deleteTrackTogetkerTaskByTaskId"
parameterType=
"String"
>
delete from TB_ST_TRACKTOGETHERTASK where task_id=#{taskId}
</delete>
<!--时空伴随任务删除-->
<select
id=
"queryTaskByTaskid"
parameterType=
"String"
resultType=
"com.founder.interservice.tracktraveltogether.model.TrackTogetherTask"
>
select * from TB_ST_TRACKTOGETHERTASK where task_id=#{taskId}
</select>
</mapper>
\ No newline at end of file
src/main/resources/static/js/skhsJgzs.js
View file @
8d248499
...
...
@@ -138,14 +138,8 @@ function doQueryFL(){
var
flStr
=
""
;
if
(
index2
==
'BZHLX'
){
flStr
=
"标识号类型"
;
}
else
if
(
index2
==
'XB'
){
flStr
=
"性别"
;
}
else
if
(
index2
==
'RYBQ'
){
flStr
=
"人员背景"
;
}
else
if
(
index2
==
'SFBS'
){
flStr
=
"是否本市"
;
}
else
if
(
index2
==
'CSRQ'
){
flStr
=
"出生日期"
;
}
else
if
(
index2
==
'SJHMGSD'
){
flStr
=
"手机号码归属地"
;
}
else
if
(
index2
==
'SJHMYYS'
){
...
...
@@ -169,29 +163,7 @@ function doQueryFL(){
);
}
if
(
index2
==
'CSRQ'
){
//出生日期单独循环newNavInfo
//把年,年月,年月日的内容拼接出来
var
y
=
""
;
dataCsrq
=
data
[
index2
];
$
.
each
(
data
[
index2
],
function
(
i
,
item
)
{
var
str
=
item
.
NAMES
+
"("
+
item
.
COUNTS
+
")"
;
if
(
item
.
VALS
.
length
==
4
){
y
+=
"<a class='newNavA' style='text-decoration:none;' href='javascript:void(0)' onclick=flclick(this,'"
+
item
.
NAMES
+
"','"
+
index2
+
"','"
+
item
.
VALS
+
"')>"
+
str
+
"</a>"
;
}
});
if
(
y
!=
""
)
{
debugger
;
$
(
"#newNavbody"
+
index2
).
append
(
"<div class='newNavInfo' isshowed='false' id='flnr"
+
index2
+
"y'>"
+
"<div class='newClear'></div>"
+
y
+
"</div>"
);
}
}
else
if
(
index2
==
'SJHMGSD'
){
if
(
index2
==
'SJHMGSD'
){
//单独循环SFBS
var
sfbs
=
""
;
dataSfbs
=
data
[
index2
];
...
...
@@ -363,55 +335,7 @@ function doQueryqk(){
function
flclick
(
obj
,
value
,
index
,
object_type
,
levels
){
$
(
".newNavbody"
).
addClass
(
"pb"
);
//点击之后分类框body为空固定高度
if
(
index
==
"CSRQ"
)
{
var
m
=
""
;
var
d
=
""
;
$
.
each
(
dataCsrq
,
function
(
i
,
item
)
{
var
str
=
item
.
NAMES
+
"("
+
item
.
COUNTS
+
")"
;
str
=
str
.
replace
(
'年'
,
'-'
);
str
=
str
.
replace
(
'月'
,
'-'
);
if
(
item
.
VALS
.
length
==
7
&&
item
.
VALS
.
substring
(
0
,
4
)
==
value
){
m
+=
"<a class='newNavA' style='text-decoration:none;' href='javascript:void(0)' onclick=flclick(this,'"
+
item
.
NAMES
+
"','"
+
index
+
"','"
+
item
.
VALS
+
"')>"
+
str
+
"</a>"
;
}
else
if
(
item
.
VALS
.
length
==
10
&&
item
.
VALS
.
substring
(
0
,
7
)
==
value
){
d
+=
"<a class='newNavA' style='text-decoration:none;' href='javascript:void(0)' onclick=flclick(this,'"
+
item
.
NAMES
+
"','"
+
index
+
"','"
+
item
.
VALS
+
"')>"
+
str
+
"</a>"
;
}
});
if
(
m
!=
""
)
{
$
(
"#flnr"
+
index
+
"m"
).
remove
();
//删除div每次新append
$
(
"#newNavbody"
+
index
).
append
(
"<div class='newNavInfo-m' style='display: none;' id='flnr"
+
index
+
"m'>"
+
"<div class='newClear'></div>"
+
m
+
"</div>"
);
//点击年时候 显示对应的“<<值”
$
(
obj
).
parents
(
".newNavbody"
).
find
(
".current-icon"
).
eq
(
0
).
show
();
$
(
obj
).
parents
(
".newNavbody"
).
find
(
".current-text"
).
eq
(
0
).
html
(
value
);
}
if
(
d
!=
""
){
$
(
"#flnr"
+
index
+
"d"
).
remove
();
$
(
"#newNavbody"
+
index
).
append
(
"<div class='newNavInfo-d' style='display: none;' id='flnr"
+
index
+
"d'>"
+
"<div class='newClear'></div>"
+
d
+
"</div>"
);
//点击月时候 显示对应的“<<值”
value
=
value
.
replace
(
"年"
,
"-"
)
$
(
obj
).
parents
(
".newNavbody"
).
find
(
".current-icon"
).
eq
(
1
).
show
();
$
(
obj
).
parents
(
".newNavbody"
).
find
(
".current-text"
).
eq
(
1
).
html
(
value
);
}
if
(
value
.
length
==
10
){
//点击日时候 显示对应的“<<值”
$
(
obj
).
parents
(
".newNavbody"
).
find
(
".current-icon"
).
eq
(
2
).
show
();
value
=
value
.
replace
(
"年"
,
"-"
)
value
=
value
.
replace
(
"月"
,
"-"
)
$
(
obj
).
parents
(
".newNavbody"
).
find
(
".current-text"
).
eq
(
2
).
html
(
value
);
}
//点击出生日期的分类时候移除固定高度
$
(
obj
).
parents
(
".newNavbody"
).
removeClass
(
"pb"
);
}
else
if
(
index
==
"SJHMGSD"
){
if
(
index
==
"SJHMGSD"
){
$
(
obj
).
parents
(
".newNavbody"
).
find
(
".current-icon"
).
eq
(
levels
).
show
();
$
(
obj
).
parents
(
".newNavbody"
).
find
(
".current-text"
).
eq
(
levels
).
html
(
value
);
var
fbs
=
""
;
...
...
@@ -459,7 +383,7 @@ function flclick(obj,value,index,object_type,levels){
}
/**/
$
(
".newLayoutDiv"
).
siblings
().
hide
();
//分类选中之后,隐藏其他内容
if
(
index
==
"CSRQ"
||
fbs
!=
""
){
if
(
fbs
!=
""
){
//点击年 分类框body显示对应的月份
if
(
$
(
obj
).
parents
(
".newNavInfo"
).
length
==
1
||
$
(
obj
).
parents
(
".newNavMoreInfo"
).
length
==
1
)
{
$
(
obj
).
parents
(
".newNavbody"
).
find
(
".newNavInfo"
).
hide
();
...
...
@@ -473,10 +397,6 @@ function flclick(obj,value,index,object_type,levels){
}
if
(
index
==
"BZHLX"
){
$
(
"#objectType"
).
val
(
object_type
);
}
else
if
(
index
==
"CSRQ"
){
$
(
"#birthday"
).
val
(
object_type
);
}
else
if
(
index
==
"XB"
){
$
(
"#sex"
).
val
(
object_type
);
}
else
if
(
index
==
"RYBQ"
){
var
qkgw
=
object_type
.
split
(
','
);
$
(
"#sfFzxyr"
).
val
(
qkgw
[
0
]);
...
...
@@ -523,10 +443,6 @@ function goBackMd(obj,index){
if
(
$
(
obj
).
prev
(
".newNavA"
).
text
()
==
'手机号码归属地导航'
){
$
(
"#sjhmgsd"
).
val
(
val
);
$
(
"#sjhmgsdsj"
).
val
(
0
);
}
else
if
(
$
(
obj
).
prev
(
".newNavA"
).
text
()
==
'出生日期导航'
){
val
=
val
.
replace
(
/-/
,
'年'
);
val
=
val
.
replace
(
'-'
,
'月'
);
$
(
"#birthday"
).
val
(
val
);
}
doQuery
();
}
...
...
@@ -665,34 +581,6 @@ function goSlide(thisObj){
newNavbody
.
find
(
".newNavInfo-m"
).
toggleClass
(
"newNavMoreInfo"
);
}
}
/*//添加区域快点击事件
$(".work-mark-wrap li").click(function(){
$(this).addClass("picked").siblings().removeClass("picked");
});*/
//行点击事件 //去掉行点击事件
/*
function clickRow(rowIndex, rowData, value){
//清楚其它行添加的样式
$(".work-mark-wrap li").removeClass("picked");
//获取区域字段,并进行处理
var regionlist = rowData.regionlist;
if (null != regionlist && "" != regionlist && regionlist.length > 0) {
regionlist = regionlist.substring(1,regionlist.length-1);
var regionArr = regionlist.split(",");
for(var i in regionArr){
var nameValue = regionArr[i].replace(/\"/g,"").trim();
//区域名称相等的时候,给li添加选中的样式
$("td[name='regionName']").each(function(){
var name = $(this).text();
if (nameValue == name){
$(this).parents("li").addClass("picked");
}
})
}
}
}
*/
/*推荐人员、车辆弹框*/
function
showDialog
(
tjType
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment