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

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

@@ -145,7 +145,7 @@ public class XxcxController {
 
         List<TbZhzxJjxxView> tbZhzxJjxxViews = new ArrayList<>();
         try {
-            if(StringUtils.isEmpty(param.getJjdbh()) && StringUtils.isEmpty(param.getBjrxm())&& StringUtils.isEmpty(param.getJjyxm())){
+            if(StringUtils.isEmpty(param.getJjdbh()) && StringUtils.isEmpty(param.getBjrxm()) && StringUtils.isEmpty(param.getJjyxm()) && StringUtils.isEmpty(param.getAsjbh())){
                 reslt.setData(new ArrayList<>());
                 reslt.setMsg("查询参数为空，不能查询！");
                 reslt.setStatus("fail");
@@ -178,7 +178,7 @@ public class XxcxController {
 
         List<TbZhzxCjxxView> tbZhzxCjxxViews = new ArrayList<>();
         try {
-            if(StringUtils.isEmpty(param.getJjdbh()) && StringUtils.isEmpty(param.getPjdbh())&& StringUtils.isEmpty(param.getPjyxm())){
+            if(StringUtils.isEmpty(param.getJjdbh()) && StringUtils.isEmpty(param.getPjdbh()) && StringUtils.isEmpty(param.getPjyxm()) && StringUtils.isEmpty(param.getAsjbh())){
                 reslt.setData(new ArrayList<>());
                 reslt.setMsg("查询参数为空，不能查询！");
                 reslt.setStatus("fail");

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

@@ -162,6 +162,9 @@ public class TbZhzxCjxx implements Serializable {
     //派警时间
     private String formPjsj;
 
+    //案事件编号
+    private String asjbh;
+
     public String getFormXfsj() {
         return formXfsj;
     }
@@ -585,4 +588,12 @@ public class TbZhzxCjxx implements Serializable {
     public void setFormPjsj(String formPjsj) {
         this.formPjsj = formPjsj;
     }
+
+    public String getAsjbh() {
+        return asjbh;
+    }
+
+    public void setAsjbh(String asjbh) {
+        this.asjbh = asjbh;
+    }
 }

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

@@ -31,7 +31,17 @@ public class TbZhzxCjxxView implements Serializable {
     //周边情况
     private String zbqk;
     //派警意见
-     private String pjyj;
+    private String pjyj;
+    //案事件编号
+    private String asjbh;
+
+    public String getAsjbh() {
+        return asjbh;
+    }
+
+    public void setAsjbh(String asjbh) {
+        this.asjbh = asjbh;
+    }
 
     public String getPjyj() {
         return pjyj;

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

@@ -219,6 +219,9 @@ public class TbZhzxJjxx implements Serializable {
     //接入时间
     private String formJrsj;
 
+    //案事件编号
+    private String asjbh;
+
     public String getJjdw() {
         return jjdw;
     }
@@ -794,4 +797,12 @@ public class TbZhzxJjxx implements Serializable {
     public void setFormJrsj(String formJrsj) {
         this.formJrsj = formJrsj;
     }
+
+    public String getAsjbh() {
+        return asjbh;
+    }
+
+    public void setAsjbh(String asjbh) {
+        this.asjbh = asjbh;
+    }
 }

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

@@ -40,6 +40,8 @@ public class TbZhzxJjxxView implements Serializable {
     private String dicBjfsdm;
     //受理单编号
     private String sldbh;
+    //案事件编号
+    private String asjbh;
 
     public String getBjdh() {
         return bjdh;
@@ -184,4 +186,12 @@ public class TbZhzxJjxxView implements Serializable {
     public void setSldbh(String sldbh) {
         this.sldbh = sldbh;
     }
+
+    public String getAsjbh() {
+        return asjbh;
+    }
+
+    public void setAsjbh(String asjbh) {
+        this.asjbh = asjbh;
+    }
 }

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

@@ -168,6 +168,7 @@ public class XxcxServiceImpl implements XxcxService {
                     view.setLxdh(entity.getLxdh());
                     view.setSfdd(entity.getSfdd());
                     view.setYhdz(entity.getYhdz());
+                    view.setAsjbh(entity.getAsjbh());
                     result.add(view);
                 }
             }
@@ -192,6 +193,7 @@ public class XxcxServiceImpl implements XxcxService {
                     view.setPjyj(entity.getPjyj());
                     view.setPjyxm(entity.getPjyxm());
                     view.setZbqk(entity.getZbqk());
+                    view.setAsjbh(entity.getAsjbh());
                     result.add(view);
                 }
             }

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

@@ -152,7 +152,8 @@
             FORM_RKSJ as formRksj,
             FORM_CJSJ as formCjsj,
             FORM_ODS_RKSJ as formOdsRksj,
-            FORM_JRSJ as formJrsj
+            FORM_JRSJ as formJrsj,
+            ASJBH as asjbh
         from TB_M_ZHZX_JJXX
         where 1=1
         <if test="jjdw != null and jjdw != ''"> AND JJDW = #{jjdw , jdbcType=VARCHAR } </if>
@@ -170,6 +171,7 @@
         <if test="bjxldm != null and bjxldm != ''"> AND BJXLDM = #{bjxldm , jdbcType=VARCHAR } </if>
         <if test="dicJjdw != null and dicJjdw != ''"> AND DIC_JJDW = #{dicJjdw , jdbcType=VARCHAR } </if>
         <if test="dicBjfsdm != null and dicBjfsdm != ''"> AND DIC_BJFSDM = #{dicBjfsdm , jdbcType=VARCHAR } </if>
+        <if test="asjbh != null and asjbh != ''"> AND ASJBH = #{asjbh , jdbcType=VARCHAR } </if>
     </select>
     
     <select id="queryCjxx" resultType="com.founder.model.TbZhzxCjxx" parameterType="com.founder.model.TbZhzxCjxxView">
@@ -225,7 +227,8 @@
             ODS_RKSJ as odsRksj,
             JRSJ as jrsj,
             DIC_XZQH as dicXzqh,
-            FORM_PJSJ as formPjsj
+            FORM_PJSJ as formPjsj,
+            ASJBH as asjbh
         from TB_M_ZHZX_CJXX
         where 1=1
         <if test="pjdbh != null and pjdbh != ''"> AND PJDBH = #{pjdbh , jdbcType=VARCHAR } </if>
@@ -233,5 +236,6 @@
         <if test="pjyxm != null and pjyxm != ''"> AND PJYXM = #{pjyxm , jdbcType=VARCHAR } </if>
         <if test="ddsj != null and ddsj != ''"> AND DDSJ = #{ddsj , jdbcType=VARCHAR } </if>
         <if test="pjsj != null and pjsj != ''"> AND PJSJ = #{pjsj , jdbcType=VARCHAR } </if>
+        <if test="asjbh != null and asjbh != ''"> AND ASJBH = #{asjbh , jdbcType=VARCHAR } </if>
     </select>
 </mapper>