From 7e6e59aa162776a0ab37cfbc0c6c79d14100eb69 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期六, 16 九月 2023 18:09:57 +0800
Subject: [PATCH] 增加DL/T645多功能电表协议
---
igds-api-phone/src/main/java/com/ld/igds/phone/service/impl/ServiceImpl5207.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/igds-api-phone/src/main/java/com/ld/igds/phone/service/impl/ServiceImpl5207.java b/igds-api-phone/src/main/java/com/ld/igds/phone/service/impl/ServiceImpl5207.java
index adffa5d..03be311 100644
--- a/igds-api-phone/src/main/java/com/ld/igds/phone/service/impl/ServiceImpl5207.java
+++ b/igds-api-phone/src/main/java/com/ld/igds/phone/service/impl/ServiceImpl5207.java
@@ -58,15 +58,15 @@
InoutData data = inoutMapper.inoutQueryById(inoutParam);
//鍒ゆ柇鍗曞瓙鏄惁鍦ㄥ�间粨娴佺▼
- if(!data.getProgress().equals(InoutConstant.PROGRESS_HANDLE)){
- return PhoneRespUtil.error(RespCodeEnum.CODE_2000,"璇ュ崟瀛愪笉鍦ㄥ�间粨鐘舵�侊紝涓嶈兘杩涜鍊间粨鎻愪氦锛�");
+ if (!data.getProgress().equals(InoutConstant.PROGRESS_HANDLE)) {
+ return PhoneRespUtil.error(RespCodeEnum.CODE_2000, "璇ュ崟瀛愪笉鍦ㄥ�间粨鐘舵�侊紝涓嶈兘杩涜鍊间粨鎻愪氦锛�");
}
- if(param.getType().equals(PhoneConstant.PHONE_INOUT_START)){
+ if (param.getType().equals(PhoneConstant.PHONE_INOUT_START)) {
//鍊间粨寮�濮嬫彁浜わ紝鍙洿鏂板�间粨寮�濮嬫椂闂�
String msg = inoutService.updateData(data);
return PhoneRespUtil.success(msg, req);
- }else{
+ } else {
//鍊间粨缁撴潫鎻愪氦,闇�鏇存柊娴佺▼鐘舵�併�佸�间粨缁撴潫鏃堕棿銆佸�间粨浜恒�佸�间粨鎵ｉ噸绛�
data.setDeHandle(param.getDeHandle());
data.setHandleUser(authUser.getCname());
@@ -80,7 +80,9 @@
files.add(fileData2);
data.setFiles(files);
//杩涜涓嬩竴娴佺▼鏇存柊
- PageResponse<InoutData> stringPageResponse = inoutManager.inNextStep(data);
+ // PageResponse<InoutData> stringPageResponse = inoutManager.inNextStep(data);
+
+ PageResponse<InoutData> stringPageResponse = inoutManager.submitHandle(data);
return PhoneRespUtil.success(stringPageResponse.getData(), req);
}
--
Gitblit v1.9.3