劳务费缺少字段增加

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

@@ -89,6 +89,8 @@ public class OerDjmlEntity extends BaseEntity {
     private String WX00000057;//自定义字段  已支出激励费
     private String WX00000058;//自定义字段  发放人群
     private String WX00000059;//自定义字段  发放性质
+    private String fzx7dm;//资金来源代码
+    private String fzx7mc;//资金来源名称
     //附件对象
     @JSONField(ordinal = 9995)
     private List<FileInfoDTO> fileInfoList;
@@ -579,4 +581,20 @@ public class OerDjmlEntity extends BaseEntity {
     public void setWX00000059(String WX00000059) {
         this.WX00000059 = WX00000059;
     }
+
+    public String getFzx7dm() {
+        return fzx7dm;
+    }
+
+    public void setFzx7dm(String fzx7dm) {
+        this.fzx7dm = fzx7dm;
+    }
+
+    public String getFzx7mc() {
+        return fzx7mc;
+    }
+
+    public void setFzx7mc(String fzx7mc) {
+        this.fzx7mc = fzx7mc;
+    }
 }

fw-grpU8/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/entity/OerDjmlEntity.xml

@@ -172,6 +172,8 @@ GSDM,KJND,mlId
             <if test="WX00000057 != null and WX00000057 !='' "> WX00000057, </if>
             <if test="WX00000058 != null and WX00000058 !='' "> WX00000058, </if>
             <if test="WX00000059 != null and WX00000059 !='' "> WX00000059, </if>
+            <if test="fzx7dm != null and fzx7dm !='' "> fzx7dm, </if>
+            <if test="fzx7mc != null and fzx7mc !='' "> fzx7mc, </if>
             <if test="xmdm != null and xmdm !='' "> xmdm, </if>
             <if test="xmmc != null and xmmc !='' "> xmmc, </if>
         </trim>
@@ -227,6 +229,8 @@ GSDM,KJND,mlId
             <if test="WX00000057 != null and WX00000057 !='' "> #{WX00000057}, </if>
             <if test="WX00000058 != null and WX00000058 !='' "> #{WX00000058}, </if>
             <if test="WX00000059 != null and WX00000059 !='' "> #{WX00000059}, </if>
+            <if test="fzx7dm != null and fzx7dm !='' "> #{fzx7dm}, </if>
+            <if test="fzx7mc != null and fzx7mc !='' "> #{fzx7mc}, </if>
             <if test="xmdm != null and xmdm !='' "> #{xmdm}, </if>
             <if test="xmmc != null and xmmc !='' "> #{xmmc}, </if>
         </trim>
@@ -280,6 +284,8 @@ GSDM,KJND,mlId
             <if test="yhzh != null and yhzh !='' "> yhzh = #{yhzh}, </if>
             <if test="xmdm != null and xmdm !='' "> xmdm = #{xmdm}, </if>
             <if test="xmmc != null and xmmc !='' "> xmmc = #{xmmc}, </if>
+            <if test="fzx7dm != null and fzx7dm !='' "> fzx7dm = #{fzx7dm}, </if>
+            <if test="fzx7mc != null and fzx7mc !='' "> fzx7dm = #{fzx7mc}, </if>
             <if test="WX00000051 != null and WX00000051 !='' "> WX00000051 =#{WX00000051}, </if>
             <if test="WX00000054 != null and WX00000054 !='' "> WX00000054 = #{WX00000054}, </if>
             <if test="WX00000055 != null and WX00000055 !='' "> WX00000055 = #{WX00000055}, </if>

fw-grpU8/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/service/impl/OerDjmlExtServiceImpl.java

@@ -910,6 +910,10 @@ public class OerDjmlExtServiceImpl implements IOerDjmlExtService {
             djml.setKjnd(formmainData.getString("field0044"));
             djml.setDjlxId(djlxid);
             djml.setZt("2");
+            djml.setFjs("0");
+            djml.setCurshjd("0");
+            djml.setNextshjd("-9");
+            djml.setShrId("-1");
             djml.setCrerdm(formmainData.getString("field0084"));//制单人代码
             djml.setCrermc(formmainData.getString("field0085"));//制单人名称
             djml.setCrerdate(timestampConvert(formmainData.getString("start_date"),"yyyyMMdd"));
@@ -925,6 +929,8 @@ public class OerDjmlExtServiceImpl implements IOerDjmlExtService {
             djml.setZy(formmainData.getString("field0045"));//劳务内容
             djml.setWX00000051(formmainData.getString("field0006"));//讲座发生时间
             djml.setWX00000059(formmainData.getString("field0105"));//发放性质
+            djml.setFzx7dm(formmainData.getString("field0104"));
+            djml.setFzx7mc(formmainData.getString("field0103"));
             //报销明细
             List<OerDjnrEntity> djnrList = new ArrayList<>();
             //结算方式