From 212469a194a6c4869a66eebf1b9d4f4dd9682df7 Mon Sep 17 00:00:00 2001 From: lst Date: Sat, 14 Sep 2024 16:11:06 +0800 Subject: [PATCH] 气瓶流转修改 --- backend/lpg-manage/src/main/java/com/hotent/lpg/manage/manager/impl/MQpxxManagerImpl.java | 4 ++-- backend/lpg/src/main/java/com/hotent/lpg/manager/impl/WQpxxManagerImpl.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/backend/lpg-manage/src/main/java/com/hotent/lpg/manage/manager/impl/MQpxxManagerImpl.java b/backend/lpg-manage/src/main/java/com/hotent/lpg/manage/manager/impl/MQpxxManagerImpl.java index 036dbd7..f084f16 100644 --- a/backend/lpg-manage/src/main/java/com/hotent/lpg/manage/manager/impl/MQpxxManagerImpl.java +++ b/backend/lpg-manage/src/main/java/com/hotent/lpg/manage/manager/impl/MQpxxManagerImpl.java @@ -1209,11 +1209,11 @@ public class MQpxxManagerImpl extends BaseManagerImpl implement } if (ObjectUtil.isNotEmpty(mprkList)) { ArrayList qpxxDTOS = getQpxxDTOS(mprkList, wYgxx, wczxx, QpczlxEnum.mprk.getCode()); - qplzcz_new(qpxxDTOS, QpztEnum.mp.getInfo(), wYgxx, now, QplzjdmcEnum.czzmprk.getInfo(), QpcyzlxEnum.cz.getInfo(), wczxx.getId()); + qplzcz_new(qpxxDTOS, QpztEnum.mp.getInfo(), wYgxx, now, CzlxEnum.czz.getInfo().equals(wczxx.getFCzlx()) ? QplzjdmcEnum.czzmprk.getInfo() : QplzjdmcEnum.gyzmprk.getInfo(), QpcyzlxEnum.cz.getInfo(), wczxx.getId()); } if (ObjectUtil.isNotEmpty(kprkList)) { ArrayList qpxxDTOS = getQpxxDTOS(kprkList, wYgxx, wczxx, QpczlxEnum.kprk.getCode()); - qplzcz_new(qpxxDTOS, QpztEnum.kp.getInfo(), wYgxx, now, QplzjdmcEnum.czzkphs.getInfo(), QpcyzlxEnum.cz.getInfo(), wczxx.getId()); + qplzcz_new(qpxxDTOS, QpztEnum.kp.getInfo(), wYgxx, now, CzlxEnum.czz.getInfo().equals(wczxx.getFCzlx()) ? QplzjdmcEnum.czzkphs.getInfo() : QplzjdmcEnum.kphsgyz.getInfo(), QpcyzlxEnum.cz.getInfo(), wczxx.getId()); } if (ObjectUtil.isEmpty(mprkList) && ObjectUtil.isEmpty(kprkList)) { throw new RuntimeException("请传入气瓶信息"); diff --git a/backend/lpg/src/main/java/com/hotent/lpg/manager/impl/WQpxxManagerImpl.java b/backend/lpg/src/main/java/com/hotent/lpg/manager/impl/WQpxxManagerImpl.java index fb79cd4..f5d204e 100644 --- a/backend/lpg/src/main/java/com/hotent/lpg/manager/impl/WQpxxManagerImpl.java +++ b/backend/lpg/src/main/java/com/hotent/lpg/manager/impl/WQpxxManagerImpl.java @@ -859,11 +859,11 @@ public class WQpxxManagerImpl extends BaseManagerImpl implement } if (ObjectUtil.isNotEmpty(mprkList)) { ArrayList qpxxDTOS = getQpxxDTOS(mprkList, wYgxx, wczxx,QpczlxEnum.mprk.getCode()); - qplzcz_new(qpxxDTOS, QpztEnum.mp.getInfo(), wYgxx, now, QplzjdmcEnum.czzmprk.getInfo(), QpcyzlxEnum.cz.getInfo(), wczxx.getId()); + qplzcz_new(qpxxDTOS, QpztEnum.mp.getInfo(), wYgxx, now, CzlxEnum.czz.getInfo().equals(wczxx.getFCzlx()) ? QplzjdmcEnum.czzmprk.getInfo() : QplzjdmcEnum.gyzmprk.getInfo(), QpcyzlxEnum.cz.getInfo(), wczxx.getId()); } if (ObjectUtil.isNotEmpty(kprkList)) { ArrayList qpxxDTOS = getQpxxDTOS(kprkList, wYgxx, wczxx,QpczlxEnum.kprk.getCode()); - qplzcz_new(qpxxDTOS, QpztEnum.kp.getInfo(), wYgxx, now, QplzjdmcEnum.czzkphs.getInfo(), QpcyzlxEnum.cz.getInfo(), wczxx.getId()); + qplzcz_new(qpxxDTOS, QpztEnum.kp.getInfo(), wYgxx, now, CzlxEnum.czz.getInfo().equals(wczxx.getFCzlx()) ? QplzjdmcEnum.czzkphs.getInfo() : QplzjdmcEnum.kphsgyz.getInfo(), QpcyzlxEnum.cz.getInfo(), wczxx.getId()); } if (ObjectUtil.isEmpty(mprkList) && ObjectUtil.isEmpty(kprkList)) { throw new RuntimeException("请传入气瓶信息"); -- libgit2 0.21.2