登记时间修改

src/main/java/com/cc/controller/SolrController.java

@@ -8727,16 +8727,6 @@ public class SolrController {
 			wzmstQ += " AND DJSJ:[* TO " + asjRyRelateVO.getWzmstcx_djsjJssj()+"]";
 		}
 
-		if(null!=asjRyRelateVO.getWzmstcx_djsjKssj() && !"".equals(asjRyRelateVO.getWzmstcx_djsjKssj())){
-			if(null!=asjRyRelateVO.getWzmstcx_djsjJssj() && !"".equals(asjRyRelateVO.getWzmstcx_djsjJssj())) {
-				wzmstQ += " AND DJSJ:[" + asjRyRelateVO.getWzmstcx_djsjKssj() + " TO " + asjRyRelateVO.getWzmstcx_djsjJssj() + "]";
-			}else{
-				wzmstQ += " AND DJSJ:["+asjRyRelateVO.getWzmstcx_djsjKssj()+" TO "+"*]";
-			}
-		}else if(null!=asjRyRelateVO.getWzmstcx_djsjJssj() && !"".equals(asjRyRelateVO.getWzmstcx_djsjJssj())) {
-			wzmstQ += " AND DJSJ:[* TO " + asjRyRelateVO.getWzmstcx_djsjJssj()+"]";
-		}
-
 		if(null!=asjRyRelateVO.getZxsj01_xx() && !"".equals(asjRyRelateVO.getZxsj01_xx())){
 			if(null!=asjRyRelateVO.getZxsj01_sx() && !"".equals(asjRyRelateVO.getZxsj01_sx())) {
 				wzmstQ += " AND DJSJ:[" + asjRyRelateVO.getZxsj01_xx() + " TO " + asjRyRelateVO.getZxsj01_sx() + "]";
@@ -10193,12 +10183,17 @@ public class SolrController {
 				jsasjQ += " AND FXASJDD_XZQHMC:"+asjRyRelateVO.getFxasjdd_xzqhmc();
 			}
 		}
-		if(StringUtils.isNotBlank(jsasjQ)){
+		/*if(StringUtils.isNotBlank(jsasjQ)){
 			System.out.println(jsasjQ);
 			fqList.add(jsasjQ);
+		}*/
+		if(StringUtils.isNotBlank(jsasjQ)){
+			String fq = "{!join fromIndex=TB_XW_JBWZMST from=GLXX_XXZJBH to=ID}";
+			fq += jsasjQ.substring(16,jsasjQ.length());
+			System.out.println(fq);
+			fqList.add(fq);
 		}
 
-
 		System.out.println("过虑查询条件fqList==================="+fqList);
 		map.put("fqList",fqList);
 		return map;

src/main/webapp/wzmstcxcx.jsp

@@ -102,8 +102,8 @@
 														<td><p class="code-w"><input type="text" id="sldw_gajgjgdm" name="sldw_gajgjgdm" showtype="code" class="val easyui-combotree"  data-options="codetype: 'queryTypeCode?type=CODE_UNIT',multiple:true,method:'get',fit:true,textField : 'text', valueField : 'id'"/></p>
 														</td>
 														<td class="td_title">登记时间：</td>
-														<td><input id="jsasjDjsjKssj" name="jsasjDjsjKssj" order="1" type="text" showtype="date" showname="asjfssj" class="Wdate" onfocus="WdatePicker({maxDate:'#F{$dp.$D(\'jsasjDjsjJssj\')}',dateFmt:'yyyy-MM-dd'})"/>
-															-<input id="jsasjDjsjJssj" name="jsasjDjsjJssj" order="2" type="text" showtype="date" showname="asjfssj" class="Wdate" onfocus="WdatePicker({minDate:'#F{$dp.$D(\'jsasjDjsjKssj\')}',dateFmt:'yyyy-MM-dd'})"/></td>
+														<td><input id="jsasj_djsjKssj" name="jsasj_djsjKssj" order="1" type="text" showtype="date" showname="asjfssj" class="Wdate" onfocus="WdatePicker({maxDate:'#F{$dp.$D(\'jsasj_djsjJssj\')}',dateFmt:'yyyy-MM-dd'})"/>
+															-<input id="jsasj_djsjJssj" name="jsasj_djsjJssj" order="2" type="text" showtype="date" showname="asjfssj" class="Wdate" onfocus="WdatePicker({minDate:'#F{$dp.$D(\'jsasj_djsjKssj\')}',dateFmt:'yyyy-MM-dd'})"/></td>
 														<td class="td_title">主办人：</td>
 														<td><input type="text" class="input-sm form-control input-common" id="zbr_xm" name="zbr_xm"></td>
 													</tr>