hzya
/
kangarooDataCenterV3
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
hecan 2024-08-19 17:10:58 +08:00
parent 3aeb5699a9 c6735a739e
commit 4ac86bfe86
4 changed files with 185 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,6 +69,8 @@ public class OerDjmlEntity extends BaseEntity {
private String khyh;//开户银行
//差旅费出差人
private String clf_ccr;
//出差类别
private String clf_cclb;
//送审日期
private String ssrq;
//送审人id
@ -477,4 +479,12 @@ public class OerDjmlEntity extends BaseEntity {
public void setFileInfoList(List<FileInfoDTO> fileInfoList) {
this.fileInfoList = fileInfoList;
}
public String getClf_cclb() {
return clf_cclb;
}
public void setClf_cclb(String clf_cclb) {
this.clf_cclb = clf_cclb;
}
}

155
service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/entity/OerDjmlEntity.xml
View File

@ -92,66 +92,93 @@ GSDM,KJND,mlId
<insert id="OerDjmlEntity_insert" parameterType="com.hzya.frame.grpU8.nxproof.oerdjml.entity.OerDjmlEntity">
insert into OER_DJML(
<if test="gsdm != null and gsdm !='' "> GSDM, </if>
<if test="kjnd != null and kjnd !='' "> KJND, </if>
<if test="djlxId != null and djlxId !='' "> DJLXID, </if>
<if test="mlId != null and mlId !='' "> MLID, </if>
<if test="zt != null and zt !='' "> ZT, </if>
<if test="crerdm != null and crerdm !=''"> CRerDM, </if>
<if test="crermc != null and crermc !='' "> CRerMC, </if>
<if test="crerdate != null and crerdate !='' "> CRerDate, </if>
<if test="flowcode != null and flowcode !='' "> FlowCode,</if>
<if test="curshjd != null and curshjd !='' "> CurSHJD, </if>
<if test="nextshjd != null and nextshjd !='' "> NextSHJD,</if>
<if test="shrs != null and shrs !='' "> SHR,</if>
<if test="shrId != null and shrId !=''"> SHRID, </if>
<if test="shrq != null and shrq !='' "> SHRQ, </if>
<if test="jsfs != null and jsfs !='' "> JSFS, </if>
<if test="djbh != null and djbh !='' "> DJBH, </if>
<if test="djdate != null and djdate !='' "> DJDate, </if>
<if test="fjs != null and fjs !='' "> FJS,</if>
<if test="bmdm != null and bmdm !='' "> BMDM, </if>
<if test="bmmc != null and bmmc !='' "> BMMC,</if>
<if test="grdm != null and grdm !='' ">GRDM, </if>
<if test="grmc != null and grmc !='' ">GRMC,</if>
<if test="tel != null and tel !='' "> TEL, </if>
<if test="yjje != null and yjje !='' "> YJJE, </if>
<if test="thje != null and thje !='' "> THJE,</if>
<if test="blje != null and blje !='' "> BLJE, </if>
<if test="je != null and je !='' "> JE, </if>
<if test="whje != null and whje !='' "> WHJE,</if>
<if test="jedx != null and jedx !='' "> JEDX </if>
<trim prefixOverrides="," suffixOverrides=",">
<if test="gsdm != null and gsdm !='' "> GSDM, </if>
<if test="kjnd != null and kjnd !='' "> KJND, </if>
<if test="djlxId != null and djlxId !='' "> DJLXID, </if>
<if test="mlId != null and mlId !='' "> MLID, </if>
<if test="zt != null and zt !='' "> ZT, </if>
<if test="crerdm != null and crerdm !=''"> CRerDM, </if>
<if test="crermc != null and crermc !='' "> CRerMC, </if>
<if test="crerdate != null and crerdate !='' "> CRerDate, </if>
<if test="flowcode != null and flowcode !='' "> FlowCode,</if>
<if test="curshjd != null and curshjd !='' "> CurSHJD, </if>
<if test="nextshjd != null and nextshjd !='' "> NextSHJD,</if>
<if test="shrs != null and shrs !='' "> SHR,</if>
<if test="shrId != null and shrId !=''"> SHRID, </if>
<if test="shrq != null and shrq !='' "> SHRQ, </if>
<if test="jsfs != null and jsfs !='' "> JSFS, </if>
<if test="djbh != null and djbh !='' "> DJBH, </if>
<if test="djdate != null and djdate !='' "> DJDate, </if>
<if test="fjs != null and fjs !='' "> FJS,</if>
<if test="bmdm != null and bmdm !='' "> BMDM, </if>
<if test="bmmc != null and bmmc !='' "> BMMC,</if>
<if test="grdm != null and grdm !='' ">GRDM, </if>
<if test="grmc != null and grmc !='' ">GRMC,</if>
<if test="tel != null and tel !='' "> TEL, </if>
<if test="yjje != null and yjje !='' "> YJJE, </if>
<if test="thje != null and thje !='' "> THJE,</if>
<if test="blje != null and blje !='' "> BLJE, </if>
<if test="je != null and je !='' "> JE, </if>
<if test="whje != null and whje !='' "> WHJE,</if>
<if test="jedx != null and jedx !='' "> JEDX, </if>
<if test="zy != null and zy !='' "> ZY, </if>
<if test="clf_ccr != null and clf_ccr !='' "> clf_ccr, </if>
<if test="clf_cclb != null and clf_cclb !='' "> clf_cclb, </if>
<if test="jjdm != null and jjdm !='' "> jjdm, </if>
<if test="jjmc != null and jjmc !='' "> jjmc, </if>
<if test="khyh != null and khyh !='' "> khyh, </if>
<if test="yhzh != null and yhzh !='' "> yhzh, </if>
<if test="ssr != null and ssr !='' "> ssr, </if>
<if test="ssrid != null and ssrid !='' "> ssrid, </if>
<if test="xmdm != null and xmdm !='' "> xmdm, </if>
<if test="xmmc != null and xmmc !='' "> xmmc, </if>
</trim>
)
values (
<if test="gsdm != null and gsdm !='' "> #{gsdm}, </if>
<if test="kjnd != null and kjnd !='' "> #{kjnd}, </if>
<if test="djlxId != null and djlxId !='' "> ${djlxId}, </if>
<if test="mlId != null and mlId !='' "> ${mlId}, </if>
<if test="zt != null and zt !='' "> #{zt}, </if>
<if test="crerdm != null and crerdm !=''"> #{crerdm}, </if>
<if test="crermc != null and crermc !='' "> #{crermc}, </if>
<if test="crerdate != null and crerdate !='' "> #{crerdate}, </if>
<if test="flowcode != null and flowcode !='' "> #{flowcode},</if>
<if test="curshjd != null and curshjd !='' "> ${curshjd}, </if>
<if test="nextshjd != null and nextshjd !='' "> ${nextshjd},</if>
<if test="shrs != null and shrs !='' "> #{shrs}, </if>
<if test="shrId != null and shrId !='' "> #{shrId}, </if>
<if test="shrq != null and shrq !='' "> #{shrq}, </if>
<if test="jsfs != null and jsfs !='' "> #{jsfs}, </if>
<if test="djbh != null and djbh !='' "> #{djbh}, </if>
<if test="djdate != null and djdate !='' "> #{djdate}, </if>
<if test="fjs != null and fjs !='' "> ${fjs},</if>
<if test="bmdm != null and bmdm !='' "> #{bmdm}, </if>
<if test="bmmc != null and bmmc !='' "> #{bmmc},</if>
<if test="grdm != null and grdm !='' "> #{grdm}, </if>
<if test="grmc != null and grmc !='' "> #{grmc},</if>
<if test="tel != null and tel !='' "> #{tel}, </if>
<if test="yjje != null and yjje !='' "> #{yjje}, </if>
<if test="thje != null and thje !='' "> #{thje},</if>
<if test="blje != null and blje !='' "> #{blje}, </if>
<if test="je != null and je !='' "> #{je}, </if>
<if test="whje != null and whje !='' "> #{whje},</if>
<if test="jedx != null and jedx !='' "> #{jedx} </if>
<trim prefixOverrides="," suffixOverrides=",">
<if test="gsdm != null and gsdm !='' "> #{gsdm}, </if>
<if test="kjnd != null and kjnd !='' "> #{kjnd}, </if>
<if test="djlxId != null and djlxId !='' "> ${djlxId}, </if>
<if test="mlId != null and mlId !='' "> ${mlId}, </if>
<if test="zt != null and zt !='' "> #{zt}, </if>
<if test="crerdm != null and crerdm !=''"> #{crerdm}, </if>
<if test="crermc != null and crermc !='' "> #{crermc}, </if>
<if test="crerdate != null and crerdate !='' "> #{crerdate}, </if>
<if test="flowcode != null and flowcode !='' "> #{flowcode},</if>
<if test="curshjd != null and curshjd !='' "> ${curshjd}, </if>
<if test="nextshjd != null and nextshjd !='' "> ${nextshjd},</if>
<if test="shrs != null and shrs !='' "> #{shrs}, </if>
<if test="shrId != null and shrId !='' "> #{shrId}, </if>
<if test="shrq != null and shrq !='' "> #{shrq}, </if>
<if test="jsfs != null and jsfs !='' "> #{jsfs}, </if>
<if test="djbh != null and djbh !='' "> #{djbh}, </if>
<if test="djdate != null and djdate !='' "> #{djdate}, </if>
<if test="fjs != null and fjs !='' "> ${fjs},</if>
<if test="bmdm != null and bmdm !='' "> #{bmdm}, </if>
<if test="bmmc != null and bmmc !='' "> #{bmmc},</if>
<if test="grdm != null and grdm !='' "> #{grdm}, </if>
<if test="grmc != null and grmc !='' "> #{grmc},</if>
<if test="tel != null and tel !='' "> #{tel}, </if>
<if test="yjje != null and yjje !='' "> #{yjje}, </if>
<if test="thje != null and thje !='' "> #{thje},</if>
<if test="blje != null and blje !='' "> #{blje}, </if>
<if test="je != null and je !='' "> #{je}, </if>
<if test="whje != null and whje !='' "> #{whje},</if>
<if test="jedx != null and jedx !='' "> #{jedx}, </if>
<if test="zy != null and zy !='' "> #{zy}, </if>
<if test="clf_ccr != null and clf_ccr !='' "> #{clf_ccr}, </if>
<if test="clf_cclb != null and clf_cclb !='' "> #{clf_cclb}, </if>
<if test="jjdm != null and jjdm !='' "> #{jjdm}, </if>
<if test="jjmc != null and jjmc !='' "> #{jjmc}, </if>
<if test="khyh != null and khyh !='' "> #{khyh}, </if>
<if test="yhzh != null and yhzh !='' "> #{yhzh}, </if>
<if test="ssr != null and ssr !='' "> #{ssr}, </if>
<if test="ssrid != null and ssrid !='' "> #{ssrid}, </if>
<if test="xmdm != null and xmdm !='' "> #{xmdm}, </if>
<if test="xmmc != null and xmmc !='' "> #{xmmc}, </if>
</trim>
)
</insert>
@ -193,10 +220,22 @@ GSDM,KJND,mlId
<if test="je != null and je !='' "> JE = #{je}, </if>
<if test="whje != null and whje !='' "> WHJE = #{whje},</if>
<if test="jedx != null and jedx !='' "> JEDX = #{jedx}, </if>
<if test="zy != null and zy !='' "> ZY = #{zy}, </if>
<if test="clf_ccr != null and clf_ccr !='' "> clf_ccr = #{clf_ccr}, </if>
<if test="clf_cclb != null and clf_cclb !='' "> clf_cclb = #{clf_cclb}, </if>
<if test="jjdm != null and jjdm !='' "> jjdm = #{jjdm}, </if>
<if test="jjmc != null and jjmc !='' "> jjmc = #{jjmc}, </if>
<if test="khyh != null and khyh !='' "> khyh = #{khyh}, </if>
<if test="yhzh != null and yhzh !='' "> yhzh = #{yhzh}, </if>
<if test="ssr != null and ssr !='' "> ssr = #{ssr}, </if>
<if test="ssrid != null and ssrid !='' "> ssrid = #{ssrid}, </if>
<if test="xmdm != null and xmdm !='' "> xmdm = #{xmdm}, </if>
<if test="xmmc != null and xmmc !='' "> xmmc = #{xmmc}, </if>
</trim>
where DJBH = #{djbh} and MLID=${mlId}
</update>
<!--删除，用于单据删除时使用-->
<delete id="OerDjmlEntity_delete" parameterType="com.hzya.frame.grpU8.nxproof.oerdjml.entity.OerDjmlEntity">
DELETE

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

@ -70,7 +70,7 @@ public class OerDjnrEntity extends BaseEntity {
//差旅费-住宿费
private String clf_zsf;
//差旅费-伙食费标准
private String CLF_HSBZ;
private String clf_hsbz;
//差旅费-伙食费
private String clf_hsf;
//差旅费-交通补助标准
@ -423,12 +423,12 @@ public class OerDjnrEntity extends BaseEntity {
this.clf_zsf = clf_zsf;
}
public String getCLF_HSBZ() {
return CLF_HSBZ;
public String getClf_hsbz() {
return clf_hsbz;
}
public void setCLF_HSBZ(String CLF_HSBZ) {
this.CLF_HSBZ = CLF_HSBZ;
public void setClf_hsbz(String clf_hsbz) {
this.clf_hsbz = clf_hsbz;
}
public String getClf_hsf() {

75
service/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjnr/entity/OerDjnrEntity.xml
View File

@ -25,6 +25,31 @@
<result property="kzzbId" column="kzzbId" />
<result property="module" column="module" />
<result property="jjdm" column="jjdm" />
<result property="jjmc" column="jjmc" />
<result property="fzx8dm" column="fzx8dm" />
<result property="fzx8mc" column="fzx8mc" />
<result property="fzx9dm" column="fzx9dm" />
<result property="fzx9mc" column="fzx9mc" />
<result property="jflxdm" column="jflxdm" />
<result property="jflxmc" column="jflxmc" />
<result property="clf_startdate" column="clf_startdate" />
<result property="clf_enddate" column="clf_enddate" />
<result property="clf_ccdd" column="clf_ccdd" />
<result property="clf_ccksd" column="clf_ccksd" />
<result property="clf_djzs" column="clf_djzs" />
<result property="clf_ccts" column="clf_ccts" />
<result property="clf_ccrs" column="clf_ccrs" />
<result property="clf_zw" column="clf_zw" />
<result property="clf_jtgj" column="clf_jtgj" />
<result property="clf_jtf" column="clf_jtf" />
<result property="clf_zsbz" column="clf_zsbz" />
<result property="clf_zsf" column="clf_zsf" />
<result property="clf_hsbz" column="clf_hsbz" />
<result property="clf_jtbz" column="clf_jtbz" />
<result property="clf_jtbzf" column="clf_jtbzf" />
<result property="clf_qtf" column="clf_qtf" />
</resultMap>
<sql id="OerDjnrEntity_Base_Column_List">
@ -52,7 +77,31 @@
<if test="fzx7dm != null and fzx7dm !='' "> FZX7DM, </if>
<if test="fzx7mc != null and fzx7mc !='' "> FZX7MC,</if>
<if test="kzzbId != null and kzzbId !='' "> KZZBID, </if>
<if test="gsdm != null and gsdm !='' "> GSDM </if>
<if test="gsdm != null and gsdm !='' "> GSDM, </if>
<if test="jjdm != null and jjdm !='' "> jjdm, </if>
<if test="jjmc != null and jjmc !='' "> jjmc, </if>
<if test="fzx8dm != null and fzx8dm !='' "> fzx8dm, </if>
<if test="fzx8mc != null and fzx8mc !='' "> fzx8mc, </if>
<if test="fzx9dm != null and fzx9dm !='' "> fzx9dm, </if>
<if test="fzx9mc != null and fzx9mc !='' "> fzx9mc, </if>
<if test="jflxdm != null and jflxdm !='' "> jflxdm, </if>
<if test="jflxmc != null and jflxmc !='' "> jflxmc, </if>
<if test="clf_startdate != null and clf_startdate !='' "> clf_startdate, </if>
<if test="clf_enddate != null and clf_enddate !='' "> clf_enddate, </if>
<if test="clf_ccdd != null and clf_ccdd !='' "> clf_ccdd, </if>
<if test="clf_ccksd != null and clf_ccksd !='' "> clf_ccksd, </if>
<if test="clf_djzs != null and clf_djzs !='' "> clf_djzs, </if>
<if test="clf_ccts != null and clf_ccts !='' "> clf_ccts, </if>
<if test="clf_ccrs != null and clf_ccrs !='' "> clf_ccrs, </if>
<if test="clf_zw != null and clf_zw !='' "> clf_zw, </if>
<if test="clf_jtgj != null and clf_jtgj !='' "> clf_jtgj, </if>
<if test="clf_jtf != null and clf_jtf !='' "> clf_jtf, </if>
<if test="clf_zsbz != null and clf_zsbz !='' "> clf_zsbz, </if>
<if test="clf_zsf != null and clf_zsf !='' "> clf_zsf, </if>
<if test="clf_hsbz != null and clf_hsbz !='' "> clf_hsbz, </if>
<if test="clf_jtbz != null and clf_jtbz !='' "> clf_jtbz, </if>
<if test="clf_jtbzf != null and clf_jtbzf !='' "> clf_jtbzf, </if>
<if test="clf_qtf != null and clf_qtf !='' "> clf_qtf </if>
)
values (
<if test="mlId != null and mlId !='' "> #{mlId}, </if>
@ -75,7 +124,29 @@
<if test="fzx7dm != null and fzx7dm !='' "> #{fzx7dm}, </if>
<if test="fzx7mc != null and fzx7mc !='' "> #{fzx7mc},</if>
<if test="kzzbId != null and kzzbId !='' "> #{kzzbId}, </if>
<if test="gsdm != null and gsdm !='' "> #{gsdm} </if>
<if test="gsdm != null and gsdm !='' "> #{gsdm}, </if>
<if test="fzx8dm != null and fzx8dm !='' "> #{fzx8dm}, </if>
<if test="fzx8mc != null and fzx8mc !='' "> #{fzx8mc}, </if>
<if test="fzx9dm != null and fzx9dm !='' "> #{fzx9dm}, </if>
<if test="fzx9mc != null and fzx9mc !='' "> #{fzx9mc}, </if>
<if test="jflxdm != null and jflxdm !='' "> #{jflxdm}, </if>
<if test="jflxmc != null and jflxmc !='' "> #{jflxmc}, </if>
<if test="clf_startdate != null and clf_startdate !='' "> #{clf_startdate}, </if>
<if test="clf_enddate != null and clf_enddate !='' "> #{clf_enddate}, </if>
<if test="clf_ccdd != null and clf_ccdd !='' "> #{clf_ccdd}, </if>
<if test="clf_ccksd != null and clf_ccksd !='' "> #{clf_ccksd}, </if>
<if test="clf_djzs != null and clf_djzs !='' "> #{clf_djzs}, </if>
<if test="clf_ccts != null and clf_ccts !='' "> #{clf_ccts}, </if>
<if test="clf_ccrs != null and clf_ccrs !='' "> #{clf_ccrs}, </if>
<if test="clf_zw != null and clf_zw !='' "> #{clf_zw}, </if>
<if test="clf_jtgj != null and clf_jtgj !='' "> #{clf_jtgj}, </if>
<if test="clf_jtf != null and clf_jtf !='' "> #{clf_jtf}, </if>
<if test="clf_zsbz != null and clf_zsbz !='' "> #{clf_zsbz}, </if>
<if test="clf_zsf != null and clf_zsf !='' "> #{clf_zsf}, </if>
<if test="clf_hsbz != null and clf_hsbz !='' "> #{clf_hsbz}, </if>
<if test="clf_jtbz != null and clf_jtbz !='' "> #{clf_jtbz}, </if>
<if test="clf_jtbzf != null and clf_jtbzf !='' "> #{clf_jtbzf}, </if>
<if test="clf_qtf != null and clf_qtf !='' "> #{clf_qtf} </if>
)
</insert>