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
b9c9cf98
Commit
b9c9cf98
authored
Oct 13, 2023
by
lisong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
代码完善
parent
22a72833
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
22 deletions
+21
-22
TzsUserInfoController.java
...boot/module/tcm/biz/controller/TzsUserInfoController.java
+0
-3
TzBaseEnterpriseInfoServiceImpl.java
...tcm/biz/service/impl/TzBaseEnterpriseInfoServiceImpl.java
+18
-16
TzsUserInfoServiceImpl.java
...t/module/tcm/biz/service/impl/TzsUserInfoServiceImpl.java
+3
-3
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/controller/TzsUserInfoController.java
View file @
b9c9cf98
...
...
@@ -11,16 +11,13 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import
com.yeejoin.amos.boot.module.tcm.api.dto.TzsEquipListDto
;
import
com.yeejoin.amos.boot.module.tcm.api.dto.TzsUserInfoDto
;
import
com.yeejoin.amos.boot.module.tcm.api.entity.TzsUserInfo
;
import
com.yeejoin.amos.boot.module.tcm.api.entity.TzsUserQualifications
;
import
com.yeejoin.amos.boot.module.tcm.api.service.ITzsUserInfoService
;
import
com.yeejoin.amos.boot.module.tcm.biz.service.impl.TzsUserInfoServiceImpl
;
import
com.yeejoin.amos.component.feign.utils.FeignUtil
;
import
com.yeejoin.amos.feign.privilege.Privilege
;
import
com.yeejoin.amos.feign.privilege.model.AgencyUserModel
;
import
com.yeejoin.amos.feign.privilege.model.CompanyModel
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
import
org.checkerframework.checker.units.qual.A
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.util.ObjectUtils
;
import
org.springframework.web.bind.annotation.*
;
...
...
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/TzBaseEnterpriseInfoServiceImpl.java
View file @
b9c9cf98
...
...
@@ -513,24 +513,26 @@ public class TzBaseEnterpriseInfoServiceImpl
List
<
TzsUserInfo
>
tzsUserInfos
=
tzsUserInfoMapper
.
selectList
(
lambda
);
tzsUserInfos
.
forEach
(
item
->
{
boolean
update
=
false
;
JSONArray
objects
=
JSON
.
parseArray
(
item
.
getEquipType
());
ArrayList
<
String
>
oldDate
=
new
ArrayList
<>();
objects
.
forEach
(
itemTpe
->
{
oldDate
.
add
(
itemTpe
.
toString
());
});
for
(
Object
object
:
objects
)
{
if
(!
newDate
.
contains
(
object
))
{
update
=
true
;
oldDate
.
remove
(
object
.
toString
());
if
(!
ObjectUtils
.
isEmpty
(
item
.
getEquipType
()))
{
JSONArray
objects
=
JSON
.
parseArray
(
item
.
getEquipType
());
ArrayList
<
String
>
oldDate
=
new
ArrayList
<>();
objects
.
forEach
(
itemTpe
->
{
oldDate
.
add
(
itemTpe
.
toString
());
});
for
(
Object
object
:
objects
)
{
if
(!
newDate
.
contains
(
object
))
{
update
=
true
;
oldDate
.
remove
(
object
.
toString
());
}
}
}
if
(
update
)
{
if
(!
ObjectUtils
.
isEmpty
(
oldDate
))
{
item
.
setEquipType
(
JSON
.
toJSONString
(
oldDate
));
}
else
{
item
.
setEquipType
(
null
);
if
(
update
)
{
if
(!
ObjectUtils
.
isEmpty
(
oldDate
))
{
item
.
setEquipType
(
JSON
.
toJSONString
(
oldDate
));
}
else
{
item
.
setEquipType
(
null
);
}
tzsUserInfoMapper
.
updateById
(
item
);
}
tzsUserInfoMapper
.
updateById
(
item
);
}
});
}
...
...
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 @
b9c9cf98
...
...
@@ -406,11 +406,11 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
@Override
public
List
<
Map
<
String
,
Object
>>
getUserType
(
String
unitType
)
{
if
(
unitType
.
equals
(
"pro"
)){
if
(
unitType
.
equals
(
"pro"
))
{
return
tzsUserInfoMapper
.
getUserType
(
"QYRYGW-SCDW"
);
}
else
if
(
unitType
.
equals
(
"use"
))
{
}
else
if
(
unitType
.
equals
(
"use"
))
{
return
tzsUserInfoMapper
.
getUserType
(
"QYRYGW-SYDW"
);
}
else
{
}
else
{
return
tzsUserInfoMapper
.
getUserType
(
null
);
}
...
...
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