From 4cd1dadc75ff88e0673b51498f5ac8bcec445d53 Mon Sep 17 00:00:00 2001
From: xiang2lin <251481237@qq.com>
Date: Wed, 2 Apr 2025 16:40:17 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=B9=E7=94=A8=E6=8A=A5=E9=94=80=E5=8D=95?=
=?UTF-8?q?=E7=94=9F=E6=88=90=E9=94=99=E8=AF=AF=E5=AD=97=E6=AE=B5=E4=BF=AE?=
=?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../frame/grpU8/nxproof/oerdjjsfs/entity/OerDjjsfsEntity.xml | 3 +++
.../hzya/frame/grpU8/nxproof/oerdjml/entity/OerDjmlEntity.xml | 2 +-
.../nxproof/oerdjml/service/impl/OerDjmlExtServiceImpl.java | 4 ++--
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/fw-grpU8/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjjsfs/entity/OerDjjsfsEntity.xml b/fw-grpU8/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjjsfs/entity/OerDjjsfsEntity.xml
index 1373b9b4..26cefee0 100644
--- a/fw-grpU8/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjjsfs/entity/OerDjjsfsEntity.xml
+++ b/fw-grpU8/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjjsfs/entity/OerDjjsfsEntity.xml
@@ -23,6 +23,7 @@
<result property="rytype" column="rytype" />
<result property="grdm" column="grdm" />
<result property="yt" column="yt" />
+ <result property="bnxid" column="bnxid" />
<result property="skrbz" column="skrbz" />
</resultMap>
@@ -56,6 +57,7 @@ GSDM,KJND
<if test="grdm != null and grdm !='' "> GRDM, </if>
<if test="yt != null and yt !='' "> yt,</if>
<if test="skrbz != null and skrbz !='' "> SKRBZ, </if>
+ <if test="bnxid != null and bnxid !='' "> bnxid, </if>
<if test="gsdm != null and gsdm !='' "> GSDM </if>
)
values (
@@ -82,6 +84,7 @@ GSDM,KJND
<if test="grdm != null and grdm !='' "> #{grdm}, </if>
<if test="yt != null and yt !='' "> #{yt},</if>
<if test="skrbz != null and skrbz !='' "> #{skrbz}, </if>
+ <if test="bnxid != null and bnxid !='' "> #{bnxid}, </if>
<if test="gsdm != null and gsdm !='' "> #{gsdm} </if>
)
</insert>
diff --git a/fw-grpU8/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/entity/OerDjmlEntity.xml b/fw-grpU8/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/entity/OerDjmlEntity.xml
index d96baeb7..d3c90a45 100644
--- a/fw-grpU8/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/entity/OerDjmlEntity.xml
+++ b/fw-grpU8/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/entity/OerDjmlEntity.xml
@@ -85,7 +85,7 @@ GSDM,KJND,mlId
as mlId from OER_DJML where GSDM=#{gsdm} and mlid like concat(substring(replace(DATE_FORMAT(now(),'%Y-%m-%d'),'-',''),1,6),'%')
</select>-->
<select id="OerDjmlEntity_list_base_mlidMax" resultMap="get-OerDjmlEntity-result" parameterType="com.hzya.frame.grpU8.nxproof.oerdjml.entity.OerDjmlEntity">
- select (isnull(max(MLID),concat(substring(#{djdate},0,7),0000)) + 1) as mlId
+ select (isnull(max(MLID),concat(substring(#{djdate},0,7),'0000')) + 1) as mlId
from OER_DJML where 1=1 and GSDM=#{gsdm} and MLID like concat(substring(#{djdate},0,7),'%')
</select>
diff --git a/fw-grpU8/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/service/impl/OerDjmlExtServiceImpl.java b/fw-grpU8/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/service/impl/OerDjmlExtServiceImpl.java
index 3c0372d3..83f00e53 100644
--- a/fw-grpU8/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/service/impl/OerDjmlExtServiceImpl.java
+++ b/fw-grpU8/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/service/impl/OerDjmlExtServiceImpl.java
@@ -277,8 +277,8 @@ public class OerDjmlExtServiceImpl implements IOerDjmlExtService {
jsfs.setDjlxId(djlxid);
jsfs.setBnxid(headers.get("jsfs_bnxid"));
jsfs.setXh(String.valueOf(xh));
- jsfs.setJsfsdm(forson.getString("field0042"));
- jsfs.setJsfsmc(forson.getString("field0043"));
+ jsfs.setJsfsdm(forson.getString("field0043"));
+ jsfs.setJsfsmc(forson.getString("field0042"));
jsfs.setKmdm("");
jsfs.setKmmc("");
jsfs.setSkr(forson.getString("field0076"));