From f23f7a18fe8fe3729dfb91af5b55b515b835c7d8 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期四, 17 八月 2023 17:40:16 +0800
Subject: [PATCH] 问题修改
---
igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5207.java | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5207.java b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5207.java
index 303514f..a1460d3 100644
--- a/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5207.java
+++ b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5207.java
@@ -20,6 +20,7 @@
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -42,7 +43,7 @@
@Override
public String getInterfaceId() {
- return Phone35Constant.API_PHONE_5205;
+ return Phone35Constant.API_PHONE_5207;
}
@SuppressWarnings("unchecked")
@@ -56,26 +57,24 @@
return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "鍙傛暟鏈夎锛岃閲嶈瘯锛侊紒");
}
//鍙傛暟楠岃瘉
- if (StringUtils.isEmpty(param.getDeptId())) {
- return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "鍙傛暟鏈夎锛岃閲嶈瘯锛侊紒");
- }
+// if (StringUtils.isEmpty(param.getDeptId())) {
+// return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "鍙傛暟鏈夎锛岃閲嶈瘯锛侊紒");
+// }
//鍊间粨鎻愪氦鍓嶏紝鍐嶆纭褰撳墠娴佹按鏄惁涓哄�间粨娴佺▼
InoutRecord record = hPhoneService.getInoutRecord(phone35AuthUser.getCompanyId(), phone35AuthUser.getDeptId(), param.getId(), null);
- if(!InoutConstant.PROGRESS_HANDLE.equals(record.getProgress())){
+ if (!InoutConstant.PROGRESS_HANDLE.equals(record.getProgress())) {
return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "璇ュ崟瀛愪笉鍦ㄥ�间粨鐘舵�侊紝涓嶈兘杩涜鍊间粨鎻愪氦锛�");
}
InoutData data = new InoutData();
BeanUtils.copyProperties(record, data);
- if(param.getType().equals(Phone35Constant.PHONE_INOUT_START)){
+ if (param.getType().equals(Phone35Constant.PHONE_INOUT_START)) {
//鍊间粨寮�濮嬫彁浜わ紝鍙洿鏂板�间粨寮�濮嬫椂闂�
- data.setHandleStart(new Date());
String msg = inoutService.updateData(data);
return PhoneRespUtil.success(null, req, msg);
- }else{
+ } else {
//鍊间粨缁撴潫鎻愪氦,闇�鏇存柊娴佺▼鐘舵�併�佸�间粨缁撴潫鏃堕棿銆佸�间粨浜恒�佸�间粨鎵ｉ噸绛�
- data.setHandleEnd(new Date());
data.setDeHandle(param.getDeHandle());
data.setHandleUser(phone35AuthUser.getCname());
//璁剧疆鍊间粨鍥剧墖淇℃伅
@@ -88,8 +87,10 @@
files.add(fileData2);
//TODO 璁剧疆姘村嵃
data.setFiles(files);
+
+ PageResponse<InoutData> stringPageResponse = inoutManager.submitHandle(data);
//杩涜涓嬩竴娴佺▼鏇存柊
- PageResponse<InoutData> stringPageResponse = inoutManager.inNextStep(data);
+ // PageResponse<InoutData> stringPageResponse = inoutManager.inNextStep(data);
return PhoneRespUtil.success(stringPageResponse.getData(), req);
}
--
Gitblit v1.9.3