Commit 14783325 authored by 赵啸非's avatar 赵啸非

添加申诉统计业务

parent 5e67479e
...@@ -67,7 +67,7 @@ public class ApiWebPerformController extends AbstractBaseController<PerformReq> ...@@ -67,7 +67,7 @@ public class ApiWebPerformController extends AbstractBaseController<PerformReq>
if (ObjectUtils.isEmpty(req.getPhone())) throw new AppException("手机号码不能为空!"); if (ObjectUtils.isEmpty(req.getPhone())) throw new AppException("手机号码不能为空!");
if (ObjectUtils.isEmpty(req.getRuleCode())) throw new AppException("绩效规则编码不能为空!"); if (ObjectUtils.isEmpty(req.getRuleCode())) throw new AppException("绩效规则编码不能为空!");
boolean bool = attend(req); boolean bool = attend(req);
if (!bool) throw new AppException(busiDesc + "失败!"); if (bool) throw new AppException(busiDesc + "失败!");
} catch (Exception e) { } catch (Exception e) {
log.error(busiDesc, e); log.error(busiDesc, e);
return Rest.fail(e.getMessage()); return Rest.fail(e.getMessage());
...@@ -92,7 +92,7 @@ public class ApiWebPerformController extends AbstractBaseController<PerformReq> ...@@ -92,7 +92,7 @@ public class ApiWebPerformController extends AbstractBaseController<PerformReq>
if (ObjectUtils.isEmpty(req.getPhone())) throw new AppException("手机号码不能为空!"); if (ObjectUtils.isEmpty(req.getPhone())) throw new AppException("手机号码不能为空!");
if (ObjectUtils.isEmpty(req.getRuleCode())) throw new AppException("绩效规则编码不能为空!"); if (ObjectUtils.isEmpty(req.getRuleCode())) throw new AppException("绩效规则编码不能为空!");
boolean bool = review(req); boolean bool = review(req);
if (!bool) throw new AppException(busiDesc + "失败!"); if (bool) throw new AppException(busiDesc + "失败!");
} catch (Exception e) { } catch (Exception e) {
log.error(busiDesc, e); log.error(busiDesc, e);
return Rest.fail(e.getMessage()); return Rest.fail(e.getMessage());
...@@ -117,7 +117,7 @@ public class ApiWebPerformController extends AbstractBaseController<PerformReq> ...@@ -117,7 +117,7 @@ public class ApiWebPerformController extends AbstractBaseController<PerformReq>
if (ObjectUtils.isEmpty(req.getPhone())) throw new AppException("手机号码不能为空!"); if (ObjectUtils.isEmpty(req.getPhone())) throw new AppException("手机号码不能为空!");
if (ObjectUtils.isEmpty(req.getRuleCode())) throw new AppException("绩效规则编码不能为空!"); if (ObjectUtils.isEmpty(req.getRuleCode())) throw new AppException("绩效规则编码不能为空!");
boolean bool = complain(req); boolean bool = complain(req);
if (!bool) throw new AppException(busiDesc + "失败!"); if (bool) throw new AppException(busiDesc + "失败!");
} catch (Exception e) { } catch (Exception e) {
log.error(busiDesc, e); log.error(busiDesc, e);
return Rest.fail(e.getMessage()); return Rest.fail(e.getMessage());
...@@ -142,7 +142,7 @@ public class ApiWebPerformController extends AbstractBaseController<PerformReq> ...@@ -142,7 +142,7 @@ public class ApiWebPerformController extends AbstractBaseController<PerformReq>
if (ObjectUtils.isEmpty(req.getPhone())) throw new AppException("手机号码不能为空!"); if (ObjectUtils.isEmpty(req.getPhone())) throw new AppException("手机号码不能为空!");
if (ObjectUtils.isEmpty(req.getRuleCode())) throw new AppException("绩效规则编码不能为空!"); if (ObjectUtils.isEmpty(req.getRuleCode())) throw new AppException("绩效规则编码不能为空!");
boolean bool = gowork(req); boolean bool = gowork(req);
if (!bool) throw new AppException(busiDesc + "失败!"); if (bool) throw new AppException(busiDesc + "失败!");
} catch (Exception e) { } catch (Exception e) {
log.error(busiDesc, e); log.error(busiDesc, e);
return Rest.fail(e.getMessage()); return Rest.fail(e.getMessage());
...@@ -167,7 +167,7 @@ public class ApiWebPerformController extends AbstractBaseController<PerformReq> ...@@ -167,7 +167,7 @@ public class ApiWebPerformController extends AbstractBaseController<PerformReq>
if (ObjectUtils.isEmpty(req.getPhone())) throw new AppException("手机号码不能为空!"); if (ObjectUtils.isEmpty(req.getPhone())) throw new AppException("手机号码不能为空!");
if (ObjectUtils.isEmpty(req.getRuleCode())) throw new AppException("绩效规则编码不能为空!"); if (ObjectUtils.isEmpty(req.getRuleCode())) throw new AppException("绩效规则编码不能为空!");
boolean bool = effect(req); boolean bool = effect(req);
if (!bool) throw new AppException(busiDesc + "失败!"); if (bool) throw new AppException(busiDesc + "失败!");
} catch (Exception e) { } catch (Exception e) {
log.error(busiDesc, e); log.error(busiDesc, e);
return Rest.fail(e.getMessage()); return Rest.fail(e.getMessage());
...@@ -192,7 +192,7 @@ public class ApiWebPerformController extends AbstractBaseController<PerformReq> ...@@ -192,7 +192,7 @@ public class ApiWebPerformController extends AbstractBaseController<PerformReq>
if (ObjectUtils.isEmpty(req.getPhone())) throw new AppException("手机号码不能为空!"); if (ObjectUtils.isEmpty(req.getPhone())) throw new AppException("手机号码不能为空!");
if (ObjectUtils.isEmpty(req.getRuleCode())) throw new AppException("绩效规则编码不能为空!"); if (ObjectUtils.isEmpty(req.getRuleCode())) throw new AppException("绩效规则编码不能为空!");
boolean bool = other(req); boolean bool = other(req);
if (!bool) throw new AppException(busiDesc + "失败!"); if (bool) throw new AppException(busiDesc + "失败!");
} catch (Exception e) { } catch (Exception e) {
log.error(busiDesc, e); log.error(busiDesc, e);
return Rest.fail(e.getMessage()); return Rest.fail(e.getMessage());
......
...@@ -167,9 +167,10 @@ public class PerformApiController extends AbstractBaseController<PerformReq> { ...@@ -167,9 +167,10 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
performInfo.setPerformType(PerformTypeEnum.考勤绩效.getValue()); performInfo.setPerformType(PerformTypeEnum.考勤绩效.getValue());
//判断是否存在申诉 //判断是否存在申诉
PerformAttendAppealEntity entity = appealService.selectOne(new PerformAttendAppealQuery().checkRecordId(item.getId())); PerformAttendAppealEntity entity = appealService.selectOne(new PerformAttendAppealQuery().checkRecordId(item.getId()));
if(!ObjectUtils.isEmpty(entity)) {
Boolean bool = entity.newEntity(); Boolean bool = entity.newEntity();
updateAppealStatus(performInfo, bool, entity.getProcessStatus(), entity.getAppealResult()); updateAppealStatus(performInfo, bool, entity.getProcessStatus(), entity.getAppealResult());
}
return performInfo; return performInfo;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
...@@ -190,8 +191,11 @@ public class PerformApiController extends AbstractBaseController<PerformReq> { ...@@ -190,8 +191,11 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
performInfo.setPerformType(PerformTypeEnum.评价差评绩效.getValue()); performInfo.setPerformType(PerformTypeEnum.评价差评绩效.getValue());
//判断是否存在申诉 //判断是否存在申诉
PerformAttendAppealEntity entity = appealService.selectOne(new PerformAttendAppealQuery().checkRecordId(item.getId())); PerformAttendAppealEntity entity = appealService.selectOne(new PerformAttendAppealQuery().checkRecordId(item.getId()));
if (!ObjectUtils.isEmpty(entity)) {
Boolean bool = entity.newEntity(); Boolean bool = entity.newEntity();
updateAppealStatus(performInfo, bool, entity.getProcessStatus(), entity.getAppealResult()); updateAppealStatus(performInfo, bool, entity.getProcessStatus(), entity.getAppealResult());
}
return performInfo; return performInfo;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
...@@ -212,8 +216,10 @@ public class PerformApiController extends AbstractBaseController<PerformReq> { ...@@ -212,8 +216,10 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
//判断是否存在申诉 //判断是否存在申诉
PerformAttendAppealEntity entity = appealService.selectOne(new PerformAttendAppealQuery().checkRecordId(item.getId())); PerformAttendAppealEntity entity = appealService.selectOne(new PerformAttendAppealQuery().checkRecordId(item.getId()));
if (!ObjectUtils.isEmpty(entity)) {
Boolean bool = entity.newEntity(); Boolean bool = entity.newEntity();
updateAppealStatus(performInfo, bool, entity.getProcessStatus(), entity.getAppealResult()); updateAppealStatus(performInfo, bool, entity.getProcessStatus(), entity.getAppealResult());
}
return performInfo; return performInfo;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
model.put(KEY_RESULT_DATA, collect); model.put(KEY_RESULT_DATA, collect);
...@@ -232,8 +238,12 @@ public class PerformApiController extends AbstractBaseController<PerformReq> { ...@@ -232,8 +238,12 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
performInfo.setPerformType(PerformTypeEnum.办件绩效.getValue()); performInfo.setPerformType(PerformTypeEnum.办件绩效.getValue());
//判断是否存在申诉 //判断是否存在申诉
PerformAttendAppealEntity entity = appealService.selectOne(new PerformAttendAppealQuery().checkRecordId(item.getId())); PerformAttendAppealEntity entity = appealService.selectOne(new PerformAttendAppealQuery().checkRecordId(item.getId()));
if (!ObjectUtils.isEmpty(entity)) {
Boolean bool = entity.newEntity(); Boolean bool = entity.newEntity();
updateAppealStatus(performInfo, bool, entity.getProcessStatus(), entity.getAppealResult()); updateAppealStatus(performInfo, bool, entity.getProcessStatus(), entity.getAppealResult());
}
return performInfo; return performInfo;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
model.put(KEY_RESULT_DATA, collect); model.put(KEY_RESULT_DATA, collect);
......
...@@ -42,6 +42,9 @@ public class PerformReviewRecordServiceImpl extends AbstractCRUDServiceImpl<Perf ...@@ -42,6 +42,9 @@ public class PerformReviewRecordServiceImpl extends AbstractCRUDServiceImpl<Perf
}else { }else {
checkReviewRecordEntity.setCheckStatus(CheckStatusEnum.未处理.getValue()); //非自动扣分相设置为未处理 checkReviewRecordEntity.setCheckStatus(CheckStatusEnum.未处理.getValue()); //非自动扣分相设置为未处理
} }
//checkReviewRecordEntity.s
checkReviewRecordService.save(checkReviewRecordEntity,context); checkReviewRecordService.save(checkReviewRecordEntity,context);
} }
......
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