Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
cloud-fb
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
王衍超
cloud-fb
Commits
ec4f5c3f
Commit
ec4f5c3f
authored
Apr 20, 2021
by
shiwenbo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
购砂单位系统和场站系统查询上传人时兼容区域公司系统,反之不支持。
parent
fafe2545
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
10 deletions
+18
-10
SandAttachmentController.java
...java/com/xyst/dinas/biz/web/SandAttachmentController.java
+9
-5
WarehouseAttachmentController.java
...com/xyst/dinas/biz/web/WarehouseAttachmentController.java
+9
-5
No files found.
backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/web/SandAttachmentController.java
View file @
ec4f5c3f
...
@@ -52,6 +52,7 @@ import com.beecode.bap.attachment.common.Utils;
...
@@ -52,6 +52,7 @@ import com.beecode.bap.attachment.common.Utils;
import
com.beecode.bap.attachment.exception.AttachmentDataDownLoadException
;
import
com.beecode.bap.attachment.exception.AttachmentDataDownLoadException
;
import
com.beecode.bap.attachment.exception.AttachmentDataUploadException
;
import
com.beecode.bap.attachment.exception.AttachmentDataUploadException
;
import
com.beecode.bap.attachment.exception.AttachmentException
;
import
com.beecode.bap.attachment.exception.AttachmentException
;
import
com.beecode.bap.attachment.internal.CreatorAdapterService
;
import
com.beecode.bap.attachment.service.AttachmentService
;
import
com.beecode.bap.attachment.service.AttachmentService
;
import
com.beecode.inz.basis.pojo.SandUser
;
import
com.beecode.inz.basis.pojo.SandUser
;
import
com.beecode.inz.basis.service.SandUserService
;
import
com.beecode.inz.basis.service.SandUserService
;
...
@@ -489,8 +490,8 @@ public class SandAttachmentController {
...
@@ -489,8 +490,8 @@ public class SandAttachmentController {
return
false
;
return
false
;
}
}
//
@Autowired
@Autowired
//
private CreatorAdapterService creatorAdapterService;
private
CreatorAdapterService
creatorAdapterService
;
// private UUID getCurrentCreatorId() {
// private UUID getCurrentCreatorId() {
// return creatorAdapterService.getCurrentCreatorId();
// return creatorAdapterService.getCurrentCreatorId();
...
@@ -502,9 +503,12 @@ public class SandAttachmentController {
...
@@ -502,9 +503,12 @@ public class SandAttachmentController {
}
}
private
String
getCreatorName
(
UUID
id
)
{
private
String
getCreatorName
(
UUID
id
)
{
// return creatorAdapterService.getCreatorName(id);
String
userName
=
creatorAdapterService
.
getCreatorName
(
id
);
SandUser
user
=
sandUserService
.
getById
(
id
);
if
(
userName
==
null
)
{
return
user
.
getTitle
();
SandUser
user
=
sandUserService
.
getById
(
id
);
return
user
.
getTitle
();
}
return
userName
;
}
}
private
Map
<
String
,
Object
>
toMap
(
AttachmentInfo
info
)
{
private
Map
<
String
,
Object
>
toMap
(
AttachmentInfo
info
)
{
...
...
backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/web/WarehouseAttachmentController.java
View file @
ec4f5c3f
...
@@ -52,6 +52,7 @@ import com.beecode.bap.attachment.common.Utils;
...
@@ -52,6 +52,7 @@ import com.beecode.bap.attachment.common.Utils;
import
com.beecode.bap.attachment.exception.AttachmentDataDownLoadException
;
import
com.beecode.bap.attachment.exception.AttachmentDataDownLoadException
;
import
com.beecode.bap.attachment.exception.AttachmentDataUploadException
;
import
com.beecode.bap.attachment.exception.AttachmentDataUploadException
;
import
com.beecode.bap.attachment.exception.AttachmentException
;
import
com.beecode.bap.attachment.exception.AttachmentException
;
import
com.beecode.bap.attachment.internal.CreatorAdapterService
;
import
com.beecode.bap.attachment.service.AttachmentService
;
import
com.beecode.bap.attachment.service.AttachmentService
;
import
com.beecode.inz.basis.pojo.WarehouseUser
;
import
com.beecode.inz.basis.pojo.WarehouseUser
;
import
com.beecode.inz.basis.service.WarehouseUserService
;
import
com.beecode.inz.basis.service.WarehouseUserService
;
...
@@ -489,8 +490,8 @@ public class WarehouseAttachmentController {
...
@@ -489,8 +490,8 @@ public class WarehouseAttachmentController {
return
false
;
return
false
;
}
}
//
@Autowired
@Autowired
//
private CreatorAdapterService creatorAdapterService;
private
CreatorAdapterService
creatorAdapterService
;
// private UUID getCurrentCreatorId() {
// private UUID getCurrentCreatorId() {
// return creatorAdapterService.getCurrentCreatorId();
// return creatorAdapterService.getCurrentCreatorId();
...
@@ -502,9 +503,12 @@ public class WarehouseAttachmentController {
...
@@ -502,9 +503,12 @@ public class WarehouseAttachmentController {
}
}
private
String
getCreatorName
(
UUID
id
)
{
private
String
getCreatorName
(
UUID
id
)
{
// return creatorAdapterService.getCreatorName(id);
String
userName
=
creatorAdapterService
.
getCreatorName
(
id
);
WarehouseUser
user
=
warehouseUserService
.
getById
(
id
);
if
(
userName
==
null
)
{
return
user
.
getTitle
();
WarehouseUser
user
=
warehouseUserService
.
getById
(
id
);
return
user
.
getTitle
();
}
return
userName
;
}
}
private
Map
<
String
,
Object
>
toMap
(
AttachmentInfo
info
)
{
private
Map
<
String
,
Object
>
toMap
(
AttachmentInfo
info
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment