From 4c40dff48454e0eeb80d6db068d28a5bb259bde0 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 11 六月 2024 11:16:40 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java | 11 +++++++----
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java | 18 ++++++++++--------
admin/src/components/common/GlobalWindow.vue | 2 +-
server/system_service/src/main/java/com/doumee/core/utils/FtpUtil.java | 4 ++--
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/common/PublicCloudController.java | 2 +-
admin/.env.development | 4 ++++
admin/src/components/common/GlobalRigthWindow.vue | 2 +-
7 files changed, 26 insertions(+), 17 deletions(-)
diff --git a/admin/.env.development b/admin/.env.development
new file mode 100644
index 0000000..b685bb8
--- /dev/null
+++ b/admin/.env.development
@@ -0,0 +1,4 @@
+# 寮�鍙戠幆澧冮厤缃�
+NODE_ENV = 'development'
+
+VUE_APP_API_URL = 'http://localhost:10010'
diff --git a/admin/src/components/common/GlobalRigthWindow.vue b/admin/src/components/common/GlobalRigthWindow.vue
index 1e01639..8cbe166 100644
--- a/admin/src/components/common/GlobalRigthWindow.vue
+++ b/admin/src/components/common/GlobalRigthWindow.vue
@@ -72,7 +72,7 @@
// 杈撳叆妗嗛珮搴�
$input-height: 32px;
.global-window {
- top: 80px !important;
+ top: 56px !important;
left: 218px !important;
// 澶撮儴鏍囬
::v-deep .el-drawer__header {
diff --git a/admin/src/components/common/GlobalWindow.vue b/admin/src/components/common/GlobalWindow.vue
index 359891b..b3c01bd 100644
--- a/admin/src/components/common/GlobalWindow.vue
+++ b/admin/src/components/common/GlobalWindow.vue
@@ -83,7 +83,7 @@
// 杈撳叆妗嗛珮搴�
$input-height: 32px;
.global-window {
- top: 80px !important;
+ top: 56px !important;
left: 250px !important;
// 澶撮儴鏍囬
::v-deep .el-drawer__header {
diff --git a/server/system_service/src/main/java/com/doumee/core/utils/FtpUtil.java b/server/system_service/src/main/java/com/doumee/core/utils/FtpUtil.java
index 5a6fbd5..8712f61 100644
--- a/server/system_service/src/main/java/com/doumee/core/utils/FtpUtil.java
+++ b/server/system_service/src/main/java/com/doumee/core/utils/FtpUtil.java
@@ -267,7 +267,7 @@
return false;
}
- public boolean uploadInputstreamBatch(InputStream inputStream, String remote, Boolean close) {
+ public boolean uploadInputstreamBatch(InputStream inputStream, String remote, Boolean close , Integer index ) {
// 璁剧疆PassiveMode浼犺緭
try {
ftpClient.enterLocalPassiveMode();
@@ -279,7 +279,7 @@
if (remote.contains("/")) {
remoteFileName = remote.substring(remote.lastIndexOf("/") + 1);
// 鍒涘缓鏈嶅姟鍣ㄨ繙绋嬬洰褰曠粨鏋勶紝鍒涘缓澶辫触鐩存帴杩斿洖
- if (StringUtils.equals(CreateDirecroty(remote, ftpClient), "2")) {
+ if (Constants.equalsInteger(index,Constants.ONE) && StringUtils.equals(CreateDirecroty(remote, ftpClient), "2")) {
log.error("鍒涘缓ftp鐩綍澶辫触======================="+remote);
return false;
}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/common/PublicCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/common/PublicCloudController.java
index eb12019..bb45612 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/common/PublicCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/common/PublicCloudController.java
@@ -101,7 +101,7 @@
String date = DateUtil.getNowShortDate();
String fName = date + "/" + UUID.randomUUID() + endType;
String fileName = folder + "/" + fName;
- boolean r = ftp.uploadInputstreamBatch(is, fileName, Constants.equalsInteger(index ,fileList.size()));
+ boolean r = ftp.uploadInputstreamBatch(is, fileName, Constants.equalsInteger(index ,fileList.size()),index);
if (r) {
JSONObject fileJSON = new JSONObject();
fileJSON.put("url", prefixPath + fileName);
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
index 62379b0..41dc926 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
@@ -637,13 +637,15 @@
List<Approve> levelList = getLevelListFromResult(approveGroupList,approveDateVO,memberId);
List<Approve> copyList = getAllCopyList(approveGroupList);
//閬嶅巻level鏌ヨ姣忎竴绾у埆涓氬姟鏁版嵁
- for(Approve level:levelList){
- List<Approve> tlist = getLevelInfoFromList(level,approveGroupList);
- approveDateVO.getApproveList().addAll(tlist);
- if(tlist.size() ==0
- ||Constants.equalsInteger(Constants.approveStatus.unPass, tlist.get(0).getStatus())
- ||Constants.equalsInteger(Constants.approveStatus.cancel, tlist.get(0).getStatus())){
- break;
+ if(levelList!=null){
+ for(Approve level:levelList){
+ List<Approve> tlist = getLevelInfoFromList(level,approveGroupList);
+ approveDateVO.getApproveList().addAll(tlist);
+ if(tlist.size() ==0
+ ||Constants.equalsInteger(Constants.approveStatus.unPass, tlist.get(0).getStatus())
+ ||Constants.equalsInteger(Constants.approveStatus.cancel, tlist.get(0).getStatus())){
+ break;
+ }
}
}
@@ -799,7 +801,7 @@
}
}
if(CollectionUtils.isEmpty(approveList)){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀹℃壒淇℃伅锛氱骇鍒暟鎹紓甯�");
+ // throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀹℃壒淇℃伅锛氱骇鍒暟鎹紓甯�");
}
return approveList;
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java
index 4c324ed..ece9591 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java
@@ -188,7 +188,8 @@
if(Constants.equalsInteger(model.getStatus(),Constants.FOUR)){
String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
+systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
- Member member = memberMapper.selectById(model.getCancelUser());
+ Member member1 = memberMapper.selectById(model.getCancelUser());
+
Approve approve = new Approve();
approve.setApproveType(Constants.ZERO);
approve.setCreateDate(model.getCancelTime());
@@ -196,9 +197,11 @@
approve.setStatusInfo("宸叉挙閿�");
approve.setStatus(Constants.FOUR);
approve.setType(Constants.ZERO);
- approve.setMemberName(member.getName());
- if(StringUtils.isNotBlank(member.getFaceImg())){
- approve.setFaceImg(path + member.getFaceImg());
+ if(member1!=null) {
+ approve.setMemberName(member1.getName());
+ if (StringUtils.isNotBlank(member1.getFaceImg())) {
+ approve.setFaceImg(path + member1.getFaceImg());
+ }
}
approve.setCheckInfo(model.getCancelInfo());
approveList.add(approve);
--
Gitblit v1.9.3