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

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

+package com.founder.model;
+
+import java.io.Serializable;
+
+public class TbZhzxCjxxView implements Serializable {
+
+    //接警单编号
+    private String jjdbh;
+    //派警单编号(受理单编号)
+    private String pjdbh;
+    //派警时间
+    private String pjsj;
+    //到达时间
+    private String ddsj;
+    //派警员姓名
+    private String pjyxm;
+    //联系方式
+    private String lxfs;
+    //事发场所
+    private String sfcs;
+    //发生地点
+    private String fsdd;
+    //天气情况
+    private String tqqk;
+    //警情属性
+    private String jqsx;
+    //简要案情及处理结果
+    private String jyaq;
+    //损失情况
+    private String ssqk;
+
+    public String getJjdbh() {
+        return jjdbh;
+    }
+
+    public void setJjdbh(String jjdbh) {
+        this.jjdbh = jjdbh;
+    }
+
+    public String getPjdbh() {
+        return pjdbh;
+    }
+
+    public void setPjdbh(String pjdbh) {
+        this.pjdbh = pjdbh;
+    }
+
+    public String getPjsj() {
+        return pjsj;
+    }
+
+    public void setPjsj(String pjsj) {
+        this.pjsj = pjsj;
+    }
+
+    public String getDdsj() {
+        return ddsj;
+    }
+
+    public void setDdsj(String ddsj) {
+        this.ddsj = ddsj;
+    }
+
+    public String getPjyxm() {
+        return pjyxm;
+    }
+
+    public void setPjyxm(String pjyxm) {
+        this.pjyxm = pjyxm;
+    }
+
+    public String getLxfs() {
+        return lxfs;
+    }
+
+    public void setLxfs(String lxfs) {
+        this.lxfs = lxfs;
+    }
+
+    public String getSfcs() {
+        return sfcs;
+    }
+
+    public void setSfcs(String sfcs) {
+        this.sfcs = sfcs;
+    }
+
+    public String getFsdd() {
+        return fsdd;
+    }
+
+    public void setFsdd(String fsdd) {
+        this.fsdd = fsdd;
+    }
+
+    public String getTqqk() {
+        return tqqk;
+    }
+
+    public void setTqqk(String tqqk) {
+        this.tqqk = tqqk;
+    }
+
+    public String getJqsx() {
+        return jqsx;
+    }
+
+    public void setJqsx(String jqsx) {
+        this.jqsx = jqsx;
+    }
+
+    public String getJyaq() {
+        return jyaq;
+    }
+
+    public void setJyaq(String jyaq) {
+        this.jyaq = jyaq;
+    }
+
+    public String getSsqk() {
+        return ssqk;
+    }
+
+    public void setSsqk(String ssqk) {
+        this.ssqk = ssqk;
+    }
+
+}

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

+package com.founder.model;
+
+import java.io.Serializable;
+
+public class TbZhzxJjxxView implements Serializable {
+
+    //接警单编号
+    private String jjdbh;
+    //报警方式
+    private String bjfsdm;
+    //报警类别
+    private String bjlbdm;
+    //报警类型
+    private String bjlxdm;
+    //报警细类
+    private String bjxldm;
+    //报警内容
+    private String bjnr;
+    //报警人姓名
+    private String bjrxm;
+    //报警人性别
+    private String bjrxb;
+    //联系电话
+    private String lxdh;
+    //报警电话用户地址
+    private String yhdz;
+    //事发地址
+    private String sfdd;
+    //接警员姓名
+    private String jjyxm;
+    //报警时间
+    private String bjsj;
+    //接警单位
+    private String jjdw;
+    //接警单位(字典)
+    private String dicJjdw;
+    //报警方式(字典)
+    private String dicBjfsdm;
+    //受理单编号
+    private String sldbh;
+
+    public String getJjdbh() {
+        return jjdbh;
+    }
+
+    public void setJjdbh(String jjdbh) {
+        this.jjdbh = jjdbh;
+    }
+
+    public String getBjfsdm() {
+        return bjfsdm;
+    }
+
+    public void setBjfsdm(String bjfsdm) {
+        this.bjfsdm = bjfsdm;
+    }
+
+    public String getBjlbdm() {
+        return bjlbdm;
+    }
+
+    public void setBjlbdm(String bjlbdm) {
+        this.bjlbdm = bjlbdm;
+    }
+
+    public String getBjlxdm() {
+        return bjlxdm;
+    }
+
+    public void setBjlxdm(String bjlxdm) {
+        this.bjlxdm = bjlxdm;
+    }
+
+    public String getBjxldm() {
+        return bjxldm;
+    }
+
+    public void setBjxldm(String bjxldm) {
+        this.bjxldm = bjxldm;
+    }
+
+    public String getBjnr() {
+        return bjnr;
+    }
+
+    public void setBjnr(String bjnr) {
+        this.bjnr = bjnr;
+    }
+
+    public String getBjrxm() {
+        return bjrxm;
+    }
+
+    public void setBjrxm(String bjrxm) {
+        this.bjrxm = bjrxm;
+    }
+
+    public String getBjrxb() {
+        return bjrxb;
+    }
+
+    public void setBjrxb(String bjrxb) {
+        this.bjrxb = bjrxb;
+    }
+
+    public String getLxdh() {
+        return lxdh;
+    }
+
+    public void setLxdh(String lxdh) {
+        this.lxdh = lxdh;
+    }
+
+    public String getYhdz() {
+        return yhdz;
+    }
+
+    public void setYhdz(String yhdz) {
+        this.yhdz = yhdz;
+    }
+
+    public String getSfdd() {
+        return sfdd;
+    }
+
+    public void setSfdd(String sfdd) {
+        this.sfdd = sfdd;
+    }
+
+    public String getJjyxm() {
+        return jjyxm;
+    }
+
+    public void setJjyxm(String jjyxm) {
+        this.jjyxm = jjyxm;
+    }
+
+    public String getBjsj() {
+        return bjsj;
+    }
+
+    public void setBjsj(String bjsj) {
+        this.bjsj = bjsj;
+    }
+
+    public String getJjdw() {
+        return jjdw;
+    }
+
+    public void setJjdw(String jjdw) {
+        this.jjdw = jjdw;
+    }
+
+    public String getDicJjdw() {
+        return dicJjdw;
+    }
+
+    public void setDicJjdw(String dicJjdw) {
+        this.dicJjdw = dicJjdw;
+    }
+
+    public String getDicBjfsdm() {
+        return dicBjfsdm;
+    }
+
+    public void setDicBjfsdm(String dicBjfsdm) {
+        this.dicBjfsdm = dicBjfsdm;
+    }
+
+    public String getSldbh() {
+        return sldbh;
+    }
+
+    public void setSldbh(String sldbh) {
+        this.sldbh = sldbh;
+    }
+}

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

@@ -49,6 +49,8 @@ public class XxcxServiceImpl implements XxcxService {
             tbStAsjView.setSlsj(tbStAsj.getSlsj());
             tbStAsjView.setXxlyms(tbStAsj.getXxlyms());
             tbStAsjView.setZczjZxsj(tbStAsj.getZczjZxsj01());
+            tbStAsjView.setAsjlydm(tbStAsj.getAsjlydm());
+            tbStAsjView.setSaje(tbStAsj.getSsjzrmby());
         }
         return tbStAsjView;
     }