Merge remote-tracking branch 'remotes/origin/dev_neimeng' into dev_neimeng

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

@@ -37,12 +37,13 @@ public class RecordController {
 
         if(null == recordService.queryRybhRecord(users.getIdentitycard())){
             record.setUserid(users.getIdentitycard());
-            record.setAj_record("案事件编号:id,案件名称:ajmc,侦查阶段:zcjdmc,业务状态:sj" +
-                    "zt,案件类别:ajlbdmmc,案件时间:ajxgsj,立案单位:ladw_gajgmc,简要案情:jyaq");
+            record.setAj_record("案事件编号:id,案件名称:ajmc,侦查阶段:zcjdmc,业务状态:sjzt,案件类别:ajlbdmmc,案件时间:ajxgsj,立案单位:ladw_gajgmc,简要案情:jyaq");
             record.setXyr_record("案事件编号:asjbh,证件号码:cyzj_zjhm,姓名:xm,性别:xbdmmc,民族:mzmc,户籍地行政区划:hjdz_xzqhmc,现住地行政区划:xzz_xzqhmc,到案状态:zhfzxyr_fzxyrdaztmc");
             record.setRybh_record("案事件编号:asjbh,证件号码:cyzj_zjhm,姓名:xm,性别:xbdmmc,民族:mzmc,户籍地行政区划:hjdz_xzqhmc,人身侵犯结果:rsqfjgmc,人身伤害程度:rsshcdmc");
             record.setAjzlz_record("案事件编号:caseid,案件类别:casetype,发案区域:casearea,案件时间:casetimef,案件状态:casestatus,立案单位:registerunit,简要案情:brief");
-            record.setMisxyr_record("案事件编号:caseid,姓名:name");
+            record.setMisxyr_record("案事件编号:caseid,姓名:name,性别:sex,口音:accent,国籍:nation,民族:folk,身份证号:idcardnumb,指纹编号:fingerprintnumb");
+            record.setMisshr_record("案事件编号:caseid,姓名:name,性别:sex,出生日期:birthday,单位:unit,住址详情:addrdetail,伤害程度:harmgread,户籍地址:hjdetail");
+            record.setMisbar_record("案事件编号:caseid,姓名:name,性别:sex,出生日期:birthday,住址详情:addre,身份证号:idcardnumb,电话:phone,报案方式:reportmethod");
             recordService.insertRecord(record);
         }else{
             record = recordService.queryRybhRecord(users.getIdentitycard());

src/main/java/com/cc/model/MisAsjRyRelateVO.java

@@ -210,14 +210,7 @@ public class MisAsjRyRelateVO {
 
     //案件现场照片
 
-    //报案人
-    private String	addrf	;
-    private String	addre	;
-    private String	bbcall	;
-    private String	reportmethod	;
-    private String	hjaddrf	;
-    private String	hjaddre	;
-    private String	age	;
+
 
     //车辆
     private String	cartype	;
@@ -269,25 +262,47 @@ public class MisAsjRyRelateVO {
     private String	namedetail	;
     private String	spellname	;
 
+    //报案人
+    private String	bar_name;
+    private String	bar_sex;
+    private String	bar_birthday;
+    private String	bar_idcardnumb;
+    private String	bar_phone;
+    private String	bar_tag;
+    private String	addrf	;
+    private String	addre	;
+    private String	bbcall	;
+    private String	reportmethod	;
+    private String	hjaddrf	;
+    private String	hjaddre	;
+    private String	age	;
 
     //受害人
+    private String	shr_name;
+    private String	shr_sex;
+    private String	shr_birthday;
+    private String	shr_unit;
+    private String	bhr_bpcall;
+    private String	bhr_phone;
+    private String	bhr_tag;
     private String	birthday	;
     private String	address	;
     private String	addrdetail	;
     private String	harmgread	;
     private String	registeraddress	;
-    private String	bpcall	;
-    private String	phone	;
     private String	remark	;
     private String	comereason	;
     private String	hjdetail	;
 
     //嫌疑人
+    private String	xyr_idcardnumb;
+    private String	xyr_unit;
+    private String	xyr_tag;
     private String	serial	;
     private String	name	;
     private String	alias	;
     private String	accent	;
-    private String	sex	;
+    private String	xyr_sex	;
     private String	ageupperlimit	;
     private String	agefloorlimit	;
     private String	highupperlimit	;
@@ -297,7 +312,6 @@ public class MisAsjRyRelateVO {
     private String	standing	;
     private String	nation	;
     private String	folk	;
-    private String	idcardnumb	;
     private String	wfjl	;
     private String	hjaddress	;
     private String	hjaddressdetail	;
@@ -311,6 +325,142 @@ public class MisAsjRyRelateVO {
     private String	otherspeciality	;
     private String	actioncharactor	;
 
+    public String getBar_name() {
+        return bar_name;
+    }
+
+    public void setBar_name(String bar_name) {
+        this.bar_name = bar_name;
+    }
+
+    public String getBar_sex() {
+        return bar_sex;
+    }
+
+    public void setBar_sex(String bar_sex) {
+        this.bar_sex = bar_sex;
+    }
+
+    public String getBar_birthday() {
+        return bar_birthday;
+    }
+
+    public void setBar_birthday(String bar_birthday) {
+        this.bar_birthday = bar_birthday;
+    }
+
+    public String getBar_idcardnumb() {
+        return bar_idcardnumb;
+    }
+
+    public void setBar_idcardnumb(String bar_idcardnumb) {
+        this.bar_idcardnumb = bar_idcardnumb;
+    }
+
+    public String getBar_phone() {
+        return bar_phone;
+    }
+
+    public void setBar_phone(String bar_phone) {
+        this.bar_phone = bar_phone;
+    }
+
+    public String getBar_tag() {
+        return bar_tag;
+    }
+
+    public void setBar_tag(String bar_tag) {
+        this.bar_tag = bar_tag;
+    }
+
+    public String getShr_name() {
+        return shr_name;
+    }
+
+    public void setShr_name(String shr_name) {
+        this.shr_name = shr_name;
+    }
+
+    public String getShr_sex() {
+        return shr_sex;
+    }
+
+    public void setShr_sex(String shr_sex) {
+        this.shr_sex = shr_sex;
+    }
+
+    public String getShr_birthday() {
+        return shr_birthday;
+    }
+
+    public void setShr_birthday(String shr_birthday) {
+        this.shr_birthday = shr_birthday;
+    }
+
+    public String getShr_unit() {
+        return shr_unit;
+    }
+
+    public void setShr_unit(String shr_unit) {
+        this.shr_unit = shr_unit;
+    }
+
+    public String getBhr_bpcall() {
+        return bhr_bpcall;
+    }
+
+    public void setBhr_bpcall(String bhr_bpcall) {
+        this.bhr_bpcall = bhr_bpcall;
+    }
+
+    public String getBhr_phone() {
+        return bhr_phone;
+    }
+
+    public void setBhr_phone(String bhr_phone) {
+        this.bhr_phone = bhr_phone;
+    }
+
+    public String getBhr_tag() {
+        return bhr_tag;
+    }
+
+    public void setBhr_tag(String bhr_tag) {
+        this.bhr_tag = bhr_tag;
+    }
+
+    public String getXyr_idcardnumb() {
+        return xyr_idcardnumb;
+    }
+
+    public void setXyr_idcardnumb(String xyr_idcardnumb) {
+        this.xyr_idcardnumb = xyr_idcardnumb;
+    }
+
+    public String getXyr_unit() {
+        return xyr_unit;
+    }
+
+    public void setXyr_unit(String xyr_unit) {
+        this.xyr_unit = xyr_unit;
+    }
+
+    public String getXyr_tag() {
+        return xyr_tag;
+    }
+
+    public void setXyr_tag(String xyr_tag) {
+        this.xyr_tag = xyr_tag;
+    }
+
+    public String getXyr_sex() {
+        return xyr_sex;
+    }
+
+    public void setXyr_sex(String xyr_sex) {
+        this.xyr_sex = xyr_sex;
+    }
+
     public String getCaseid() {
         return caseid;
     }
@@ -2367,21 +2517,6 @@ public class MisAsjRyRelateVO {
         this.registeraddress = registeraddress;
     }
 
-    public String getBpcall() {
-        return bpcall;
-    }
-
-    public void setBpcall(String bpcall) {
-        this.bpcall = bpcall;
-    }
-
-    public String getPhone() {
-        return phone;
-    }
-
-    public void setPhone(String phone) {
-        this.phone = phone;
-    }
 
     public String getRemark() {
         return remark;
@@ -2439,14 +2574,6 @@ public class MisAsjRyRelateVO {
         this.accent = accent;
     }
 
-    public String getSex() {
-        return sex;
-    }
-
-    public void setSex(String sex) {
-        this.sex = sex;
-    }
-
     public String getAgeupperlimit() {
         return ageupperlimit;
     }
@@ -2519,14 +2646,6 @@ public class MisAsjRyRelateVO {
         this.folk = folk;
     }
 
-    public String getIdcardnumb() {
-        return idcardnumb;
-    }
-
-    public void setIdcardnumb(String idcardnumb) {
-        this.idcardnumb = idcardnumb;
-    }
-
     public String getWfjl() {
         return wfjl;
     }

src/main/java/com/cc/model/Record.java

@@ -15,6 +15,16 @@ public class Record {
 	private String ajzlz_record;
 	private String misxyr_record;
 	private String misshr_record;
+	private String misbar_record;
+
+	public String getMisbar_record() {
+		return misbar_record;
+	}
+
+	public void setMisbar_record(String misbar_record) {
+		this.misbar_record = misbar_record;
+	}
+
 	private String gxsj;
 	private String id;
 

src/main/java/com/cc/service/IMisSolrService.java

@@ -12,7 +12,8 @@ public interface IMisSolrService {
 
     EasyUIPage queryMisSolrAsj(String q, List<String> fqList, MisAsjRyRelateVO misAsjRyRelateVO, String page, String rows, String solrAddress, String sorlInstance, String groupids, String sort, String order, String unitcode, Map<String,Object> configMap, String daohan, String groupidvalue);
     EasyUIPage queryMisSolrXyr(String q, List<String> fqList, MisAsjRyRelateVO misAsjRyRelateVO, String page, String rows, String solrAddress, String sorlInstance, String groupids, String sort, String order, String unitcode, Map<String,Object> configMap, String daohan, String groupidvalue);
-
+    EasyUIPage queryMisSolrBhr(String q, List<String> fqList, MisAsjRyRelateVO misAsjRyRelateVO, String page, String rows, String solrAddress, String sorlInstance, String groupids, String sort, String order, String unitcode, Map<String,Object> configMap, String daohan, String groupidvalue);
+    EasyUIPage queryMisSolrBar(String q, List<String> fqList, MisAsjRyRelateVO misAsjRyRelateVO, String page, String rows, String solrAddress, String sorlInstance, String groupids, String sort, String order, String unitcode, Map<String,Object> configMap, String daohan, String groupidvalue);
     List<Map<String, Object>> getMisAsjSorlByFQ(String ssdw,String fq,Integer maxValue,String solrAddress, String sorlInstance,String[] checkIds);
 
 }

src/main/resources/mapper/xzxt/RecordSqlMap.xml

@@ -9,6 +9,8 @@
         <result column="aj_record" jdbcType="VARCHAR" property="aj_record" />
         <result column="ajzlz_record" jdbcType="VARCHAR" property="ajzlz_record" />
         <result column="misxyr_record" jdbcType="VARCHAR" property="misxyr_record" />
+        <result column="misshr_record" jdbcType="VARCHAR" property="misshr_record" />
+        <result column="misbar_record" jdbcType="VARCHAR" property="misbar_record" />
         <result column="gxsj" jdbcType="VARCHAR" property="gxsj" />
     </resultMap>
     <!--查询被害人的记录-->
@@ -34,6 +36,12 @@
             <if test="misxyr_record != null">
                 misxyr_record = #{misxyr_record,jdbcType=VARCHAR},
             </if>
+            <if test="misshr_record != null">
+                misxyr_record = #{misxyr_record,jdbcType=VARCHAR},
+            </if>
+            <if test="misbar_record != null">
+                misbar_record = #{misbar_record,jdbcType=VARCHAR},
+            </if>
             GXSJ =SYSDATE
         </set>
         WHERE  userid =#{userid,jdbcType=INTEGER}
@@ -46,6 +54,9 @@
         XYR_RECORD,
         AJ_RECORD,
         AJZLZ_RECORD,
+        MISXYR_RECORD,
+        MISSHR_RECORD,
+        MISBAR_RECORD,
         USERID,
         GXSJ
         ) VALUES (
@@ -58,6 +69,12 @@
         <if test="aj_record==null">NULL,</if>
         <if test="ajzlz_record!=null">#{ajzlz_record},</if>
         <if test="ajzlz_record==null">NULL,</if>
+        <if test="misxyr_record!=null">#{misxyr_record},</if>
+        <if test="misxyr_record==null">NULL,</if>
+        <if test="misshr_record!=null">#{misshr_record},</if>
+        <if test="misshr_record==null">NULL,</if>
+        <if test="misbar_record!=null">#{misbar_record},</if>
+        <if test="misbar_record==null">NULL,</if>
         <if test="userid!=null">#{userid},</if>
         <if test="userid==null">NULL,</if>
         sysdate

src/main/webapp/static/rasc/js/navCategory_zj.js

@@ -224,6 +224,16 @@ var navCategory = {
             url = "listMisXyr";
             sorlInstance = "CASE_S_XYR";
         }
+        else if(searchType=='misbhr'){
+            presentType = $('input[type=radio][name="misxyrPresentType"]:checked ').val();
+            url = "listMisBhr";
+            sorlInstance = "CASE_S_SHR";
+        }
+        else if(searchType=='misbar'){
+            presentType = $('input[type=radio][name="misxyrPresentType"]:checked ').val();
+            url = "listMisBar";
+            sorlInstance = "CASE_S_BAR";
+        }
         searchTerm.sorlInstance=sorlInstance;
         if(presentType=='DList'){
             $("#dListContainer").show();