Merge branch 'dev' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into dev

 Conflicts:

	service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/entity/OerDjmlEntity.java

service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/entity/OerDjmlEntity.java

@@ -48,6 +48,24 @@ public class OerDjmlEntity extends BaseEntity {
     private String pzh;//凭证号
     private String fph;//发票号
 
+    //项目代码
+    private String xmdm;
+    //项目名称
+    private String xmmc;
+    //经济代码
+    private String jjdm;
+    //经济名称
+    private String jjmc;
+    private String yhzh;//银行账户
+    private String khyh;//开户银行
+    //差旅费出差人
+    private String clf_ccr;
+    //送审日期
+    private String ssrq;
+    //送审人id
+    private String ssrid;
+    //送审人
+    private String ssr;
     private byte[] RptRtContent;
 
     public String getMlId() {
@@ -321,4 +339,84 @@ public class OerDjmlEntity extends BaseEntity {
     public void setLclb(String lclb) {
         this.lclb = lclb;
     }
+
+    public String getXmdm() {
+        return xmdm;
+    }
+
+    public void setXmdm(String xmdm) {
+        this.xmdm = xmdm;
+    }
+
+    public String getXmmc() {
+        return xmmc;
+    }
+
+    public void setXmmc(String xmmc) {
+        this.xmmc = xmmc;
+    }
+
+    public String getJjdm() {
+        return jjdm;
+    }
+
+    public void setJjdm(String jjdm) {
+        this.jjdm = jjdm;
+    }
+
+    public String getJjmc() {
+        return jjmc;
+    }
+
+    public void setJjmc(String jjmc) {
+        this.jjmc = jjmc;
+    }
+
+    public String getYhzh() {
+        return yhzh;
+    }
+
+    public void setYhzh(String yhzh) {
+        this.yhzh = yhzh;
+    }
+
+    public String getKhyh() {
+        return khyh;
+    }
+
+    public void setKhyh(String khyh) {
+        this.khyh = khyh;
+    }
+
+    public String getClf_ccr() {
+        return clf_ccr;
+    }
+
+    public void setClf_ccr(String clf_ccr) {
+        this.clf_ccr = clf_ccr;
+    }
+
+    public String getSsrq() {
+        return ssrq;
+    }
+
+    public void setSsrq(String ssrq) {
+        this.ssrq = ssrq;
+    }
+
+    public String getSsrid() {
+        return ssrid;
+    }
+
+    public void setSsrid(String ssrid) {
+        this.ssrid = ssrid;
+    }
+
+    public String getSsr() {
+        return ssr;
+    }
+
+    public void setSsr(String ssr) {
+        this.ssr = ssr;
+    }
 }

service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjnr/entity/OerDjnrEntity.java

@@ -35,7 +35,50 @@ public class OerDjnrEntity extends BaseEntity {
     private String kmdm;//支出科目代码
     private String kmmc;//支出科目名称
     private String kzzbId;
-
+    private String jjdm;//经济代码
+    private String jjmc;//经济名称
+    private String fzx8dm;//固定项8代码
+    private String fzx8mc;//固定项8名称
+    private String fzx9dm;//固定项9代码
+    private String fzx9mc;//固定项9名称
+    //经费类型代码
+    private String jflxdm;
+    //经费类型名称
+    private String jflxmc;
+    //差旅费-出差开始日期
+    private String clf_startdate;
+    //差旅费-出差结束日期
+    private String clf_enddate;
+    //差旅费-出差目的地
+    private String clf_ccdd;
+    //差旅费-出差开始地点
+    private String clf_ccksd;
+    //差旅费-单据张数
+    private String clf_djzs;
+    //差旅费-出差天数
+    private String clf_ccts;
+    //差旅费-出差人数
+    private String clf_ccrs;
+    //差旅费-职务
+    private String clf_zw;
+    //差旅费-交通工具
+    private String clf_jtgj;
+    //差旅费-交通费
+    private String clf_jtf;
+    //差旅费-住宿费标准
+    private String clf_zsbz;
+    //差旅费-住宿费
+    private String clf_zsf;
+    //差旅费-伙食费标准
+    private String CLF_HSBZ;
+    //差旅费-伙食费
+    private String clf_hsf;
+    //差旅费-交通补助标准
+    private String clf_jtbz;
+    //差旅费-交通补助
+    private String clf_jtbzf;
+    //差旅费-其他费用
+    private String clf_qtf;
     public String getXh() {
         return xh;
     }
@@ -219,4 +262,204 @@ public class OerDjnrEntity extends BaseEntity {
     public void setKzzbId(String kzzbId) {
         this.kzzbId = kzzbId;
     }
+
+    public String getJjdm() {
+        return jjdm;
+    }
+
+    public void setJjdm(String jjdm) {
+        this.jjdm = jjdm;
+    }
+
+    public String getJjmc() {
+        return jjmc;
+    }
+
+    public void setJjmc(String jjmc) {
+        this.jjmc = jjmc;
+    }
+
+    public String getFzx8dm() {
+        return fzx8dm;
+    }
+
+    public void setFzx8dm(String fzx8dm) {
+        this.fzx8dm = fzx8dm;
+    }
+
+    public String getFzx8mc() {
+        return fzx8mc;
+    }
+
+    public void setFzx8mc(String fzx8mc) {
+        this.fzx8mc = fzx8mc;
+    }
+
+    public String getFzx9dm() {
+        return fzx9dm;
+    }
+
+    public void setFzx9dm(String fzx9dm) {
+        this.fzx9dm = fzx9dm;
+    }
+
+    public String getFzx9mc() {
+        return fzx9mc;
+    }
+
+    public void setFzx9mc(String fzx9mc) {
+        this.fzx9mc = fzx9mc;
+    }
+
+    public String getJflxdm() {
+        return jflxdm;
+    }
+
+    public void setJflxdm(String jflxdm) {
+        this.jflxdm = jflxdm;
+    }
+
+    public String getJflxmc() {
+        return jflxmc;
+    }
+
+    public void setJflxmc(String jflxmc) {
+        this.jflxmc = jflxmc;
+    }
+
+    public String getClf_startdate() {
+        return clf_startdate;
+    }
+
+    public void setClf_startdate(String clf_startdate) {
+        this.clf_startdate = clf_startdate;
+    }
+
+    public String getClf_enddate() {
+        return clf_enddate;
+    }
+
+    public void setClf_enddate(String clf_enddate) {
+        this.clf_enddate = clf_enddate;
+    }
+
+    public String getClf_ccdd() {
+        return clf_ccdd;
+    }
+
+    public void setClf_ccdd(String clf_ccdd) {
+        this.clf_ccdd = clf_ccdd;
+    }
+
+    public String getClf_ccksd() {
+        return clf_ccksd;
+    }
+
+    public void setClf_ccksd(String clf_ccksd) {
+        this.clf_ccksd = clf_ccksd;
+    }
+
+    public String getClf_djzs() {
+        return clf_djzs;
+    }
+
+    public void setClf_djzs(String clf_djzs) {
+        this.clf_djzs = clf_djzs;
+    }
+
+    public String getClf_ccts() {
+        return clf_ccts;
+    }
+
+    public void setClf_ccts(String clf_ccts) {
+        this.clf_ccts = clf_ccts;
+    }
+
+    public String getClf_ccrs() {
+        return clf_ccrs;
+    }
+
+    public void setClf_ccrs(String clf_ccrs) {
+        this.clf_ccrs = clf_ccrs;
+    }
+
+    public String getClf_zw() {
+        return clf_zw;
+    }
+
+    public void setClf_zw(String clf_zw) {
+        this.clf_zw = clf_zw;
+    }
+
+    public String getClf_jtgj() {
+        return clf_jtgj;
+    }
+
+    public void setClf_jtgj(String clf_jtgj) {
+        this.clf_jtgj = clf_jtgj;
+    }
+
+    public String getClf_jtf() {
+        return clf_jtf;
+    }
+
+    public void setClf_jtf(String clf_jtf) {
+        this.clf_jtf = clf_jtf;
+    }
+
+    public String getClf_zsbz() {
+        return clf_zsbz;
+    }
+
+    public void setClf_zsbz(String clf_zsbz) {
+        this.clf_zsbz = clf_zsbz;
+    }
+
+    public String getClf_zsf() {
+        return clf_zsf;
+    }
+
+    public void setClf_zsf(String clf_zsf) {
+        this.clf_zsf = clf_zsf;
+    }
+
+    public String getCLF_HSBZ() {
+        return CLF_HSBZ;
+    }
+
+    public void setCLF_HSBZ(String CLF_HSBZ) {
+        this.CLF_HSBZ = CLF_HSBZ;
+    }
+
+    public String getClf_hsf() {
+        return clf_hsf;
+    }
+
+    public void setClf_hsf(String clf_hsf) {
+        this.clf_hsf = clf_hsf;
+    }
+
+    public String getClf_jtbz() {
+        return clf_jtbz;
+    }
+
+    public void setClf_jtbz(String clf_jtbz) {
+        this.clf_jtbz = clf_jtbz;
+    }
+
+    public String getClf_jtbzf() {
+        return clf_jtbzf;
+    }
+
+    public void setClf_jtbzf(String clf_jtbzf) {
+        this.clf_jtbzf = clf_jtbzf;
+    }
+
+    public String getClf_qtf() {
+        return clf_qtf;
+    }
+
+    public void setClf_qtf(String clf_qtf) {
+        this.clf_qtf = clf_qtf;
+    }
 }