Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
8
8timerapiv200
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
8timerv2
8timerapiv200
Commits
0b2b5859
Commit
0b2b5859
authored
4 years ago
by
lal
Committed by
chenzg
3 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复BUG
parent
323a7608
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
41 additions
and
8 deletions
+41
-8
src/main/java/cn/timer/api/controller/jxgl/JxglController.java
+13
-6
src/main/java/cn/timer/api/dao/jxgl/JxglAppraisalMapper.java
+4
-0
src/main/resources/mapping/jxgl/JxglAppraisalMapper.xml
+7
-0
src/main/resources/mapping/jxgl/JxglPerformanceAppraisalMapper.xml
+17
-2
No files found.
src/main/java/cn/timer/api/controller/jxgl/JxglController.java
View file @
0b2b5859
...
...
@@ -633,10 +633,19 @@ public class JxglController {
// if(appisal.getAppraisalPersonNum() == 1) {
//
// }
if
(
appraisalUpdateSts
.
getSts
()
==
0
)
{
//开启评分
List
<
JxglAppraisal
>
ais
=
JxglAppraisal
.
builder
().
build
().
selectList
(
new
QueryWrapper
<
JxglAppraisal
>().
lambda
().
eq
(
JxglAppraisal:
:
getPerformanceAppraisalId
,
appraisalUpdateSts
.
getId
())
.
eq
(
JxglAppraisal:
:
getSts
,
1
));
if
(
ais
.
size
()
==
0
)
{
return
ResultUtil
.
error
(
"已无可开启的绩效评分"
);
}
}
else
if
(
appraisalUpdateSts
.
getSts
()
==
1
)
{
//开启结果确认
List
<
JxglAppraisal
>
ais
=
jxglAppraisalMapper
.
selectListByappraisalid
(
appraisalUpdateSts
.
getId
());
if
(
ais
.
size
()
==
0
)
{
return
ResultUtil
.
error
(
"已无可开启的绩效结果确认"
);
}
}
List
<
JxglAppraisal
>
ais
=
JxglAppraisal
.
builder
().
build
().
selectList
(
new
QueryWrapper
<
JxglAppraisal
>().
lambda
().
eq
(
JxglAppraisal:
:
getPerformanceAppraisalId
,
appraisalUpdateSts
.
getId
())
.
eq
(
JxglAppraisal:
:
getSts
,
0
));
if
(
ais
.
size
()
>
0
)
{
JxglPerformanceAppraisal
performanceAppraisal
=
jxglPerformanceAppraisalMapper
.
selectOne
(
new
QueryWrapper
<
JxglPerformanceAppraisal
>().
lambda
()
.
eq
(
JxglPerformanceAppraisal:
:
getId
,
appraisalUpdateSts
.
getId
())
...
...
@@ -793,9 +802,7 @@ public class JxglController {
return
ResultUtil
.
success
();
}
else
{
return
ResultUtil
.
error
(
"已无可开启的绩效节点"
);
}
}
/**
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/dao/jxgl/JxglAppraisalMapper.java
View file @
0b2b5859
package
cn
.
timer
.
api
.
dao
.
jxgl
;
import
java.util.List
;
import
org.apache.ibatis.annotations.Param
;
import
org.springframework.stereotype.Repository
;
...
...
@@ -26,5 +28,7 @@ public interface JxglAppraisalMapper extends BaseMapper<JxglAppraisal> {
IPage
<
JxglAppraisal
>
selectMyEmpByQuery
(
IPage
<
JxglAppraisal
>
page
,
@Param
(
"param"
)
EmpPerformanceQuery
query
);
String
CurrentdepartmentID
(
int
orgcode
,
int
empnum
);
List
<
JxglAppraisal
>
selectListByappraisalid
(
int
appraisalid
);
}
This diff is collapsed.
Click to expand it.
src/main/resources/mapping/jxgl/JxglAppraisalMapper.xml
View file @
0b2b5859
...
...
@@ -229,6 +229,13 @@
is_edit JxglAppraisal_is_edit
</sql>
<select
id=
"selectListByappraisalid"
resultMap=
"BaseResultMap"
>
SELECT id,performance_appraisal_id,emp_num,name,appraisal_explain,create_time,update_time,is_edit,sts,total,level
FROM jxgl_appraisal
WHERE performance_appraisal_id = #{appraisalid}
AND (sts = 2 or sts = 3)
</select>
<select
id=
"selectListByQuery"
resultMap=
"BaseResultMap_All"
>
SELECT
<include
refid=
"Base_Column_List_a"
/>
,
...
...
This diff is collapsed.
Click to expand it.
src/main/resources/mapping/jxgl/JxglPerformanceAppraisalMapper.xml
View file @
0b2b5859
...
...
@@ -249,7 +249,7 @@
</select>
<select
id=
"selectMyProcessedByQuery"
resultMap=
"BaseResultMap_ALl"
>
SELECT
<!--
SELECT
a.name,a.appraisal_start_time,a.appraisal_end_time,
b.id b_id,b.sts b_sts,
c.comprehensive_score c_comprehensive_score,
...
...
@@ -267,8 +267,23 @@
AND d.executor_id = #{param.id}
AND d.sts = 2
</where>
ORDER BY a.id DESC
ORDER BY a.id DESC
-->
select em.`name` b_user_name,
em.phone b_phone,
(SELECT name FROM zzgl_bmgw_m WHERE id = (SELECT up_id FROM zzgl_bmgw_m WHERE id = em.bmgw_id limit 1) limit 1) as b_bm_name,
pe.`name`,
nod.process_type as b_sts,
jx.total c_comprehensive_score,
jx.`level` c_level
from jxgl_process_node nod
LEFT JOIN jxgl_appraisal as jx on jx.id = nod.appraisal_id
LEFT JOIN jxgl_performance_appraisal as pe on pe.id = jx.performance_appraisal_id
LEFT JOIN yggl_main_emp as em on em.emp_num = nod.executor_id
where nod.executor_id = #{param.id}
and pe.org_code = #{param.orgCode}
and nod.sts = 2
ORDER BY pe.id DESC
</select>
...
...
This diff is collapsed.
Click to expand it.
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