Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
Y
yn-health-science
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
徐俊
yn-health-science
Commits
fb5a7d88
Commit
fb5a7d88
authored
Mar 20, 2025
by
徐俊
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
xujun
parent
19e3d639
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
7 deletions
+8
-7
ComTalentApplyController.java
...com/yiboshi/science/rest/v1/ComTalentApplyController.java
+0
-3
ComPersonServiceImpl.java
...om/yiboshi/science/service/impl/ComPersonServiceImpl.java
+1
-2
ComTalentApplyServiceImpl.java
...boshi/science/service/impl/ComTalentApplyServiceImpl.java
+7
-2
No files found.
science-admin/src/main/java/com/yiboshi/science/rest/v1/ComTalentApplyController.java
View file @
fb5a7d88
...
@@ -82,9 +82,6 @@ public class ComTalentApplyController extends BaseController<ComTalentApplyServi
...
@@ -82,9 +82,6 @@ public class ComTalentApplyController extends BaseController<ComTalentApplyServi
@PreAuthorize
(
"hasAnyRole('REPORT','GOV','ADMIN')"
)
@PreAuthorize
(
"hasAnyRole('REPORT','GOV','ADMIN')"
)
@Logs
(
value
=
CommonEnum
.
logType
.
talentApply
)
@Logs
(
value
=
CommonEnum
.
logType
.
talentApply
)
public
ResponseDataModel
<
String
>
save
(
@RequestBody
ComTalentApplyDTO
comTalentApplyDTO
,
BindingResult
bindingResult
)
{
public
ResponseDataModel
<
String
>
save
(
@RequestBody
ComTalentApplyDTO
comTalentApplyDTO
,
BindingResult
bindingResult
)
{
comTalentApplyDTO
.
setAppPersonId
(
SecurityUserHolder
.
getPersonId
());
comTalentApplyDTO
.
setAppUnitId
(
SecurityUserHolder
.
getUnitId
());
return
ResponseDataModel
.
ok
(
comTalentApplyService
.
save
(
comTalentApplyDTO
));
return
ResponseDataModel
.
ok
(
comTalentApplyService
.
save
(
comTalentApplyDTO
));
}
}
}
}
science-admin/src/main/java/com/yiboshi/science/service/impl/ComPersonServiceImpl.java
View file @
fb5a7d88
...
@@ -513,8 +513,7 @@ public class ComPersonServiceImpl extends BaseServiceImpl<ComPersonDAO, ComPerso
...
@@ -513,8 +513,7 @@ public class ComPersonServiceImpl extends BaseServiceImpl<ComPersonDAO, ComPerso
public
String
insertOrUpdate
(
ComTalentApplyDTO
dto
)
{
public
String
insertOrUpdate
(
ComTalentApplyDTO
dto
)
{
ComPerson
model
=
new
ComPerson
();
ComPerson
model
=
new
ComPerson
();
if
(
Objects
.
nonNull
(
dto
.
getPersonId
()))
{
if
(
Objects
.
nonNull
(
dto
.
getPersonId
()))
{
model
.
setId
(
dto
.
getPersonId
());
model
=
this
.
getById
(
dto
.
getPersonId
());
model
=
this
.
getEntity
(
model
);
}
}
String
id
=
""
;
String
id
=
""
;
if
(
null
==
model
)
{
if
(
null
==
model
)
{
...
...
science-admin/src/main/java/com/yiboshi/science/service/impl/ComTalentApplyServiceImpl.java
View file @
fb5a7d88
...
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
...
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import
com.yiboshi.arch.exception.BusinessException
;
import
com.yiboshi.arch.exception.BusinessException
;
import
com.yiboshi.science.base.BaseServiceImpl
;
import
com.yiboshi.science.base.BaseServiceImpl
;
import
com.yiboshi.science.base.Pagination
;
import
com.yiboshi.science.base.Pagination
;
import
com.yiboshi.science.config.security.SecurityUserHolder
;
import
com.yiboshi.science.dao.ComTalentApplyDAO
;
import
com.yiboshi.science.dao.ComTalentApplyDAO
;
import
com.yiboshi.science.entity.ComTalentApply
;
import
com.yiboshi.science.entity.ComTalentApply
;
import
com.yiboshi.science.entity.SystemParameter
;
import
com.yiboshi.science.entity.SystemParameter
;
...
@@ -128,12 +129,16 @@ public class ComTalentApplyServiceImpl extends BaseServiceImpl<ComTalentApplyDAO
...
@@ -128,12 +129,16 @@ public class ComTalentApplyServiceImpl extends BaseServiceImpl<ComTalentApplyDAO
public
ComTalentApplyDTO
getNewTalentApply
()
{
public
ComTalentApplyDTO
getNewTalentApply
()
{
ComTalentApplyDTO
dto
=
new
ComTalentApplyDTO
();
ComTalentApplyDTO
dto
=
new
ComTalentApplyDTO
();
dto
.
setReportYear
(
comBatchService
.
getReportYear
(
null
,
CommonEnum
.
timeType
.
talentApply
.
getCode
()));
dto
.
setCompleteStatus
(
"0,0,0,0,0,0"
);
List
<
ComTalentBudgetDTO
>
bugetList
=
comTalentBudgetService
.
getList
();
List
<
ComTalentBudgetDTO
>
bugetList
=
comTalentBudgetService
.
getList
();
dto
.
setBudgetList
(
bugetList
);
dto
.
setBudgetList
(
bugetList
);
dto
.
setReportYear
(
comBatchService
.
getReportYear
(
null
,
CommonEnum
.
timeType
.
talentApply
.
getCode
()));
dto
.
setCompleteStatus
(
"0,0,0,0,0,0"
);
dto
.
setTalentState
(
CommonEnum
.
projState
.
draft
.
getCode
());
dto
.
setAppPersonId
(
SecurityUserHolder
.
getPersonId
());
dto
.
setAppUnitId
(
SecurityUserHolder
.
getUnitId
());
return
dto
;
return
dto
;
}
}
...
...
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