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
6d5610f0
Commit
6d5610f0
authored
May 18, 2019
by
吴善钰
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/master'
parents
22ee818f
50b10b58
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
65 additions
and
2 deletions
+65
-2
src/main/java/com/founder/interservice/bkxx/model/Bkxx.java
+3
-0
src/main/java/com/founder/interservice/bkxx/service/impl/BkServiceImpl.java
+0
-0
src/main/java/com/founder/interservice/ryhx/controller/RyhxController.java
+32
-0
src/main/resources/static/js/bkxxInsert.js
+6
-1
src/main/webapp/WEB-INF/jsp/bkxx/bkxxInsert.jsp
+2
-1
src/main/webapp/WEB-INF/jsp/ryhx/gxqxx.jsp
+22
-0
No files found.
src/main/java/com/founder/interservice/bkxx/model/Bkxx.java
View file @
6d5610f0
...
...
@@ -50,4 +50,7 @@ public class Bkxx {
private
String
xxly
;
//信息来源,如果是民警手动录入的,则默认给录入人姓名,如果是系统自动加入布控,则给布控任务的布控对象号码
private
String
xxlytype
;
//信息来源type,01,表示民警录入,02,表示系统关联自动加入
private
String
sqr_gajgjgdm
;
private
String
sqr_gajgjgmc
;
}
src/main/java/com/founder/interservice/bkxx/service/impl/BkServiceImpl.java
View file @
6d5610f0
This diff is collapsed.
Click to expand it.
src/main/java/com/founder/interservice/ryhx/controller/RyhxController.java
View file @
6d5610f0
...
...
@@ -363,9 +363,41 @@ public class RyhxController {
relationList
=
removeJSonObject
(
relationList
);
}
}
TbStCqhotel
tbStCqhotel
=
null
;
List
<
TbStCqhotel
>
listHotel
=
new
ArrayList
<>();
List
<
TbStCqhotelData
>
listHotelData
=
null
;
//本人住店信息
List
<
TbStCqhotelData
>
listOtherHotelData
=
new
ArrayList
<>();
//本人所有同住人信息
try
{
if
(
zjhm
!=
null
&&
!
""
.
equals
(
zjhm
))
{
//旅店住宿信息
listHotelData
=
ryhxService
.
queryHotelRzxx
(
zjhm
);
if
(
listHotelData
!=
null
&&
listHotelData
.
size
()
>
0
)
{
for
(
TbStCqhotelData
tbStCqhotelData
:
listHotelData
)
{
String
hotelno
=
tbStCqhotelData
.
getHotelno
();
String
rzsj
=
tbStCqhotelData
.
getRzsj
();
String
roomno
=
tbStCqhotelData
.
getRoomno
();
//疑似落脚点(旅店信息)
if
(
null
!=
hotelno
&&
!
""
.
equals
(
hotelno
))
{
tbStCqhotel
=
ryhxService
.
queryHotelAddr
(
hotelno
);
listHotel
.
add
(
tbStCqhotel
);
}
//根据旅店信息,查询同住人员信息
if
(
null
!=
tbStCqhotel
)
{
//当前酒店同住人员信息
List
<
TbStCqhotelData
>
listOneHotelData
=
ryhxService
.
queryHotelxx
(
zjhm
,
hotelno
,
rzsj
,
roomno
);
listOtherHotelData
.
addAll
(
listOneHotelData
);
}
}
}
}
}
catch
(
Exception
e
){
e
.
printStackTrace
();
}
ModelAndView
modelAndView
=
new
ModelAndView
(
"ryhx/gxqxx"
);
modelAndView
.
addObject
(
"relationList"
,
relationList
);
modelAndView
.
addObject
(
"relationnum"
,
relationList
.
size
());
modelAndView
.
addObject
(
"listOtherHotelData"
,
listOtherHotelData
);
//同住人员住宿信息
modelAndView
.
addObject
(
"listOtherHotelDatacount"
,
listOtherHotelData
.
size
());
//同住人员住宿信息
modelAndView
.
addObject
(
"zjhm"
,
zjhm
);
return
modelAndView
;
}
...
...
src/main/resources/static/js/bkxxInsert.js
View file @
6d5610f0
...
...
@@ -123,7 +123,12 @@
if
(
data
.
data
.
id
==
"0"
){
$
.
messager
.
alert
({
title
:
'提示'
,
msg
:
'保存失败'
});
}
else
if
(
data
.
data
.
id
==
null
){
$
.
messager
.
alert
({
title
:
'提示'
,
msg
:
'数据已存在,不可重复提交'
});
if
(
data
.
data
.
maxCount
!=
null
){
$
.
messager
.
alert
({
title
:
'提示'
,
msg
:
'已超过最大布控/追踪数'
});
}
else
{
$
.
messager
.
alert
({
title
:
'提示'
,
msg
:
'数据已存在,不可重复提交'
});
}
}
else
{
$
.
messager
.
alert
({
title
:
'提示'
,
msg
:
'保存成功'
});
}
...
...
src/main/webapp/WEB-INF/jsp/bkxx/bkxxInsert.jsp
View file @
6d5610f0
...
...
@@ -202,7 +202,8 @@
<input type="hidden" id="xxly" name="xxly" value="${bkxx.xxly}"/>
<input type="hidden" id="xxlytype" name="xxlytype" value="${bkxx.xxlytype}"/>
<input type="hidden" id="djsj" name="djsj" value="${djsjStr}"/>
<input type="hidden" id="sqr_gajgjgdm" name="sqr_gajgjgdm" value="${bkxx.sqr_gajgjgdm}"/>
<input type="hidden" id="sqr_gajgjgmc" name="sqr_gajgjgmc" value="${bkxx.sqr_gajgjgmc}"/>
</td>
</tr>
</tbody>
...
...
src/main/webapp/WEB-INF/jsp/ryhx/gxqxx.jsp
View file @
6d5610f0
...
...
@@ -35,6 +35,28 @@
</div>
</div>
</c:if>
<c:forEach
var=
"tzxx"
items=
"${listOtherHotelData}"
>
<c:if
test=
"${not empty listOtherHotelData}"
>
<div
class=
"new1 tabs-o animated pulse"
>
<span
class=
"tbs-title"
>
同住人
</span>
<div
class=
"tbs-cont"
>
<div
class=
"fl count"
onclick=
"tips(this)"
>
${tzxx.xm}
</div>
<div
class=
"fl ajbh"
>
${tzxx.idcode}
</div>
</div>
</div>
</c:if>
</c:forEach>
<c:if
test=
"${empty listOtherHotelData}"
>
<div
class=
"new1 tabs-o animated pulse"
style=
"margin-top: -298px;"
>
<span
class=
"tbs-title"
style=
"font-size:14px; margin-left: 13px;"
>
提示
</span>
<div
class=
"tbs-cont"
>
<div
class=
"fl count"
onclick=
"tips(this)"
>
${listOtherHotelDatacount}
</div>
<div
class=
"fl ajbh"
>
<span
style=
"font-size:16px; margin-left: 22px;"
>
暂无查询结果
</span>
</div>
</div>
</div>
</c:if>
</div>
<script
type=
"text/javascript"
src=
"/js/jquery-1.11.3.js"
></script>
<script
type=
"text/javascript"
src=
"/common/layer/layer.js"
></script>
...
...
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