Skip to content

8
8timerapiv200
Commit 7949e275 by dengshichuan
Options

Merge branch 'tzq' into 'develop' 

Tzq

See merge request 8timerv2/8timerapiv200!246
parents e987f534 edb08915
Showing with 152 additions and 65 deletions
src/main/java/cn/timer/api/controller/LoginController.java
...@@ -581,6 +581,7 @@ public class LoginController { ...@@ -581,6 +581,7 @@ public class LoginController {
System.out.println("重复初始化数据！"); System.out.println("重复初始化数据！");
} }
// 绩效设置初始化
JxglBasicSetting bS = jxglService.selectAT(qyId); JxglBasicSetting bS = jxglService.selectAT(qyId);
if (bS == null) { if (bS == null) {
boolean res = jxglService.initJxglBasicSetting(qyId); boolean res = jxglService.initJxglBasicSetting(qyId);
......
src/main/java/cn/timer/api/controller/jxgl/JxglController.java
...@@ -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) {
...@@ -644,7 +644,7 @@ public class JxglController { ...@@ -644,7 +644,7 @@ public class JxglController {
.id(appraisalUpdateSts.getId()) .id(appraisalUpdateSts.getId())
.sts(PerformanceAppraisalSts.PERFORMANCE_ARCHIVE.getType()) .sts(PerformanceAppraisalSts.PERFORMANCE_ARCHIVE.getType())
.build()); .build());
return ResultUtil.success(""); return ResultUtil.success();
} }
Integer sts = null; Integer sts = null;
...@@ -746,6 +746,34 @@ public class JxglController { ...@@ -746,6 +746,34 @@ public class JxglController {
} }
} }
break; break;
case 3:
// 修改 考核状态
jxglAppraisalMapper.update(
JxglAppraisal.builder().performanceAppraisalId(id).sts(AppraisalSts.PERFORMANCE_ARCHIVE.getType()).build(),
new UpdateWrapper<JxglAppraisal>().lambda()
.eq(JxglAppraisal::getPerformanceAppraisalId, id)
);
List<JxglAppraisal> listAppraisal = jxglAppraisalMapper.selectList(new QueryWrapper<JxglAppraisal>().lambda()
.select(JxglAppraisal::getId)
.eq(JxglAppraisal::getPerformanceAppraisalId, performanceAppraisal.getId()));
if (CollectionUtil.isNotEmpty(listAppraisal)) {
List<Integer> aIds2 = listAppraisal.stream().map(JxglAppraisal::getId).collect(Collectors.toList());
if (CollectionUtil.isNotEmpty(aIds2)) {
JxglAppraisalLog appraisalLog = JxglAppraisalLog.builder().build();
aIds2.forEach(aId -> {
appraisalLog.setId(null);
appraisalLog.setAppraisalId(aId);
appraisalLog.setExecutorId(userBean.getEmpNum());
appraisalLog.setExecutorName(userBean.getUserInfo().getName());
appraisalLog.setType(AppraisalLogType.PERFORMANCE_ARCHIVE.getType());
appraisalLog.insert();
});
}
}
break;
default: default:
break; break;
} }
...@@ -761,8 +789,8 @@ public class JxglController { ...@@ -761,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) {
...@@ -797,8 +825,9 @@ public class JxglController { ...@@ -797,8 +825,9 @@ public class JxglController {
List<Integer> aIds = listAppraisal.stream().map(JxglAppraisal::getId).collect(Collectors.toList()); List<Integer> aIds = listAppraisal.stream().map(JxglAppraisal::getId).collect(Collectors.toList());
if (CollectionUtil.isNotEmpty(aIds)) { if (CollectionUtil.isNotEmpty(aIds)) {
JxglAppraisalLog appraisalLog = JxglAppraisalLog.builder().build();
aIds.forEach(aId -> { aIds.forEach(aId -> {
JxglAppraisalLog appraisalLog = JxglAppraisalLog.builder().build(); appraisalLog.setId(null);
appraisalLog.setAppraisalId(aId); appraisalLog.setAppraisalId(aId);
appraisalLog.setExecutorId(userBean.getEmpNum()); appraisalLog.setExecutorId(userBean.getEmpNum());
appraisalLog.setExecutorName(userBean.getUserInfo().getName()); appraisalLog.setExecutorName(userBean.getUserInfo().getName());
...@@ -808,8 +837,6 @@ public class JxglController { ...@@ -808,8 +837,6 @@ public class JxglController {
} }
} }
return ResultUtil.success(); return ResultUtil.success();
} }
...@@ -838,8 +865,8 @@ public class JxglController { ...@@ -838,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) {
...@@ -859,8 +886,8 @@ public class JxglController { ...@@ -859,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) {
...@@ -879,8 +906,8 @@ public class JxglController { ...@@ -879,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) {
...@@ -916,8 +943,8 @@ public class JxglController { ...@@ -916,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);
...@@ -949,8 +976,8 @@ public class JxglController { ...@@ -949,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) {
...@@ -991,8 +1018,8 @@ public class JxglController { ...@@ -991,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) {
...@@ -1024,8 +1051,8 @@ public class JxglController { ...@@ -1024,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) {
...@@ -1061,8 +1088,8 @@ public class JxglController { ...@@ -1061,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) {
...@@ -1082,8 +1109,8 @@ public class JxglController { ...@@ -1082,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(),
...@@ -1103,8 +1130,8 @@ public class JxglController { ...@@ -1103,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) {
...@@ -1132,8 +1159,8 @@ public class JxglController { ...@@ -1132,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());
...@@ -1157,12 +1184,10 @@ public class JxglController { ...@@ -1157,12 +1184,10 @@ 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) { public Result<Object> selectsP(@CurrentUser UserBean userBean, @Validated @RequestBody MyPerformance query) {
MyPerformance query = MyPerformance.builder().build();
IPage<JxglPerformanceAppraisal> page = new Page<JxglPerformanceAppraisal>(query.getCurrentPage(),query.getTotalPage()); IPage<JxglPerformanceAppraisal> page = new Page<JxglPerformanceAppraisal>(query.getCurrentPage(),query.getTotalPage());
query.setOrgCode(userBean.getOrgCode()); query.setOrgCode(userBean.getOrgCode());
query.setId(userBean.getEmpNum()); query.setId(userBean.getEmpNum());
...@@ -1179,8 +1204,8 @@ public class JxglController { ...@@ -1179,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 {
...@@ -1271,8 +1296,8 @@ public class JxglController { ...@@ -1271,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()
...@@ -1354,8 +1379,8 @@ public class JxglController { ...@@ -1354,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()
...@@ -1422,8 +1447,8 @@ public class JxglController { ...@@ -1422,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(
...@@ -1490,8 +1515,8 @@ public class JxglController { ...@@ -1490,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(
...@@ -1570,8 +1595,8 @@ public class JxglController { ...@@ -1570,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(
...@@ -1654,8 +1679,8 @@ public class JxglController { ...@@ -1654,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{
...@@ -1861,8 +1886,8 @@ public class JxglController { ...@@ -1861,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()
...@@ -1919,8 +1944,8 @@ public class JxglController { ...@@ -1919,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) {
...@@ -1984,8 +2009,8 @@ public class JxglController { ...@@ -1984,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();
......
src/main/java/cn/timer/api/controller/jxgl/service/JxglServiceImpl.java
...@@ -40,6 +40,7 @@ public class JxglServiceImpl implements JxglService { ...@@ -40,6 +40,7 @@ public class JxglServiceImpl implements JxglService {
res = !performanceRating.insert() && res ? false : res; res = !performanceRating.insert() && res ? false : res;
performanceRating.setId(null);
performanceRating.setBasicSettingId(bC.getId()); performanceRating.setBasicSettingId(bC.getId());
performanceRating.setName("B"); performanceRating.setName("B");
performanceRating.setSectionMinScore(60); performanceRating.setSectionMinScore(60);
...@@ -47,6 +48,7 @@ public class JxglServiceImpl implements JxglService { ...@@ -47,6 +48,7 @@ public class JxglServiceImpl implements JxglService {
performanceRating.setRanks(0); performanceRating.setRanks(0);
res = !performanceRating.insert() && res ? false : res; res = !performanceRating.insert() && res ? false : res;
performanceRating.setId(null);
performanceRating.setBasicSettingId(bC.getId()); performanceRating.setBasicSettingId(bC.getId());
performanceRating.setName("A"); performanceRating.setName("A");
performanceRating.setSectionMinScore(80); performanceRating.setSectionMinScore(80);
......
src/main/java/cn/timer/api/controller/spmk/SpmkController.java
...@@ -22,6 +22,7 @@ import org.springframework.web.bind.annotation.RestController; ...@@ -22,6 +22,7 @@ import org.springframework.web.bind.annotation.RestController;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
...@@ -34,6 +35,7 @@ import cn.hutool.core.util.StrUtil; ...@@ -34,6 +35,7 @@ import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONObject; import cn.hutool.json.JSONObject;
import cn.timer.api.aspect.lang.annotation.Log; import cn.timer.api.aspect.lang.annotation.Log;
import cn.timer.api.aspect.lang.enums.BusinessType; import cn.timer.api.aspect.lang.enums.BusinessType;
import cn.timer.api.bean.qyzx.QyzxEmpEntAsso;
import cn.timer.api.bean.spmk.SpmkApprovalG; import cn.timer.api.bean.spmk.SpmkApprovalG;
import cn.timer.api.bean.spmk.SpmkApprovalTemplate; import cn.timer.api.bean.spmk.SpmkApprovalTemplate;
import cn.timer.api.bean.spmk.SpmkApprovalTemplateG; import cn.timer.api.bean.spmk.SpmkApprovalTemplateG;
...@@ -52,6 +54,7 @@ import cn.timer.api.config.enuminterface.SpmkEnumInterface; ...@@ -52,6 +54,7 @@ import cn.timer.api.config.enuminterface.SpmkEnumInterface;
import cn.timer.api.config.enuminterface.SpmkEnumInterface.ApproveSummarySts; import cn.timer.api.config.enuminterface.SpmkEnumInterface.ApproveSummarySts;
import cn.timer.api.config.enuminterface.SpmkEnumInterface.ExecutorSts; import cn.timer.api.config.enuminterface.SpmkEnumInterface.ExecutorSts;
import cn.timer.api.config.enums.CommonEnum; import cn.timer.api.config.enums.CommonEnum;
import cn.timer.api.config.enums.SysRoleType;
import cn.timer.api.config.exception.CustomException; import cn.timer.api.config.exception.CustomException;
import cn.timer.api.config.validation.Insert; import cn.timer.api.config.validation.Insert;
import cn.timer.api.config.validation.Ranks; import cn.timer.api.config.validation.Ranks;
...@@ -60,6 +63,7 @@ import cn.timer.api.config.validation.ValidList; ...@@ -60,6 +63,7 @@ import cn.timer.api.config.validation.ValidList;
import cn.timer.api.controller.spmk.service.SpmkService; import cn.timer.api.controller.spmk.service.SpmkService;
import cn.timer.api.controller.yggl.service.YgglService; import cn.timer.api.controller.yggl.service.YgglService;
import cn.timer.api.controller.zzgl.service.ZzglBmgwMService; import cn.timer.api.controller.zzgl.service.ZzglBmgwMService;
import cn.timer.api.dao.qyzx.QyzxEmpEntAssoMapper;
import cn.timer.api.dao.spmk.SpmkApprovalGMapper; import cn.timer.api.dao.spmk.SpmkApprovalGMapper;
import cn.timer.api.dao.spmk.SpmkApprovalTemplateGMapper; import cn.timer.api.dao.spmk.SpmkApprovalTemplateGMapper;
import cn.timer.api.dao.spmk.SpmkApprovalTemplateMapper; import cn.timer.api.dao.spmk.SpmkApprovalTemplateMapper;
...@@ -103,6 +107,8 @@ public class SpmkController { ...@@ -103,6 +107,8 @@ public class SpmkController {
private ZzglBmgwMService zzglBmgwMService; private ZzglBmgwMService zzglBmgwMService;
@Autowired @Autowired
private QyzxEmpEntAssoMapper qyzxEmpEntAssoMapper;
@Autowired
private SpmkApprovalTemplateGMapper spmkApprovalTemplateGMapper; private SpmkApprovalTemplateGMapper spmkApprovalTemplateGMapper;
@Autowired @Autowired
private SpmkApprovalTemplateMapper spmkApprovalTemplateMapper; private SpmkApprovalTemplateMapper spmkApprovalTemplateMapper;
...@@ -691,7 +697,17 @@ public class SpmkController { ...@@ -691,7 +697,17 @@ public class SpmkController {
.eq(SpmkExecutor::getId, approvingDto.getExecutorId()) .eq(SpmkExecutor::getId, approvingDto.getExecutorId())
.eq(SpmkExecutor::getEmpNum, userBean.getEmpNum()) .eq(SpmkExecutor::getEmpNum, userBean.getEmpNum())
.eq(SpmkExecutor::getSts, SpmkEnumInterface.ExecutorSts.IN_EXECUTION.ordinal())) == 0) { .eq(SpmkExecutor::getSts, SpmkEnumInterface.ExecutorSts.IN_EXECUTION.ordinal())) == 0) {
return ResultUtil.error("非当前审批人,无法审批!");
Integer adminNum = new LambdaQueryChainWrapper<QyzxEmpEntAsso>(qyzxEmpEntAssoMapper)
.eq(QyzxEmpEntAsso::getEmpNum, userBean.getEmpNum())
.eq(QyzxEmpEntAsso::getOrgCode, userBean.getOrgCode())
.in(QyzxEmpEntAsso::getUserType, SysRoleType.U_TYPE_ADMIN,SysRoleType.U_TYPE_C_ADMIN)
.count();
if (adminNum <= 0) {
return ResultUtil.error("非当前审批人 或 管理员,无法操作!");
}
} }
if (aSummary.getSts() == 0) { if (aSummary.getSts() == 0) {
......
src/main/java/cn/timer/api/controller/yggl/YgglController.java
...@@ -1309,8 +1309,7 @@ public class YgglController { ...@@ -1309,8 +1309,7 @@ public class YgglController {
LambdaQueryWrapper<QyzxEmpEntAsso> queryWrapper = new QueryWrapper<QyzxEmpEntAsso>().lambda() LambdaQueryWrapper<QyzxEmpEntAsso> queryWrapper = new QueryWrapper<QyzxEmpEntAsso>().lambda()
.eq(QyzxEmpEntAsso::getEmpNum, empNum) .eq(QyzxEmpEntAsso::getEmpNum, empNum)
.eq(QyzxEmpEntAsso::getOrgCode, userBean.getOrgCode()) .eq(QyzxEmpEntAsso::getOrgCode, userBean.getOrgCode());
;
// 确认离职 删除员工关联表 // 确认离职 删除员工关联表
qyzxEmpEntAssoMapper.delete(queryWrapper); qyzxEmpEntAssoMapper.delete(queryWrapper);
...@@ -1322,7 +1321,8 @@ public class YgglController { ...@@ -1322,7 +1321,8 @@ public class YgglController {
.eq(ZzglBmgwM::getLeader, empNum)); .eq(ZzglBmgwM::getLeader, empNum));
// 更新当前企业 // 更新当前企业
List<QyzxEmpEntAsso> listEEA = qyzxEmpEntAssoMapper.selectList(queryWrapper); List<QyzxEmpEntAsso> listEEA = qyzxEmpEntAssoMapper.selectList(new QueryWrapper<QyzxEmpEntAsso>().lambda()
.eq(QyzxEmpEntAsso::getEmpNum, empNum));
if (listEEA != null && listEEA.size() > 0) { if (listEEA != null && listEEA.size() > 0) {
QyzxEmpLogin.builder().id(empNum).orgId(CollUtil.getFirst(listEEA).getOrgCode()).build().updateById(); QyzxEmpLogin.builder().id(empNum).orgId(CollUtil.getFirst(listEEA).getOrgCode()).build().updateById();
} }
......
src/main/java/cn/timer/api/utils/DateUtil.java
...@@ -99,6 +99,35 @@ public class DateUtil { ...@@ -99,6 +99,35 @@ public class DateUtil {
return 0; return 0;
} }
/**
* 将String时间转换为时间戳
*
* @param time
* @return
* @throws ParseException
*/
public static Date getFormatDate(String time) throws ParseException {
if (StrUtil.isNotBlank(time)) {
switch (time.length()) {
case 10:
return getStringDate(time, "yyyy-MM-dd");
case 16:
return getStringDate(time, "yyyy-MM-dd HH:mm");
case 19:
return getStringDate(time, "yyyy-MM-dd HH:mm:ss");
default:
break;
}
return null;
}
return null;
}
/** /**
* 将String时间转换为时间戳 * 将String时间转换为时间戳
...@@ -107,6 +136,19 @@ public class DateUtil { ...@@ -107,6 +136,19 @@ public class DateUtil {
* @return * @return
* @throws ParseException * @throws ParseException
*/ */
public static Date getStringDate(String time, String format)
throws ParseException {
SimpleDateFormat simpleDateFormat = new SimpleDateFormat(format);
return simpleDateFormat.parse(time);
}
/**
* 将String时间转换为 Date
*
* @param time
* @return
* @throws ParseException
*/
public static long getStringTime(String time, String format) public static long getStringTime(String time, String format)
throws ParseException { throws ParseException {
SimpleDateFormat simpleDateFormat = new SimpleDateFormat(format); SimpleDateFormat simpleDateFormat = new SimpleDateFormat(format);
......
src/main/java/cn/timer/api/utils/router/business/GoOutBusiness.java
...@@ -50,8 +50,8 @@ public class GoOutBusiness extends SpmkAssoBusiness { ...@@ -50,8 +50,8 @@ public class GoOutBusiness extends SpmkAssoBusiness {
.orgcode(orgCode) .orgcode(orgCode)
.evectionid(Convert.toInt(approveId)) .evectionid(Convert.toInt(approveId))
.evectiontype(2) .evectiontype(2)
.starttime(DateUtil.getStringTime(startTime, "yyyy-MM-dd HH:mm:ss")) .starttime(DateUtil.getFormat(startTime))
.endtime(DateUtil.getStringTime(endTime, "yyyy-MM-dd HH:mm:ss")) .endtime(DateUtil.getFormat(endTime))
.duration(Convert.toDouble(longTime)) .duration(Convert.toDouble(longTime))
.build(); .build();
......
src/main/java/cn/timer/api/utils/router/business/RegularizationBusiness.java
...@@ -15,6 +15,7 @@ import cn.timer.api.controller.yggl.service.YgglService; ...@@ -15,6 +15,7 @@ import cn.timer.api.controller.yggl.service.YgglService;
import cn.timer.api.dto.spmk.FromData; import cn.timer.api.dto.spmk.FromData;
import cn.timer.api.dto.yggl.YgzzDto; import cn.timer.api.dto.yggl.YgzzDto;
import cn.timer.api.utils.DateFormatUtils; import cn.timer.api.utils.DateFormatUtils;
import cn.timer.api.utils.DateUtil;
import lombok.Builder; import lombok.Builder;
/** /**
...@@ -60,8 +61,8 @@ public class RegularizationBusiness extends SpmkAssoBusiness { ...@@ -60,8 +61,8 @@ public class RegularizationBusiness extends SpmkAssoBusiness {
YgzzDto ygzzDto = YgzzDto.builder() YgzzDto ygzzDto = YgzzDto.builder()
.empNum(id) .empNum(id)
.orgCode(orgCode) .orgCode(orgCode)
.zzTime(DateFormatUtils.getDateByString(confirmationTime)) .zzTime(DateUtil.getFormatDate(confirmationTime))
.sjzzTime(DateFormatUtils.getDateByString(newConfirmationTime)) .sjzzTime(DateUtil.getFormatDate(newConfirmationTime))
.zzRemark(Remarks) .zzRemark(Remarks)
.build(); .build();
System.out.println("转正:"+ygzzDto); System.out.println("转正:"+ygzzDto);
......
src/main/java/cn/timer/api/utils/router/business/ResignationBusiness.java
...@@ -6,13 +6,13 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -6,13 +6,13 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import cn.hutool.core.convert.Convert; import cn.hutool.core.convert.Convert;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import cn.hutool.json.JSONObject; import cn.hutool.json.JSONObject;
import cn.timer.api.controller.yggl.service.YgglService; import cn.timer.api.controller.yggl.service.YgglService;
import cn.timer.api.dto.spmk.FromData; import cn.timer.api.dto.spmk.FromData;
import cn.timer.api.dto.yggl.LzygQueryDto; import cn.timer.api.dto.yggl.LzygQueryDto;
import cn.timer.api.utils.DateFormatUtils; import cn.timer.api.utils.DateFormatUtils;
import cn.timer.api.utils.DateUtil;
import lombok.Builder; import lombok.Builder;
/** /**
...@@ -46,7 +46,7 @@ public class ResignationBusiness extends SpmkAssoBusiness { ...@@ -46,7 +46,7 @@ public class ResignationBusiness extends SpmkAssoBusiness {
LzygQueryDto dtO = LzygQueryDto.builder() LzygQueryDto dtO = LzygQueryDto.builder()
.orgCode(orgCode) .orgCode(orgCode)
.empNum(id) .empNum(id)
.lzTime(DateFormatUtils.getDateByString(terminationDate)) .lzTime(DateUtil.getFormatDate(terminationDate))
.lzyy(ReasonForResignation) .lzyy(ReasonForResignation)
.lzbz(Remarks) .lzbz(Remarks)
.build(); .build();
......
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