Merge remote-tracking branch 'remotes/origin/master'

src/main/java/com/founder/controller/XxcxController.java

@@ -41,8 +41,8 @@ public class XxcxController {
         TbStAsjView tbStAsjView1=new TbStAsjView();
         try {
             String asjbh = tbStAsjView.getAsjbh();
-            String jqbh = tbStAsjView.getJqbh();
-            if(StringUtils.isEmpty(asjbh) && StringUtils.isEmpty(jqbh)){
+            String jjdbh = tbStAsjView.getJjdbh();
+            if(StringUtils.isEmpty(asjbh) && StringUtils.isEmpty(jjdbh)){
                 reslt.setData(null);
                 reslt.setMsg("查询参数为空，不能查询！");
                 reslt.setStatus("fail");
@@ -50,8 +50,8 @@ public class XxcxController {
             }
             if(!StringUtils.isEmpty(asjbh)){
                 tbStAsjView1 = xxcxService.queryTbStAsjByAsjbh(asjbh);
-            }else if(!StringUtils.isEmpty(jqbh)){
-                tbStAsjView1 = xxcxService.queryTbStAsjByJqbh(jqbh);
+            }else if(!StringUtils.isEmpty(jjdbh)){
+                tbStAsjView1 = xxcxService.queryTbStAsjByJjdbh(jjdbh);
             }
             reslt.setData(tbStAsjView1  );
             reslt.setMsg("案件信息查询成功");

src/main/java/com/founder/model/TbStAsjView.java

@@ -86,6 +86,9 @@ public class TbStAsjView implements Serializable {
     //损失折扣
     private String sszk;
 
+    //接警单编号
+    private String jjdbh;
+
     public String getAsjbh() {
         return asjbh;
     }
@@ -285,4 +288,12 @@ public class TbStAsjView implements Serializable {
     public void setAsjlydm(String asjlydm) {
         this.asjlydm = asjlydm;
     }
+
+    public String getJjdbh() {
+        return jjdbh;
+    }
+
+    public void setJjdbh(String jjdbh) {
+        this.jjdbh = jjdbh;
+    }
 }

src/main/java/com/founder/service/XxcxService.java

@@ -9,7 +9,7 @@ public interface XxcxService {
     public List<TbStAsjView> queryTbStAsj(String asjbh,String sfzh);
     public TbStAsjView queryTbStAsjByAsjbh(String asjbh);
 
-    TbStAsjView queryTbStAsjByJqbh(String jqbh);
+    TbStAsjView queryTbStAsjByJjdbh(String jjdbh);
 
     List<TbXwRybhView> queryTbXwRybh(TbXwRybhView param);
 

src/main/java/com/founder/service/impl/XxcxServiceImpl.java

@@ -52,16 +52,16 @@ public class XxcxServiceImpl implements XxcxService {
             tbStAsjView.setZczjZxsj(tbStAsj.getZczjZxsj01());
             tbStAsjView.setAsjlydm(tbStAsj.getAsjlydm());
             tbStAsjView.setSsjzrmby(tbStAsj.getSsjzrmby());
-            tbStAsjView.setJqbh(tbStAsj.getJjbh());
+            tbStAsjView.setJjdbh(tbStAsj.getJjbh());
         }
         return tbStAsjView;
     }
 
     @Override
-    public TbStAsjView queryTbStAsjByJqbh(String jqbh) {
+    public TbStAsjView queryTbStAsjByJjdbh(String jjdbh) {
         TbStAsjView tbStAsjView = null;
         TbStAsj param = new TbStAsj();
-        param.setJjbh(jqbh);
+        param.setJjbh(jjdbh);
         TbStAsj tbStAsj = xxcxDao.queryTbStAsj(param);
         if(tbStAsj!=null){
             tbStAsjView = new TbStAsjView();
@@ -83,7 +83,7 @@ public class XxcxServiceImpl implements XxcxService {
             tbStAsjView.setZczjZxsj(tbStAsj.getZczjZxsj01());
             tbStAsjView.setAsjlydm(tbStAsj.getAsjlydm());
             tbStAsjView.setSsjzrmby(tbStAsj.getSsjzrmby());
-            tbStAsjView.setJqbh(tbStAsj.getJjbh());
+            tbStAsjView.setJjdbh(tbStAsj.getJjbh());
         }
         return tbStAsjView;
     }

src/main/resources/mybatis/mapper/XxcxDaoMapper.xml

@@ -2,30 +2,32 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.founder.dao.XxcxDao">
     <select id="queryTbStAsj" parameterType="com.founder.model.TbStAsj" resultType="com.founder.model.TbStAsj">
-        select ASJBH as asjbh,
-        JJBH as jjbh,
-        ASJLYDM as asjlydm,
-        ZCJDDM as zcjddm,
-        AJLBDM as ajlbdm,
-        AJMC as ajmc,
-        XXLYMS as xxlyms,
-        ASJFSSJ_ASJFSKSSJ as asjfssjAsjfskssj,
-        ASJFSSJ_ASJFSJSSJ as asjfssjAsjfsjssj,
-        ASJFSDD_XZQHDM as asjfsddXzqhdm,
-        ASJFSDD_DZMC as asjfsddDzmc,
-        SSJZRMBY as ssjzrmby,
-        SLSJ as slsj,
-        LARQ as larq,
-        LADW_GAJGJGDM as ladwGajgjgdm,
-        LADW_GAJGMC as ladwGajgmc,
-        ZCZJ_ZXSJ01 as zczjZxsj01,
-        GXSJ as gxsj,
-        JYAQ as jyaq
-        from TB_ST_ASJ
+        select t.ASJBH as asjbh,
+        t.ASJLYDM as asjlydm,
+        t.ZCJDDM as zcjddm,
+        t.AJLBDM as ajlbdm,
+        t.AJMC as ajmc,
+        t.XXLYMS as xxlyms,
+        t.ASJFSSJ_ASJFSKSSJ as asjfssjAsjfskssj,
+        t.ASJFSSJ_ASJFSJSSJ as asjfssjAsjfsjssj,
+        t.ASJFSDD_XZQHDM as asjfsddXzqhdm,
+        t.ASJFSDD_DZMC as asjfsddDzmc,
+        t.SSJZRMBY as ssjzrmby,
+        t.SLSJ as slsj,
+        t.LARQ as larq,
+        t.LADW_GAJGJGDM as ladwGajgjgdm,
+        t.LADW_GAJGMC as ladwGajgmc,
+        t.ZCZJ_ZXSJ01 as zczjZxsj01,
+        t.GXSJ as gxsj,
+        t.JYAQ as jyaq,
+        jj.jjdbh as jjbh
+        from TB_ST_ASJ t
+        left join TB_M_ZHZX_JJXX jj
+        on t.asjbh = jj.asjbh
         where 1=1
-        and xxsc_pdbz = '0'
-        <if test="asjbh != null and asjbh != ''"> AND ASJBH = #{asjbh , jdbcType=VARCHAR } </if>
-        <if test="jjbh != null and jjbh != ''"> AND JJBH = #{jjbh , jdbcType=VARCHAR } </if>
+        and t.xxsc_pdbz = '0'
+        <if test="asjbh != null and asjbh != ''"> AND t.ASJBH = #{asjbh , jdbcType=VARCHAR } </if>
+        <if test="jjbh != null and jjbh != ''"> AND jj.jjdbh = #{jjbh , jdbcType=VARCHAR } </if>
     </select>
     
     <select id="queryTbXwRybh" resultType="com.founder.model.TbXwRybh" parameterType="com.founder.model.TbXwRybhView">