Commit 212469a194a6c4869a66eebf1b9d4f4dd9682df7
1 parent
f6d746aa
Exists in
dev
气瓶流转修改
Showing
2 changed files
with
4 additions
and
4 deletions
Show diff stats
backend/lpg-manage/src/main/java/com/hotent/lpg/manage/manager/impl/MQpxxManagerImpl.java
| ... | ... | @@ -1209,11 +1209,11 @@ public class MQpxxManagerImpl extends BaseManagerImpl<MQpxxDao, WQpxx> implement |
| 1209 | 1209 | } |
| 1210 | 1210 | if (ObjectUtil.isNotEmpty(mprkList)) { |
| 1211 | 1211 | ArrayList<QpxxDTO> qpxxDTOS = getQpxxDTOS(mprkList, wYgxx, wczxx, QpczlxEnum.mprk.getCode()); |
| 1212 | - qplzcz_new(qpxxDTOS, QpztEnum.mp.getInfo(), wYgxx, now, QplzjdmcEnum.czzmprk.getInfo(), QpcyzlxEnum.cz.getInfo(), wczxx.getId()); | |
| 1212 | + 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()); | |
| 1213 | 1213 | } |
| 1214 | 1214 | if (ObjectUtil.isNotEmpty(kprkList)) { |
| 1215 | 1215 | ArrayList<QpxxDTO> qpxxDTOS = getQpxxDTOS(kprkList, wYgxx, wczxx, QpczlxEnum.kprk.getCode()); |
| 1216 | - qplzcz_new(qpxxDTOS, QpztEnum.kp.getInfo(), wYgxx, now, QplzjdmcEnum.czzkphs.getInfo(), QpcyzlxEnum.cz.getInfo(), wczxx.getId()); | |
| 1216 | + 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()); | |
| 1217 | 1217 | } |
| 1218 | 1218 | if (ObjectUtil.isEmpty(mprkList) && ObjectUtil.isEmpty(kprkList)) { |
| 1219 | 1219 | throw new RuntimeException("请传入气瓶信息"); | ... | ... |
backend/lpg/src/main/java/com/hotent/lpg/manager/impl/WQpxxManagerImpl.java
| ... | ... | @@ -859,11 +859,11 @@ public class WQpxxManagerImpl extends BaseManagerImpl<WQpxxDao, WQpxx> implement |
| 859 | 859 | } |
| 860 | 860 | if (ObjectUtil.isNotEmpty(mprkList)) { |
| 861 | 861 | ArrayList<QpxxDTO> qpxxDTOS = getQpxxDTOS(mprkList, wYgxx, wczxx,QpczlxEnum.mprk.getCode()); |
| 862 | - qplzcz_new(qpxxDTOS, QpztEnum.mp.getInfo(), wYgxx, now, QplzjdmcEnum.czzmprk.getInfo(), QpcyzlxEnum.cz.getInfo(), wczxx.getId()); | |
| 862 | + 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()); | |
| 863 | 863 | } |
| 864 | 864 | if (ObjectUtil.isNotEmpty(kprkList)) { |
| 865 | 865 | ArrayList<QpxxDTO> qpxxDTOS = getQpxxDTOS(kprkList, wYgxx, wczxx,QpczlxEnum.kprk.getCode()); |
| 866 | - qplzcz_new(qpxxDTOS, QpztEnum.kp.getInfo(), wYgxx, now, QplzjdmcEnum.czzkphs.getInfo(), QpcyzlxEnum.cz.getInfo(), wczxx.getId()); | |
| 866 | + 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()); | |
| 867 | 867 | } |
| 868 | 868 | if (ObjectUtil.isEmpty(mprkList) && ObjectUtil.isEmpty(kprkList)) { |
| 869 | 869 | throw new RuntimeException("请传入气瓶信息"); | ... | ... |