Skip to content

A
attendance-performance-platform
Commit 068186e1 authored by 廖旭伟's avatar 廖旭伟
Browse files
Options

修改问题

parent 00453272
Hide whitespace changes
Inline Side-by-side
Showing with 42 additions and 42 deletions
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckAttendRecordServiceImpl.java
View file @ 068186e1
......@@ -105,23 +105,23 @@ public class CheckAttendRecordServiceImpl extends AbstractCRUDServiceImpl<CheckA
summaryQuery.setMonth(vo.getMonth());
StaffPerformSummaryEntity temp = staffPerformSummaryService.selectOne(summaryQuery);
if(temp!=null){
if(temp.getAssessScore()==null){
staffPerformSummaryEntity.setAssessScore(new BigDecimal(0));
if(temp.getReviewScore()==null){
staffPerformSummaryEntity.setReviewScore(new BigDecimal(0));
}
if(temp.getOtherScore()==null){
staffPerformSummaryEntity.setOtherScore(new BigDecimal(0));
}
if(temp.getWorkScore()==null){
staffPerformSummaryEntity.setWorkScore(new BigDecimal(0));
if(temp.getGoworkScore()==null){
staffPerformSummaryEntity.setGoworkScore(new BigDecimal(0));
}
if(temp.getEffectScore()==null){
staffPerformSummaryEntity.setEffectScore(new BigDecimal(0));
}
BigDecimal erro = new BigDecimal(0);
erro.add(staffPerformSummaryEntity.getAssessScore());
erro.add(staffPerformSummaryEntity.getReviewScore());
erro.add(staffPerformSummaryEntity.getAttendScore());
erro.add(staffPerformSummaryEntity.getOtherScore());
erro.add(staffPerformSummaryEntity.getWorkScore());
erro.add(staffPerformSummaryEntity.getGoworkScore());
erro.add(staffPerformSummaryEntity.getEffectScore());
staffPerformSummaryEntity.setErrorScore(erro);
BigDecimal total = new BigDecimal(100);
......@@ -130,9 +130,9 @@ public class CheckAttendRecordServiceImpl extends AbstractCRUDServiceImpl<CheckA
staffPerformSummaryEntity.setUpdateTime(new Date());
staffPerformSummaryService.update(staffPerformSummaryEntity);
}else {
staffPerformSummaryEntity.setAssessScore(new BigDecimal(0));
staffPerformSummaryEntity.setReviewScore(new BigDecimal(0));
staffPerformSummaryEntity.setOtherScore(new BigDecimal(0));
staffPerformSummaryEntity.setWorkScore(new BigDecimal(0));
staffPerformSummaryEntity.setGoworkScore(new BigDecimal(0));
staffPerformSummaryEntity.setEffectScore(new BigDecimal(0));
staffPerformSummaryEntity.setErrorScore(vo.getSumScore());
BigDecimal total = new BigDecimal(100);
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckComplainRecordServiceImpl.java
View file @ 068186e1
......@@ -98,7 +98,7 @@ public class CheckComplainRecordServiceImpl extends AbstractCRUDServiceImpl<Chec
for(StaffCheckSummaryVo vo:summaryVoList){
StaffPerformSummaryEntity staffPerformSummaryEntity = new StaffPerformSummaryEntity();
BeanUtils.copyProperties(vo,staffPerformSummaryEntity, BeanUtil.getNullPropertyNames(vo));
staffPerformSummaryEntity.setAssessScore(vo.getSumScore());
staffPerformSummaryEntity.setReviewScore(vo.getSumScore());
StaffPerformSummaryQuery summaryQuery = new StaffPerformSummaryQuery();
summaryQuery.setStaffId(vo.getStaffId());
summaryQuery.setYear(vo.getYear());
......@@ -111,17 +111,17 @@ public class CheckComplainRecordServiceImpl extends AbstractCRUDServiceImpl<Chec
if(temp.getOtherScore()==null){
staffPerformSummaryEntity.setOtherScore(new BigDecimal(0));
}
if(temp.getWorkScore()==null){
staffPerformSummaryEntity.setWorkScore(new BigDecimal(0));
if(temp.getGoworkScore()==null){
staffPerformSummaryEntity.setGoworkScore(new BigDecimal(0));
}
if(temp.getEffectScore()==null){
staffPerformSummaryEntity.setEffectScore(new BigDecimal(0));
}
BigDecimal erro = new BigDecimal(0);
erro.add(staffPerformSummaryEntity.getAssessScore());
erro.add(staffPerformSummaryEntity.getReviewScore());
erro.add(staffPerformSummaryEntity.getAttendScore());
erro.add(staffPerformSummaryEntity.getOtherScore());
erro.add(staffPerformSummaryEntity.getWorkScore());
erro.add(staffPerformSummaryEntity.getGoworkScore());
erro.add(staffPerformSummaryEntity.getEffectScore());
staffPerformSummaryEntity.setErrorScore(erro);
BigDecimal total = new BigDecimal(100);
......@@ -135,7 +135,7 @@ public class CheckComplainRecordServiceImpl extends AbstractCRUDServiceImpl<Chec
}else {
staffPerformSummaryEntity.setAttendScore(new BigDecimal(0));
staffPerformSummaryEntity.setOtherScore(new BigDecimal(0));
staffPerformSummaryEntity.setWorkScore(new BigDecimal(0));
staffPerformSummaryEntity.setGoworkScore(new BigDecimal(0));
staffPerformSummaryEntity.setEffectScore(new BigDecimal(0));
staffPerformSummaryEntity.setErrorScore(vo.getSumScore());
BigDecimal total = new BigDecimal(100);
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckEffectRecordServiceImpl.java
View file @ 068186e1
......@@ -105,23 +105,23 @@ public class CheckEffectRecordServiceImpl extends AbstractCRUDServiceImpl<CheckE
summaryQuery.setMonth(vo.getMonth());
StaffPerformSummaryEntity temp = staffPerformSummaryService.selectOne(summaryQuery);
if(temp!=null){
if(temp.getAssessScore()==null){
staffPerformSummaryEntity.setAssessScore(new BigDecimal(0));
if(temp.getReviewScore()==null){
staffPerformSummaryEntity.setReviewScore(new BigDecimal(0));
}
if(temp.getOtherScore()==null){
staffPerformSummaryEntity.setOtherScore(new BigDecimal(0));
}
if(temp.getWorkScore()==null){
staffPerformSummaryEntity.setWorkScore(new BigDecimal(0));
if(temp.getGoworkScore()==null){
staffPerformSummaryEntity.setGoworkScore(new BigDecimal(0));
}
if(temp.getAttendScore()==null){
staffPerformSummaryEntity.setAttendScore(new BigDecimal(0));
}
BigDecimal erro = new BigDecimal(0);
erro.add(staffPerformSummaryEntity.getAssessScore());
erro.add(staffPerformSummaryEntity.getReviewScore());
erro.add(staffPerformSummaryEntity.getAttendScore());
erro.add(staffPerformSummaryEntity.getOtherScore());
erro.add(staffPerformSummaryEntity.getWorkScore());
erro.add(staffPerformSummaryEntity.getGoworkScore());
erro.add(staffPerformSummaryEntity.getEffectScore());
staffPerformSummaryEntity.setErrorScore(erro);
BigDecimal total = new BigDecimal(100);
......@@ -134,9 +134,9 @@ public class CheckEffectRecordServiceImpl extends AbstractCRUDServiceImpl<CheckE
staffPerformSummaryService.update(staffPerformSummaryEntity);
}else {
staffPerformSummaryEntity.setAttendScore(new BigDecimal(0));
staffPerformSummaryEntity.setAssessScore(new BigDecimal(0));
staffPerformSummaryEntity.setReviewScore(new BigDecimal(0));
staffPerformSummaryEntity.setOtherScore(new BigDecimal(0));
staffPerformSummaryEntity.setWorkScore(new BigDecimal(0));
staffPerformSummaryEntity.setGoworkScore(new BigDecimal(0));
staffPerformSummaryEntity.setErrorScore(vo.getSumScore());
BigDecimal total = new BigDecimal(100);
staffPerformSummaryEntity.setTotalScore(total.subtract(vo.getSumScore()));
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckGoworkRecordServiceImpl.java
View file @ 068186e1
......@@ -98,15 +98,15 @@ public class CheckGoworkRecordServiceImpl extends AbstractCRUDServiceImpl<CheckG
for(StaffCheckSummaryVo vo:summaryVoList){
StaffPerformSummaryEntity staffPerformSummaryEntity = new StaffPerformSummaryEntity();
BeanUtils.copyProperties(vo,staffPerformSummaryEntity, BeanUtil.getNullPropertyNames(vo));
staffPerformSummaryEntity.setWorkScore(vo.getSumScore());
staffPerformSummaryEntity.setGoworkScore(vo.getSumScore());
StaffPerformSummaryQuery summaryQuery = new StaffPerformSummaryQuery();
summaryQuery.setStaffId(vo.getStaffId());
summaryQuery.setYear(vo.getYear());
summaryQuery.setMonth(vo.getMonth());
StaffPerformSummaryEntity temp = staffPerformSummaryService.selectOne(summaryQuery);
if(temp!=null){
if(temp.getAssessScore()==null){
staffPerformSummaryEntity.setAssessScore(new BigDecimal(0));
if(temp.getReviewScore()==null){
staffPerformSummaryEntity.setReviewScore(new BigDecimal(0));
}
if(temp.getOtherScore()==null){
staffPerformSummaryEntity.setOtherScore(new BigDecimal(0));
......@@ -118,10 +118,10 @@ public class CheckGoworkRecordServiceImpl extends AbstractCRUDServiceImpl<CheckG
staffPerformSummaryEntity.setEffectScore(new BigDecimal(0));
}
BigDecimal erro = new BigDecimal(0);
erro.add(staffPerformSummaryEntity.getAssessScore());
erro.add(staffPerformSummaryEntity.getReviewScore());
erro.add(staffPerformSummaryEntity.getAttendScore());
erro.add(staffPerformSummaryEntity.getOtherScore());
erro.add(staffPerformSummaryEntity.getWorkScore());
erro.add(staffPerformSummaryEntity.getGoworkScore());
erro.add(staffPerformSummaryEntity.getEffectScore());
staffPerformSummaryEntity.setErrorScore(erro);
BigDecimal total = new BigDecimal(100);
......@@ -134,7 +134,7 @@ public class CheckGoworkRecordServiceImpl extends AbstractCRUDServiceImpl<CheckG
staffPerformSummaryService.update(staffPerformSummaryEntity);
}else {
staffPerformSummaryEntity.setAttendScore(new BigDecimal(0));
staffPerformSummaryEntity.setAssessScore(new BigDecimal(0));
staffPerformSummaryEntity.setReviewScore(new BigDecimal(0));
staffPerformSummaryEntity.setOtherScore(new BigDecimal(0));
staffPerformSummaryEntity.setEffectScore(new BigDecimal(0));
staffPerformSummaryEntity.setErrorScore(vo.getSumScore());
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckOtherRecordServiceImpl.java
View file @ 068186e1
......@@ -104,23 +104,23 @@ public class CheckOtherRecordServiceImpl extends AbstractCRUDServiceImpl<CheckOt
summaryQuery.setMonth(vo.getMonth());
StaffPerformSummaryEntity temp = staffPerformSummaryService.selectOne(summaryQuery);
if(temp!=null){
if(temp.getAssessScore()==null){
staffPerformSummaryEntity.setAssessScore(new BigDecimal(0));
if(temp.getReviewScore()==null){
staffPerformSummaryEntity.setReviewScore(new BigDecimal(0));
}
if(temp.getAttendScore()==null){
staffPerformSummaryEntity.setAttendScore(new BigDecimal(0));
}
if(temp.getWorkScore()==null){
staffPerformSummaryEntity.setWorkScore(new BigDecimal(0));
if(temp.getGoworkScore()==null){
staffPerformSummaryEntity.setGoworkScore(new BigDecimal(0));
}
if(temp.getEffectScore()==null){
staffPerformSummaryEntity.setEffectScore(new BigDecimal(0));
}
BigDecimal erro = new BigDecimal(0);
erro.add(staffPerformSummaryEntity.getAssessScore());
erro.add(staffPerformSummaryEntity.getReviewScore());
erro.add(staffPerformSummaryEntity.getAttendScore());
erro.add(staffPerformSummaryEntity.getOtherScore());
erro.add(staffPerformSummaryEntity.getWorkScore());
erro.add(staffPerformSummaryEntity.getGoworkScore());
erro.add(staffPerformSummaryEntity.getEffectScore());
staffPerformSummaryEntity.setErrorScore(erro);
BigDecimal total = new BigDecimal(100);
......@@ -133,8 +133,8 @@ public class CheckOtherRecordServiceImpl extends AbstractCRUDServiceImpl<CheckOt
staffPerformSummaryService.update(staffPerformSummaryEntity);
}else {
staffPerformSummaryEntity.setAttendScore(new BigDecimal(0));
staffPerformSummaryEntity.setAssessScore(new BigDecimal(0));
staffPerformSummaryEntity.setWorkScore(new BigDecimal(0));
staffPerformSummaryEntity.setReviewScore(new BigDecimal(0));
staffPerformSummaryEntity.setGoworkScore(new BigDecimal(0));
staffPerformSummaryEntity.setEffectScore(new BigDecimal(0));
staffPerformSummaryEntity.setErrorScore(vo.getSumScore());
BigDecimal total = new BigDecimal(100);
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckReviewRecordServiceImpl.java
View file @ 068186e1
......@@ -97,7 +97,7 @@ public class CheckReviewRecordServiceImpl extends AbstractCRUDServiceImpl<CheckR
for(StaffCheckSummaryVo vo:summaryVoList){
StaffPerformSummaryEntity staffPerformSummaryEntity = new StaffPerformSummaryEntity();
BeanUtils.copyProperties(vo,staffPerformSummaryEntity, BeanUtil.getNullPropertyNames(vo));
staffPerformSummaryEntity.setAssessScore(vo.getSumScore());
staffPerformSummaryEntity.setReviewScore(vo.getSumScore());
StaffPerformSummaryQuery summaryQuery = new StaffPerformSummaryQuery();
summaryQuery.setStaffId(vo.getStaffId());
summaryQuery.setYear(vo.getYear());
......@@ -110,17 +110,17 @@ public class CheckReviewRecordServiceImpl extends AbstractCRUDServiceImpl<CheckR
if(temp.getOtherScore()==null){
staffPerformSummaryEntity.setOtherScore(new BigDecimal(0));
}
if(temp.getWorkScore()==null){
staffPerformSummaryEntity.setWorkScore(new BigDecimal(0));
if(temp.getGoworkScore()==null){
staffPerformSummaryEntity.setGoworkScore(new BigDecimal(0));
}
if(temp.getEffectScore()==null){
staffPerformSummaryEntity.setEffectScore(new BigDecimal(0));
}
BigDecimal erro = new BigDecimal(0);
erro.add(staffPerformSummaryEntity.getAssessScore());
erro.add(staffPerformSummaryEntity.getReviewScore());
erro.add(staffPerformSummaryEntity.getAttendScore());
erro.add(staffPerformSummaryEntity.getOtherScore());
erro.add(staffPerformSummaryEntity.getWorkScore());
erro.add(staffPerformSummaryEntity.getGoworkScore());
erro.add(staffPerformSummaryEntity.getEffectScore());
staffPerformSummaryEntity.setErrorScore(erro);
BigDecimal total = new BigDecimal(100);
......@@ -134,7 +134,7 @@ public class CheckReviewRecordServiceImpl extends AbstractCRUDServiceImpl<CheckR
}else {
staffPerformSummaryEntity.setAttendScore(new BigDecimal(0));
staffPerformSummaryEntity.setOtherScore(new BigDecimal(0));
staffPerformSummaryEntity.setWorkScore(new BigDecimal(0));
staffPerformSummaryEntity.setGoworkScore(new BigDecimal(0));
staffPerformSummaryEntity.setEffectScore(new BigDecimal(0));
staffPerformSummaryEntity.setErrorScore(vo.getSumScore());
BigDecimal total = new BigDecimal(100);
......
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