Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
Project
Project
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
项目统一框架
amos-boot-biz
Commits
647ae98d
Commit
647ae98d
authored
Oct 13, 2023
by
lisong
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register
parents
b9c9cf98
6a9a074e
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
17 deletions
+17
-17
TzsUserInfoServiceImpl.java
...t/module/tcm/biz/service/impl/TzsUserInfoServiceImpl.java
+17
-17
No files found.
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/service/impl/TzsUserInfoServiceImpl.java
View file @
647ae98d
...
@@ -84,7 +84,7 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
...
@@ -84,7 +84,7 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
tzsUserInfoDtoPage
.
getRecords
().
forEach
(
item
->
{
tzsUserInfoDtoPage
.
getRecords
().
forEach
(
item
->
{
if
(!
ObjectUtils
.
isEmpty
(
item
.
getProfile
()))
{
if
(!
ObjectUtils
.
isEmpty
(
item
.
getProfile
()))
{
List
<
CommonFile
>
commonFiles
=
JSON
.
parseArray
(
item
.
getProfile
(),
CommonFile
.
class
);
List
<
CommonFile
>
commonFiles
=
JSON
.
parseArray
(
item
.
getProfile
(),
CommonFile
.
class
);
if
(!
ObjectUtils
.
isEmpty
(
commonFiles
)){
if
(!
ObjectUtils
.
isEmpty
(
commonFiles
))
{
item
.
setProfile
(
commonFiles
.
get
(
0
).
getUrl
());
item
.
setProfile
(
commonFiles
.
get
(
0
).
getUrl
());
}
}
}
}
...
@@ -262,7 +262,7 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
...
@@ -262,7 +262,7 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
}
}
//绑定两个规定用户组
//绑定两个规定用户组
String
post
=
tzsUserInfo
.
getPost
();
String
post
=
tzsUserInfo
.
getPost
();
post
=
post
.
replace
(
"["
,
""
).
replace
(
"]"
,
""
).
replace
(
"\""
,
""
);
post
=
post
.
replace
(
"["
,
""
).
replace
(
"]"
,
""
).
replace
(
"\""
,
""
);
for
(
String
code
:
post
.
split
(
","
))
{
for
(
String
code
:
post
.
split
(
","
))
{
DataDictionary
groupId
=
iDataDictionaryService
DataDictionary
groupId
=
iDataDictionaryService
.
getOne
(
new
LambdaQueryWrapper
<
DataDictionary
>().
eq
(
DataDictionary:
:
getCode
,
code
).
likeRight
(
DataDictionary:
:
getType
,
QYRYGW
));
.
getOne
(
new
LambdaQueryWrapper
<
DataDictionary
>().
eq
(
DataDictionary:
:
getCode
,
code
).
likeRight
(
DataDictionary:
:
getType
,
QYRYGW
));
...
@@ -333,10 +333,10 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
...
@@ -333,10 +333,10 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
@Override
@Override
public
Map
<
String
,
Object
>
getCompanyType
()
{
public
Map
<
String
,
Object
>
getCompanyType
()
{
Map
<
String
,
Object
>
result
=
new
HashMap
<>();
Map
<
String
,
Object
>
result
=
new
HashMap
<>();
result
.
put
(
"companyType"
,
null
);
result
.
put
(
"companyType"
,
null
);
List
<
CompanyModel
>
companyModels
=
FeignUtil
.
remoteCall
(()
->
Privilege
.
companyClient
.
queryListByChild
(
RequestContext
.
getExeUserId
()));
List
<
CompanyModel
>
companyModels
=
FeignUtil
.
remoteCall
(()
->
Privilege
.
companyClient
.
queryListByChild
(
RequestContext
.
getExeUserId
()));
if
(
companyModels
.
isEmpty
())
{
if
(
companyModels
.
isEmpty
())
{
return
result
;
return
result
;
}
}
result
.
put
(
"creditCode"
,
companyModels
.
get
(
0
).
getCompanyCode
());
result
.
put
(
"creditCode"
,
companyModels
.
get
(
0
).
getCompanyCode
());
...
@@ -344,31 +344,31 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
...
@@ -344,31 +344,31 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
boolean
useCompany
=
false
;
boolean
useCompany
=
false
;
for
(
CompanyModel
companyModel
:
companyModels
)
{
for
(
CompanyModel
companyModel
:
companyModels
)
{
String
companyType
=
companyModel
.
getCompanyType
();
String
companyType
=
companyModel
.
getCompanyType
();
if
(
companyType
.
contains
(
"使用单位"
)
||
companyType
.
contains
(
"个人主体"
))
{
if
(
companyType
.
contains
(
"使用单位"
)
||
companyType
.
contains
(
"个人主体"
))
{
useCompany
=
true
;
useCompany
=
true
;
}
}
if
(
companyType
.
contains
(
"充装单位"
)
||
companyType
.
contains
(
"安装改造维修单位"
)||
companyType
.
contains
(
"制造单位"
)
||
companyType
.
contains
(
"设计单位"
))
{
if
(
companyType
.
contains
(
"充装单位"
)
||
companyType
.
contains
(
"安装改造维修单位"
)
||
companyType
.
contains
(
"制造单位"
)
||
companyType
.
contains
(
"设计单位"
))
{
productCompany
=
true
;
productCompany
=
true
;
}
}
}
}
String
companyType
=
null
;
String
companyType
=
null
;
if
(
useCompany
)
{
if
(
useCompany
)
{
companyType
=
"use"
;
companyType
=
"use"
;
}
}
if
(
productCompany
)
{
if
(
productCompany
)
{
companyType
=
"pro"
;
companyType
=
"pro"
;
}
}
if
(
useCompany
&&
productCompany
)
{
if
(
useCompany
&&
productCompany
)
{
companyType
=
"useAndPro"
;
companyType
=
"useAndPro"
;
}
}
result
.
put
(
"companyType"
,
companyType
);
result
.
put
(
"companyType"
,
companyType
);
return
result
;
return
result
;
}
}
@Override
@Override
public
Page
<
TzsEquipListDto
>
getEquipList
(
String
type
,
String
userSeq
,
TzsEquipListDto
dto
,
Page
<
TzsEquipListDto
>
page
)
{
public
Page
<
TzsEquipListDto
>
getEquipList
(
String
type
,
String
userSeq
,
TzsEquipListDto
dto
,
Page
<
TzsEquipListDto
>
page
)
{
List
<
CompanyModel
>
companyModels
=
FeignUtil
.
remoteCall
(()
->
Privilege
.
companyClient
.
queryListByChild
(
RequestContext
.
getExeUserId
()));
List
<
CompanyModel
>
companyModels
=
FeignUtil
.
remoteCall
(()
->
Privilege
.
companyClient
.
queryListByChild
(
RequestContext
.
getExeUserId
()));
if
(
companyModels
.
isEmpty
())
{
if
(
companyModels
.
isEmpty
())
{
throw
new
BadRequest
(
"未指定人员归属单位信息"
);
throw
new
BadRequest
(
"未指定人员归属单位信息"
);
}
}
String
companyCode
=
companyModels
.
get
(
0
).
getCompanyCode
();
String
companyCode
=
companyModels
.
get
(
0
).
getCompanyCode
();
...
@@ -378,7 +378,7 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
...
@@ -378,7 +378,7 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
}
}
@Override
@Override
public
Boolean
equipBind
(
String
type
,
String
userSeq
,
String
creditCode
,
Map
<
String
,
Object
>
map
)
{
public
Boolean
equipBind
(
String
type
,
String
userSeq
,
String
creditCode
,
Map
<
String
,
Object
>
map
)
{
Object
recordList
=
map
.
get
(
"ids"
);
Object
recordList
=
map
.
get
(
"ids"
);
List
<
String
>
ids
=
(
List
<
String
>)
recordList
;
List
<
String
>
ids
=
(
List
<
String
>)
recordList
;
List
<
TzsUserEquip
>
tzsUserEquipList
=
new
ArrayList
<>();
List
<
TzsUserEquip
>
tzsUserEquipList
=
new
ArrayList
<>();
...
@@ -392,7 +392,7 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
...
@@ -392,7 +392,7 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
tzsUserEquipList
.
add
(
tzsUserEquip
);
tzsUserEquipList
.
add
(
tzsUserEquip
);
}
}
flag
=
tzsUserEquipService
.
saveBatch
(
tzsUserEquipList
);
flag
=
tzsUserEquipService
.
saveBatch
(
tzsUserEquipList
);
}
else
if
(
"untie"
.
equals
(
type
))
{
}
else
if
(
"untie"
.
equals
(
type
))
{
int
num
=
tzsUserEquipMapper
.
delete
(
new
QueryWrapper
<
TzsUserEquip
>().
eq
(
"user_seq"
,
userSeq
).
in
(
"equip_id"
,
ids
));
int
num
=
tzsUserEquipMapper
.
delete
(
new
QueryWrapper
<
TzsUserEquip
>().
eq
(
"user_seq"
,
userSeq
).
in
(
"equip_id"
,
ids
));
flag
=
num
>
0
?
true
:
flag
;
flag
=
num
>
0
?
true
:
flag
;
}
}
...
@@ -401,7 +401,7 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
...
@@ -401,7 +401,7 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
@Override
@Override
public
List
<
TzsUserInfo
>
getSafetyList
(
String
companyCode
)
{
public
List
<
TzsUserInfo
>
getSafetyList
(
String
companyCode
)
{
return
tzsUserInfoMapper
.
selectList
(
new
QueryWrapper
<
TzsUserInfo
>().
eq
(
"unit_code"
,
companyCode
).
like
(
"post"
,
6549
));
return
tzsUserInfoMapper
.
selectList
(
new
QueryWrapper
<
TzsUserInfo
>().
eq
(
"unit_code"
,
companyCode
).
like
(
"post"
,
6549
));
}
}
@Override
@Override
...
...
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