Commit edb08915 by tangzhaoqian

+1

parent 0e6b79db
...@@ -623,8 +623,8 @@ public class JxglController { ...@@ -623,8 +623,8 @@ public class JxglController {
* 修改-绩效管理状态 * 修改-绩效管理状态
*/ */
@PostMapping(value = "/update_performance_appraisal_sts") @PostMapping(value = "/update_performance_appraisal_sts")
@ApiOperation(value = "8.修改-绩效管理状态", httpMethod = "POST", notes = "修改-绩效管理状态") @ApiOperation(value = "9.修改-绩效管理状态", httpMethod = "POST", notes = "修改-绩效管理状态")
@ApiOperationSupport(order = 8) @ApiOperationSupport(order = 9)
public Result<Object> updatePAS(@CurrentUser UserBean userBean, public Result<Object> updatePAS(@CurrentUser UserBean userBean,
@Validated @RequestBody AppraisalUpdateSts appraisalUpdateSts) { @Validated @RequestBody AppraisalUpdateSts appraisalUpdateSts) {
...@@ -789,8 +789,8 @@ public class JxglController { ...@@ -789,8 +789,8 @@ public class JxglController {
* 终止-绩效考核 * 终止-绩效考核
*/ */
@PutMapping(value = "/termination_performance_appraisal") @PutMapping(value = "/termination_performance_appraisal")
@ApiOperation(value = "8.终止-绩效考核", httpMethod = "PUT", notes = "终止-绩效考核") @ApiOperation(value = "10.终止-绩效考核", httpMethod = "PUT", notes = "终止-绩效考核")
@ApiOperationSupport(order = 8) @ApiOperationSupport(order = 10)
@Role @Role
@Log(title = "终止-绩效考核") @Log(title = "终止-绩效考核")
public Result<Object> terminationPA(@CurrentUser UserBean userBean,@NotNull @RequestParam Integer id) { public Result<Object> terminationPA(@CurrentUser UserBean userBean,@NotNull @RequestParam Integer id) {
...@@ -865,8 +865,8 @@ public class JxglController { ...@@ -865,8 +865,8 @@ public class JxglController {
* 查询-绩效考核-列表-归档 * 查询-绩效考核-列表-归档
*/ */
@PostMapping(value = "/selects_performance_appraisal_archive") @PostMapping(value = "/selects_performance_appraisal_archive")
@ApiOperation(value = "8.查询-绩效考核-列表-归档", httpMethod = "POST", notes = "查询-绩效考核-列表-归档") @ApiOperation(value = "11.查询-绩效考核-列表-归档", httpMethod = "POST", notes = "查询-绩效考核-列表-归档")
@ApiOperationSupport(order = 8) @ApiOperationSupport(order = 11)
@Role @Role
public Result<Object> selectsPAArchive(@CurrentUser UserBean userBean, public Result<Object> selectsPAArchive(@CurrentUser UserBean userBean,
@RequestBody PerformanceAppraisalQuery query) { @RequestBody PerformanceAppraisalQuery query) {
...@@ -886,8 +886,8 @@ public class JxglController { ...@@ -886,8 +886,8 @@ public class JxglController {
* 查询-绩效考核-列表-非归档 * 查询-绩效考核-列表-非归档
*/ */
@PostMapping(value = "/selects_performance_appraisal") @PostMapping(value = "/selects_performance_appraisal")
@ApiOperation(value = "9.查询-绩效考核-列表-非归档", httpMethod = "POST", notes = "查询-绩效考核-列表-非归档") @ApiOperation(value = "12.查询-绩效考核-列表-非归档", httpMethod = "POST", notes = "查询-绩效考核-列表-非归档")
@ApiOperationSupport(order = 9) @ApiOperationSupport(order = 12)
@Role @Role
public Result<Object> selectsPA(@CurrentUser UserBean userBean, @RequestBody PerformanceAppraisalQuery query) { public Result<Object> selectsPA(@CurrentUser UserBean userBean, @RequestBody PerformanceAppraisalQuery query) {
...@@ -906,8 +906,8 @@ public class JxglController { ...@@ -906,8 +906,8 @@ public class JxglController {
* 查询-考核-列表 * 查询-考核-列表
*/ */
@PostMapping(value = "/selects_appraisal") @PostMapping(value = "/selects_appraisal")
@ApiOperation(value = "10.查询-考核-列表", httpMethod = "POST", notes = "查询-考核-列表") @ApiOperation(value = "13.查询-考核-列表", httpMethod = "POST", notes = "查询-考核-列表")
@ApiOperationSupport(order = 10) @ApiOperationSupport(order = 13)
@Role @Role
public Result<Object> selectsA(@CurrentUser UserBean userBean, @RequestBody AppraisalQuery query) { public Result<Object> selectsA(@CurrentUser UserBean userBean, @RequestBody AppraisalQuery query) {
...@@ -943,8 +943,8 @@ public class JxglController { ...@@ -943,8 +943,8 @@ public class JxglController {
* 查询-考核-详情 * 查询-考核-详情
*/ */
@GetMapping(value = "/select_appraisal/{id}") @GetMapping(value = "/select_appraisal/{id}")
@ApiOperation(value = "11.查询-考核-详情", httpMethod = "GET", notes = "查询-考核-详情") @ApiOperation(value = "14.查询-考核-详情", httpMethod = "GET", notes = "查询-考核-详情")
@ApiOperationSupport(order = 11) @ApiOperationSupport(order = 14)
public Result<Object> selectA(@CurrentUser UserBean userBean, @PathVariable Integer id) { public Result<Object> selectA(@CurrentUser UserBean userBean, @PathVariable Integer id) {
AppraisalDetail aD = jxglAppraisalMapper.selectDetailById(userBean.getOrgCode(), id); AppraisalDetail aD = jxglAppraisalMapper.selectDetailById(userBean.getOrgCode(), id);
...@@ -976,8 +976,8 @@ public class JxglController { ...@@ -976,8 +976,8 @@ public class JxglController {
* 修改-流程执行人-转派 * 修改-流程执行人-转派
*/ */
@PutMapping(value = "/update_process_node") @PutMapping(value = "/update_process_node")
@ApiOperation(value = "12.修改-流程执行人-转派", httpMethod = "PUT", notes = "修改-流程执行人-转派") @ApiOperation(value = "15.修改-流程执行人-转派", httpMethod = "PUT", notes = "修改-流程执行人-转派")
@ApiOperationSupport(order = 12) @ApiOperationSupport(order = 15)
@Role @Role
public Result<Object> updatePN(@CurrentUser UserBean userBean, public Result<Object> updatePN(@CurrentUser UserBean userBean,
@Validated @RequestBody ProcessNodeUpdate processNodeUpdate) { @Validated @RequestBody ProcessNodeUpdate processNodeUpdate) {
...@@ -1018,8 +1018,8 @@ public class JxglController { ...@@ -1018,8 +1018,8 @@ public class JxglController {
* 终止-考核 * 终止-考核
*/ */
@PutMapping(value = "/termination_assessment") @PutMapping(value = "/termination_assessment")
@ApiOperation(value = "13.终止-考核", httpMethod = "PUT", notes = "终止-考核") @ApiOperation(value = "16.终止-考核", httpMethod = "PUT", notes = "终止-考核")
@ApiOperationSupport(order = 13) @ApiOperationSupport(order = 16)
@Role @Role
@Log(title = "终止-考核") @Log(title = "终止-考核")
public Result<Object> terminationAssessment(@CurrentUser UserBean userBean, @NotNull @RequestParam Integer id) { public Result<Object> terminationAssessment(@CurrentUser UserBean userBean, @NotNull @RequestParam Integer id) {
...@@ -1051,8 +1051,8 @@ public class JxglController { ...@@ -1051,8 +1051,8 @@ public class JxglController {
* 查询-绩效管理-员工绩效-汇总 * 查询-绩效管理-员工绩效-汇总
*/ */
@PostMapping(value = "/selects_emp_performance") @PostMapping(value = "/selects_emp_performance")
@ApiOperation(value = "14.查询-绩效管理-员工绩效-汇总", httpMethod = "POST", notes = " 查询-绩效管理-员工绩效-汇总") @ApiOperation(value = "17.查询-绩效管理-员工绩效-汇总", httpMethod = "POST", notes = " 查询-绩效管理-员工绩效-汇总")
@ApiOperationSupport(order = 14) @ApiOperationSupport(order = 17)
@Role @Role
public Result<Object> selectsEP(@CurrentUser UserBean userBean, @RequestBody EmpPerformanceQuery query) { public Result<Object> selectsEP(@CurrentUser UserBean userBean, @RequestBody EmpPerformanceQuery query) {
...@@ -1088,8 +1088,8 @@ public class JxglController { ...@@ -1088,8 +1088,8 @@ public class JxglController {
* 查询-某员工考核-列表 * 查询-某员工考核-列表
*/ */
@PostMapping(value = "/selects_emp_appraisal") @PostMapping(value = "/selects_emp_appraisal")
@ApiOperation(value = "15.查询-某员工考核-列表", httpMethod = "POST", notes = "查询-某员工考核-列表") @ApiOperation(value = "18.查询-某员工考核-列表", httpMethod = "POST", notes = "查询-某员工考核-列表")
@ApiOperationSupport(order = 15) @ApiOperationSupport(order = 18)
@Role @Role
public Result<Object> selectsEA(@CurrentUser UserBean userBean,@Validated @RequestBody EmpAppraisalQuery query) { public Result<Object> selectsEA(@CurrentUser UserBean userBean,@Validated @RequestBody EmpAppraisalQuery query) {
...@@ -1109,8 +1109,8 @@ public class JxglController { ...@@ -1109,8 +1109,8 @@ public class JxglController {
* 查询-我的绩效-考核我的-列表 * 查询-我的绩效-考核我的-列表
*/ */
@PostMapping(value = "/selects_my_appraisal") @PostMapping(value = "/selects_my_appraisal")
@ApiOperation(value = "15.查询-我的绩效-考核我的-列表", httpMethod = "POST", notes = "查询-我的绩效-考核我的-列表") @ApiOperation(value = "19.查询-我的绩效-考核我的-列表", httpMethod = "POST", notes = "查询-我的绩效-考核我的-列表")
@ApiOperationSupport(order = 15) @ApiOperationSupport(order = 19)
public Result<Object> selectsMA(@CurrentUser UserBean userBean,@Validated @RequestBody EmpAppraisalQuery query) { public Result<Object> selectsMA(@CurrentUser UserBean userBean,@Validated @RequestBody EmpAppraisalQuery query) {
IPage<JxglPerformanceAppraisal> page = new Page<JxglPerformanceAppraisal>(query.getCurrentPage(), IPage<JxglPerformanceAppraisal> page = new Page<JxglPerformanceAppraisal>(query.getCurrentPage(),
...@@ -1130,8 +1130,8 @@ public class JxglController { ...@@ -1130,8 +1130,8 @@ public class JxglController {
* 查询-绩效考核-方案 * 查询-绩效考核-方案
*/ */
@GetMapping(value = "/selects_performance_appraisal/{id}") @GetMapping(value = "/selects_performance_appraisal/{id}")
@ApiOperation(value = "16.查询-绩效考核-方案", httpMethod = "GET", notes = "查询-绩效考核-方案") @ApiOperation(value = "20.查询-绩效考核-方案", httpMethod = "GET", notes = "查询-绩效考核-方案")
@ApiOperationSupport(order = 16) @ApiOperationSupport(order = 20)
@Role @Role
public Result<Object> selectPA(@CurrentUser UserBean userBean, @PathVariable Integer id) { public Result<Object> selectPA(@CurrentUser UserBean userBean, @PathVariable Integer id) {
...@@ -1159,8 +1159,8 @@ public class JxglController { ...@@ -1159,8 +1159,8 @@ public class JxglController {
* 查询-目标待填写/目标待确认/评分/结果待确认-列表 * 查询-目标待填写/目标待确认/评分/结果待确认-列表
*/ */
@PostMapping(value = "/selects_my_performance") @PostMapping(value = "/selects_my_performance")
@ApiOperation(value = "17.查询-目标待填写/目标待确认/评分/结果待确认-列表", httpMethod = "POST", notes = "查询") @ApiOperation(value = "21.查询-目标待填写/目标待确认/评分/结果待确认-列表", httpMethod = "POST", notes = "查询")
@ApiOperationSupport(order = 17) @ApiOperationSupport(order = 21)
public Result<Object> selects(@CurrentUser UserBean userBean,@Validated @RequestBody MyPerformance query) { public Result<Object> selects(@CurrentUser UserBean userBean,@Validated @RequestBody MyPerformance query) {
IPage<JxglPerformanceAppraisal> page = new Page<JxglPerformanceAppraisal>(query.getCurrentPage(),query.getTotalPage()); IPage<JxglPerformanceAppraisal> page = new Page<JxglPerformanceAppraisal>(query.getCurrentPage(),query.getTotalPage());
...@@ -1184,8 +1184,8 @@ public class JxglController { ...@@ -1184,8 +1184,8 @@ public class JxglController {
* 查询-我的绩效-已处理-列表 * 查询-我的绩效-已处理-列表
*/ */
@PostMapping(value = "/selects_my_performance_processed") @PostMapping(value = "/selects_my_performance_processed")
@ApiOperation(value = "18.查询-我的绩效-已处理-列表", httpMethod = "POST", notes = "查询") @ApiOperation(value = "22.查询-我的绩效-已处理-列表", httpMethod = "POST", notes = "查询")
@ApiOperationSupport(order = 18) @ApiOperationSupport(order = 22)
public Result<Object> selectsP(@CurrentUser UserBean userBean, @Validated @RequestBody MyPerformance query) { public Result<Object> selectsP(@CurrentUser UserBean userBean, @Validated @RequestBody MyPerformance query) {
IPage<JxglPerformanceAppraisal> page = new Page<JxglPerformanceAppraisal>(query.getCurrentPage(),query.getTotalPage()); IPage<JxglPerformanceAppraisal> page = new Page<JxglPerformanceAppraisal>(query.getCurrentPage(),query.getTotalPage());
...@@ -1204,8 +1204,8 @@ public class JxglController { ...@@ -1204,8 +1204,8 @@ public class JxglController {
* 目标填写-保存 * 目标填写-保存
*/ */
@PostMapping(value = "/save_target_fill") @PostMapping(value = "/save_target_fill")
@ApiOperation(value = "17.目标填写-保存", httpMethod = "POST", notes = "目标填写-保存") @ApiOperation(value = "23.目标填写-保存", httpMethod = "POST", notes = "目标填写-保存")
@ApiOperationSupport(order = 17) @ApiOperationSupport(order = 23)
public Result<Object> saveTF(@CurrentUser UserBean userBean, @RequestBody AppraisalUpdate appraisalUpdate) public Result<Object> saveTF(@CurrentUser UserBean userBean, @RequestBody AppraisalUpdate appraisalUpdate)
throws Exception { throws Exception {
...@@ -1296,8 +1296,8 @@ public class JxglController { ...@@ -1296,8 +1296,8 @@ public class JxglController {
* 目标填写-提交 * 目标填写-提交
*/ */
@PostMapping(value = "/submit_target_fill") @PostMapping(value = "/submit_target_fill")
@ApiOperation(value = "17.目标填写-提交", httpMethod = "POST", notes = "目标填写-提交") @ApiOperation(value = "24.目标填写-提交", httpMethod = "POST", notes = "目标填写-提交")
@ApiOperationSupport(order = 17) @ApiOperationSupport(order = 24)
public Result<Object> submitTF(@CurrentUser UserBean userBean, @RequestParam Integer id) { public Result<Object> submitTF(@CurrentUser UserBean userBean, @RequestParam Integer id) {
Integer count2 = jxglAppraisalMapper.selectCount(new QueryWrapper<JxglAppraisal>().lambda() Integer count2 = jxglAppraisalMapper.selectCount(new QueryWrapper<JxglAppraisal>().lambda()
...@@ -1379,8 +1379,8 @@ public class JxglController { ...@@ -1379,8 +1379,8 @@ public class JxglController {
* 目标确认-同意 * 目标确认-同意
*/ */
@PostMapping(value = "/update_target_confirmed") @PostMapping(value = "/update_target_confirmed")
@ApiOperation(value = "18.目标确认-同意", httpMethod = "POST", notes = "目标确认-同意") @ApiOperation(value = "25.目标确认-同意", httpMethod = "POST", notes = "目标确认-同意")
@ApiOperationSupport(order = 18) @ApiOperationSupport(order = 25)
public Result<Object> updateTC(@CurrentUser UserBean userBean, @RequestParam Integer id) { public Result<Object> updateTC(@CurrentUser UserBean userBean, @RequestParam Integer id) {
Integer count2 = jxglAppraisalMapper.selectCount(new QueryWrapper<JxglAppraisal>().lambda() Integer count2 = jxglAppraisalMapper.selectCount(new QueryWrapper<JxglAppraisal>().lambda()
...@@ -1447,8 +1447,8 @@ public class JxglController { ...@@ -1447,8 +1447,8 @@ public class JxglController {
* 目标确认-驳回目标 * 目标确认-驳回目标
*/ */
@PostMapping(value = "/update_target_confirmed_reject") @PostMapping(value = "/update_target_confirmed_reject")
@ApiOperation(value = "18.目标确认-驳回目标", httpMethod = "POST", notes = "目标确认-驳回目标") @ApiOperation(value = "26.目标确认-驳回目标", httpMethod = "POST", notes = "目标确认-驳回目标")
@ApiOperationSupport(order = 18) @ApiOperationSupport(order = 26)
public Result<Object> updateTCR(@CurrentUser UserBean userBean, @RequestBody AppraisalReject appraisalReject) { public Result<Object> updateTCR(@CurrentUser UserBean userBean, @RequestBody AppraisalReject appraisalReject) {
Integer count2 = jxglAppraisalMapper.selectCount( Integer count2 = jxglAppraisalMapper.selectCount(
...@@ -1515,8 +1515,8 @@ public class JxglController { ...@@ -1515,8 +1515,8 @@ public class JxglController {
* 评价 -驳回目标 * 评价 -驳回目标
*/ */
@PostMapping(value = "/update_superior_score_reject") @PostMapping(value = "/update_superior_score_reject")
@ApiOperation(value = "19.评价 -驳回目标", httpMethod = "POST", notes = "评价 -驳回目标") @ApiOperation(value = "27.评价 -驳回目标", httpMethod = "POST", notes = "评价 -驳回目标")
@ApiOperationSupport(order = 19) @ApiOperationSupport(order = 27)
public Result<Object> updateSSR(@CurrentUser UserBean userBean, @RequestBody AppraisalReject appraisalReject) { public Result<Object> updateSSR(@CurrentUser UserBean userBean, @RequestBody AppraisalReject appraisalReject) {
Integer count2 = jxglAppraisalMapper.selectCount( Integer count2 = jxglAppraisalMapper.selectCount(
...@@ -1595,8 +1595,8 @@ public class JxglController { ...@@ -1595,8 +1595,8 @@ public class JxglController {
* 上级评价 -驳回评分 * 上级评价 -驳回评分
*/ */
@PostMapping(value = "/update_superior_reject_score") @PostMapping(value = "/update_superior_reject_score")
@ApiOperation(value = "20.上级评价 -驳回评分", httpMethod = "POST", notes = "上级评价 -驳回评分") @ApiOperation(value = "28.上级评价 -驳回评分", httpMethod = "POST", notes = "上级评价 -驳回评分")
@ApiOperationSupport(order = 20) @ApiOperationSupport(order = 28)
public Result<Object> updateSRS(@CurrentUser UserBean userBean,@Validated @RequestBody AppraisalReject appraisalReject) { public Result<Object> updateSRS(@CurrentUser UserBean userBean,@Validated @RequestBody AppraisalReject appraisalReject) {
Integer count2 = jxglAppraisalMapper.selectCount( Integer count2 = jxglAppraisalMapper.selectCount(
...@@ -1679,8 +1679,8 @@ public class JxglController { ...@@ -1679,8 +1679,8 @@ public class JxglController {
* 评分提交 * 评分提交
*/ */
@PostMapping(value = "/save_score") @PostMapping(value = "/save_score")
@ApiOperation(value = "22.评分提交", httpMethod = "POST", notes = "评分提交") @ApiOperation(value = "29.评分提交", httpMethod = "POST", notes = "评分提交")
@ApiOperationSupport(order = 22) @ApiOperationSupport(order = 29)
@Log(title = "评分提交") @Log(title = "评分提交")
public Result<Object> saveScore(@CurrentUser UserBean userBean, public Result<Object> saveScore(@CurrentUser UserBean userBean,
@Validated @RequestBody ValidList<AppraisalAssessment> appraisalAssessments) throws Exception{ @Validated @RequestBody ValidList<AppraisalAssessment> appraisalAssessments) throws Exception{
...@@ -1886,8 +1886,8 @@ public class JxglController { ...@@ -1886,8 +1886,8 @@ public class JxglController {
* 结果确认-确认 * 结果确认-确认
*/ */
@PostMapping(value = "/result_verification") @PostMapping(value = "/result_verification")
@ApiOperation(value = "23.结果确认-确认", httpMethod = "POST", notes = "结果确认-确认") @ApiOperation(value = "30.结果确认-确认", httpMethod = "POST", notes = "结果确认-确认")
@ApiOperationSupport(order = 23) @ApiOperationSupport(order = 30)
public Result<Object> resultVerification(@CurrentUser UserBean userBean, @RequestParam Integer id) { public Result<Object> resultVerification(@CurrentUser UserBean userBean, @RequestParam Integer id) {
Integer count = jxglAppraisalMapper.selectCount(new QueryWrapper<JxglAppraisal>().lambda() Integer count = jxglAppraisalMapper.selectCount(new QueryWrapper<JxglAppraisal>().lambda()
...@@ -1944,8 +1944,8 @@ public class JxglController { ...@@ -1944,8 +1944,8 @@ public class JxglController {
* 结果确认-改分 * 结果确认-改分
*/ */
@PostMapping(value = "/change_score") @PostMapping(value = "/change_score")
@ApiOperation(value = "24.结果确认-改分", httpMethod = "POST", notes = "结果确认-改分") @ApiOperation(value = "31.结果确认-改分", httpMethod = "POST", notes = "结果确认-改分")
@ApiOperationSupport(order = 24) @ApiOperationSupport(order = 31)
@Log(title = "绩效管理-结果确认-改分", businessType = BusinessType.UPDATE) @Log(title = "绩效管理-结果确认-改分", businessType = BusinessType.UPDATE)
public Result<Object> changeScore(@CurrentUser UserBean userBean, public Result<Object> changeScore(@CurrentUser UserBean userBean,
@Validated @RequestBody AppraisalAssessment appraisalAssessment) { @Validated @RequestBody AppraisalAssessment appraisalAssessment) {
...@@ -2009,8 +2009,8 @@ public class JxglController { ...@@ -2009,8 +2009,8 @@ public class JxglController {
* 查询-我的绩效-员工绩效 * 查询-我的绩效-员工绩效
*/ */
@PostMapping(value = "/selects_my_emp_performance") @PostMapping(value = "/selects_my_emp_performance")
@ApiOperation(value = "25.查询-我的绩效-员工绩效", httpMethod = "POST", notes = "查询-我的绩效-员工绩效") @ApiOperation(value = "32.查询-我的绩效-员工绩效", httpMethod = "POST", notes = "查询-我的绩效-员工绩效")
@ApiOperationSupport(order = 25) @ApiOperationSupport(order = 32)
@Log(title = "绩效管理-查询-我的绩效-员工绩效") @Log(title = "绩效管理-查询-我的绩效-员工绩效")
public Result<Object> selectsMEP(@CurrentUser UserBean userBean, @RequestBody EmpPerformanceQuery query) { public Result<Object> selectsMEP(@CurrentUser UserBean userBean, @RequestBody EmpPerformanceQuery query) {
Integer orgCode = userBean.getOrgCode(); Integer orgCode = userBean.getOrgCode();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment