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
5e4a0513
Commit
5e4a0513
authored
Aug 30, 2024
by
韩桐桐
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(tcm):1,新增接口:必填项校验(前端处理不了后端处理)
parent
98269fab
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
22 additions
and
1 deletion
+22
-1
TzsUserPermissionServiceImpl.java
...le/tcm/biz/service/impl/TzsUserPermissionServiceImpl.java
+22
-1
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/TzsUserPermissionServiceImpl.java
View file @
5e4a0513
...
@@ -14,8 +14,10 @@ import com.yeejoin.amos.boot.module.tcm.api.mapper.TzsUserPermissionMapper;
...
@@ -14,8 +14,10 @@ import com.yeejoin.amos.boot.module.tcm.api.mapper.TzsUserPermissionMapper;
import
com.yeejoin.amos.boot.module.tcm.api.service.ITzsUserPermissionService
;
import
com.yeejoin.amos.boot.module.tcm.api.service.ITzsUserPermissionService
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.util.ObjectUtils
;
import
org.typroject.tyboot.core.foundation.utils.ValidationUtil
;
import
org.typroject.tyboot.core.foundation.utils.ValidationUtil
;
import
org.typroject.tyboot.core.rdbms.service.BaseService
;
import
org.typroject.tyboot.core.rdbms.service.BaseService
;
import
org.typroject.tyboot.core.restful.exception.instance.BadRequest
;
import
java.time.LocalDate
;
import
java.time.LocalDate
;
import
java.time.LocalDateTime
;
import
java.time.LocalDateTime
;
...
@@ -98,7 +100,26 @@ public class TzsUserPermissionServiceImpl extends BaseService<TzsUserPermissionD
...
@@ -98,7 +100,26 @@ public class TzsUserPermissionServiceImpl extends BaseService<TzsUserPermissionD
// permissionData6552 作业人员资质
// permissionData6552 作业人员资质
JSONArray
permissionData6552
=
userInfoDto
.
getPermissionData6552
();
JSONArray
permissionData6552
=
userInfoDto
.
getPermissionData6552
();
if
(!
ValidationUtil
.
isEmpty
(
permissionData6552
))
{
if
(!
ValidationUtil
.
isEmpty
(
permissionData6552
))
{
permissionData6552
.
forEach
(
x
->
tzsUserPermissions
.
add
(
buildPermission
(
ZYRY_TYPE
,
(
JSONObject
)
x
,
userInfoDto
)));
permissionData6552
.
forEach
(
item
->
{
JSONObject
itempermissionData6552
=
(
JSONObject
)
item
;
// 前端无法处理后端手动判断
// 作业项目中含有【金属焊接操作】,则【金属焊接操作-项目代号】必填
// 作业项目中含有【非金属焊接操作】,则【非金属焊接操作-项目代号】必填
// 作业项目中含有【其他】,则【其他作业项目是必填的】必填
String
jobItem
=
String
.
valueOf
(
itempermissionData6552
.
get
(
"jobItem"
));
String
otherItem
=
String
.
valueOf
(
itempermissionData6552
.
get
(
"otherItem"
));
JSONObject
itemCode
=
JSON
.
parseObject
(
String
.
valueOf
(
itempermissionData6552
.
get
(
"itemCode"
)));
if
(
jobItem
.
contains
(
"金属焊接操作"
)
&&
ObjectUtils
.
isEmpty
(
itemCode
.
get
(
"JSHJCZItemCode"
)))
{
throw
new
BadRequest
(
"金属焊接操作-项目代号是必填的"
);
}
if
(
jobItem
.
contains
(
"非金属焊接操作"
)
&&
ObjectUtils
.
isEmpty
(
itemCode
.
get
(
"FJSHJCZItemCode"
)))
{
throw
new
BadRequest
(
"非金属焊接操作-项目代号是必填的"
);
}
if
(
jobItem
.
contains
(
"其他"
)
&&
ObjectUtils
.
isEmpty
(
otherItem
))
{
throw
new
BadRequest
(
"其他作业项目是必填的"
);
}
tzsUserPermissions
.
add
(
buildPermission
(
ZYRY_TYPE
,
itempermissionData6552
,
userInfoDto
));
});
}
}
this
.
saveBatch
(
tzsUserPermissions
);
this
.
saveBatch
(
tzsUserPermissions
);
}
}
...
...
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