Commit a232eb3a authored by 廖旭伟's avatar 廖旭伟

绩效考核授权4个维度不启用时不再生成绩效信息

parent 6c94d3ad
...@@ -234,6 +234,9 @@ public class CheckAttendRecordServiceImpl extends AbstractCRUDServiceImpl<CheckA ...@@ -234,6 +234,9 @@ public class CheckAttendRecordServiceImpl extends AbstractCRUDServiceImpl<CheckA
} }
for (StaffCheckSummaryVo vo : summaryVoList) { for (StaffCheckSummaryVo vo : summaryVoList) {
StaffEntity staffEntity = staffService.get(vo.getStaffId()); StaffEntity staffEntity = staffService.get(vo.getStaffId());
if(staffEntity.getAttendCheck()==0 && staffEntity.getEffectCheck()==0 && staffEntity.getGoworkCheck()==0 && staffEntity.getComplainCheck()==0){
continue;
}
StaffPerformSummaryEntity staffPerformSummaryEntity = new StaffPerformSummaryEntity(); StaffPerformSummaryEntity staffPerformSummaryEntity = new StaffPerformSummaryEntity();
staffPerformSummaryEntity.initAttrValue(); staffPerformSummaryEntity.initAttrValue();
BeanUtils.copyProperties(vo, staffPerformSummaryEntity, BeanUtil.getNullPropertyNames(vo)); BeanUtils.copyProperties(vo, staffPerformSummaryEntity, BeanUtil.getNullPropertyNames(vo));
...@@ -314,6 +317,10 @@ public class CheckAttendRecordServiceImpl extends AbstractCRUDServiceImpl<CheckA ...@@ -314,6 +317,10 @@ public class CheckAttendRecordServiceImpl extends AbstractCRUDServiceImpl<CheckA
List<StaffPerformStatEntity> performStatList = dao.getStaffPerformStat(query); List<StaffPerformStatEntity> performStatList = dao.getStaffPerformStat(query);
if (CollectionUtils.isNotEmpty(performStatList)) { if (CollectionUtils.isNotEmpty(performStatList)) {
for (StaffPerformStatEntity entity : performStatList) { for (StaffPerformStatEntity entity : performStatList) {
StaffEntity staffEntity = staffService.get(entity.getStaffId());
if(staffEntity.getAttendCheck()==0 && staffEntity.getEffectCheck()==0 && staffEntity.getGoworkCheck()==0 && staffEntity.getComplainCheck()==0){
continue;
}
StaffPerformStatQuery tempQuery = new StaffPerformStatQuery(); StaffPerformStatQuery tempQuery = new StaffPerformStatQuery();
tempQuery.setStaffId(entity.getStaffId()); tempQuery.setStaffId(entity.getStaffId());
tempQuery.setYear(entity.getYear()); tempQuery.setYear(entity.getYear());
......
...@@ -200,6 +200,10 @@ public class CheckComplainRecordServiceImpl extends AbstractCRUDServiceImpl<Chec ...@@ -200,6 +200,10 @@ public class CheckComplainRecordServiceImpl extends AbstractCRUDServiceImpl<Chec
List<StaffCheckSummaryVo> summaryVoList = dao.summaryCheck(query); List<StaffCheckSummaryVo> summaryVoList = dao.summaryCheck(query);
if (CollectionUtils.isNotEmpty(summaryVoList)) { if (CollectionUtils.isNotEmpty(summaryVoList)) {
for (StaffCheckSummaryVo vo : summaryVoList) { for (StaffCheckSummaryVo vo : summaryVoList) {
StaffEntity staffEntity = staffService.get(vo.getStaffId());
if(staffEntity.getAttendCheck()==0 && staffEntity.getEffectCheck()==0 && staffEntity.getGoworkCheck()==0 && staffEntity.getComplainCheck()==0){
continue;
}
StaffPerformSummaryEntity staffPerformSummaryEntity = new StaffPerformSummaryEntity(); StaffPerformSummaryEntity staffPerformSummaryEntity = new StaffPerformSummaryEntity();
staffPerformSummaryEntity.initAttrValue(); staffPerformSummaryEntity.initAttrValue();
BeanUtils.copyProperties(vo, staffPerformSummaryEntity, BeanUtil.getNullPropertyNames(vo)); BeanUtils.copyProperties(vo, staffPerformSummaryEntity, BeanUtil.getNullPropertyNames(vo));
...@@ -281,6 +285,10 @@ public class CheckComplainRecordServiceImpl extends AbstractCRUDServiceImpl<Chec ...@@ -281,6 +285,10 @@ public class CheckComplainRecordServiceImpl extends AbstractCRUDServiceImpl<Chec
List<StaffPerformStatEntity> performStatList = dao.getStaffPerformStat(query); List<StaffPerformStatEntity> performStatList = dao.getStaffPerformStat(query);
if (CollectionUtils.isNotEmpty(performStatList)) { if (CollectionUtils.isNotEmpty(performStatList)) {
for (StaffPerformStatEntity entity : performStatList) { for (StaffPerformStatEntity entity : performStatList) {
StaffEntity staffEntity = staffService.get(entity.getStaffId());
if(staffEntity.getAttendCheck()==0 && staffEntity.getEffectCheck()==0 && staffEntity.getGoworkCheck()==0 && staffEntity.getComplainCheck()==0){
continue;
}
StaffPerformStatQuery tempQuery = new StaffPerformStatQuery(); StaffPerformStatQuery tempQuery = new StaffPerformStatQuery();
tempQuery.setStaffId(entity.getStaffId()); tempQuery.setStaffId(entity.getStaffId());
tempQuery.setYear(entity.getYear()); tempQuery.setYear(entity.getYear());
......
...@@ -226,6 +226,9 @@ public class CheckEffectRecordServiceImpl extends AbstractCRUDServiceImpl<CheckE ...@@ -226,6 +226,9 @@ public class CheckEffectRecordServiceImpl extends AbstractCRUDServiceImpl<CheckE
} }
for(StaffCheckSummaryVo vo:summaryVoList){ for(StaffCheckSummaryVo vo:summaryVoList){
StaffEntity staffEntity = staffService.get(vo.getStaffId()); StaffEntity staffEntity = staffService.get(vo.getStaffId());
if(staffEntity.getAttendCheck()==0 && staffEntity.getEffectCheck()==0 && staffEntity.getGoworkCheck()==0 && staffEntity.getComplainCheck()==0){
continue;
}
StaffPerformSummaryEntity staffPerformSummaryEntity = new StaffPerformSummaryEntity(); StaffPerformSummaryEntity staffPerformSummaryEntity = new StaffPerformSummaryEntity();
staffPerformSummaryEntity.initAttrValue(); staffPerformSummaryEntity.initAttrValue();
BeanUtils.copyProperties(vo,staffPerformSummaryEntity, BeanUtil.getNullPropertyNames(vo)); BeanUtils.copyProperties(vo,staffPerformSummaryEntity, BeanUtil.getNullPropertyNames(vo));
...@@ -309,6 +312,10 @@ public class CheckEffectRecordServiceImpl extends AbstractCRUDServiceImpl<CheckE ...@@ -309,6 +312,10 @@ public class CheckEffectRecordServiceImpl extends AbstractCRUDServiceImpl<CheckE
List<StaffPerformStatEntity> performStatList = dao.getStaffPerformStat(query); List<StaffPerformStatEntity> performStatList = dao.getStaffPerformStat(query);
if(CollectionUtils.isNotEmpty(performStatList)){ if(CollectionUtils.isNotEmpty(performStatList)){
for(StaffPerformStatEntity entity:performStatList) { for(StaffPerformStatEntity entity:performStatList) {
StaffEntity staffEntity = staffService.get(entity.getStaffId());
if(staffEntity.getAttendCheck()==0 && staffEntity.getEffectCheck()==0 && staffEntity.getGoworkCheck()==0 && staffEntity.getComplainCheck()==0){
continue;
}
StaffPerformStatQuery tempQuery = new StaffPerformStatQuery(); StaffPerformStatQuery tempQuery = new StaffPerformStatQuery();
tempQuery.setStaffId(entity.getStaffId()); tempQuery.setStaffId(entity.getStaffId());
tempQuery.setYear(entity.getYear()); tempQuery.setYear(entity.getYear());
......
...@@ -223,6 +223,9 @@ public class CheckGoworkRecordServiceImpl extends AbstractCRUDServiceImpl<CheckG ...@@ -223,6 +223,9 @@ public class CheckGoworkRecordServiceImpl extends AbstractCRUDServiceImpl<CheckG
} }
for(StaffCheckSummaryVo vo:summaryVoList){ for(StaffCheckSummaryVo vo:summaryVoList){
StaffEntity staffEntity = staffService.get(vo.getStaffId()); StaffEntity staffEntity = staffService.get(vo.getStaffId());
if(staffEntity.getAttendCheck()==0 && staffEntity.getEffectCheck()==0 && staffEntity.getGoworkCheck()==0 && staffEntity.getComplainCheck()==0){
continue;
}
StaffPerformSummaryEntity staffPerformSummaryEntity = new StaffPerformSummaryEntity(); StaffPerformSummaryEntity staffPerformSummaryEntity = new StaffPerformSummaryEntity();
staffPerformSummaryEntity.initAttrValue(); staffPerformSummaryEntity.initAttrValue();
BeanUtils.copyProperties(vo,staffPerformSummaryEntity, BeanUtil.getNullPropertyNames(vo)); BeanUtils.copyProperties(vo,staffPerformSummaryEntity, BeanUtil.getNullPropertyNames(vo));
...@@ -306,6 +309,10 @@ public class CheckGoworkRecordServiceImpl extends AbstractCRUDServiceImpl<CheckG ...@@ -306,6 +309,10 @@ public class CheckGoworkRecordServiceImpl extends AbstractCRUDServiceImpl<CheckG
List<StaffPerformStatEntity> performStatList = dao.getStaffPerformStat(query); List<StaffPerformStatEntity> performStatList = dao.getStaffPerformStat(query);
if(CollectionUtils.isNotEmpty(performStatList)){ if(CollectionUtils.isNotEmpty(performStatList)){
for(StaffPerformStatEntity entity:performStatList) { for(StaffPerformStatEntity entity:performStatList) {
StaffEntity staffEntity = staffService.get(entity.getStaffId());
if(staffEntity.getAttendCheck()==0 && staffEntity.getEffectCheck()==0 && staffEntity.getGoworkCheck()==0 && staffEntity.getComplainCheck()==0){
continue;
}
StaffPerformStatQuery tempQuery = new StaffPerformStatQuery(); StaffPerformStatQuery tempQuery = new StaffPerformStatQuery();
tempQuery.setStaffId(entity.getStaffId()); tempQuery.setStaffId(entity.getStaffId());
tempQuery.setYear(entity.getYear()); tempQuery.setYear(entity.getYear());
......
...@@ -228,6 +228,9 @@ public class CheckReviewRecordServiceImpl extends AbstractCRUDServiceImpl<CheckR ...@@ -228,6 +228,9 @@ public class CheckReviewRecordServiceImpl extends AbstractCRUDServiceImpl<CheckR
} }
for (StaffCheckSummaryVo vo : summaryVoList) { for (StaffCheckSummaryVo vo : summaryVoList) {
StaffEntity staffEntity = staffService.get(vo.getStaffId()); StaffEntity staffEntity = staffService.get(vo.getStaffId());
if(staffEntity.getAttendCheck()==0 && staffEntity.getEffectCheck()==0 && staffEntity.getGoworkCheck()==0 && staffEntity.getComplainCheck()==0){
continue;
}
StaffPerformSummaryEntity staffPerformSummaryEntity = new StaffPerformSummaryEntity(); StaffPerformSummaryEntity staffPerformSummaryEntity = new StaffPerformSummaryEntity();
staffPerformSummaryEntity.initAttrValue(); staffPerformSummaryEntity.initAttrValue();
BeanUtils.copyProperties(vo, staffPerformSummaryEntity, BeanUtil.getNullPropertyNames(vo)); BeanUtils.copyProperties(vo, staffPerformSummaryEntity, BeanUtil.getNullPropertyNames(vo));
...@@ -311,6 +314,10 @@ public class CheckReviewRecordServiceImpl extends AbstractCRUDServiceImpl<CheckR ...@@ -311,6 +314,10 @@ public class CheckReviewRecordServiceImpl extends AbstractCRUDServiceImpl<CheckR
List<StaffPerformStatEntity> performStatList = dao.getStaffPerformStat(query); List<StaffPerformStatEntity> performStatList = dao.getStaffPerformStat(query);
if (CollectionUtils.isNotEmpty(performStatList)) { if (CollectionUtils.isNotEmpty(performStatList)) {
for (StaffPerformStatEntity entity : performStatList) { for (StaffPerformStatEntity entity : performStatList) {
StaffEntity staffEntity = staffService.get(entity.getStaffId());
if(staffEntity.getAttendCheck()==0 && staffEntity.getEffectCheck()==0 && staffEntity.getGoworkCheck()==0 && staffEntity.getComplainCheck()==0){
continue;
}
StaffPerformStatQuery tempQuery = new StaffPerformStatQuery(); StaffPerformStatQuery tempQuery = new StaffPerformStatQuery();
tempQuery.setStaffId(entity.getStaffId()); tempQuery.setStaffId(entity.getStaffId());
tempQuery.setYear(entity.getYear()); tempQuery.setYear(entity.getYear());
......
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