diff --git a/attendance-performance-manager-ui/admin/src/views/staff/perform/summary/list.vue b/attendance-performance-manager-ui/admin/src/views/staff/perform/summary/list.vue
index ce24654911e74ca383b2ef8595173cc80920bb1c..12382f18df1d08e591d28d05214e2f23c9fc7362 100644
--- a/attendance-performance-manager-ui/admin/src/views/staff/perform/summary/list.vue
+++ b/attendance-performance-manager-ui/admin/src/views/staff/perform/summary/list.vue
@@ -111,13 +111,30 @@ export default {
{ label: "濮撳悕", prop: "staffName", formatter: this.formatter },
- { label: "宸ュ彿", prop: "workNum", formatter: this.formatter },
+ {
+ label: "宸ュ彿",
+ prop: "workNum",
+ formatter: this.formatter,
+ width: 80,
+ },
- { label: "鎵嬫満鍙�", prop: "phoneNumber", formatter: this.formatter },
+ {
+ label: "鎵嬫満鍙�",
+ prop: "phoneNumber",
+ formatter: this.formatter,
+ },
- { label: "鎵€灞炲ぇ鍘�", prop: "salaName", formatter: this.formatter },
+ {
+ label: "鎵€灞炲ぇ鍘�",
+ prop: "salaName",
+ formatter: this.formatter,
+ },
- { label: "鎵€灞為儴闂�", prop: "deptName", formatter: this.formatter },
+ {
+ label: "鎵€灞為儴闂�",
+ prop: "deptName",
+ formatter: this.formatter,
+ },
{
label: "鎵€灞炰腑蹇�",
formatter: (row) => {
@@ -128,31 +145,128 @@ export default {
{
label: "鑰冨嫟缁╂晥鎸囨爣鍒嗘暟",
prop: "attendScore",
+ width: 140,
+ formatter: (row) => {
+ console.log(row, this.tableData.dict, "1111");
+ return (
+ this.tableData.dict.weightPdu.attendWeight - row.attendScore
+ ).toFixed(2) > 0 ? (
+ <span style="color:red">
+ {row.attendScore +
+ "锛�-" +
+ (
+ this.tableData.dict.weightPdu.attendWeight -
+ row.attendScore
+ ).toFixed(2) +
+ "锛�"}
+ </span>
+ ) : (
+ row.attendScore +
+ `锛�${(
+ this.tableData.dict.weightPdu.attendWeight - row.attendScore
+ ).toFixed(2)}锛塦
+ );
+ },
},
{
label: "璇勪环缁╂晥鎸囨爣鍒嗘暟",
prop: "reviewScore",
+ width: 140,
+ formatter: (row) => {
+ return (
+ this.tableData.dict.weightPdu.reviewWeight - row.reviewScore
+ ).toFixed(2) > 0 ? (
+ <span style="color:red">
+ {row.reviewScore +
+ "锛�-" +
+ (
+ this.tableData.dict.weightPdu.reviewWeight -
+ row.reviewScore
+ ).toFixed(2) +
+ "锛�"}
+ </span>
+ ) : (
+ row.reviewScore +
+ `锛�${(
+ this.tableData.dict.weightPdu.reviewWeight - row.reviewScore
+ ).toFixed(2)}锛塦
+ );
+ },
},
- {
- label: "鎶曡瘔缁╂晥鎸囨爣鍒嗘暟",
- prop: "complainScore",
- },
+ // {
+ // label: "鎶曡瘔缁╂晥鎸囨爣鍒嗘暟",
+ // prop: "complainScore",
+ // formatter: (row) => {
+ // return (
+ // row.complainScore +
+ // `锛�${this.tableData.dict.attendWeight - row.complainScore}锛塦
+ // );
+ // },
+ // },
{
label: "鍔炰欢缁╂晥鍒嗘暟",
prop: "goworkScore",
+ width: 140,
+ formatter: (row) => {
+ return (
+ this.tableData.dict.weightPdu.goworkWeight - row.goworkScore
+ ).toFixed(2) > 0 ? (
+ <span style="color:red">
+ {row.goworkScore +
+ "锛�-" +
+ (
+ this.tableData.dict.weightPdu.goworkWeight -
+ row.goworkScore
+ ).toFixed(2) +
+ "锛�"}
+ </span>
+ ) : (
+ row.goworkScore +
+ `锛�${(
+ this.tableData.dict.weightPdu.goworkWeight - row.goworkScore
+ ).toFixed(2)}锛塦
+ );
+ },
},
{
label: "鏁堣兘缁╂晥鍒嗘暟",
prop: "effectScore",
+ width: 140,
+ formatter: (row) => {
+ return (
+ this.tableData.dict.weightPdu.effectWeight - row.effectScore
+ ).toFixed(2) > 0 ? (
+ <span style="color:red">
+ {row.effectScore +
+ "锛�-" +
+ (
+ this.tableData.dict.weightPdu.effectWeight -
+ row.effectScore
+ ).toFixed(2) +
+ "锛�"}
+ </span>
+ ) : (
+ row.effectScore +
+ `锛�${(
+ this.tableData.dict.weightPdu.effectWeight - row.effectScore
+ ).toFixed(2)}锛塦
+ );
+ },
},
- {
- label: "鑷瘎缁╂晥鍒嗘暟",
- prop: "otherScore",
- },
+ // {
+ // label: "鑷瘎缁╂晥鍒嗘暟",
+ // prop: "otherScore",
+ // formatter: (row) => {
+ // return (
+ // row.attendScore +
+ // `锛�${this.tableData.dict.selfWeight - row.attendScore}锛塦
+ // );
+ // },
+ // },
// {
// label: "绱寮傚父鍒嗘暟",
@@ -167,7 +281,7 @@ export default {
{ label: "鏈�", prop: "month", formatter: this.formatter },
{
label: "鎿嶄綔",
- width: 240,
+ width: 120,
formatter: (row) => {
return (
<table-buttons
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 f303e5a2df8293034b9582bc4c8f42b56b9cca46..3896b51d98cf73cfd743dc366ac8edc5c4e35ae9 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
@@ -213,7 +213,7 @@ public class CheckAttendRecordServiceImpl extends AbstractCRUDServiceImpl<CheckA
@Override
public List<StaffCheckSummaryVo> summaryCheck(StaffCheckSummaryQuery query) throws AppException {
- if (StringUtils.isEmpty(query.getCheckTimeStart()) || StringUtils.isEmpty(query.getCheckTimeStart())) {
+ if (StringUtils.isEmpty(query.getCheckTimeStart()) || StringUtils.isEmpty(query.getCheckTimeEnd())) {
/* SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
Calendar calendar = Calendar.getInstance();
calendar.set(Calendar.DAY_OF_MONTH, 1);
@@ -234,6 +234,17 @@ public class CheckAttendRecordServiceImpl extends AbstractCRUDServiceImpl<CheckA
}
for (StaffCheckSummaryVo vo : summaryVoList) {
StaffEntity staffEntity = staffService.get(vo.getStaffId());
+ if(staffEntity.getStatus() == StaffSatusEnum.绂昏亴.getValue()) {
+ if(staffEntity.getLeaveDate()!=null){
+ String leaveDateStr = DateUtils.getStrDate(staffEntity.getLeaveDate());
+ String month = vo.getMonth()>9?String.valueOf(vo.getMonth()):"0"+vo.getMonth();
+ String summaryDate = vo.getYear()+"-"+month+"-01";
+ if(DateUtils.StrToDate(leaveDateStr).compareTo(DateUtils.StrToDate(summaryDate)) < 0){
+ //绂昏亴鏃ユ湡鍦ㄧ粺璁℃棩鏈熶箣鍓嶄笉缁熻
+ continue;
+ }
+ }
+ }
if(staffEntity.getAttendCheck()==0 && staffEntity.getEffectCheck()==0 && staffEntity.getGoworkCheck()==0 && staffEntity.getComplainCheck()==0){
continue;
}
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 d0d4e9a51ea5d60915e64aea3b4a09221a366c1b..714b4fcd2574ba639463ff650caf7977936918d9 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
@@ -201,6 +201,17 @@ public class CheckComplainRecordServiceImpl extends AbstractCRUDServiceImpl<Chec
if (CollectionUtils.isNotEmpty(summaryVoList)) {
for (StaffCheckSummaryVo vo : summaryVoList) {
StaffEntity staffEntity = staffService.get(vo.getStaffId());
+ if(staffEntity.getStatus() == StaffSatusEnum.绂昏亴.getValue()) {
+ if(staffEntity.getLeaveDate()!=null){
+ String leaveDateStr = DateUtils.getStrDate(staffEntity.getLeaveDate());
+ String month = vo.getMonth()>9?String.valueOf(vo.getMonth()):"0"+vo.getMonth();
+ String summaryDate = vo.getYear()+"-"+month+"-01";
+ if(DateUtils.StrToDate(leaveDateStr).compareTo(DateUtils.StrToDate(summaryDate)) < 0){
+ //绂昏亴鏃ユ湡鍦ㄧ粺璁℃棩鏈熶箣鍓嶄笉缁熻
+ continue;
+ }
+ }
+ }
if(staffEntity.getAttendCheck()==0 && staffEntity.getEffectCheck()==0 && staffEntity.getGoworkCheck()==0 && staffEntity.getComplainCheck()==0){
continue;
}
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 bc7305ecaee8a7c1377c66ee2b826319d40ace61..5adebeb673c99a62ebc5040aef73ece850247ba4 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
@@ -226,6 +226,17 @@ public class CheckEffectRecordServiceImpl extends AbstractCRUDServiceImpl<CheckE
}
for(StaffCheckSummaryVo vo:summaryVoList){
StaffEntity staffEntity = staffService.get(vo.getStaffId());
+ if(staffEntity.getStatus() == StaffSatusEnum.绂昏亴.getValue()) {
+ if(staffEntity.getLeaveDate()!=null){
+ String leaveDateStr = DateUtils.getStrDate(staffEntity.getLeaveDate());
+ String month = vo.getMonth()>9?String.valueOf(vo.getMonth()):"0"+vo.getMonth();
+ String summaryDate = vo.getYear()+"-"+month+"-01";
+ if(DateUtils.StrToDate(leaveDateStr).compareTo(DateUtils.StrToDate(summaryDate)) < 0){
+ //绂昏亴鏃ユ湡鍦ㄧ粺璁℃棩鏈熶箣鍓嶄笉缁熻
+ continue;
+ }
+ }
+ }
if(staffEntity.getAttendCheck()==0 && staffEntity.getEffectCheck()==0 && staffEntity.getGoworkCheck()==0 && staffEntity.getComplainCheck()==0){
continue;
}
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 69a2c78dd78efc072f0b1756a65492737efc5a0c..5e2d0b9c891f315a2b37181c493e679fb6d43311 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
@@ -223,6 +223,17 @@ public class CheckGoworkRecordServiceImpl extends AbstractCRUDServiceImpl<CheckG
}
for(StaffCheckSummaryVo vo:summaryVoList){
StaffEntity staffEntity = staffService.get(vo.getStaffId());
+ if(staffEntity.getStatus() == StaffSatusEnum.绂昏亴.getValue()) {
+ if(staffEntity.getLeaveDate()!=null){
+ String leaveDateStr = DateUtils.getStrDate(staffEntity.getLeaveDate());
+ String month = vo.getMonth()>9?String.valueOf(vo.getMonth()):"0"+vo.getMonth();
+ String summaryDate = vo.getYear()+"-"+month+"-01";
+ if(DateUtils.StrToDate(leaveDateStr).compareTo(DateUtils.StrToDate(summaryDate)) < 0){
+ //绂昏亴鏃ユ湡鍦ㄧ粺璁℃棩鏈熶箣鍓嶄笉缁熻
+ continue;
+ }
+ }
+ }
if(staffEntity.getAttendCheck()==0 && staffEntity.getEffectCheck()==0 && staffEntity.getGoworkCheck()==0 && staffEntity.getComplainCheck()==0){
continue;
}
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 556a11a3385e1b10e90af8965aef9cbf8f2a2730..80f830449630142741b90be83392ee3a4bccd4ac 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
@@ -206,6 +206,18 @@ public class CheckOtherRecordServiceImpl extends AbstractCRUDServiceImpl<CheckOt
List<StaffCheckSummaryVo> summaryVoList = dao.summaryCheck(query);
if (CollectionUtils.isNotEmpty(summaryVoList)) {
for (StaffCheckSummaryVo vo : summaryVoList) {
+ StaffEntity staffEntity = staffService.get(vo.getStaffId());
+ if(staffEntity.getStatus() == StaffSatusEnum.绂昏亴.getValue()) {
+ if(staffEntity.getLeaveDate()!=null){
+ String leaveDateStr = DateUtils.getStrDate(staffEntity.getLeaveDate());
+ String month = vo.getMonth()>9?String.valueOf(vo.getMonth()):"0"+vo.getMonth();
+ String summaryDate = vo.getYear()+"-"+month+"-01";
+ if(DateUtils.StrToDate(leaveDateStr).compareTo(DateUtils.StrToDate(summaryDate)) < 0){
+ //绂昏亴鏃ユ湡鍦ㄧ粺璁℃棩鏈熶箣鍓嶄笉缁熻
+ continue;
+ }
+ }
+ }
StaffPerformSummaryEntity staffPerformSummaryEntity = new StaffPerformSummaryEntity();
staffPerformSummaryEntity.initAttrValue();
BeanUtils.copyProperties(vo, staffPerformSummaryEntity, BeanUtil.getNullPropertyNames(vo));
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 53613a12e6ae9158efeb47cbeede275e7bc2420d..10eddae6e3aeea817131e819bbbc5ea4859cb34d 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
@@ -228,6 +228,17 @@ public class CheckReviewRecordServiceImpl extends AbstractCRUDServiceImpl<CheckR
}
for (StaffCheckSummaryVo vo : summaryVoList) {
StaffEntity staffEntity = staffService.get(vo.getStaffId());
+ if(staffEntity.getStatus() == StaffSatusEnum.绂昏亴.getValue()) {
+ if(staffEntity.getLeaveDate()!=null){
+ String leaveDateStr = DateUtils.getStrDate(staffEntity.getLeaveDate());
+ String month = vo.getMonth()>9?String.valueOf(vo.getMonth()):"0"+vo.getMonth();
+ String summaryDate = vo.getYear()+"-"+month+"-01";
+ if(DateUtils.StrToDate(leaveDateStr).compareTo(DateUtils.StrToDate(summaryDate)) < 0){
+ //绂昏亴鏃ユ湡鍦ㄧ粺璁℃棩鏈熶箣鍓嶄笉缁熻
+ continue;
+ }
+ }
+ }
if(staffEntity.getAttendCheck()==0 && staffEntity.getEffectCheck()==0 && staffEntity.getGoworkCheck()==0 && staffEntity.getComplainCheck()==0){
continue;
}
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckWindowWorkmanPerformServiceImpl.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckWindowWorkmanPerformServiceImpl.java
index 4729d958c0dd8cea8795212cb5d8f711d1fff2ab..9ab2112343de77e02dde590c0e07b5d2ae7a7ecc 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckWindowWorkmanPerformServiceImpl.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckWindowWorkmanPerformServiceImpl.java
@@ -2,10 +2,12 @@ package com.mortals.xhx.module.check.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.mortals.framework.service.ICacheService;
import com.mortals.framework.service.IUser;
+import com.mortals.framework.util.DateUtils;
import com.mortals.framework.util.StringUtils;
import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.common.code.CheckStatusEnum;
import com.mortals.xhx.common.code.CheckTypeEnum;
+import com.mortals.xhx.common.code.StaffSatusEnum;
import com.mortals.xhx.common.pdu.WeightPdu;
import com.mortals.xhx.common.utils.BeanUtil;
import com.mortals.xhx.module.check.model.CheckWindowPerformEntity;
@@ -105,6 +107,17 @@ public class CheckWindowWorkmanPerformServiceImpl extends AbstractCRUDServiceImp
}
for (StaffCheckSummaryVo vo : summaryVoList) {
StaffEntity staffEntity = staffService.get(vo.getStaffId());
+ if(staffEntity.getStatus() == StaffSatusEnum.绂昏亴.getValue()) {
+ if(staffEntity.getLeaveDate()!=null){
+ String leaveDateStr = DateUtils.getStrDate(staffEntity.getLeaveDate());
+ String month = vo.getMonth()>9?String.valueOf(vo.getMonth()):"0"+vo.getMonth();
+ String summaryDate = vo.getYear()+"-"+month+"-01";
+ if(DateUtils.StrToDate(leaveDateStr).compareTo(DateUtils.StrToDate(summaryDate)) < 0){
+ //绂昏亴鏃ユ湡鍦ㄧ粺璁℃棩鏈熶箣鍓嶄笉缁熻
+ continue;
+ }
+ }
+ }
if(staffEntity.getAttendCheck()==0 && staffEntity.getEffectCheck()==0 && staffEntity.getGoworkCheck()==0 && staffEntity.getComplainCheck()==0){
continue;
}