diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckAttendRecordServiceImpl.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckAttendRecordServiceImpl.java index 9ea11ef2cff700987188ccb78cc1ff369c122e56..8bfcd3e101fff545e6472c2fad99037865f956e1 100644 --- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckAttendRecordServiceImpl.java +++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckAttendRecordServiceImpl.java @@ -313,6 +313,7 @@ public class CheckAttendRecordServiceImpl extends AbstractCRUDServiceImpl<CheckA StaffPerformSummaryEntity temp = staffPerformSummaryService.selectOne(summaryQuery); if (temp != null) { staffPerformSummaryEntity.setRemarkAdd(temp.getRemarkAdd()); + staffPerformSummaryEntity.setRemark(temp.getRemark()); staffPerformSummaryEntity.setAddTotalScore(temp.getAddTotalScore()); if (temp.getReviewScore() != null) { staffPerformSummaryEntity.setReviewScore(temp.getReviewScore()); diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckComplainRecordServiceImpl.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckComplainRecordServiceImpl.java index 7fc9eb0353afb7644c141fb8ce3be17cf678867a..73c6cf034743a5f7cc84924624345e404b9e5b4e 100644 --- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckComplainRecordServiceImpl.java +++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckComplainRecordServiceImpl.java @@ -307,6 +307,7 @@ public class CheckComplainRecordServiceImpl extends AbstractCRUDServiceImpl<Chec StaffPerformSummaryEntity temp = staffPerformSummaryService.selectOne(summaryQuery); if (temp != null) { staffPerformSummaryEntity.setRemarkAdd(temp.getRemarkAdd()); + staffPerformSummaryEntity.setRemark(temp.getRemark()); staffPerformSummaryEntity.setAddTotalScore(temp.getAddTotalScore()); if (temp.getAttendScore() != null) { staffPerformSummaryEntity.setAttendScore(temp.getAttendScore()); diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckEffectRecordServiceImpl.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckEffectRecordServiceImpl.java index d32e1a0094cbdef6717155d469254bdbe0f03373..ba332967989a0b09a9ed634851bd3bae658e60db 100644 --- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckEffectRecordServiceImpl.java +++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckEffectRecordServiceImpl.java @@ -296,6 +296,7 @@ public class CheckEffectRecordServiceImpl extends AbstractCRUDServiceImpl<CheckE StaffPerformSummaryEntity temp = staffPerformSummaryService.selectOne(summaryQuery); if(temp!=null){ staffPerformSummaryEntity.setRemarkAdd(temp.getRemarkAdd()); + staffPerformSummaryEntity.setRemark(temp.getRemark()); staffPerformSummaryEntity.setAddTotalScore(temp.getAddTotalScore()); if(temp.getReviewScore()!=null){ staffPerformSummaryEntity.setReviewScore(temp.getReviewScore()); diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckGoworkRecordServiceImpl.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckGoworkRecordServiceImpl.java index 03ff89aab22770a1cf4d9a2f5f5a988c2fea1083..35496bd2200ab8fc8e900717d29b04ba8bd72e50 100644 --- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckGoworkRecordServiceImpl.java +++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckGoworkRecordServiceImpl.java @@ -295,6 +295,7 @@ public class CheckGoworkRecordServiceImpl extends AbstractCRUDServiceImpl<CheckG StaffPerformSummaryEntity temp = staffPerformSummaryService.selectOne(summaryQuery); if(temp!=null){ staffPerformSummaryEntity.setRemarkAdd(temp.getRemarkAdd()); + staffPerformSummaryEntity.setRemark(temp.getRemark()); staffPerformSummaryEntity.setAddTotalScore(temp.getAddTotalScore()); if(temp.getReviewScore()!=null){ staffPerformSummaryEntity.setReviewScore(temp.getReviewScore()); diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckOtherRecordServiceImpl.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckOtherRecordServiceImpl.java index a54dc17e8ed98166d651786aa53dd8c899dc334e..2baac9223c8b7d2e0664781cd36cb56f2e3bf6f5 100644 --- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckOtherRecordServiceImpl.java +++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckOtherRecordServiceImpl.java @@ -300,6 +300,7 @@ public class CheckOtherRecordServiceImpl extends AbstractCRUDServiceImpl<CheckOt StaffPerformSummaryEntity temp = staffPerformSummaryService.selectOne(summaryQuery); if (temp != null) { staffPerformSummaryEntity.setRemarkAdd(temp.getRemarkAdd()); + staffPerformSummaryEntity.setRemark(temp.getRemark()); staffPerformSummaryEntity.setAddTotalScore(temp.getAddTotalScore()); if (temp.getReviewScore() != null) { staffPerformSummaryEntity.setReviewScore(temp.getReviewScore()); diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckReviewRecordServiceImpl.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckReviewRecordServiceImpl.java index c81789d4222b15e4b45da26268af3f967046b572..6618c4e8873295747c7c1ee0da630e05983383d2 100644 --- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckReviewRecordServiceImpl.java +++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckReviewRecordServiceImpl.java @@ -304,6 +304,7 @@ public class CheckReviewRecordServiceImpl extends AbstractCRUDServiceImpl<CheckR StaffPerformSummaryEntity temp = staffPerformSummaryService.selectOne(summaryQuery); if (temp != null) { staffPerformSummaryEntity.setRemarkAdd(temp.getRemarkAdd()); + staffPerformSummaryEntity.setRemark(temp.getRemark()); staffPerformSummaryEntity.setAddTotalScore(temp.getAddTotalScore()); if (temp.getAttendScore() != null) { staffPerformSummaryEntity.setAttendScore(temp.getAttendScore());