From 3b422cf97f7397efba5fa85359a30683e190b68b Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Wed, 14 Jan 2026 09:57:29 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A[=E8=B5=84=E6=BA=90=E5=BA=93?= =?UTF-8?q?=E7=AE=A1=E7=90=86][=E9=BA=BB=E7=B2=BE=E8=8D=AF=E7=BF=BB?= =?UTF-8?q?=E8=AF=91]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hxhq/business/service/impl/MjyServiceImpl.java | 2 +- .../business/service/impl/MjyTzServiceImpl.java | 32 +++++++++++----------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java index d37c8dd..0bd342e 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java @@ -988,7 +988,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS BigDecimal leftKc = new BigDecimal(mjyOld.getKc()).subtract(new BigDecimal(form.getSyl())); mjyFfjlService.gh(form, mjyOld, ghr1, ghr2, jsr1, jsr2); //region 台账 - mjyTzService.getTz(mjyOld.getId(),null,null,ghr1,ghr2,null,null,jsr1,jsr2,null,"归还",form.getRkmz(),mjyOld.getKcdw(),form.getRemark()); + mjyTzService.saveTz(mjyOld.getId(),null,null,ghr1,ghr2,null,null,jsr1,jsr2,null,"归还",form.getRkmz(),mjyOld.getKcdw(),form.getRemark()); //region 稽查轨迹 Map formData = new LinkedHashMap<>(); formData.put("入库位置", form.getRkwz()); diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyTzServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyTzServiceImpl.java index d919f03..0439249 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyTzServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyTzServiceImpl.java @@ -60,21 +60,21 @@ public class MjyTzServiceImpl extends ServiceImpl implements MjyTz mjyTz = new MjyTz(); mjyTz.setMjyId(mjyId); if (lqr1 != null && lqr2 != null) { - mjyTz.setLqrMc(lqr1.getNickName() + lqr2.getNickName()); - mjyTz.setLqrMcEn(lqr1.getUserName() + lqr2.getUserName()); + mjyTz.setLqrMc(lqr1.getNickName() +","+ lqr2.getNickName()); + mjyTz.setLqrMcEn(lqr1.getUserName() +","+ lqr2.getUserName()); } if (ghr1 != null && ghr2 != null) { - mjyTz.setGhrMc(ghr1.getNickName() + ghr2.getNickName()); - mjyTz.setGhrMcEn(ghr1.getUserName() + ghr2.getUserName()); + mjyTz.setGhrMc(ghr1.getNickName() +","+ ghr2.getNickName()); + mjyTz.setGhrMcEn(ghr1.getUserName() +","+ ghr2.getUserName()); } if (ffr1 != null && ffr2 != null) { - mjyTz.setFfrMc(ffr1.getNickName() + ffr2.getNickName()); - mjyTz.setFfrMcEn(ffr1.getUserName() + ffr2.getUserName()); + mjyTz.setFfrMc(ffr1.getNickName() +","+ ffr2.getNickName()); + mjyTz.setFfrMcEn(ffr1.getUserName() +","+ ffr2.getUserName()); } if (jsr1 != null && jsr2 != null) { - mjyTz.setJsrMc(jsr1.getNickName() + jsr2.getNickName()); - mjyTz.setJsrMcEn(jsr1.getUserName() + jsr2.getUserName()); + mjyTz.setJsrMc(jsr1.getNickName() +","+ jsr2.getNickName()); + mjyTz.setJsrMcEn(jsr1.getUserName() +","+ jsr2.getUserName()); } if (qmr != null && qmr != null) { mjyTz.setQmrId(qmr.getUserId()); @@ -110,21 +110,21 @@ public class MjyTzServiceImpl extends ServiceImpl implements MjyTz mjyTz = new MjyTz(); mjyTz.setMjyId(mjyId); if (lqr1 != null && lqr2 != null) { - mjyTz.setLqrMc(lqr1.getNickName() + lqr2.getNickName()); - mjyTz.setLqrMcEn(lqr1.getUserName() + lqr2.getUserName()); + mjyTz.setLqrMc(lqr1.getNickName() +","+ lqr2.getNickName()); + mjyTz.setLqrMcEn(lqr1.getUserName() +","+ lqr2.getUserName()); } if (ghr1 != null && ghr2 != null) { - mjyTz.setGhrMc(ghr1.getNickName() + ghr2.getNickName()); - mjyTz.setGhrMcEn(ghr1.getUserName() + ghr2.getUserName()); + mjyTz.setGhrMc(ghr1.getNickName() +","+ ghr2.getNickName()); + mjyTz.setGhrMcEn(ghr1.getUserName() +","+ ghr2.getUserName()); } if (ffr1 != null && ffr2 != null) { - mjyTz.setFfrMc(ffr1.getNickName() + ffr2.getNickName()); - mjyTz.setFfrMcEn(ffr1.getUserName() + ffr2.getUserName()); + mjyTz.setFfrMc(ffr1.getNickName() +","+ ffr2.getNickName()); + mjyTz.setFfrMcEn(ffr1.getUserName() +","+ ffr2.getUserName()); } if (jsr1 != null && jsr2 != null) { - mjyTz.setJsrMc(jsr1.getNickName() + jsr2.getNickName()); - mjyTz.setJsrMcEn(jsr1.getUserName() + jsr2.getUserName()); + mjyTz.setJsrMc(jsr1.getNickName() +","+ jsr2.getNickName()); + mjyTz.setJsrMcEn(jsr1.getUserName() +","+ jsr2.getUserName()); } if (qmr != null && qmr != null) { mjyTz.setQmrId(qmr.getUserId());