fix
This commit is contained in:
parent
97a5f62a62
commit
cd7ae3deb0
@ -43,6 +43,7 @@ public class AssessManagerController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@PostMapping("assess/manager/detail")
|
@PostMapping("assess/manager/detail")
|
||||||
|
@ApiOperation("获取考核详情列表")
|
||||||
@ApiResponses({@ApiResponse(code = 200,message = "成功",response = AssessManagerDetailRes.class)})
|
@ApiResponses({@ApiResponse(code = 200,message = "成功",response = AssessManagerDetailRes.class)})
|
||||||
public R assessDetail(@RequestBody AssessDetailReq req){
|
public R assessDetail(@RequestBody AssessDetailReq req){
|
||||||
PageUtils pageUtils = assessManagerService.assessDetail(req);
|
PageUtils pageUtils = assessManagerService.assessDetail(req);
|
||||||
|
|||||||
@ -1,6 +1,7 @@
|
|||||||
package com.lz.modules.performance.req;
|
package com.lz.modules.performance.req;
|
||||||
|
|
||||||
import com.lz.modules.equipment.entity.model.BasePage;
|
import com.lz.modules.equipment.entity.model.BasePage;
|
||||||
|
import io.swagger.models.auth.In;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@ -13,15 +14,9 @@ import java.util.List;
|
|||||||
@Data
|
@Data
|
||||||
public class AssessDetailReq extends BasePage{
|
public class AssessDetailReq extends BasePage{
|
||||||
//考勤组id
|
//考勤组id
|
||||||
private Long groupId;
|
private Long evaluationId;
|
||||||
|
//发起考核的id
|
||||||
private String month;
|
private int startId;
|
||||||
|
|
||||||
private String startTime;
|
|
||||||
|
|
||||||
private String endTime;
|
|
||||||
//周期类型
|
|
||||||
private int type;
|
|
||||||
//员工名称
|
//员工名称
|
||||||
private String staffName;
|
private String staffName;
|
||||||
//部门ids数组
|
//部门ids数组
|
||||||
@ -29,5 +24,5 @@ public class AssessDetailReq extends BasePage{
|
|||||||
//人员id数组
|
//人员id数组
|
||||||
private List<Long> staffIds;
|
private List<Long> staffIds;
|
||||||
//状态 确认 执行 结果录入。。。
|
//状态 确认 执行 结果录入。。。
|
||||||
private int status;
|
private Integer flowProcess;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -388,6 +388,19 @@
|
|||||||
ON r.start_id = s.start_id and r.staff_id = s.staff_id
|
ON r.start_id = s.start_id and r.staff_id = s.staff_id
|
||||||
where r.is_delete = 0 and s.is_delete = 0
|
where r.is_delete = 0 and s.is_delete = 0
|
||||||
and r.start_id = #{startId}
|
and r.start_id = #{startId}
|
||||||
|
<if test="evaluationId !=null">
|
||||||
|
and r.evaluation_id = #{evaluationId}
|
||||||
|
</if>
|
||||||
|
<if test="flowProcess !=null">
|
||||||
|
and r.flow_process = #{flowProcess}
|
||||||
|
</if>
|
||||||
|
<if test="staffIds !=null and staffIds.size() !=0">
|
||||||
|
and staff_id in(
|
||||||
|
<foreach collection="staffIds" item="staff_id" separator=",">
|
||||||
|
#{staff_id}
|
||||||
|
</foreach>
|
||||||
|
)
|
||||||
|
</if>
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
</mapper>
|
</mapper>
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user