Skip to content

X
xzxt-solr
Commit 27844717 by liu_xiaoxu
Options

老mis 人员查询、物品查询

parent 95efad69
Showing with 130 additions and 28 deletions
src/main/java/com/cc/controller/MisSolrController.java
......@@ -277,6 +277,64 @@ public class MisSolrController {
misAsjq += " AND CASETYPE:"+misAsjRyRelateVO.getCasetype();
}
}
if(null!=misAsjRyRelateVO.getCasetype_first() && !"".equals(misAsjRyRelateVO.getCasetype_first())){
if(misAsjRyRelateVO.getCasetype_first().indexOf(",") > 0){
String[] arrs = misAsjRyRelateVO.getCasetype_first().split(",");
String mgs = " AND (";
for (int i = 0; i < arrs.length; i++) {
if (i < arrs.length - 1) {
mgs += "CASETYPE_FIRST:" + arrs[i] + " OR ";
} else {
mgs += "CASETYPE_FIRST:" + arrs[i];
}
}
mgs += ")";
misAsjq += mgs;
}else{
misAsjq += " AND CASETYPE_FIRST:"+misAsjRyRelateVO.getCasetype_first();
}
}
if(null!=misAsjRyRelateVO.getCasetype_second() && !"".equals(misAsjRyRelateVO.getCasetype_second())){
if(misAsjRyRelateVO.getCasetype_second().indexOf(",") > 0){
String[] arrs = misAsjRyRelateVO.getCasetype_second().split(",");
String mgs = " AND (";
for (int i = 0; i < arrs.length; i++) {
if (i < arrs.length - 1) {
mgs += "CASETYPE_SECOND:" + arrs[i] + " OR ";
} else {
mgs += "CASETYPE_SECOND:" + arrs[i];
}
}
mgs += ")";
misAsjq += mgs;
}else{
misAsjq += " AND CASETYPE_SECOND:"+misAsjRyRelateVO.getCasetype_second();
}
}
if(null!=misAsjRyRelateVO.getCasetype_third() && !"".equals(misAsjRyRelateVO.getCasetype_third())){
if(misAsjRyRelateVO.getCasetype_third().indexOf(",") > 0){
String[] arrs = misAsjRyRelateVO.getCasetype_third().split(",");
String mgs = " AND (";
for (int i = 0; i < arrs.length; i++) {
if (i < arrs.length - 1) {
mgs += "CASETYPE_THIRD:" + arrs[i] + " OR ";
} else {
mgs += "CASETYPE_THIRD:" + arrs[i];
}
}
if(null!=misAsjRyRelateVO.getCasetypemc()&& !"".equals(misAsjRyRelateVO.getCasetypemc())){
if("null".equals(misAsjRyRelateVO.getCasetypemc())){
misAsjq += " AND -CASETYPEMC:*";
}else{
misAsjq += " AND CASETYPEMC:*"+misAsjRyRelateVO.getCasetypemc()+"*";
}
}
mgs += ")";
misAsjq += mgs;
}else{
misAsjq += " AND CASETYPE_THIRD:"+misAsjRyRelateVO.getCasetype_third();
}
}
if(null!=misAsjRyRelateVO.getCasearea() && !"".equals(misAsjRyRelateVO.getCasearea())){
if(misAsjRyRelateVO.getCasearea().indexOf(",") > 0){
String[] arrs = misAsjRyRelateVO.getCasearea().split(",");
......@@ -385,7 +443,7 @@ public class MisSolrController {
if("null".equals(misAsjRyRelateVO.getCasetimef_date())){
misAsjq += " AND -CASETIMEF_DATE:*";
}else{
misAsjq += " AND CASETIMEF_DATE:*"+misAsjRyRelateVO.getCasetimef_date()+"*";
misAsjq += " AND CASETIMEF_DATE:*"+misAsjRyRelateVO.getCasetimef_date().substring(0,7)+"*";
}
}
if(null!=misAsjRyRelateVO.getRegisterunit_gajgjgdm_first() && !"".equals(misAsjRyRelateVO.getRegisterunit_gajgjgdm_first())){
......@@ -495,7 +553,7 @@ public class MisSolrController {
if("null".equals(misAsjRyRelateVO.getRegisterdate_date())){
misAsjq += " AND -REGISTERDATE_DATE:*";
}else{
misAsjq += " AND REGISTERDATE_DATE:*"+misAsjRyRelateVO.getRegisterdate_date()+"*";
misAsjq += " AND REGISTERDATE_DATE:*"+misAsjRyRelateVO.getRegisterdate_date().substring(0,7)+"*";
}
}
//死亡人数
......@@ -834,6 +892,8 @@ public class MisSolrController {
misAsjq += " AND CASEID:*"+misAsjRyRelateVO.getCaseid()+"*";
}
}
//案件类别
if(null!=misAsjRyRelateVO.getCasetype() && !"".equals(misAsjRyRelateVO.getCasetype())){
if(misAsjRyRelateVO.getCasetype().indexOf(",") > 0){
String[] arrs = misAsjRyRelateVO.getCasetype().split(",");
......@@ -851,27 +911,65 @@ public class MisSolrController {
misAsjq += " AND CASETYPE:"+misAsjRyRelateVO.getCasetype();
}
}
if(null!=misAsjRyRelateVO.getCasetype_first()&& !"".equals(misAsjRyRelateVO.getCasetype_first())){
if("null".equals(misAsjRyRelateVO.getCasetype_first())){
misAsjq += " AND -CASETYPE_FIRST:*";
if(null!=misAsjRyRelateVO.getCasetype_first() && !"".equals(misAsjRyRelateVO.getCasetype_first())){
if(misAsjRyRelateVO.getCasetype_first().indexOf(",") > 0){
String[] arrs = misAsjRyRelateVO.getCasetype_first().split(",");
String mgs = " AND (";
for (int i = 0; i < arrs.length; i++) {
if (i < arrs.length - 1) {
mgs += "CASETYPE_FIRST:" + arrs[i] + " OR ";
} else {
mgs += "CASETYPE_FIRST:" + arrs[i];
}
}
mgs += ")";
misAsjq += mgs;
}else{
misAsjq += " AND CASETYPE_FIRST:*"+misAsjRyRelateVO.getCasetype_first()+"*";
misAsjq += " AND CASETYPE_FIRST:"+misAsjRyRelateVO.getCasetype_first();
}
}
if(null!=misAsjRyRelateVO.getCasetype_second()&& !"".equals(misAsjRyRelateVO.getCasetype_second())){
if("null".equals(misAsjRyRelateVO.getCasetype_second())){
misAsjq += " AND -CASETYPE_SECOND:*";
if(null!=misAsjRyRelateVO.getCasetype_second() && !"".equals(misAsjRyRelateVO.getCasetype_second())){
if(misAsjRyRelateVO.getCasetype_second().indexOf(",") > 0){
String[] arrs = misAsjRyRelateVO.getCasetype_second().split(",");
String mgs = " AND (";
for (int i = 0; i < arrs.length; i++) {
if (i < arrs.length - 1) {
mgs += "CASETYPE_SECOND:" + arrs[i] + " OR ";
} else {
mgs += "CASETYPE_SECOND:" + arrs[i];
}
}
mgs += ")";
misAsjq += mgs;
}else{
misAsjq += " AND CASETYPE_SECOND:*"+misAsjRyRelateVO.getCasetype_second()+"*";
misAsjq += " AND CASETYPE_SECOND:"+misAsjRyRelateVO.getCasetype_second();
}
}
if(null!=misAsjRyRelateVO.getCasetype_third()&& !"".equals(misAsjRyRelateVO.getCasetype_third())){
if("null".equals(misAsjRyRelateVO.getCasetype_third())){
misAsjq += " AND -CASETYPE_THIRD:*";
if(null!=misAsjRyRelateVO.getCasetype_third() && !"".equals(misAsjRyRelateVO.getCasetype_third())){
if(misAsjRyRelateVO.getCasetype_third().indexOf(",") > 0){
String[] arrs = misAsjRyRelateVO.getCasetype_third().split(",");
String mgs = " AND (";
for (int i = 0; i < arrs.length; i++) {
if (i < arrs.length - 1) {
mgs += "CASETYPE_THIRD:" + arrs[i] + " OR ";
} else {
mgs += "CASETYPE_THIRD:" + arrs[i];
}
}
if(null!=misAsjRyRelateVO.getCasetypemc()&& !"".equals(misAsjRyRelateVO.getCasetypemc())){
if("null".equals(misAsjRyRelateVO.getCasetypemc())){
misAsjq += " AND -CASETYPEMC:*";
}else{
misAsjq += " AND CASETYPEMC:*"+misAsjRyRelateVO.getCasetypemc()+"*";
}
}
mgs += ")";
misAsjq += mgs;
}else{
misAsjq += " AND CASETYPE_THIRD:*"+misAsjRyRelateVO.getCasetype_third()+"*";
misAsjq += " AND CASETYPE_THIRD:"+misAsjRyRelateVO.getCasetype_third();
}
}
if(null!=misAsjRyRelateVO.getCasearea() && !"".equals(misAsjRyRelateVO.getCasearea())){
if(misAsjRyRelateVO.getCasearea().indexOf(",") > 0){
String[] arrs = misAsjRyRelateVO.getCasearea().split(",");
......@@ -1484,13 +1582,7 @@ public class MisSolrController {
misBarq += " AND BAR_SEXMC:"+misAsjRyRelateVO.getBar_sexmc();
}
}
if(null!=misAsjRyRelateVO.getBar_sex() && !"".equals(misAsjRyRelateVO.getBar_sex())){
if("null".equals(misAsjRyRelateVO.getBar_sex())){
misBarq += " AND -SEX:*";
}else{
misBarq += " AND SEX:"+misAsjRyRelateVO.getBar_sex();
}
}
//出生日期
if(null!=misAsjRyRelateVO.getBar_birthdayxx() && !"".equals(misAsjRyRelateVO.getBar_birthdayxx())){
if(null!=misAsjRyRelateVO.getBar_birthdaysx() && !"".equals(misAsjRyRelateVO.getBar_birthdaysx())) {
......@@ -1670,6 +1762,7 @@ public class MisSolrController {
misAsjq += " AND CASESTATUS:"+misAsjRyRelateVO.getCasestatus();
}
}
if(null!=misAsjRyRelateVO.getBrief() && !"".equals(misAsjRyRelateVO.getBrief())){
if("null".equals(misAsjRyRelateVO.getBrief())){
misAsjq += " AND -BRIEF:*";
......
src/main/java/com/cc/model/MisAsjRyRelateVO.java
......@@ -128,6 +128,7 @@ public class MisAsjRyRelateVO {
private String captureamount ;
private String ordernumb ;
private String casestatus ;
private String casestatusmc ;
private String scroutunit ;
private String oldnumbers ;
private String findway ;
......@@ -2118,6 +2119,14 @@ public class MisAsjRyRelateVO {
this.casestatus = casestatus;
}
public String getCasestatusmc() {
return casestatusmc;
}
public void setCasestatusmc(String casestatusmc) {
this.casestatusmc = casestatusmc;
}
public String getScroutunit() {
return scroutunit;
}
......
src/main/webapp/misajrycx.jsp
......@@ -1214,13 +1214,13 @@
var text = "";
if(groupid.indexOf("CASETYPE")!=-1){
text="案件类别";
id="CASETYPE";
id="CASETYPE_FIRST";
}else if(groupid.indexOf("CASETIMEF")!=-1){
text="案发日期";
id="CASETIMEF";
id="CASETIMEF_YEAR";
}else if(groupid.indexOf("REGISTERDATE")!=-1){
text="立案日期";
id="REGISTERDATE";
id="REGISTERDATE_YEAR";
}else if(groupid.indexOf("REGISTERUNIT_GAJG")!=-1){
text="立案单位";
id="REGISTERUNIT_GAJG";
......
src/main/webapp/misajwpcx.jsp
......@@ -1147,16 +1147,16 @@
var text = "";
if(groupid.indexOf("CASETIMEF")!=-1){
text="案发日期";
id="CASETIMEF";
id="CASETIMEF_YEAR";
}else if(groupid.indexOf("REGISTERDATE")!=-1){
text="立案日期";
id="REGISTERDATE";
id="REGISTERDATE_YEAR";
}else if(groupid=="CASEAREAMC"){
text = "发案地区";
id="CASEAREAMC";
}else if(groupid=="REGISTERUNIT_GAJGJGDM"){
}else if(groupid=="CASETYPE"){
text = "案件类别";
id="REGISTERUNIT_GAJGJGDM";
id="CASETYPE_FIRST";
}else if(groupid=="REGISTERUNIT_GAJGJGDM_FIRST"){
text = "立案单位";
id="REGISTERUNIT_GAJGJGDM_FIRST";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment