Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
X
xzxt-solr
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
常超
xzxt-solr
Commits
744a9511
Commit
744a9511
authored
Sep 24, 2019
by
xing_wang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
STORY #813 命案筛查,案件查询调整
parent
59d564e0
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
178 additions
and
6 deletions
+178
-6
src/main/java/com/cc/controller/SolrController.java
+22
-4
src/main/webapp/macx.jsp
+28
-2
src/main/webapp/static/rasc/css/queryList.css
+71
-0
src/main/webapp/static/rasc/js/tipbar.js
+57
-0
No files found.
src/main/java/com/cc/controller/SolrController.java
View file @
744a9511
...
...
@@ -1425,9 +1425,11 @@ public class SolrController {
if
(
"05"
.
equals
(
asjRyRelateVO
.
getSfbhcxaj
())){
asjQ
+=
" OR LAYWSJZT:05"
;
}
else
{
asjQ
+=
"
-(LAYWSJZT:05)
"
;
asjQ
+=
"
OR LAYWSJZT:05
"
;
}
}
else
{
asjQ
+=
" -(LAYWSJZT:05)"
;
}
//数据状态要多选,特殊处理
String
laywsjzt01
=
null
;
...
...
@@ -1442,9 +1444,20 @@ public class SolrController {
if
((
null
!=
asjRyRelateVO
.
getLaywsjzt01
()||
null
!=
asjRyRelateVO
.
getLaywsjzt02
()||
null
!=
asjRyRelateVO
.
getLaywsjzt07
())
&&(
null
!=
asjRyRelateVO
.
getZczjywsjzt00
()||
null
!=
asjRyRelateVO
.
getZczjywsjzt01
()||
null
!=
asjRyRelateVO
.
getZczjywsjzt02
()||
null
!=
asjRyRelateVO
.
getZczjywsjzt07
())){
if
(
null
!=
asjRyRelateVO
.
getZczjywsjzt00
()
&&
!
""
.
equals
(
asjRyRelateVO
.
getZczjywsjzt00
())){
zczjywsjzt
=
"((-ZCZJYWSJZT:* AND *:*) OR ZCZJYWSJZT:(00 "
;
asjQ
+=
" AND(LAYWSJZT:("
+
asjRyRelateVO
.
getLaywsjzt01
()+
" "
+
asjRyRelateVO
.
getLaywsjzt02
()+
" "
+
asjRyRelateVO
.
getLaywsjzt07
()+
")OR ZCZJYWSJZT:"
+
zczjywsjzt
+
asjRyRelateVO
.
getZczjywsjzt01
()+
" "
+
asjRyRelateVO
.
getZczjywsjzt02
()+
" "
+
asjRyRelateVO
.
getZczjywsjzt07
()+
")))"
;
if
(
null
!=
asjRyRelateVO
.
getSfbhcxaj
()
&&
!
""
.
equals
(
asjRyRelateVO
.
getSfbhcxaj
())){
asjQ
+=
" OR(LAYWSJZT:("
+
asjRyRelateVO
.
getLaywsjzt01
()+
" "
+
asjRyRelateVO
.
getLaywsjzt02
()+
" "
+
asjRyRelateVO
.
getLaywsjzt07
()+
")OR ZCZJYWSJZT:"
+
zczjywsjzt
+
asjRyRelateVO
.
getZczjywsjzt01
()+
" "
+
asjRyRelateVO
.
getZczjywsjzt02
()+
" "
+
asjRyRelateVO
.
getZczjywsjzt07
()+
")))"
;
}
else
{
asjQ
+=
" AND(LAYWSJZT:("
+
asjRyRelateVO
.
getLaywsjzt01
()+
" "
+
asjRyRelateVO
.
getLaywsjzt02
()+
" "
+
asjRyRelateVO
.
getLaywsjzt07
()+
")OR ZCZJYWSJZT:"
+
zczjywsjzt
+
asjRyRelateVO
.
getZczjywsjzt01
()+
" "
+
asjRyRelateVO
.
getZczjywsjzt02
()+
" "
+
asjRyRelateVO
.
getZczjywsjzt07
()+
")))"
;
}
}
else
{
asjQ
+=
" AND(LAYWSJZT:("
+
asjRyRelateVO
.
getLaywsjzt01
()+
" "
+
asjRyRelateVO
.
getLaywsjzt02
()+
" "
+
asjRyRelateVO
.
getLaywsjzt07
()+
")OR ZCZJYWSJZT:("
+
zczjywsjzt
+
" "
+
asjRyRelateVO
.
getZczjywsjzt01
()+
" "
+
asjRyRelateVO
.
getZczjywsjzt02
()+
" "
+
asjRyRelateVO
.
getZczjywsjzt07
()+
"))"
;
if
(
null
!=
asjRyRelateVO
.
getSfbhcxaj
()
&&
!
""
.
equals
(
asjRyRelateVO
.
getSfbhcxaj
())){
asjQ
+=
" OR(LAYWSJZT:("
+
asjRyRelateVO
.
getLaywsjzt01
()+
" "
+
asjRyRelateVO
.
getLaywsjzt02
()+
" "
+
asjRyRelateVO
.
getLaywsjzt07
()+
")OR ZCZJYWSJZT:("
+
zczjywsjzt
+
" "
+
asjRyRelateVO
.
getZczjywsjzt01
()+
" "
+
asjRyRelateVO
.
getZczjywsjzt02
()+
" "
+
asjRyRelateVO
.
getZczjywsjzt07
()+
"))"
;
}
else
{
asjQ
+=
" AND(LAYWSJZT:("
+
asjRyRelateVO
.
getLaywsjzt01
()+
" "
+
asjRyRelateVO
.
getLaywsjzt02
()+
" "
+
asjRyRelateVO
.
getLaywsjzt07
()+
")OR ZCZJYWSJZT:("
+
zczjywsjzt
+
" "
+
asjRyRelateVO
.
getZczjywsjzt01
()+
" "
+
asjRyRelateVO
.
getZczjywsjzt02
()+
" "
+
asjRyRelateVO
.
getZczjywsjzt07
()+
"))"
;
}
}
}
else
{
...
...
@@ -1458,7 +1471,12 @@ public class SolrController {
laywsjzt07
=
"07"
;
}
if
(
null
!=
asjRyRelateVO
.
getLaywsjzt01
()||
null
!=
asjRyRelateVO
.
getLaywsjzt02
()||
null
!=
asjRyRelateVO
.
getLaywsjzt07
()){
asjQ
+=
" AND LAYWSJZT:("
+
laywsjzt01
+
" "
+
laywsjzt02
+
" "
+
laywsjzt07
+
")"
;
if
(
null
!=
asjRyRelateVO
.
getSfbhcxaj
()
&&
!
""
.
equals
(
asjRyRelateVO
.
getSfbhcxaj
())){
asjQ
+=
" OR LAYWSJZT:("
+
laywsjzt01
+
" "
+
laywsjzt02
+
" "
+
laywsjzt07
+
")"
;
}
else
{
asjQ
+=
" AND LAYWSJZT:("
+
laywsjzt01
+
" "
+
laywsjzt02
+
" "
+
laywsjzt07
+
")"
;
}
}
if
(((
null
!=
asjRyRelateVO
.
getZczjywsjzt00
()
&&
!
""
.
equals
(
asjRyRelateVO
.
getZczjywsjzt00
()))&&(
null
!=
asjRyRelateVO
.
getZczjywsjzt01
()
&&
!
""
.
equals
(
asjRyRelateVO
.
getZczjywsjzt01
())))
...
...
src/main/webapp/macx.jsp
View file @
744a9511
...
...
@@ -45,6 +45,7 @@
<script
type=
"text/javascript"
src=
"static/rasc/js/navCategory_zj.js"
></script>
<script
type=
"text/javascript"
src=
"static/layer/layer.js"
></script>
<script
type=
"text/javascript"
src=
"static/rasc/js/ychy.js"
></script>
<script
type=
"text/javascript"
src=
"static/rasc/js/tipbar.js"
></script>
<!--水印-->
<script
src=
"static/js/watermark.js"
></script>
<style>
...
...
@@ -211,7 +212,7 @@
<input
type=
"checkbox"
showType=
"checkbox"
name=
"laywsjzt07"
id=
"laywsjzt07"
value=
"07"
><label
for=
"laywsjzt07"
>
立案已上报
</label>
</td>
<td
class=
"td_title"
style=
"text-align: left"
>
<input
type=
"checkbox"
showType=
"checkbox"
name=
"Sfbhcxaj"
id=
"sfbhcxaj"
value=
"00"
><label
for=
"Sfbhcxaj"
>
不
包含已撤销案件
</label>
<input
type=
"checkbox"
showType=
"checkbox"
name=
"Sfbhcxaj"
id=
"sfbhcxaj"
value=
"00"
><label
for=
"Sfbhcxaj"
>
包含已撤销案件
</label>
</td>
<td
class=
"td_title"
></td>
...
...
@@ -1872,7 +1873,11 @@
$
(
"#dGridContainer"
).
show
();
}
});
var
tipVisible
=
GetCookie
(
"tipVisible"
);
var
neverShow
=
GetCookie
(
"neverShow"
);
if
(
tipVisible
!=
"no"
&&
neverShow
!=
"no"
){
$
(
"#yhtsxx"
).
show
();
}
getSession
();
/**
* 获取登录信息水印
...
...
@@ -2456,5 +2461,25 @@
</script>
<div
class=
"backToTop"
title=
"返回顶部"
style=
"display: none;"
><img
src=
"static/rasc/images/gotop.png"
></div>
<!--用户提示-->
<div
id=
"yhtsxx"
style=
"display: none"
>
<div
class=
"wrap_mask"
id=
"wrap_mask_yhts"
></div>
<div
class=
"xtyhts_wrap"
id=
"xtyhts_wrap"
>
<h1>
提示
</h1>
<div
class=
"xtyhts_center"
>
<p>
1、命案筛查默认查询结果不包含已撤销的案件。
</p>
<p>
2、若查询已撤销案件,请勾选案件状态里的包含已撤销案件。
</p>
</div>
<div
class=
"btn_div"
><a
class=
"close_btn"
onclick=
'hideTip();noShow()'
>
我 知 道 了
</a><input
type=
'checkbox'
id=
'notip'
style=
"margin: 0 2px 0 28px;"
/><label
for=
'notip'
>
不再提示
</label></div>
</div>
</div>
</div>
<script
type=
"text/javascript"
>
//用户提示弹窗
function
hideTip
(){
$
(
"#wrap_mask_yhts"
).
fadeOut
();
$
(
"#xtyhts_wrap"
).
fadeOut
();
}
</script>
</body>
</html>
\ No newline at end of file
src/main/webapp/static/rasc/css/queryList.css
View file @
744a9511
...
...
@@ -262,3 +262,74 @@
height
:
30px
;
line-height
:
30px
;
}
/*用户提示弹窗样式*/
.wrap_mask
{
width
:
100%
;
height
:
100%
;
position
:
fixed
;
top
:
0
;
left
:
0
;
background-color
:
rgba
(
0
,
0
,
0
,
0.5
);
z-index
:
9998
;
}
.xtyhts_wrap
{
width
:
1000px
;
padding-bottom
:
25px
;
background-color
:
#fff
;
border-radius
:
10px
;
-moz-box-shadow
:
0
1px
3px
rgba
(
0
,
0
,
0
,
0.2
);
-o-box-shadow
:
0
1px
3px
rgba
(
0
,
0
,
0
,
0.2
);
box-shadow
:
0
1px
3px
rgba
(
0
,
0
,
0
,
0.2
);
-webkit-box-shadow
:
0
2px
10px
rgba
(
0
,
0
,
0
,
0.3
);
position
:
fixed
;
top
:
50%
;
left
:
50%
;
margin-top
:
-345px
;
margin-left
:
-450px
;
z-index
:
9999
;
}
.xtyhts_wrap
h1
{
width
:
100%
;
height
:
60px
;
line-height
:
60px
;
text-align
:
center
;
font-size
:
20px
;
border-bottom
:
1px
solid
#acc4cc
;
vertical-align
:
middle
;
}
.xtyhts_wrap
h1
img
{
vertical-align
:
middle
;
margin-right
:
6px
;
margin-bottom
:
3px
;
}
.xtyhts_center
{
width
:
90%
;
margin
:
0
auto
;
}
.xtyhts_wrap
p
{
font-size
:
16px
;
color
:
#000
;
line-height
:
34px
;
}
.xtyhts_wrap
p
.xtyhts_center_p
{
text-indent
:
2em
;
line-height
:
30px
;
}
.btn_div
{
width
:
100%
;
text-align
:
center
;
margin-top
:
35px
;
}
.xtyhts_wrap
.close_btn
{
display
:
inline-block
;
text-align
:
center
;
font-size
:
14px
;
padding
:
8px
12px
;
border
:
1px
solid
#ccc
;
border-radius
:
8px
;
background-color
:
#09f
;
color
:
#fff
;
}
.xtyhts_wrap
.close_btn
:hover
{
background-color
:
#048be4
;
}
src/main/webapp/static/rasc/js/tipbar.js
0 → 100644
View file @
744a9511
/**
* Created by zhaoshn on 2018/7/11.
*/
/*命案*/
function
noShow
(){
if
(
document
.
getElementById
(
"notip"
).
checked
){
SetCookie
(
"neverShow"
,
"no"
,{
expires
:
37230
});
}
}
/*命案部权案件撤销*/
function
bqajcxShow
(){
if
(
document
.
getElementById
(
"notip"
).
checked
){
SetCookie
(
"neverShowBqajcx"
,
"no"
,{
expires
:
37230
});
}
}
/*失踪人员*/
function
szryShow
(){
if
(
document
.
getElementById
(
"notip"
).
checked
){
SetCookie
(
"neverShowSzry"
,
"no"
,{
expires
:
36230
});
}
}
/*未知名尸体*/
/*function wzmstShow(){
if(document.getElementById("notip").checked){
SetCookie("neverShowWzmst","no",{expires:35230});
}
}*/
function
GetCookie
(
name
){
var
arr
=
document
.
cookie
.
match
(
new
RegExp
(
"(^| )"
+
name
+
"=([^;]*)(;|$)"
));
if
(
arr
!=
null
)
return
decodeURIComponent
(
arr
[
2
]);
return
null
;
}
function
SetCookie
(
name
,
value
,
options
){
var
expires
=
''
,
path
=
''
,
domain
=
''
,
secure
=
''
;
if
(
options
)
{
if
(
options
.
expires
&&
(
typeof
options
.
expires
==
'number'
||
options
.
expires
.
toUTCString
))
{
var
exp
;
if
(
typeof
options
.
expires
==
'number'
)
{
exp
=
new
Date
();
exp
.
setTime
(
exp
.
getTime
()
+
options
.
expires
*
24
*
60
*
60
*
1000
);
}
else
{
exp
=
options
.
expires
;
}
expires
=
';expires='
+
exp
.
toUTCString
();
}
path
=
options
.
path
?
'; path='
+
options
.
path
:
''
;
domain
=
options
.
domain
?
';domain='
+
options
.
domain
:
''
;
secure
=
options
.
secure
?
';secure'
:
''
;
}
document
.
cookie
=
[
name
,
'='
,
encodeURIComponent
(
value
),
expires
,
path
,
domain
,
secure
].
join
(
''
);
}
function
hideTip
(){
$
(
"#wrap_mask_yhts"
).
fadeOut
();
$
(
"#xtyhts_wrap"
).
fadeOut
();
}
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