Skip to content

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

绩效核查时间查询条件修改；绩效汇总分数时按照人员绩效维度配置进行汇总；绩效汇总列表增加中文排序

parent 0e6ca006
Hide whitespace changes
Inline Side-by-side
Showing with 171 additions and 92 deletions
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckComplainRecordVo.java
View file @ 6c94d3ad
...@@ -23,5 +23,9 @@ public class CheckComplainRecordVo extends BaseEntityLong { ...@@ -23,5 +23,9 @@ public class CheckComplainRecordVo extends BaseEntityLong {
/** 序号，主键，自增长列表 */ /** 序号，主键，自增长列表 */
private List <Long> idList; private List <Long> idList;
/** 开始 投诉时间 */
private String complainTimeStart;
/** 结束 投诉时间 */
private String complainTimeEnd;
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckEffectRecordVo.java
View file @ 6c94d3ad
...@@ -23,5 +23,10 @@ public class CheckEffectRecordVo extends BaseEntityLong { ...@@ -23,5 +23,10 @@ public class CheckEffectRecordVo extends BaseEntityLong {
/** 序号，主键，自增长列表 */ /** 序号，主键，自增长列表 */
private List <Long> idList; private List <Long> idList;
/** 开始 发生时间 */
private String happenTimeStart;
/** 结束 发生时间 */
private String happenTimeEnd;
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckGoworkRecordVo.java
View file @ 6c94d3ad
...@@ -23,5 +23,10 @@ public class CheckGoworkRecordVo extends BaseEntityLong { ...@@ -23,5 +23,10 @@ public class CheckGoworkRecordVo extends BaseEntityLong {
/** 序号，主键，自增长列表 */ /** 序号，主键，自增长列表 */
private List <Long> idList; private List <Long> idList;
/** 开始 办理时间 */
private String goworkTimeStart;
/** 结束 办理时间 */
private String goworkTimeEnd;
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckOtherRecordVo.java
View file @ 6c94d3ad
...@@ -23,5 +23,9 @@ public class CheckOtherRecordVo extends BaseEntityLong { ...@@ -23,5 +23,9 @@ public class CheckOtherRecordVo extends BaseEntityLong {
/** 序号，主键，自增长列表 */ /** 序号，主键，自增长列表 */
private List <Long> idList; private List <Long> idList;
/** 开始 发生时间 */
private String happenTimeStart;
/** 结束 发生时间 */
private String happenTimeEnd;
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckReviewRecordVo.java
View file @ 6c94d3ad
...@@ -23,4 +23,9 @@ public class CheckReviewRecordVo extends BaseEntityLong { ...@@ -23,4 +23,9 @@ public class CheckReviewRecordVo extends BaseEntityLong {
/** 序号，主键，自增长列表 */ /** 序号，主键，自增长列表 */
private List <Long> idList; private List <Long> idList;
/** 开始 评价时间 */
private String reviewTimeStart;
/** 结束 评价时间 */
private String reviewTimeEnd;
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckAttendRecordServiceImpl.java
View file @ 6c94d3ad
...@@ -233,6 +233,7 @@ public class CheckAttendRecordServiceImpl extends AbstractCRUDServiceImpl<CheckA ...@@ -233,6 +233,7 @@ public class CheckAttendRecordServiceImpl extends AbstractCRUDServiceImpl<CheckA
weightPdu = JSONObject.parseObject(value,WeightPdu.class); weightPdu = JSONObject.parseObject(value,WeightPdu.class);
} }
for (StaffCheckSummaryVo vo : summaryVoList) { for (StaffCheckSummaryVo vo : summaryVoList) {
StaffEntity staffEntity = staffService.get(vo.getStaffId());
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));
...@@ -272,7 +273,7 @@ public class CheckAttendRecordServiceImpl extends AbstractCRUDServiceImpl<CheckA ...@@ -272,7 +273,7 @@ public class CheckAttendRecordServiceImpl extends AbstractCRUDServiceImpl<CheckA
staffPerformSummaryEntity.setErrorScore(erro); staffPerformSummaryEntity.setErrorScore(erro);
// BigDecimal total = new BigDecimal(100); // BigDecimal total = new BigDecimal(100);
// staffPerformSummaryEntity.setTotalScore(total.add(erro)); // staffPerformSummaryEntity.setTotalScore(total.add(erro));
computeSummary(staffPerformSummaryEntity,weightPdu); computeSummary(staffPerformSummaryEntity,weightPdu,staffEntity);
staffPerformSummaryEntity.setId(temp.getId()); staffPerformSummaryEntity.setId(temp.getId());
staffPerformSummaryEntity.setUpdateTime(new Date()); staffPerformSummaryEntity.setUpdateTime(new Date());
staffPerformSummaryService.update(staffPerformSummaryEntity); staffPerformSummaryService.update(staffPerformSummaryEntity);
...@@ -285,7 +286,7 @@ public class CheckAttendRecordServiceImpl extends AbstractCRUDServiceImpl<CheckA ...@@ -285,7 +286,7 @@ public class CheckAttendRecordServiceImpl extends AbstractCRUDServiceImpl<CheckA
staffPerformSummaryEntity.setErrorScore(vo.getSumScore()); staffPerformSummaryEntity.setErrorScore(vo.getSumScore());
// BigDecimal total = new BigDecimal(100); // BigDecimal total = new BigDecimal(100);
// staffPerformSummaryEntity.setTotalScore(total.add(vo.getSumScore())); // staffPerformSummaryEntity.setTotalScore(total.add(vo.getSumScore()));
computeSummary(staffPerformSummaryEntity,weightPdu); computeSummary(staffPerformSummaryEntity,weightPdu,staffEntity);
staffPerformSummaryEntity.setCreateUserId(1l); staffPerformSummaryEntity.setCreateUserId(1l);
staffPerformSummaryEntity.setCreateTime(new Date()); staffPerformSummaryEntity.setCreateTime(new Date());
staffPerformSummaryService.save(staffPerformSummaryEntity); staffPerformSummaryService.save(staffPerformSummaryEntity);
...@@ -440,7 +441,7 @@ public class CheckAttendRecordServiceImpl extends AbstractCRUDServiceImpl<CheckA ...@@ -440,7 +441,7 @@ public class CheckAttendRecordServiceImpl extends AbstractCRUDServiceImpl<CheckA
statEntity.setTotalScore(totalScore); statEntity.setTotalScore(totalScore);
} }
private static void computeSummary(StaffPerformSummaryEntity staffPerformSummaryEntity, WeightPdu weightPdu){ private void computeSummary(StaffPerformSummaryEntity staffPerformSummaryEntity, WeightPdu weightPdu,StaffEntity staffEntity){
BigDecimal total = new BigDecimal(100); BigDecimal total = new BigDecimal(100);
BigDecimal reviewScore = total.add(staffPerformSummaryEntity.getReviewScore()); //评价 BigDecimal reviewScore = total.add(staffPerformSummaryEntity.getReviewScore()); //评价
reviewScore = reviewScore.multiply(weightPdu.reviewWeight()); reviewScore = reviewScore.multiply(weightPdu.reviewWeight());
...@@ -457,28 +458,22 @@ public class CheckAttendRecordServiceImpl extends AbstractCRUDServiceImpl<CheckA ...@@ -457,28 +458,22 @@ public class CheckAttendRecordServiceImpl extends AbstractCRUDServiceImpl<CheckA
effectScore = effectScore.multiply(weightPdu.effectWeight()); effectScore = effectScore.multiply(weightPdu.effectWeight());
// BigDecimal complainScore = complainScore = total.add(staffPerformSummaryEntity.getComplainScore()); //投诉 // BigDecimal complainScore = complainScore = total.add(staffPerformSummaryEntity.getComplainScore()); //投诉
BigDecimal summary = new BigDecimal(0); BigDecimal summary = new BigDecimal(0);
summary = summary.add(reviewScore); if(staffEntity.getReviewCheck()==1) {
summary = summary.add(attendScore); summary = summary.add(reviewScore);
summary = summary.add(otherScore); }
summary = summary.add(goworkScore); if(staffEntity.getAttendCheck()==1) {
summary = summary.add(effectScore); summary = summary.add(attendScore);
}
if(staffEntity.getOtherCheck()==1) {
summary = summary.add(otherScore);
}
if(staffEntity.getEffectCheck()==1){
summary = summary.add(effectScore);
}
if(staffEntity.getGoworkCheck()==1) {
summary = summary.add(goworkScore);
}
staffPerformSummaryEntity.setTotalScore(summary); staffPerformSummaryEntity.setTotalScore(summary);
} }
public static void main(String[] args) {
StaffPerformSummaryEntity staffPerformSummaryEntity = new StaffPerformSummaryEntity();
staffPerformSummaryEntity.initAttrValue();
staffPerformSummaryEntity.setAttendScore(new BigDecimal(-0.4));
String ss = "{\"attendWeight\":10,\"effectWeight\":20,\"goworkWeight\":20,\"reviewWeight\":0,\"selfWeight\":50}";
WeightPdu weightPdu = JSONObject.parseObject(ss,WeightPdu.class);
System.out.println(JSONObject.toJSONString(weightPdu));
// BigDecimal total = new BigDecimal(100);
// BigDecimal reviewScore = total.add(staffPerformSummaryEntity.getReviewScore()); //评价
// System.out.println(reviewScore);
// reviewScore = reviewScore.multiply(weightPdu.attendWeight());
// System.out.println(weightPdu.reviewWeight());
// System.out.println(reviewScore);
computeSummary(staffPerformSummaryEntity,weightPdu);
System.out.println(JSONObject.toJSONString(staffPerformSummaryEntity));
}
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckEffectRecordServiceImpl.java
View file @ 6c94d3ad
...@@ -225,6 +225,7 @@ public class CheckEffectRecordServiceImpl extends AbstractCRUDServiceImpl<CheckE ...@@ -225,6 +225,7 @@ public class CheckEffectRecordServiceImpl extends AbstractCRUDServiceImpl<CheckE
weightPdu = JSONObject.parseObject(value,WeightPdu.class); weightPdu = JSONObject.parseObject(value,WeightPdu.class);
} }
for(StaffCheckSummaryVo vo:summaryVoList){ for(StaffCheckSummaryVo vo:summaryVoList){
StaffEntity staffEntity = staffService.get(vo.getStaffId());
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));
...@@ -264,7 +265,7 @@ public class CheckEffectRecordServiceImpl extends AbstractCRUDServiceImpl<CheckE ...@@ -264,7 +265,7 @@ public class CheckEffectRecordServiceImpl extends AbstractCRUDServiceImpl<CheckE
staffPerformSummaryEntity.setErrorScore(erro); staffPerformSummaryEntity.setErrorScore(erro);
// BigDecimal total = new BigDecimal(100); // BigDecimal total = new BigDecimal(100);
// staffPerformSummaryEntity.setTotalScore(total.add(erro)); // staffPerformSummaryEntity.setTotalScore(total.add(erro));
computeSummary(staffPerformSummaryEntity,weightPdu); computeSummary(staffPerformSummaryEntity,weightPdu,staffEntity);
staffPerformSummaryEntity.setId(temp.getId()); staffPerformSummaryEntity.setId(temp.getId());
staffPerformSummaryEntity.setUpdateTime(new Date()); staffPerformSummaryEntity.setUpdateTime(new Date());
staffPerformSummaryService.update(staffPerformSummaryEntity); staffPerformSummaryService.update(staffPerformSummaryEntity);
...@@ -280,7 +281,7 @@ public class CheckEffectRecordServiceImpl extends AbstractCRUDServiceImpl<CheckE ...@@ -280,7 +281,7 @@ public class CheckEffectRecordServiceImpl extends AbstractCRUDServiceImpl<CheckE
staffPerformSummaryEntity.setErrorScore(vo.getSumScore()); staffPerformSummaryEntity.setErrorScore(vo.getSumScore());
// BigDecimal total = new BigDecimal(100); // BigDecimal total = new BigDecimal(100);
// staffPerformSummaryEntity.setTotalScore(total.add(vo.getSumScore())); // staffPerformSummaryEntity.setTotalScore(total.add(vo.getSumScore()));
computeSummary(staffPerformSummaryEntity,weightPdu); computeSummary(staffPerformSummaryEntity,weightPdu,staffEntity);
staffPerformSummaryEntity.setCreateUserId(1l); staffPerformSummaryEntity.setCreateUserId(1l);
staffPerformSummaryEntity.setCreateTime(new Date()); staffPerformSummaryEntity.setCreateTime(new Date());
staffPerformSummaryService.save(staffPerformSummaryEntity); staffPerformSummaryService.save(staffPerformSummaryEntity);
...@@ -435,7 +436,7 @@ public class CheckEffectRecordServiceImpl extends AbstractCRUDServiceImpl<CheckE ...@@ -435,7 +436,7 @@ public class CheckEffectRecordServiceImpl extends AbstractCRUDServiceImpl<CheckE
statEntity.setTotalScore(totalScore); statEntity.setTotalScore(totalScore);
} }
private void computeSummary(StaffPerformSummaryEntity staffPerformSummaryEntity, WeightPdu weightPdu){ private void computeSummary(StaffPerformSummaryEntity staffPerformSummaryEntity, WeightPdu weightPdu,StaffEntity staffEntity){
BigDecimal total = new BigDecimal(100); BigDecimal total = new BigDecimal(100);
BigDecimal reviewScore = total.add(staffPerformSummaryEntity.getReviewScore()); //评价 BigDecimal reviewScore = total.add(staffPerformSummaryEntity.getReviewScore()); //评价
reviewScore = reviewScore.multiply(weightPdu.reviewWeight()); reviewScore = reviewScore.multiply(weightPdu.reviewWeight());
...@@ -452,11 +453,21 @@ public class CheckEffectRecordServiceImpl extends AbstractCRUDServiceImpl<CheckE ...@@ -452,11 +453,21 @@ public class CheckEffectRecordServiceImpl extends AbstractCRUDServiceImpl<CheckE
effectScore = effectScore.multiply(weightPdu.effectWeight()); effectScore = effectScore.multiply(weightPdu.effectWeight());
// BigDecimal complainScore = complainScore = total.add(staffPerformSummaryEntity.getComplainScore()); //投诉 // BigDecimal complainScore = complainScore = total.add(staffPerformSummaryEntity.getComplainScore()); //投诉
BigDecimal summary = new BigDecimal(0); BigDecimal summary = new BigDecimal(0);
summary = summary.add(reviewScore); if(staffEntity.getReviewCheck()==1) {
summary = summary.add(attendScore); summary = summary.add(reviewScore);
summary = summary.add(otherScore); }
summary = summary.add(goworkScore); if(staffEntity.getAttendCheck()==1) {
summary = summary.add(effectScore); summary = summary.add(attendScore);
}
if(staffEntity.getOtherCheck()==1) {
summary = summary.add(otherScore);
}
if(staffEntity.getEffectCheck()==1){
summary = summary.add(effectScore);
}
if(staffEntity.getGoworkCheck()==1) {
summary = summary.add(goworkScore);
}
staffPerformSummaryEntity.setTotalScore(summary); staffPerformSummaryEntity.setTotalScore(summary);
} }
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckGoworkRecordServiceImpl.java
View file @ 6c94d3ad
...@@ -222,6 +222,7 @@ public class CheckGoworkRecordServiceImpl extends AbstractCRUDServiceImpl<CheckG ...@@ -222,6 +222,7 @@ public class CheckGoworkRecordServiceImpl extends AbstractCRUDServiceImpl<CheckG
weightPdu = JSONObject.parseObject(value,WeightPdu.class); weightPdu = JSONObject.parseObject(value,WeightPdu.class);
} }
for(StaffCheckSummaryVo vo:summaryVoList){ for(StaffCheckSummaryVo vo:summaryVoList){
StaffEntity staffEntity = staffService.get(vo.getStaffId());
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));
...@@ -261,7 +262,7 @@ public class CheckGoworkRecordServiceImpl extends AbstractCRUDServiceImpl<CheckG ...@@ -261,7 +262,7 @@ public class CheckGoworkRecordServiceImpl extends AbstractCRUDServiceImpl<CheckG
staffPerformSummaryEntity.setErrorScore(erro); staffPerformSummaryEntity.setErrorScore(erro);
// BigDecimal total = new BigDecimal(100); // BigDecimal total = new BigDecimal(100);
// staffPerformSummaryEntity.setTotalScore(total.add(erro)); // staffPerformSummaryEntity.setTotalScore(total.add(erro));
computeSummary(staffPerformSummaryEntity,weightPdu); computeSummary(staffPerformSummaryEntity,weightPdu,staffEntity);
staffPerformSummaryEntity.setId(temp.getId()); staffPerformSummaryEntity.setId(temp.getId());
staffPerformSummaryEntity.setUpdateTime(new Date()); staffPerformSummaryEntity.setUpdateTime(new Date());
staffPerformSummaryService.update(staffPerformSummaryEntity); staffPerformSummaryService.update(staffPerformSummaryEntity);
...@@ -277,7 +278,7 @@ public class CheckGoworkRecordServiceImpl extends AbstractCRUDServiceImpl<CheckG ...@@ -277,7 +278,7 @@ public class CheckGoworkRecordServiceImpl extends AbstractCRUDServiceImpl<CheckG
staffPerformSummaryEntity.setErrorScore(vo.getSumScore()); staffPerformSummaryEntity.setErrorScore(vo.getSumScore());
// BigDecimal total = new BigDecimal(100); // BigDecimal total = new BigDecimal(100);
// staffPerformSummaryEntity.setTotalScore(total.add(vo.getSumScore())); // staffPerformSummaryEntity.setTotalScore(total.add(vo.getSumScore()));
computeSummary(staffPerformSummaryEntity,weightPdu); computeSummary(staffPerformSummaryEntity,weightPdu,staffEntity);
staffPerformSummaryEntity.setCreateUserId(1l); staffPerformSummaryEntity.setCreateUserId(1l);
staffPerformSummaryEntity.setCreateTime(new Date()); staffPerformSummaryEntity.setCreateTime(new Date());
staffPerformSummaryService.save(staffPerformSummaryEntity); staffPerformSummaryService.save(staffPerformSummaryEntity);
...@@ -432,7 +433,7 @@ public class CheckGoworkRecordServiceImpl extends AbstractCRUDServiceImpl<CheckG ...@@ -432,7 +433,7 @@ public class CheckGoworkRecordServiceImpl extends AbstractCRUDServiceImpl<CheckG
statEntity.setTotalScore(totalScore); statEntity.setTotalScore(totalScore);
} }
private void computeSummary(StaffPerformSummaryEntity staffPerformSummaryEntity, WeightPdu weightPdu){ private void computeSummary(StaffPerformSummaryEntity staffPerformSummaryEntity, WeightPdu weightPdu,StaffEntity staffEntity){
BigDecimal total = new BigDecimal(100); BigDecimal total = new BigDecimal(100);
BigDecimal reviewScore = total.add(staffPerformSummaryEntity.getReviewScore()); //评价 BigDecimal reviewScore = total.add(staffPerformSummaryEntity.getReviewScore()); //评价
reviewScore = reviewScore.multiply(weightPdu.reviewWeight()); reviewScore = reviewScore.multiply(weightPdu.reviewWeight());
...@@ -449,11 +450,21 @@ public class CheckGoworkRecordServiceImpl extends AbstractCRUDServiceImpl<CheckG ...@@ -449,11 +450,21 @@ public class CheckGoworkRecordServiceImpl extends AbstractCRUDServiceImpl<CheckG
effectScore = effectScore.multiply(weightPdu.effectWeight()); effectScore = effectScore.multiply(weightPdu.effectWeight());
// BigDecimal complainScore = complainScore = total.add(staffPerformSummaryEntity.getComplainScore()); //投诉 // BigDecimal complainScore = complainScore = total.add(staffPerformSummaryEntity.getComplainScore()); //投诉
BigDecimal summary = new BigDecimal(0); BigDecimal summary = new BigDecimal(0);
summary = summary.add(reviewScore); if(staffEntity.getReviewCheck()==1) {
summary = summary.add(attendScore); summary = summary.add(reviewScore);
summary = summary.add(otherScore); }
summary = summary.add(goworkScore); if(staffEntity.getAttendCheck()==1) {
summary = summary.add(effectScore); summary = summary.add(attendScore);
}
if(staffEntity.getOtherCheck()==1) {
summary = summary.add(otherScore);
}
if(staffEntity.getEffectCheck()==1){
summary = summary.add(effectScore);
}
if(staffEntity.getGoworkCheck()==1) {
summary = summary.add(goworkScore);
}
staffPerformSummaryEntity.setTotalScore(summary); staffPerformSummaryEntity.setTotalScore(summary);
} }
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckReviewRecordServiceImpl.java
View file @ 6c94d3ad
...@@ -227,6 +227,7 @@ public class CheckReviewRecordServiceImpl extends AbstractCRUDServiceImpl<CheckR ...@@ -227,6 +227,7 @@ public class CheckReviewRecordServiceImpl extends AbstractCRUDServiceImpl<CheckR
weightPdu = JSONObject.parseObject(value,WeightPdu.class); weightPdu = JSONObject.parseObject(value,WeightPdu.class);
} }
for (StaffCheckSummaryVo vo : summaryVoList) { for (StaffCheckSummaryVo vo : summaryVoList) {
StaffEntity staffEntity = staffService.get(vo.getStaffId());
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));
...@@ -266,7 +267,7 @@ public class CheckReviewRecordServiceImpl extends AbstractCRUDServiceImpl<CheckR ...@@ -266,7 +267,7 @@ public class CheckReviewRecordServiceImpl extends AbstractCRUDServiceImpl<CheckR
staffPerformSummaryEntity.setErrorScore(erro); staffPerformSummaryEntity.setErrorScore(erro);
// BigDecimal total = new BigDecimal(100); // BigDecimal total = new BigDecimal(100);
// staffPerformSummaryEntity.setTotalScore(total.add(erro)); // staffPerformSummaryEntity.setTotalScore(total.add(erro));
computeSummary(staffPerformSummaryEntity,weightPdu); computeSummary(staffPerformSummaryEntity,weightPdu,staffEntity);
staffPerformSummaryEntity.setId(temp.getId()); staffPerformSummaryEntity.setId(temp.getId());
staffPerformSummaryEntity.setUpdateTime(new Date()); staffPerformSummaryEntity.setUpdateTime(new Date());
staffPerformSummaryService.update(staffPerformSummaryEntity); staffPerformSummaryService.update(staffPerformSummaryEntity);
...@@ -282,7 +283,7 @@ public class CheckReviewRecordServiceImpl extends AbstractCRUDServiceImpl<CheckR ...@@ -282,7 +283,7 @@ public class CheckReviewRecordServiceImpl extends AbstractCRUDServiceImpl<CheckR
staffPerformSummaryEntity.setErrorScore(vo.getSumScore()); staffPerformSummaryEntity.setErrorScore(vo.getSumScore());
// BigDecimal total = new BigDecimal(100); // BigDecimal total = new BigDecimal(100);
// staffPerformSummaryEntity.setTotalScore(total.add(vo.getSumScore())); // staffPerformSummaryEntity.setTotalScore(total.add(vo.getSumScore()));
computeSummary(staffPerformSummaryEntity,weightPdu); computeSummary(staffPerformSummaryEntity,weightPdu,staffEntity);
staffPerformSummaryEntity.setCreateUserId(1l); staffPerformSummaryEntity.setCreateUserId(1l);
staffPerformSummaryEntity.setCreateTime(new Date()); staffPerformSummaryEntity.setCreateTime(new Date());
staffPerformSummaryService.save(staffPerformSummaryEntity); staffPerformSummaryService.save(staffPerformSummaryEntity);
...@@ -437,7 +438,7 @@ public class CheckReviewRecordServiceImpl extends AbstractCRUDServiceImpl<CheckR ...@@ -437,7 +438,7 @@ public class CheckReviewRecordServiceImpl extends AbstractCRUDServiceImpl<CheckR
statEntity.setTotalScore(totalScore); statEntity.setTotalScore(totalScore);
} }
private void computeSummary(StaffPerformSummaryEntity staffPerformSummaryEntity, WeightPdu weightPdu){ private void computeSummary(StaffPerformSummaryEntity staffPerformSummaryEntity, WeightPdu weightPdu,StaffEntity staffEntity){
BigDecimal total = new BigDecimal(100); BigDecimal total = new BigDecimal(100);
BigDecimal reviewScore = total.add(staffPerformSummaryEntity.getReviewScore()); //评价 BigDecimal reviewScore = total.add(staffPerformSummaryEntity.getReviewScore()); //评价
reviewScore = reviewScore.multiply(weightPdu.reviewWeight()); reviewScore = reviewScore.multiply(weightPdu.reviewWeight());
...@@ -454,11 +455,21 @@ public class CheckReviewRecordServiceImpl extends AbstractCRUDServiceImpl<CheckR ...@@ -454,11 +455,21 @@ public class CheckReviewRecordServiceImpl extends AbstractCRUDServiceImpl<CheckR
effectScore = effectScore.multiply(weightPdu.effectWeight()); effectScore = effectScore.multiply(weightPdu.effectWeight());
// BigDecimal complainScore = complainScore = total.add(staffPerformSummaryEntity.getComplainScore()); //投诉 // BigDecimal complainScore = complainScore = total.add(staffPerformSummaryEntity.getComplainScore()); //投诉
BigDecimal summary = new BigDecimal(0); BigDecimal summary = new BigDecimal(0);
summary = summary.add(reviewScore); if(staffEntity.getReviewCheck()==1) {
summary = summary.add(attendScore); summary = summary.add(reviewScore);
summary = summary.add(otherScore); }
summary = summary.add(goworkScore); if(staffEntity.getAttendCheck()==1) {
summary = summary.add(effectScore); summary = summary.add(attendScore);
}
if(staffEntity.getOtherCheck()==1) {
summary = summary.add(otherScore);
}
if(staffEntity.getEffectCheck()==1){
summary = summary.add(effectScore);
}
if(staffEntity.getGoworkCheck()==1) {
summary = summary.add(goworkScore);
}
staffPerformSummaryEntity.setTotalScore(summary); staffPerformSummaryEntity.setTotalScore(summary);
} }
} }
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckWindowWorkmanPerformServiceImpl.java
View file @ 6c94d3ad
...@@ -14,11 +14,9 @@ import com.mortals.xhx.module.check.model.vo.StaffCheckSummaryVo; ...@@ -14,11 +14,9 @@ import com.mortals.xhx.module.check.model.vo.StaffCheckSummaryVo;
import com.mortals.xhx.module.dept.model.DeptEntity; import com.mortals.xhx.module.dept.model.DeptEntity;
import com.mortals.xhx.module.dept.model.DeptPerformStatEntity; import com.mortals.xhx.module.dept.model.DeptPerformStatEntity;
import com.mortals.xhx.module.dept.model.DeptPerformStatQuery; import com.mortals.xhx.module.dept.model.DeptPerformStatQuery;
import com.mortals.xhx.module.staff.model.StaffPerformStatEntity; import com.mortals.xhx.module.staff.model.*;
import com.mortals.xhx.module.staff.model.StaffPerformStatQuery;
import com.mortals.xhx.module.staff.model.StaffPerformSummaryEntity;
import com.mortals.xhx.module.staff.model.StaffPerformSummaryQuery;
import com.mortals.xhx.module.staff.service.StaffPerformSummaryService; import com.mortals.xhx.module.staff.service.StaffPerformSummaryService;
import com.mortals.xhx.module.staff.service.StaffService;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -58,6 +56,8 @@ public class CheckWindowWorkmanPerformServiceImpl extends AbstractCRUDServiceImp ...@@ -58,6 +56,8 @@ public class CheckWindowWorkmanPerformServiceImpl extends AbstractCRUDServiceImp
private ParamService paramService; private ParamService paramService;
@Autowired @Autowired
private ICacheService cacheService; private ICacheService cacheService;
@Autowired
private StaffService staffService;
@Override @Override
public void examine(CheckWindowWorkmanPerformEntity entity, Context context) throws AppException { public void examine(CheckWindowWorkmanPerformEntity entity, Context context) throws AppException {
...@@ -104,6 +104,7 @@ public class CheckWindowWorkmanPerformServiceImpl extends AbstractCRUDServiceImp ...@@ -104,6 +104,7 @@ public class CheckWindowWorkmanPerformServiceImpl extends AbstractCRUDServiceImp
weightPdu = JSONObject.parseObject(value,WeightPdu.class); weightPdu = JSONObject.parseObject(value,WeightPdu.class);
} }
for (StaffCheckSummaryVo vo : summaryVoList) { for (StaffCheckSummaryVo vo : summaryVoList) {
StaffEntity staffEntity = staffService.get(vo.getStaffId());
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));
...@@ -141,7 +142,7 @@ public class CheckWindowWorkmanPerformServiceImpl extends AbstractCRUDServiceImp ...@@ -141,7 +142,7 @@ public class CheckWindowWorkmanPerformServiceImpl extends AbstractCRUDServiceImp
erro = erro.add(staffPerformSummaryEntity.getEffectScore()); erro = erro.add(staffPerformSummaryEntity.getEffectScore());
erro = erro.add(staffPerformSummaryEntity.getComplainScore()); erro = erro.add(staffPerformSummaryEntity.getComplainScore());
staffPerformSummaryEntity.setErrorScore(erro); staffPerformSummaryEntity.setErrorScore(erro);
computeSummary(staffPerformSummaryEntity,weightPdu); computeSummary(staffPerformSummaryEntity,weightPdu,staffEntity);
staffPerformSummaryEntity.setId(temp.getId()); staffPerformSummaryEntity.setId(temp.getId());
staffPerformSummaryEntity.setUpdateTime(new Date()); staffPerformSummaryEntity.setUpdateTime(new Date());
staffPerformSummaryService.update(staffPerformSummaryEntity); staffPerformSummaryService.update(staffPerformSummaryEntity);
...@@ -156,7 +157,7 @@ public class CheckWindowWorkmanPerformServiceImpl extends AbstractCRUDServiceImp ...@@ -156,7 +157,7 @@ public class CheckWindowWorkmanPerformServiceImpl extends AbstractCRUDServiceImp
staffPerformSummaryEntity.setComplainScore(new BigDecimal(0)); staffPerformSummaryEntity.setComplainScore(new BigDecimal(0));
BigDecimal Score100 = new BigDecimal(100); BigDecimal Score100 = new BigDecimal(100);
staffPerformSummaryEntity.setErrorScore(Score100.subtract(vo.getSumScore())); staffPerformSummaryEntity.setErrorScore(Score100.subtract(vo.getSumScore()));
computeSummary(staffPerformSummaryEntity,weightPdu); computeSummary(staffPerformSummaryEntity,weightPdu,staffEntity);
staffPerformSummaryEntity.setCreateUserId(1l); staffPerformSummaryEntity.setCreateUserId(1l);
staffPerformSummaryEntity.setCreateTime(new Date()); staffPerformSummaryEntity.setCreateTime(new Date());
staffPerformSummaryService.save(staffPerformSummaryEntity); staffPerformSummaryService.save(staffPerformSummaryEntity);
...@@ -167,7 +168,7 @@ public class CheckWindowWorkmanPerformServiceImpl extends AbstractCRUDServiceImp ...@@ -167,7 +168,7 @@ public class CheckWindowWorkmanPerformServiceImpl extends AbstractCRUDServiceImp
return summaryVoList; return summaryVoList;
} }
private void computeSummary(StaffPerformSummaryEntity staffPerformSummaryEntity,WeightPdu weightPdu){ private void computeSummary(StaffPerformSummaryEntity staffPerformSummaryEntity, WeightPdu weightPdu, StaffEntity staffEntity){
BigDecimal total = new BigDecimal(100); BigDecimal total = new BigDecimal(100);
BigDecimal reviewScore = total.add(staffPerformSummaryEntity.getReviewScore()); //评价 BigDecimal reviewScore = total.add(staffPerformSummaryEntity.getReviewScore()); //评价
reviewScore = reviewScore.multiply(weightPdu.reviewWeight()); reviewScore = reviewScore.multiply(weightPdu.reviewWeight());
...@@ -184,11 +185,21 @@ public class CheckWindowWorkmanPerformServiceImpl extends AbstractCRUDServiceImp ...@@ -184,11 +185,21 @@ public class CheckWindowWorkmanPerformServiceImpl extends AbstractCRUDServiceImp
effectScore = effectScore.multiply(weightPdu.effectWeight()); effectScore = effectScore.multiply(weightPdu.effectWeight());
// BigDecimal complainScore = complainScore = total.add(staffPerformSummaryEntity.getComplainScore()); //投诉 // BigDecimal complainScore = complainScore = total.add(staffPerformSummaryEntity.getComplainScore()); //投诉
BigDecimal summary = new BigDecimal(0); BigDecimal summary = new BigDecimal(0);
summary = summary.add(reviewScore); if(staffEntity.getReviewCheck()==1) {
summary = summary.add(attendScore); summary = summary.add(reviewScore);
summary = summary.add(otherScore); }
summary = summary.add(goworkScore); if(staffEntity.getAttendCheck()==1) {
summary = summary.add(effectScore); summary = summary.add(attendScore);
}
if(staffEntity.getOtherCheck()==1) {
summary = summary.add(otherScore);
}
if(staffEntity.getEffectCheck()==1){
summary = summary.add(effectScore);
}
if(staffEntity.getGoworkCheck()==1) {
summary = summary.add(goworkScore);
}
staffPerformSummaryEntity.setTotalScore(summary); staffPerformSummaryEntity.setTotalScore(summary);
} }
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckAttendRecordController.java
View file @ 6c94d3ad
...@@ -86,9 +86,9 @@ public class CheckAttendRecordController extends BaseCRUDJsonBodyMappingControll ...@@ -86,9 +86,9 @@ public class CheckAttendRecordController extends BaseCRUDJsonBodyMappingControll
protected void doListBefore(CheckAttendRecordEntity query, Map<String, Object> model, Context context) throws AppException { protected void doListBefore(CheckAttendRecordEntity query, Map<String, Object> model, Context context) throws AppException {
if (ObjectUtils.isEmpty(query.getOrderColList())) { if (ObjectUtils.isEmpty(query.getOrderColList())) {
query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING))); query.setOrderColList(Arrays.asList(new OrderCol("errorTime", OrderCol.DESCENDING)));
} else { } else {
query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING)); query.getOrderColList().add(new OrderCol("errorTime", OrderCol.DESCENDING));
} }
if(ObjectUtils.isEmpty(query.getErrorTimeStart())){ if(ObjectUtils.isEmpty(query.getErrorTimeStart())){
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckComplainRecordController.java
View file @ 6c94d3ad
...@@ -22,6 +22,8 @@ import com.mortals.xhx.module.check.model.CheckComplainRecordEntity; ...@@ -22,6 +22,8 @@ import com.mortals.xhx.module.check.model.CheckComplainRecordEntity;
import com.mortals.xhx.module.check.service.CheckComplainRecordService; import com.mortals.xhx.module.check.service.CheckComplainRecordService;
import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.ArrayUtils;
import com.mortals.framework.util.StringUtils; import com.mortals.framework.util.StringUtils;
import java.time.LocalDateTime;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -77,14 +79,16 @@ public class CheckComplainRecordController extends BaseCRUDJsonBodyMappingContro ...@@ -77,14 +79,16 @@ public class CheckComplainRecordController extends BaseCRUDJsonBodyMappingContro
protected void doListBefore(CheckComplainRecordEntity query, Map<String, Object> model, Context context) throws AppException { protected void doListBefore(CheckComplainRecordEntity query, Map<String, Object> model, Context context) throws AppException {
super.doListBefore(query, model, context); super.doListBefore(query, model, context);
if (ObjectUtils.isEmpty(query.getOrderColList())) { if (ObjectUtils.isEmpty(query.getOrderColList())) {
query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING))); query.setOrderColList(Arrays.asList(new OrderCol("complainTime", OrderCol.DESCENDING)));
} else { } else {
query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING)); query.getOrderColList().add(new OrderCol("complainTime", OrderCol.DESCENDING));
} }
if(!ObjectUtils.isEmpty(query.getCreateTime())){ if(ObjectUtils.isEmpty(query.getComplainTimeStart())){
query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime())); LocalDateTime currentDate = LocalDateTime.now();
query.setCreateTimeEnd(DateUtil.formatDate(query.getCreateTime())); LocalDateTime firstDayOfMonth = currentDate.withDayOfMonth(1);
query.setComplainTimeStart(DateUtil.format(firstDayOfMonth,"yyyy-MM-dd"));
//query.setComplainTimeEnd(DateUtil.formatDate(query.getCreateTime()));
} }
} }
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckEffectRecordController.java
View file @ 6c94d3ad
...@@ -26,6 +26,7 @@ import com.mortals.xhx.module.check.service.CheckEffectRecordService; ...@@ -26,6 +26,7 @@ import com.mortals.xhx.module.check.service.CheckEffectRecordService;
import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.ArrayUtils;
import com.mortals.framework.util.StringUtils; import com.mortals.framework.util.StringUtils;
import java.time.LocalDateTime;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -88,14 +89,16 @@ public class CheckEffectRecordController extends BaseCRUDJsonBodyMappingControll ...@@ -88,14 +89,16 @@ public class CheckEffectRecordController extends BaseCRUDJsonBodyMappingControll
protected void doListBefore(CheckEffectRecordEntity query, Map<String, Object> model, Context context) throws AppException { protected void doListBefore(CheckEffectRecordEntity query, Map<String, Object> model, Context context) throws AppException {
super.doListBefore(query, model, context); super.doListBefore(query, model, context);
if (ObjectUtils.isEmpty(query.getOrderColList())) { if (ObjectUtils.isEmpty(query.getOrderColList())) {
query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING))); query.setOrderColList(Arrays.asList(new OrderCol("happenTime", OrderCol.DESCENDING)));
} else { } else {
query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING)); query.getOrderColList().add(new OrderCol("happenTime", OrderCol.DESCENDING));
} }
if(!ObjectUtils.isEmpty(query.getCreateTime())){ if(ObjectUtils.isEmpty(query.getHappenTimeStart())){
query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime())); LocalDateTime currentDate = LocalDateTime.now();
query.setCreateTimeEnd(DateUtil.formatDate(query.getCreateTime())); LocalDateTime firstDayOfMonth = currentDate.withDayOfMonth(1);
query.setHappenTimeStart(DateUtil.format(firstDayOfMonth,"yyyy-MM-dd"));
//query.setHappenTimeEnd(DateUtil.formatDate(query.getCreateTime()));
} }
} }
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckGoworkRecordController.java
View file @ 6c94d3ad
...@@ -22,6 +22,8 @@ import com.mortals.xhx.module.check.model.CheckGoworkRecordEntity; ...@@ -22,6 +22,8 @@ import com.mortals.xhx.module.check.model.CheckGoworkRecordEntity;
import com.mortals.xhx.module.check.service.CheckGoworkRecordService; import com.mortals.xhx.module.check.service.CheckGoworkRecordService;
import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.ArrayUtils;
import com.mortals.framework.util.StringUtils; import com.mortals.framework.util.StringUtils;
import java.time.LocalDateTime;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -76,13 +78,16 @@ public class CheckGoworkRecordController extends BaseCRUDJsonBodyMappingControll ...@@ -76,13 +78,16 @@ public class CheckGoworkRecordController extends BaseCRUDJsonBodyMappingControll
protected void doListBefore(CheckGoworkRecordEntity query, Map<String, Object> model, Context context) throws AppException { protected void doListBefore(CheckGoworkRecordEntity query, Map<String, Object> model, Context context) throws AppException {
super.doListBefore(query, model, context); super.doListBefore(query, model, context);
if (ObjectUtils.isEmpty(query.getOrderColList())) { if (ObjectUtils.isEmpty(query.getOrderColList())) {
query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING))); query.setOrderColList(Arrays.asList(new OrderCol("goworkTime", OrderCol.DESCENDING)));
} else { } else {
query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING)); query.getOrderColList().add(new OrderCol("goworkTime", OrderCol.DESCENDING));
} }
if(!ObjectUtils.isEmpty(query.getCreateTime())){
query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime())); if(ObjectUtils.isEmpty(query.getGoworkTimeStart())){
query.setCreateTimeEnd(DateUtil.formatDate(query.getCreateTime())); LocalDateTime currentDate = LocalDateTime.now();
LocalDateTime firstDayOfMonth = currentDate.withDayOfMonth(1);
query.setGoworkTimeStart(DateUtil.format(firstDayOfMonth,"yyyy-MM-dd"));
//query.setGoworkTimeEnd(DateUtil.formatDate(query.getCreateTime()));
} }
} }
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckOtherRecordController.java
View file @ 6c94d3ad
...@@ -22,6 +22,8 @@ import com.mortals.xhx.module.check.model.CheckOtherRecordEntity; ...@@ -22,6 +22,8 @@ import com.mortals.xhx.module.check.model.CheckOtherRecordEntity;
import com.mortals.xhx.module.check.service.CheckOtherRecordService; import com.mortals.xhx.module.check.service.CheckOtherRecordService;
import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.ArrayUtils;
import com.mortals.framework.util.StringUtils; import com.mortals.framework.util.StringUtils;
import java.time.LocalDateTime;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -76,14 +78,16 @@ public class CheckOtherRecordController extends BaseCRUDJsonBodyMappingControlle ...@@ -76,14 +78,16 @@ public class CheckOtherRecordController extends BaseCRUDJsonBodyMappingControlle
protected void doListBefore(CheckOtherRecordEntity query, Map<String, Object> model, Context context) throws AppException { protected void doListBefore(CheckOtherRecordEntity query, Map<String, Object> model, Context context) throws AppException {
super.doListBefore(query, model, context); super.doListBefore(query, model, context);
if (ObjectUtils.isEmpty(query.getOrderColList())) { if (ObjectUtils.isEmpty(query.getOrderColList())) {
query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING))); query.setOrderColList(Arrays.asList(new OrderCol("happenTime", OrderCol.DESCENDING)));
} else { } else {
query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING)); query.getOrderColList().add(new OrderCol("happenTime", OrderCol.DESCENDING));
} }
if(!ObjectUtils.isEmpty(query.getCreateTime())){ if(ObjectUtils.isEmpty(query.getHappenTimeStart())){
query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime())); LocalDateTime currentDate = LocalDateTime.now();
query.setCreateTimeEnd(DateUtil.formatDate(query.getCreateTime())); LocalDateTime firstDayOfMonth = currentDate.withDayOfMonth(1);
query.setHappenTimeStart(DateUtil.format(firstDayOfMonth,"yyyy-MM-dd"));
//query.setHappenTimeEnd(DateUtil.formatDate(query.getCreateTime()));
} }
} }
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckReviewRecordController.java
View file @ 6c94d3ad
...@@ -26,6 +26,7 @@ import com.mortals.xhx.module.check.service.CheckReviewRecordService; ...@@ -26,6 +26,7 @@ import com.mortals.xhx.module.check.service.CheckReviewRecordService;
import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.ArrayUtils;
import com.mortals.framework.util.StringUtils; import com.mortals.framework.util.StringUtils;
import java.time.LocalDateTime;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -94,9 +95,11 @@ public class CheckReviewRecordController extends BaseCRUDJsonBodyMappingControll ...@@ -94,9 +95,11 @@ public class CheckReviewRecordController extends BaseCRUDJsonBodyMappingControll
query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING)); query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
} }
if(!ObjectUtils.isEmpty(query.getCreateTime())){ if(ObjectUtils.isEmpty(query.getReviewTimeStart())){
query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime())); LocalDateTime currentDate = LocalDateTime.now();
query.setCreateTimeEnd(DateUtil.formatDate(query.getCreateTime())); LocalDateTime firstDayOfMonth = currentDate.withDayOfMonth(1);
query.setReviewTimeStart(DateUtil.format(firstDayOfMonth,"yyyy-MM-dd"));
//query.setReviewTimeEnd(DateUtil.formatDate(query.getCreateTime()));
} }
} }
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformGoworkRecordController.java
View file @ 6c94d3ad
...@@ -80,10 +80,6 @@ public class PerformGoworkRecordController extends BaseCRUDJsonBodyMappingContro ...@@ -80,10 +80,6 @@ public class PerformGoworkRecordController extends BaseCRUDJsonBodyMappingContro
query.getOrderColList().add(new OrderCol("goworkTime", OrderCol.DESCENDING)); query.getOrderColList().add(new OrderCol("goworkTime", OrderCol.DESCENDING));
} }
if(!ObjectUtils.isEmpty(query.getCreateTime())){
query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
query.setCreateTimeEnd(DateUtil.formatDate(query.getCreateTime()));
}
if(ObjectUtils.isEmpty(query.getGoworkTimeStart())){ if(ObjectUtils.isEmpty(query.getGoworkTimeStart())){
LocalDateTime currentDate = LocalDateTime.now(); LocalDateTime currentDate = LocalDateTime.now();
LocalDateTime firstDayOfMonth = currentDate.withDayOfMonth(1); LocalDateTime firstDayOfMonth = currentDate.withDayOfMonth(1);
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/model/StaffPerformSummaryEntity.java
View file @ 6c94d3ad
...@@ -93,7 +93,7 @@ public class StaffPerformSummaryEntity extends StaffPerformSummaryVo { ...@@ -93,7 +93,7 @@ public class StaffPerformSummaryEntity extends StaffPerformSummaryVo {
/** /**
* 累计异常分数 * 累计异常分数
*/ */
@Excel(name = "累计异常分数") //@Excel(name = "累计异常分数")
private BigDecimal errorScore; private BigDecimal errorScore;
/** /**
* 当月得分数 * 当月得分数
......
attendance-performance-manager/src/main/resources/sqlmap/module/staff/StaffPerformSummaryMapper.xml
View file @ 6c94d3ad
...@@ -554,9 +554,11 @@ ...@@ -554,9 +554,11 @@
<include refid="_condition_"/> <include refid="_condition_"/>
</trim> </trim>
</trim> </trim>
<include refid="_orderCols_"/> <include refid="_orderColsNew_"/>
</select> </select>
<sql id="_orderColsNew_">
order by CONVERT(a.salaName USING gbk),CONVERT(a.deptName USING gbk),CONVERT(a.staffName USING gbk)
</sql>
<!-- 获取 --> <!-- 获取 -->
......
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