Merge remote-tracking branch 'origin/master'

attendance-performance-manager/src/main/java/com/mortals/xhx/daemon/task/StaffPerformInitDataTaskImpl.java

@@ -81,6 +81,10 @@ public class StaffPerformInitDataTaskImpl implements ITaskExcuteService {
                             }
                         }
                     }
+                    //绩效考核授权4个维度不启用时不再生成绩效信息
+                    if(item.getAttendCheck()==0 && item.getEffectCheck()==0 && item.getGoworkCheck()==0 && item.getComplainCheck()==0){
+                        flag = false;
+                    }
                     if(flag){
                         StaffPerformStatEntity statEntity = new StaffPerformStatEntity();
                         statEntity.initAttrValue();
@@ -126,6 +130,10 @@ public class StaffPerformInitDataTaskImpl implements ITaskExcuteService {
                             }
                         }
                     }
+                    //绩效考核授权4个维度不启用时不再生成绩效信息
+                    if(item.getAttendCheck()==0 && item.getEffectCheck()==0 && item.getGoworkCheck()==0 && item.getComplainCheck()==0){
+                        flag = false;
+                    }
                     if(flag) {
                         StaffPerformSummaryEntity staffPerformSummaryEntity = new StaffPerformSummaryEntity();
                         staffPerformSummaryEntity.initAttrValue();

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckComplainRecordVo.java

@@ -23,5 +23,9 @@ public class CheckComplainRecordVo extends BaseEntityLong {
 
     /** 序号，主键，自增长列表 */
     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

@@ -23,5 +23,10 @@ public class CheckEffectRecordVo extends BaseEntityLong {
 
     /** 序号，主键，自增长列表 */
     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

@@ -23,5 +23,10 @@ public class CheckGoworkRecordVo extends BaseEntityLong {
 
     /** 序号，主键，自增长列表 */
     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

@@ -23,5 +23,9 @@ public class CheckOtherRecordVo extends BaseEntityLong {
 
     /** 序号，主键，自增长列表 */
     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

@@ -23,4 +23,9 @@ public class CheckReviewRecordVo extends BaseEntityLong {
 
     /** 序号，主键，自增长列表 */
     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

@@ -233,6 +233,10 @@ public class CheckAttendRecordServiceImpl extends AbstractCRUDServiceImpl<CheckA
                 weightPdu = JSONObject.parseObject(value,WeightPdu.class);
             }
             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.initAttrValue();
                 BeanUtils.copyProperties(vo, staffPerformSummaryEntity, BeanUtil.getNullPropertyNames(vo));
@@ -272,7 +276,7 @@ public class CheckAttendRecordServiceImpl extends AbstractCRUDServiceImpl<CheckA
                     staffPerformSummaryEntity.setErrorScore(erro);
 //                    BigDecimal total = new BigDecimal(100);
 //                    staffPerformSummaryEntity.setTotalScore(total.add(erro));
-                    computeSummary(staffPerformSummaryEntity,weightPdu);
+                    computeSummary(staffPerformSummaryEntity,weightPdu,staffEntity);
                     staffPerformSummaryEntity.setId(temp.getId());
                     staffPerformSummaryEntity.setUpdateTime(new Date());
                     staffPerformSummaryService.update(staffPerformSummaryEntity);
@@ -285,7 +289,7 @@ public class CheckAttendRecordServiceImpl extends AbstractCRUDServiceImpl<CheckA
                     staffPerformSummaryEntity.setErrorScore(vo.getSumScore());
 //                    BigDecimal total = new BigDecimal(100);
 //                    staffPerformSummaryEntity.setTotalScore(total.add(vo.getSumScore()));
-                    computeSummary(staffPerformSummaryEntity,weightPdu);
+                    computeSummary(staffPerformSummaryEntity,weightPdu,staffEntity);
                     staffPerformSummaryEntity.setCreateUserId(1l);
                     staffPerformSummaryEntity.setCreateTime(new Date());
                     staffPerformSummaryService.save(staffPerformSummaryEntity);
@@ -313,6 +317,10 @@ public class CheckAttendRecordServiceImpl extends AbstractCRUDServiceImpl<CheckA
         List<StaffPerformStatEntity> performStatList = dao.getStaffPerformStat(query);
         if (CollectionUtils.isNotEmpty(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();
                 tempQuery.setStaffId(entity.getStaffId());
                 tempQuery.setYear(entity.getYear());
@@ -440,7 +448,7 @@ public class CheckAttendRecordServiceImpl extends AbstractCRUDServiceImpl<CheckA
         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 reviewScore = total.add(staffPerformSummaryEntity.getReviewScore());  //评价
         reviewScore = reviewScore.multiply(weightPdu.reviewWeight());
@@ -457,28 +465,22 @@ public class CheckAttendRecordServiceImpl extends AbstractCRUDServiceImpl<CheckA
         effectScore = effectScore.multiply(weightPdu.effectWeight());
 //        BigDecimal complainScore = complainScore = total.add(staffPerformSummaryEntity.getComplainScore());  //投诉
         BigDecimal summary = new BigDecimal(0);
-        summary = summary.add(reviewScore);
-        summary = summary.add(attendScore);
-        summary = summary.add(otherScore);
-        summary = summary.add(goworkScore);
-        summary = summary.add(effectScore);
+        if(staffEntity.getReviewCheck()==1) {
+            summary = summary.add(reviewScore);
+        }
+        if(staffEntity.getAttendCheck()==1) {
+            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);
     }
 
-    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/CheckComplainRecordServiceImpl.java

@@ -200,6 +200,10 @@ public class CheckComplainRecordServiceImpl extends AbstractCRUDServiceImpl<Chec
         List<StaffCheckSummaryVo> summaryVoList = dao.summaryCheck(query);
         if (CollectionUtils.isNotEmpty(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.initAttrValue();
                 BeanUtils.copyProperties(vo, staffPerformSummaryEntity, BeanUtil.getNullPropertyNames(vo));
@@ -281,6 +285,10 @@ public class CheckComplainRecordServiceImpl extends AbstractCRUDServiceImpl<Chec
         List<StaffPerformStatEntity> performStatList = dao.getStaffPerformStat(query);
         if (CollectionUtils.isNotEmpty(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();
                 tempQuery.setStaffId(entity.getStaffId());
                 tempQuery.setYear(entity.getYear());

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckEffectRecordServiceImpl.java

@@ -225,6 +225,10 @@ public class CheckEffectRecordServiceImpl extends AbstractCRUDServiceImpl<CheckE
                 weightPdu = JSONObject.parseObject(value,WeightPdu.class);
             }
             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.initAttrValue();
                 BeanUtils.copyProperties(vo,staffPerformSummaryEntity, BeanUtil.getNullPropertyNames(vo));
@@ -264,7 +268,7 @@ public class CheckEffectRecordServiceImpl extends AbstractCRUDServiceImpl<CheckE
                     staffPerformSummaryEntity.setErrorScore(erro);
 //                    BigDecimal total = new BigDecimal(100);
 //                    staffPerformSummaryEntity.setTotalScore(total.add(erro));
-                    computeSummary(staffPerformSummaryEntity,weightPdu);
+                    computeSummary(staffPerformSummaryEntity,weightPdu,staffEntity);
                     staffPerformSummaryEntity.setId(temp.getId());
                     staffPerformSummaryEntity.setUpdateTime(new Date());
                     staffPerformSummaryService.update(staffPerformSummaryEntity);
@@ -280,7 +284,7 @@ public class CheckEffectRecordServiceImpl extends AbstractCRUDServiceImpl<CheckE
                     staffPerformSummaryEntity.setErrorScore(vo.getSumScore());
 //                    BigDecimal total = new BigDecimal(100);
 //                    staffPerformSummaryEntity.setTotalScore(total.add(vo.getSumScore()));
-                    computeSummary(staffPerformSummaryEntity,weightPdu);
+                    computeSummary(staffPerformSummaryEntity,weightPdu,staffEntity);
                     staffPerformSummaryEntity.setCreateUserId(1l);
                     staffPerformSummaryEntity.setCreateTime(new Date());
                     staffPerformSummaryService.save(staffPerformSummaryEntity);
@@ -308,6 +312,10 @@ public class CheckEffectRecordServiceImpl extends AbstractCRUDServiceImpl<CheckE
         List<StaffPerformStatEntity> performStatList = dao.getStaffPerformStat(query);
         if(CollectionUtils.isNotEmpty(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();
                 tempQuery.setStaffId(entity.getStaffId());
                 tempQuery.setYear(entity.getYear());
@@ -435,7 +443,7 @@ public class CheckEffectRecordServiceImpl extends AbstractCRUDServiceImpl<CheckE
         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 reviewScore = total.add(staffPerformSummaryEntity.getReviewScore());  //评价
         reviewScore = reviewScore.multiply(weightPdu.reviewWeight());
@@ -452,11 +460,21 @@ public class CheckEffectRecordServiceImpl extends AbstractCRUDServiceImpl<CheckE
         effectScore = effectScore.multiply(weightPdu.effectWeight());
 //        BigDecimal complainScore = complainScore = total.add(staffPerformSummaryEntity.getComplainScore());  //投诉
         BigDecimal summary = new BigDecimal(0);
-        summary = summary.add(reviewScore);
-        summary = summary.add(attendScore);
-        summary = summary.add(otherScore);
-        summary = summary.add(goworkScore);
-        summary = summary.add(effectScore);
+        if(staffEntity.getReviewCheck()==1) {
+            summary = summary.add(reviewScore);
+        }
+        if(staffEntity.getAttendCheck()==1) {
+            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);
     }
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckGoworkRecordServiceImpl.java

@@ -222,6 +222,10 @@ public class CheckGoworkRecordServiceImpl extends AbstractCRUDServiceImpl<CheckG
                 weightPdu = JSONObject.parseObject(value,WeightPdu.class);
             }
             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.initAttrValue();
                 BeanUtils.copyProperties(vo,staffPerformSummaryEntity, BeanUtil.getNullPropertyNames(vo));
@@ -261,7 +265,7 @@ public class CheckGoworkRecordServiceImpl extends AbstractCRUDServiceImpl<CheckG
                     staffPerformSummaryEntity.setErrorScore(erro);
 //                    BigDecimal total = new BigDecimal(100);
 //                    staffPerformSummaryEntity.setTotalScore(total.add(erro));
-                    computeSummary(staffPerformSummaryEntity,weightPdu);
+                    computeSummary(staffPerformSummaryEntity,weightPdu,staffEntity);
                     staffPerformSummaryEntity.setId(temp.getId());
                     staffPerformSummaryEntity.setUpdateTime(new Date());
                     staffPerformSummaryService.update(staffPerformSummaryEntity);
@@ -277,7 +281,7 @@ public class CheckGoworkRecordServiceImpl extends AbstractCRUDServiceImpl<CheckG
                     staffPerformSummaryEntity.setErrorScore(vo.getSumScore());
 //                    BigDecimal total = new BigDecimal(100);
 //                    staffPerformSummaryEntity.setTotalScore(total.add(vo.getSumScore()));
-                    computeSummary(staffPerformSummaryEntity,weightPdu);
+                    computeSummary(staffPerformSummaryEntity,weightPdu,staffEntity);
                     staffPerformSummaryEntity.setCreateUserId(1l);
                     staffPerformSummaryEntity.setCreateTime(new Date());
                     staffPerformSummaryService.save(staffPerformSummaryEntity);
@@ -305,6 +309,10 @@ public class CheckGoworkRecordServiceImpl extends AbstractCRUDServiceImpl<CheckG
         List<StaffPerformStatEntity> performStatList = dao.getStaffPerformStat(query);
         if(CollectionUtils.isNotEmpty(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();
                 tempQuery.setStaffId(entity.getStaffId());
                 tempQuery.setYear(entity.getYear());
@@ -432,7 +440,7 @@ public class CheckGoworkRecordServiceImpl extends AbstractCRUDServiceImpl<CheckG
         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 reviewScore = total.add(staffPerformSummaryEntity.getReviewScore());  //评价
         reviewScore = reviewScore.multiply(weightPdu.reviewWeight());
@@ -449,11 +457,21 @@ public class CheckGoworkRecordServiceImpl extends AbstractCRUDServiceImpl<CheckG
         effectScore = effectScore.multiply(weightPdu.effectWeight());
 //        BigDecimal complainScore = complainScore = total.add(staffPerformSummaryEntity.getComplainScore());  //投诉
         BigDecimal summary = new BigDecimal(0);
-        summary = summary.add(reviewScore);
-        summary = summary.add(attendScore);
-        summary = summary.add(otherScore);
-        summary = summary.add(goworkScore);
-        summary = summary.add(effectScore);
+        if(staffEntity.getReviewCheck()==1) {
+            summary = summary.add(reviewScore);
+        }
+        if(staffEntity.getAttendCheck()==1) {
+            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);
     }
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckReviewRecordServiceImpl.java

@@ -227,6 +227,10 @@ public class CheckReviewRecordServiceImpl extends AbstractCRUDServiceImpl<CheckR
                 weightPdu = JSONObject.parseObject(value,WeightPdu.class);
             }
             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.initAttrValue();
                 BeanUtils.copyProperties(vo, staffPerformSummaryEntity, BeanUtil.getNullPropertyNames(vo));
@@ -266,7 +270,7 @@ public class CheckReviewRecordServiceImpl extends AbstractCRUDServiceImpl<CheckR
                     staffPerformSummaryEntity.setErrorScore(erro);
 //                    BigDecimal total = new BigDecimal(100);
 //                    staffPerformSummaryEntity.setTotalScore(total.add(erro));
-                    computeSummary(staffPerformSummaryEntity,weightPdu);
+                    computeSummary(staffPerformSummaryEntity,weightPdu,staffEntity);
                     staffPerformSummaryEntity.setId(temp.getId());
                     staffPerformSummaryEntity.setUpdateTime(new Date());
                     staffPerformSummaryService.update(staffPerformSummaryEntity);
@@ -282,7 +286,7 @@ public class CheckReviewRecordServiceImpl extends AbstractCRUDServiceImpl<CheckR
                     staffPerformSummaryEntity.setErrorScore(vo.getSumScore());
 //                    BigDecimal total = new BigDecimal(100);
 //                    staffPerformSummaryEntity.setTotalScore(total.add(vo.getSumScore()));
-                    computeSummary(staffPerformSummaryEntity,weightPdu);
+                    computeSummary(staffPerformSummaryEntity,weightPdu,staffEntity);
                     staffPerformSummaryEntity.setCreateUserId(1l);
                     staffPerformSummaryEntity.setCreateTime(new Date());
                     staffPerformSummaryService.save(staffPerformSummaryEntity);
@@ -310,6 +314,10 @@ public class CheckReviewRecordServiceImpl extends AbstractCRUDServiceImpl<CheckR
         List<StaffPerformStatEntity> performStatList = dao.getStaffPerformStat(query);
         if (CollectionUtils.isNotEmpty(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();
                 tempQuery.setStaffId(entity.getStaffId());
                 tempQuery.setYear(entity.getYear());
@@ -437,7 +445,7 @@ public class CheckReviewRecordServiceImpl extends AbstractCRUDServiceImpl<CheckR
         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 reviewScore = total.add(staffPerformSummaryEntity.getReviewScore());  //评价
         reviewScore = reviewScore.multiply(weightPdu.reviewWeight());
@@ -454,11 +462,21 @@ public class CheckReviewRecordServiceImpl extends AbstractCRUDServiceImpl<CheckR
         effectScore = effectScore.multiply(weightPdu.effectWeight());
 //        BigDecimal complainScore = complainScore = total.add(staffPerformSummaryEntity.getComplainScore());  //投诉
         BigDecimal summary = new BigDecimal(0);
-        summary = summary.add(reviewScore);
-        summary = summary.add(attendScore);
-        summary = summary.add(otherScore);
-        summary = summary.add(goworkScore);
-        summary = summary.add(effectScore);
+        if(staffEntity.getReviewCheck()==1) {
+            summary = summary.add(reviewScore);
+        }
+        if(staffEntity.getAttendCheck()==1) {
+            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);
     }
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckWindowWorkmanPerformServiceImpl.java

@@ -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.DeptPerformStatEntity;
 import com.mortals.xhx.module.dept.model.DeptPerformStatQuery;
-import com.mortals.xhx.module.staff.model.StaffPerformStatEntity;
-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.model.*;
 import com.mortals.xhx.module.staff.service.StaffPerformSummaryService;
+import com.mortals.xhx.module.staff.service.StaffService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -58,6 +56,8 @@ public class CheckWindowWorkmanPerformServiceImpl extends AbstractCRUDServiceImp
     private ParamService paramService;
     @Autowired
     private ICacheService cacheService;
+    @Autowired
+    private StaffService staffService;
 
     @Override
     public void examine(CheckWindowWorkmanPerformEntity entity, Context context) throws AppException {
@@ -104,6 +104,10 @@ public class CheckWindowWorkmanPerformServiceImpl extends AbstractCRUDServiceImp
                 weightPdu = JSONObject.parseObject(value,WeightPdu.class);
             }
             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.initAttrValue();
                 BeanUtils.copyProperties(vo, staffPerformSummaryEntity, BeanUtil.getNullPropertyNames(vo));
@@ -141,7 +145,7 @@ public class CheckWindowWorkmanPerformServiceImpl extends AbstractCRUDServiceImp
                     erro = erro.add(staffPerformSummaryEntity.getEffectScore());
                     erro = erro.add(staffPerformSummaryEntity.getComplainScore());
                     staffPerformSummaryEntity.setErrorScore(erro);
-                    computeSummary(staffPerformSummaryEntity,weightPdu);
+                    computeSummary(staffPerformSummaryEntity,weightPdu,staffEntity);
                     staffPerformSummaryEntity.setId(temp.getId());
                     staffPerformSummaryEntity.setUpdateTime(new Date());
                     staffPerformSummaryService.update(staffPerformSummaryEntity);
@@ -156,7 +160,7 @@ public class CheckWindowWorkmanPerformServiceImpl extends AbstractCRUDServiceImp
                     staffPerformSummaryEntity.setComplainScore(new BigDecimal(0));
                     BigDecimal Score100 = new BigDecimal(100);
                     staffPerformSummaryEntity.setErrorScore(Score100.subtract(vo.getSumScore()));
-                    computeSummary(staffPerformSummaryEntity,weightPdu);
+                    computeSummary(staffPerformSummaryEntity,weightPdu,staffEntity);
                     staffPerformSummaryEntity.setCreateUserId(1l);
                     staffPerformSummaryEntity.setCreateTime(new Date());
                     staffPerformSummaryService.save(staffPerformSummaryEntity);
@@ -167,7 +171,7 @@ public class CheckWindowWorkmanPerformServiceImpl extends AbstractCRUDServiceImp
         return summaryVoList;
     }
 
-    private void computeSummary(StaffPerformSummaryEntity staffPerformSummaryEntity,WeightPdu weightPdu){
+    private void computeSummary(StaffPerformSummaryEntity staffPerformSummaryEntity, WeightPdu weightPdu, StaffEntity staffEntity){
         BigDecimal total = new BigDecimal(100);
         BigDecimal reviewScore = total.add(staffPerformSummaryEntity.getReviewScore());  //评价
         reviewScore = reviewScore.multiply(weightPdu.reviewWeight());
@@ -184,11 +188,21 @@ public class CheckWindowWorkmanPerformServiceImpl extends AbstractCRUDServiceImp
         effectScore = effectScore.multiply(weightPdu.effectWeight());
 //        BigDecimal complainScore = complainScore = total.add(staffPerformSummaryEntity.getComplainScore());  //投诉
         BigDecimal summary = new BigDecimal(0);
-        summary = summary.add(reviewScore);
-        summary = summary.add(attendScore);
-        summary = summary.add(otherScore);
-        summary = summary.add(goworkScore);
-        summary = summary.add(effectScore);
+        if(staffEntity.getReviewCheck()==1) {
+            summary = summary.add(reviewScore);
+        }
+        if(staffEntity.getAttendCheck()==1) {
+            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);
     }
 

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckAttendRecordController.java

@@ -86,9 +86,9 @@ public class CheckAttendRecordController extends BaseCRUDJsonBodyMappingControll
     protected void doListBefore(CheckAttendRecordEntity query, Map<String, Object> model, Context context) throws AppException {
 
         if (ObjectUtils.isEmpty(query.getOrderColList())) {
-            query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING)));
+            query.setOrderColList(Arrays.asList(new OrderCol("errorTime", OrderCol.DESCENDING)));
         } else {
-            query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
+            query.getOrderColList().add(new OrderCol("errorTime", OrderCol.DESCENDING));
         }
 
         if(ObjectUtils.isEmpty(query.getErrorTimeStart())){

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckComplainRecordController.java

@@ -22,6 +22,8 @@ import com.mortals.xhx.module.check.model.CheckComplainRecordEntity;
 import com.mortals.xhx.module.check.service.CheckComplainRecordService;
 import org.apache.commons.lang3.ArrayUtils;
 import com.mortals.framework.util.StringUtils;
+
+import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -77,14 +79,16 @@ public class CheckComplainRecordController extends BaseCRUDJsonBodyMappingContro
     protected void doListBefore(CheckComplainRecordEntity query, Map<String, Object> model, Context context) throws AppException {
         super.doListBefore(query, model, context);
         if (ObjectUtils.isEmpty(query.getOrderColList())) {
-            query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING)));
+            query.setOrderColList(Arrays.asList(new OrderCol("complainTime", OrderCol.DESCENDING)));
         } else {
-            query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
+            query.getOrderColList().add(new OrderCol("complainTime", OrderCol.DESCENDING));
         }
 
-        if(!ObjectUtils.isEmpty(query.getCreateTime())){
-            query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
-            query.setCreateTimeEnd(DateUtil.formatDate(query.getCreateTime()));
+        if(ObjectUtils.isEmpty(query.getComplainTimeStart())){
+            LocalDateTime currentDate = LocalDateTime.now();
+            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

@@ -26,6 +26,7 @@ import com.mortals.xhx.module.check.service.CheckEffectRecordService;
 import org.apache.commons.lang3.ArrayUtils;
 import com.mortals.framework.util.StringUtils;
 
+import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -88,14 +89,16 @@ public class CheckEffectRecordController extends BaseCRUDJsonBodyMappingControll
     protected void doListBefore(CheckEffectRecordEntity query, Map<String, Object> model, Context context) throws AppException {
         super.doListBefore(query, model, context);
         if (ObjectUtils.isEmpty(query.getOrderColList())) {
-            query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING)));
+            query.setOrderColList(Arrays.asList(new OrderCol("happenTime", OrderCol.DESCENDING)));
         } else {
-            query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
+            query.getOrderColList().add(new OrderCol("happenTime", OrderCol.DESCENDING));
         }
 
-        if(!ObjectUtils.isEmpty(query.getCreateTime())){
-            query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
-            query.setCreateTimeEnd(DateUtil.formatDate(query.getCreateTime()));
+        if(ObjectUtils.isEmpty(query.getHappenTimeStart())){
+            LocalDateTime currentDate = LocalDateTime.now();
+            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

@@ -22,6 +22,8 @@ import com.mortals.xhx.module.check.model.CheckGoworkRecordEntity;
 import com.mortals.xhx.module.check.service.CheckGoworkRecordService;
 import org.apache.commons.lang3.ArrayUtils;
 import com.mortals.framework.util.StringUtils;
+
+import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -76,13 +78,16 @@ public class CheckGoworkRecordController extends BaseCRUDJsonBodyMappingControll
     protected void doListBefore(CheckGoworkRecordEntity query, Map<String, Object> model, Context context) throws AppException {
         super.doListBefore(query, model, context);
         if (ObjectUtils.isEmpty(query.getOrderColList())) {
-            query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING)));
+            query.setOrderColList(Arrays.asList(new OrderCol("goworkTime", OrderCol.DESCENDING)));
         } 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()));
-            query.setCreateTimeEnd(DateUtil.formatDate(query.getCreateTime()));
+
+        if(ObjectUtils.isEmpty(query.getGoworkTimeStart())){
+            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

@@ -22,6 +22,8 @@ import com.mortals.xhx.module.check.model.CheckOtherRecordEntity;
 import com.mortals.xhx.module.check.service.CheckOtherRecordService;
 import org.apache.commons.lang3.ArrayUtils;
 import com.mortals.framework.util.StringUtils;
+
+import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -76,14 +78,16 @@ public class CheckOtherRecordController extends BaseCRUDJsonBodyMappingControlle
     protected void doListBefore(CheckOtherRecordEntity query, Map<String, Object> model, Context context) throws AppException {
         super.doListBefore(query, model, context);
         if (ObjectUtils.isEmpty(query.getOrderColList())) {
-            query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING)));
+            query.setOrderColList(Arrays.asList(new OrderCol("happenTime", OrderCol.DESCENDING)));
         } else {
-            query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
+            query.getOrderColList().add(new OrderCol("happenTime", OrderCol.DESCENDING));
         }
 
-        if(!ObjectUtils.isEmpty(query.getCreateTime())){
-            query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
-            query.setCreateTimeEnd(DateUtil.formatDate(query.getCreateTime()));
+        if(ObjectUtils.isEmpty(query.getHappenTimeStart())){
+            LocalDateTime currentDate = LocalDateTime.now();
+            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

@@ -26,6 +26,7 @@ import com.mortals.xhx.module.check.service.CheckReviewRecordService;
 import org.apache.commons.lang3.ArrayUtils;
 import com.mortals.framework.util.StringUtils;
 
+import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -94,9 +95,11 @@ public class CheckReviewRecordController extends BaseCRUDJsonBodyMappingControll
             query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
         }
 
-        if(!ObjectUtils.isEmpty(query.getCreateTime())){
-            query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
-            query.setCreateTimeEnd(DateUtil.formatDate(query.getCreateTime()));
+        if(ObjectUtils.isEmpty(query.getReviewTimeStart())){
+            LocalDateTime currentDate = LocalDateTime.now();
+            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/service/PerformStaffConfService.java

@@ -13,4 +13,13 @@ import com.mortals.xhx.module.perform.dao.PerformStaffConfDao;
 public interface PerformStaffConfService extends ICRUDService<PerformStaffConfEntity,Long>{
 
     PerformStaffConfDao getDao();
+
+    /**
+     * 检测人员规则是否配置自动核查
+     * @param staffId
+     * @param deptId
+     * @param rulesId
+     * @return
+     */
+    boolean checkRules(Long staffId,Long deptId,Long rulesId);
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/impl/PerformAttendRecordServiceImpl.java

@@ -19,6 +19,7 @@ import com.mortals.xhx.module.perform.model.PerformRulesCategoryEntity;
 import com.mortals.xhx.module.perform.model.PerformRulesEntity;
 import com.mortals.xhx.module.perform.service.PerformRulesCategoryService;
 import com.mortals.xhx.module.perform.service.PerformRulesService;
+import com.mortals.xhx.module.perform.service.PerformStaffConfService;
 import com.mortals.xhx.module.staff.model.StaffEntity;
 import com.mortals.xhx.module.staff.service.StaffService;
 import org.checkerframework.checker.units.qual.A;
@@ -67,6 +68,8 @@ public class PerformAttendRecordServiceImpl extends AbstractCRUDServiceImpl<Perf
     private PerformRulesService rulesService;
     @Autowired
     private StaffService staffService;
+    @Autowired
+    private PerformStaffConfService performStaffConfService;
 
     @Override
     protected void saveBefore(PerformAttendRecordEntity entity, Context context) throws AppException {
@@ -185,7 +188,17 @@ public class PerformAttendRecordServiceImpl extends AbstractCRUDServiceImpl<Perf
         BeanUtils.copyProperties(entity, checkAttendRecordEntity, BeanUtil.getNullPropertyNames(entity));
         checkAttendRecordEntity.setId(null);
         checkAttendRecordEntity.setRecordId(entity.getId());
-        checkAttendRecordEntity.setCheckStatus(CheckStatusEnum.未处理.getValue());      //非自动扣分相设置为未处理
+        if(performStaffConfService.checkRules(entity.getStaffId(),entity.getDeptId(),entity.getRuleId())){
+            checkAttendRecordEntity.setCheckStatus(CheckStatusEnum.已处理.getValue());
+            if(checkAttendRecordEntity.getSubAddType()==SubAddTypeEnum.增加.getValue()){
+                checkAttendRecordEntity.setCheckResult(CheckResultAddEnum.核查加分.getValue());
+            }else {
+                checkAttendRecordEntity.setCheckResult(CheckResultSubEnum.核查扣分.getValue());
+            }
+            checkAttendRecordEntity.setUpdateTime(new Date());
+        }else {
+            checkAttendRecordEntity.setCheckStatus(CheckStatusEnum.未处理.getValue());      //非自动扣分相设置为未处理
+        }
         checkAttendRecordService.save(checkAttendRecordEntity, context);
     }
 

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/impl/PerformComplainRecordServiceImpl.java

 package com.mortals.xhx.module.perform.service.impl;
-import com.mortals.xhx.common.code.CheckStatusEnum;
-import com.mortals.xhx.common.code.SubMethodEnum;
+import com.mortals.xhx.common.code.*;
 import com.mortals.xhx.common.utils.BeanUtil;
 import com.mortals.xhx.module.check.model.CheckComplainRecordEntity;
 import com.mortals.xhx.module.check.service.CheckComplainRecordService;
 import com.mortals.xhx.module.perform.model.PerformAttendRecordEntity;
 import com.mortals.xhx.module.perform.model.PerformRulesEntity;
 import com.mortals.xhx.module.perform.service.PerformRulesService;
+import com.mortals.xhx.module.perform.service.PerformStaffConfService;
 import com.mortals.xhx.module.staff.model.StaffEntity;
 import com.mortals.xhx.module.staff.service.StaffService;
 import org.springframework.beans.BeanUtils;
@@ -36,12 +36,12 @@ public class PerformComplainRecordServiceImpl extends AbstractCRUDServiceImpl<Pe
 
     @Autowired
     private CheckComplainRecordService checkComplainRecordService;
-
-
     @Autowired
     private PerformRulesService rulesService;
     @Autowired
     private StaffService staffService;
+    @Autowired
+    private PerformStaffConfService performStaffConfService;
 
     @Override
     protected void saveBefore(PerformComplainRecordEntity entity, Context context) throws AppException {
@@ -79,7 +79,17 @@ public class PerformComplainRecordServiceImpl extends AbstractCRUDServiceImpl<Pe
         BeanUtils.copyProperties(entity,checkComplainRecordEntity, BeanUtil.getNullPropertyNames(entity));
         checkComplainRecordEntity.setId(null);
         checkComplainRecordEntity.setRecordId(entity.getId());
-        checkComplainRecordEntity.setCheckStatus(CheckStatusEnum.未处理.getValue());      //非自动扣分相设置为未处理
+        if(performStaffConfService.checkRules(entity.getStaffId(),entity.getDeptId(),entity.getRuleId())){
+            checkComplainRecordEntity.setCheckStatus(CheckStatusEnum.已处理.getValue());
+            if(checkComplainRecordEntity.getSubAddType()== SubAddTypeEnum.增加.getValue()){
+                checkComplainRecordEntity.setCheckResult(CheckResultAddEnum.核查加分.getValue());
+            }else {
+                checkComplainRecordEntity.setCheckResult(CheckResultSubEnum.核查扣分.getValue());
+            }
+            checkComplainRecordEntity.setUpdateTime(new Date());
+        }else {
+            checkComplainRecordEntity.setCheckStatus(CheckStatusEnum.未处理.getValue());      //非自动扣分相设置为未处理
+        }
         checkComplainRecordService.save(checkComplainRecordEntity,context);
     }
 

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/impl/PerformEffectRecordServiceImpl.java

 package com.mortals.xhx.module.perform.service.impl;
 
-import com.mortals.xhx.common.code.CheckStatusEnum;
-import com.mortals.xhx.common.code.SubMethodEnum;
+import com.mortals.xhx.common.code.*;
 import com.mortals.xhx.common.utils.BeanUtil;
 import com.mortals.xhx.module.check.model.CheckEffectRecordEntity;
 import com.mortals.xhx.module.check.service.CheckEffectRecordService;
 import com.mortals.xhx.module.perform.model.PerformComplainRecordEntity;
 import com.mortals.xhx.module.perform.model.PerformRulesEntity;
 import com.mortals.xhx.module.perform.service.PerformRulesService;
+import com.mortals.xhx.module.perform.service.PerformStaffConfService;
 import com.mortals.xhx.module.staff.model.StaffEntity;
 import com.mortals.xhx.module.staff.service.StaffService;
 import org.springframework.beans.BeanUtils;
@@ -42,6 +42,8 @@ public class PerformEffectRecordServiceImpl extends AbstractCRUDServiceImpl<Perf
     private PerformRulesService rulesService;
     @Autowired
     private StaffService staffService;
+    @Autowired
+    private PerformStaffConfService performStaffConfService;
 
     @Override
     protected void saveBefore(PerformEffectRecordEntity entity, Context context) throws AppException {
@@ -78,7 +80,17 @@ public class PerformEffectRecordServiceImpl extends AbstractCRUDServiceImpl<Perf
         BeanUtils.copyProperties(entity, checkEffectRecordEntity, BeanUtil.getNullPropertyNames(entity));
         checkEffectRecordEntity.setId(null);
         checkEffectRecordEntity.setRecordId(entity.getId());
-        checkEffectRecordEntity.setCheckStatus(CheckStatusEnum.未处理.getValue());      //非自动扣分相设置为未处理
+        if(performStaffConfService.checkRules(entity.getStaffId(),entity.getDeptId(),entity.getRuleId())){
+            checkEffectRecordEntity.setCheckStatus(CheckStatusEnum.已处理.getValue());
+            if(checkEffectRecordEntity.getSubAddType()== SubAddTypeEnum.增加.getValue()){
+                checkEffectRecordEntity.setCheckResult(CheckResultAddEnum.核查加分.getValue());
+            }else {
+                checkEffectRecordEntity.setCheckResult(CheckResultSubEnum.核查扣分.getValue());
+            }
+            checkEffectRecordEntity.setUpdateTime(new Date());
+        }else {
+            checkEffectRecordEntity.setCheckStatus(CheckStatusEnum.未处理.getValue());      //非自动扣分相设置为未处理
+        }
         checkEffectRecordService.save(checkEffectRecordEntity, context);
     }
 

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/impl/PerformGoworkRecordServiceImpl.java

 package com.mortals.xhx.module.perform.service.impl;
-import com.mortals.xhx.common.code.CheckStatusEnum;
-import com.mortals.xhx.common.code.SubMethodEnum;
+import com.mortals.xhx.common.code.*;
 import com.mortals.xhx.common.utils.BeanUtil;
 import com.mortals.xhx.module.check.model.CheckGoworkRecordEntity;
 import com.mortals.xhx.module.check.service.CheckGoworkRecordService;
 import com.mortals.xhx.module.perform.model.PerformEffectRecordEntity;
 import com.mortals.xhx.module.perform.model.PerformRulesEntity;
 import com.mortals.xhx.module.perform.service.PerformRulesService;
+import com.mortals.xhx.module.perform.service.PerformStaffConfService;
 import com.mortals.xhx.module.staff.model.StaffEntity;
 import com.mortals.xhx.module.staff.service.StaffService;
 import org.springframework.beans.BeanUtils;
@@ -41,6 +41,8 @@ public class PerformGoworkRecordServiceImpl extends AbstractCRUDServiceImpl<Perf
     private PerformRulesService rulesService;
     @Autowired
     private StaffService staffService;
+    @Autowired
+    private PerformStaffConfService performStaffConfService;
 
     @Override
     protected void saveBefore(PerformGoworkRecordEntity entity, Context context) throws AppException {
@@ -77,9 +79,17 @@ public class PerformGoworkRecordServiceImpl extends AbstractCRUDServiceImpl<Perf
         BeanUtils.copyProperties(entity,checkGoworkRecordEntity, BeanUtil.getNullPropertyNames(entity));
         checkGoworkRecordEntity.setId(null);
         checkGoworkRecordEntity.setRecordId(entity.getId());
-
-        checkGoworkRecordEntity.setCheckStatus(CheckStatusEnum.未处理.getValue());      //非自动扣分相设置为未处理
-
+        if(performStaffConfService.checkRules(entity.getStaffId(),entity.getDeptId(),entity.getRuleId())){
+            checkGoworkRecordEntity.setCheckStatus(CheckStatusEnum.已处理.getValue());
+            if(checkGoworkRecordEntity.getSubAddType()== SubAddTypeEnum.增加.getValue()){
+                checkGoworkRecordEntity.setCheckResult(CheckResultAddEnum.核查加分.getValue());
+            }else {
+                checkGoworkRecordEntity.setCheckResult(CheckResultSubEnum.核查扣分.getValue());
+            }
+            checkGoworkRecordEntity.setUpdateTime(new Date());
+        }else {
+            checkGoworkRecordEntity.setCheckStatus(CheckStatusEnum.未处理.getValue());      //非自动扣分相设置为未处理
+        }
         checkGoworkRecordService.save(checkGoworkRecordEntity,context);
     }
 

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/impl/PerformOtherRecordServiceImpl.java

 package com.mortals.xhx.module.perform.service.impl;
-import com.mortals.xhx.common.code.CheckStatusEnum;
-import com.mortals.xhx.common.code.SubMethodEnum;
+import com.mortals.xhx.common.code.*;
 import com.mortals.xhx.common.utils.BeanUtil;
 import com.mortals.xhx.module.check.model.CheckOtherRecordEntity;
 import com.mortals.xhx.module.check.service.CheckOtherRecordService;
 import com.mortals.xhx.module.perform.model.PerformGoworkRecordEntity;
 import com.mortals.xhx.module.perform.model.PerformRulesEntity;
 import com.mortals.xhx.module.perform.service.PerformRulesService;
+import com.mortals.xhx.module.perform.service.PerformStaffConfService;
 import com.mortals.xhx.module.staff.model.StaffEntity;
 import com.mortals.xhx.module.staff.service.StaffService;
 import org.springframework.beans.BeanUtils;
@@ -41,6 +41,8 @@ public class PerformOtherRecordServiceImpl extends AbstractCRUDServiceImpl<Perfo
     private PerformRulesService rulesService;
     @Autowired
     private StaffService staffService;
+    @Autowired
+    private PerformStaffConfService performStaffConfService;
 
     @Override
     protected void saveBefore(PerformOtherRecordEntity entity, Context context) throws AppException {
@@ -81,7 +83,17 @@ public class PerformOtherRecordServiceImpl extends AbstractCRUDServiceImpl<Perfo
         BeanUtils.copyProperties(entity,checkOtherRecordEntity, BeanUtil.getNullPropertyNames(entity));
         checkOtherRecordEntity.setId(null);
         checkOtherRecordEntity.setRecordId(entity.getId());
-        checkOtherRecordEntity.setCheckStatus(CheckStatusEnum.未处理.getValue());      //非自动扣分相设置为未处理
+        if(performStaffConfService.checkRules(entity.getStaffId(),entity.getDeptId(),entity.getRuleId())){
+            checkOtherRecordEntity.setCheckStatus(CheckStatusEnum.已处理.getValue());
+            if(checkOtherRecordEntity.getSubAddType()== SubAddTypeEnum.增加.getValue()){
+                checkOtherRecordEntity.setCheckResult(CheckResultAddEnum.核查加分.getValue());
+            }else {
+                checkOtherRecordEntity.setCheckResult(CheckResultSubEnum.核查扣分.getValue());
+            }
+            checkOtherRecordEntity.setUpdateTime(new Date());
+        }else {
+            checkOtherRecordEntity.setCheckStatus(CheckStatusEnum.未处理.getValue());      //非自动扣分相设置为未处理
+        }
         checkOtherRecordService.save(checkOtherRecordEntity,context);
     }
 

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/impl/PerformReviewRecordServiceImpl.java

 package com.mortals.xhx.module.perform.service.impl;
 
-import com.mortals.xhx.common.code.CheckStatusEnum;
-import com.mortals.xhx.common.code.SubMethodEnum;
+import com.mortals.xhx.common.code.*;
 import com.mortals.xhx.common.utils.BeanUtil;
 import com.mortals.xhx.module.check.model.CheckReviewRecordEntity;
 import com.mortals.xhx.module.check.service.CheckReviewRecordService;
 import com.mortals.xhx.module.perform.model.PerformOtherRecordEntity;
 import com.mortals.xhx.module.perform.model.PerformRulesEntity;
 import com.mortals.xhx.module.perform.service.PerformRulesService;
+import com.mortals.xhx.module.perform.service.PerformStaffConfService;
 import com.mortals.xhx.module.staff.model.StaffEntity;
 import com.mortals.xhx.module.staff.service.StaffService;
 import org.springframework.beans.BeanUtils;
@@ -42,6 +42,8 @@ public class PerformReviewRecordServiceImpl extends AbstractCRUDServiceImpl<Perf
     private PerformRulesService rulesService;
     @Autowired
     private StaffService staffService;
+    @Autowired
+    private PerformStaffConfService performStaffConfService;
 
     @Override
     protected void saveBefore(PerformReviewRecordEntity entity, Context context) throws AppException {
@@ -77,7 +79,17 @@ public class PerformReviewRecordServiceImpl extends AbstractCRUDServiceImpl<Perf
         BeanUtils.copyProperties(entity, checkReviewRecordEntity, BeanUtil.getNullPropertyNames(entity));
         checkReviewRecordEntity.setId(null);
         checkReviewRecordEntity.setRecordId(entity.getId());
-        checkReviewRecordEntity.setCheckStatus(CheckStatusEnum.未处理.getValue());      //非自动扣分相设置为未处理
+        if(performStaffConfService.checkRules(entity.getStaffId(),entity.getDeptId(),entity.getRuleId())){
+            checkReviewRecordEntity.setCheckStatus(CheckStatusEnum.已处理.getValue());
+            if(checkReviewRecordEntity.getSubAddType()== SubAddTypeEnum.增加.getValue()){
+                checkReviewRecordEntity.setCheckResult(CheckResultAddEnum.核查加分.getValue());
+            }else {
+                checkReviewRecordEntity.setCheckResult(CheckResultSubEnum.核查扣分.getValue());
+            }
+            checkReviewRecordEntity.setUpdateTime(new Date());
+        }else {
+            checkReviewRecordEntity.setCheckStatus(CheckStatusEnum.未处理.getValue());      //非自动扣分相设置为未处理
+        }
         checkReviewRecordService.save(checkReviewRecordEntity, context);
     }
 

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/impl/PerformStaffConfServiceImpl.java

@@ -7,8 +7,7 @@ import com.mortals.xhx.base.system.user.model.UserQuery;
 import com.mortals.xhx.base.system.user.service.UserService;
 import com.mortals.xhx.common.code.CheckTypeEnum;
 import com.mortals.xhx.module.perform.model.*;
-import com.mortals.xhx.module.perform.service.PerformRulesCategoryService;
-import com.mortals.xhx.module.perform.service.PerformStaffConfDetailService;
+import com.mortals.xhx.module.perform.service.*;
 import com.mortals.xhx.module.staff.model.StaffEntity;
 import com.mortals.xhx.module.staff.model.StaffQuery;
 import com.mortals.xhx.module.staff.service.StaffService;
@@ -19,7 +18,6 @@ import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.xhx.module.perform.dao.PerformStaffConfDao;
-import com.mortals.xhx.module.perform.service.PerformStaffConfService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.util.ObjectUtils;
 
@@ -44,9 +42,12 @@ public class PerformStaffConfServiceImpl extends AbstractCRUDServiceImpl<Perform
     private StaffService staffService;
     @Autowired
     private PerformRulesCategoryService performRulesCategoryService;
-
+    @Autowired
+    private PerformRulesService performRulesService;
     @Autowired
     private UserService userService;
+    @Autowired
+    private PerformDeptConfDetailService performDeptConfDetailService;
 
 
     @Override
@@ -108,6 +109,10 @@ public class PerformStaffConfServiceImpl extends AbstractCRUDServiceImpl<Perform
     protected void saveAfter(PerformStaffConfEntity entity, Context context) throws AppException {
         if (CollectionUtils.isNotEmpty(entity.getStaffConfDetail())) {
             for (PerformStaffConfDetailEntity item : entity.getStaffConfDetail()) {
+                PerformRulesEntity rulesEntity = performRulesService.get(item.getRuleId());
+                if(rulesEntity!=null){
+                    item.setRuleName(rulesEntity.getName());
+                }
                 item.setStaffConfId(entity.getId());
                 item.setCreateTime(entity.getCreateTime());
                 item.setCreateUser(entity.getCreateUser());
@@ -145,6 +150,10 @@ public class PerformStaffConfServiceImpl extends AbstractCRUDServiceImpl<Perform
             Long[] detailIds = performStaffConfDetailService.find(new PerformStaffConfDetailQuery().staffConfId(entity.getId())).stream().map(PerformStaffConfDetailEntity::getId).toArray(Long[]::new);
             performStaffConfDetailService.remove(detailIds, context);
             for (PerformStaffConfDetailEntity item : entity.getStaffConfDetail()) {
+                PerformRulesEntity rulesEntity = performRulesService.get(item.getRuleId());
+                if(rulesEntity!=null){
+                    item.setRuleName(rulesEntity.getName());
+                }
                 item.setStaffConfId(entity.getId());
                 item.setCreateTime(entity.getCreateTime());
                 item.setCreateUser(entity.getCreateUser());
@@ -193,4 +202,27 @@ public class PerformStaffConfServiceImpl extends AbstractCRUDServiceImpl<Perform
             }
         }
     }
+
+    @Override
+    public boolean checkRules(Long staffId, Long deptId, Long rulesId) {
+        boolean result = false;
+        PerformStaffConfEntity staffConfEntity = this.selectOne(new PerformStaffConfQuery().staffIds(String.valueOf(staffId)));
+        if(staffConfEntity!=null){
+            List<PerformStaffConfDetailEntity> detailEntities = performStaffConfDetailService.find(new PerformStaffConfDetailQuery().staffConfId(staffConfEntity.getId()).ruleId(rulesId));
+            if(CollectionUtils.isNotEmpty(detailEntities)){
+                result = true;
+            }else {
+                PerformDeptConfDetailEntity deptConfDetailEntity = performDeptConfDetailService.selectOne(new PerformDeptConfDetailQuery().deptId(deptId).ruleId(rulesId));
+                if(deptConfDetailEntity!=null){
+                    result = true;
+                }
+            }
+        }else {
+            PerformDeptConfDetailEntity deptConfDetailEntity = performDeptConfDetailService.selectOne(new PerformDeptConfDetailQuery().deptId(deptId).ruleId(rulesId));
+            if(deptConfDetailEntity!=null){
+                result = true;
+            }
+        }
+        return result;
+    }
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformGoworkRecordController.java

@@ -80,10 +80,6 @@ public class PerformGoworkRecordController extends BaseCRUDJsonBodyMappingContro
             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())){
             LocalDateTime currentDate = LocalDateTime.now();
             LocalDateTime firstDayOfMonth = currentDate.withDayOfMonth(1);

attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/model/StaffPerformSummaryEntity.java

@@ -93,7 +93,7 @@ public class StaffPerformSummaryEntity extends StaffPerformSummaryVo {
     /**
      * 累计异常分数
      */
-    @Excel(name = "累计异常分数")
+    //@Excel(name = "累计异常分数")
     private BigDecimal errorScore;
     /**
      * 当月得分数

attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/web/StaffPerformSummaryController.java

@@ -7,6 +7,7 @@ import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.service.ICacheService;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.common.pdu.WeightPdu;
 import com.mortals.xhx.module.attendance.model.vo.AttendanceSummaryQuery;
 import com.mortals.xhx.module.check.model.vo.StaffCheckSummaryQuery;
 import com.mortals.xhx.module.dept.model.DeptQuery;
@@ -42,6 +43,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import static com.mortals.framework.ap.SysConstains.*;
+import static com.mortals.xhx.common.key.ParamKey.SYS_PARAM_WEIGHT;
 import static com.mortals.xhx.common.key.RedisKey.KEY_ATTENDANCE_STAT_CACHE;
 import static com.mortals.xhx.common.key.RedisKey.KEY_CHECK_SUMMARY_CACHE;
 
@@ -71,8 +73,8 @@ public class StaffPerformSummaryController extends BaseCRUDJsonBodyMappingContro
 
     @Override
     protected void init(Map<String, Object> model, Context context) {
-        this.addDict(model, "month", paramService.getParamBySecondOrganize("StaffPerformSummary", "month"));
-        this.addDict(model, "deptId", deptService.find(new DeptQuery()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getDeptName(), (o, n) -> n)));
+        //this.addDict(model, "month", paramService.getParamBySecondOrganize("StaffPerformSummary", "month"));
+        //this.addDict(model, "deptId", deptService.find(new DeptQuery()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getDeptName(), (o, n) -> n)));
         super.init(model, context);
     }
 
@@ -84,6 +86,19 @@ public class StaffPerformSummaryController extends BaseCRUDJsonBodyMappingContro
         }
     }
 
+    @Override
+    protected int doListAfter(StaffPerformSummaryEntity query, Map<String, Object> model, Context context) throws AppException {
+        String value = paramService.getValueByKey(SYS_PARAM_WEIGHT);
+        WeightPdu weightPdu;
+        if (ObjectUtils.isEmpty(value)){
+            weightPdu = new WeightPdu();
+        }else {
+            weightPdu = JSONObject.parseObject(value,WeightPdu.class);
+        }
+        this.addDict(model,"weightPdu",weightPdu);
+        return super.doListAfter(query,model,context);
+    }
+
     @Override
     protected int viewAfter(Long id, Map<String, Object> model, StaffPerformSummaryEntity entity, Context context) throws AppException {
         StaffEntity staffEntity = staffService.get(entity.getStaffId());

attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckAttendRecordMapperExt.xml

@@ -11,7 +11,7 @@
             SUM(CASE subAddType WHEN 1 THEN score ELSE score*-1 END) as sumScore
         FROM
             mortals_xhx_check_attend_record
-        WHERE 1 = 1 and auditStatus = 1
+        WHERE checkStatus = 2 and auditStatus = 1
         <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
         <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
         <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
@@ -30,7 +30,7 @@
         SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as attendScoreSub
         FROM
         mortals_xhx_check_attend_record
-        WHERE 1 = 1 and auditStatus = 1
+        WHERE checkStatus = 2 and auditStatus = 1
         <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
         <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
         <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
@@ -49,7 +49,7 @@
         SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as attendScoreSub
         FROM
         mortals_xhx_check_attend_record
-        WHERE 1 = 1 and auditStatus = 1
+        WHERE checkStatus = 2 and auditStatus = 1
         <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
         <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
         <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>

attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckComplainRecordMapperExt.xml

@@ -11,7 +11,7 @@
             SUM(CASE subAddType WHEN 1 THEN score ELSE score*-1 END) as sumScore
         FROM
             mortals_xhx_check_complain_record
-        WHERE 1 = 1 and auditStatus = 1
+        WHERE checkStatus = 2 and auditStatus = 1
         <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
         <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
         <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
@@ -30,7 +30,7 @@
         SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as complainScoreSub
         FROM
         mortals_xhx_check_complain_record
-        WHERE 1 = 1 and auditStatus = 1
+        WHERE checkStatus = 2 and auditStatus = 1
         <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
         <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
         <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
@@ -49,7 +49,7 @@
         SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as complainScoreSub
         FROM
         mortals_xhx_check_complain_record
-        WHERE 1 = 1 and auditStatus = 1
+        WHERE checkStatus = 2 and auditStatus = 1
         <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
         <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
         <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>

attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckEffectRecordMapperExt.xml

@@ -11,7 +11,7 @@
             SUM(CASE subAddType WHEN 1 THEN score ELSE score*-1 END) as sumScore
         FROM
             mortals_xhx_check_effect_record
-        WHERE 1 = 1 and auditStatus = 1
+        WHERE checkStatus = 2 and auditStatus = 1
         <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
         <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
         <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
@@ -30,7 +30,7 @@
         SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as effectScoreSub
         FROM
         mortals_xhx_check_effect_record
-        WHERE 1 = 1 and auditStatus = 1
+        WHERE checkStatus = 2 and auditStatus = 1
         <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
         <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
         <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
@@ -49,7 +49,7 @@
         SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as effectScoreSub
         FROM
         mortals_xhx_check_effect_record
-        WHERE 1 = 1 and auditStatus = 1
+        WHERE checkStatus = 2 and auditStatus = 1
         <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
         <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
         <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>

attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckGoworkRecordMapperExt.xml

@@ -11,7 +11,7 @@
             SUM(CASE subAddType WHEN 1 THEN score ELSE score*-1 END) as sumScore
         FROM
             mortals_xhx_check_gowork_record
-        WHERE 1 = 1 and auditStatus = 1
+        WHERE checkStatus = 2 and auditStatus = 1
         <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
         <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
         <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
@@ -30,7 +30,7 @@
         SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as goworkScoreSub
         FROM
         mortals_xhx_check_gowork_record
-        WHERE 1 = 1 and auditStatus = 1
+        WHERE checkStatus = 2 and auditStatus = 1
         <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
         <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
         <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
@@ -49,7 +49,7 @@
         SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as goworkScoreSub
         FROM
         mortals_xhx_check_gowork_record
-        WHERE 1 = 1 and auditStatus = 1
+        WHERE checkStatus = 2 and auditStatus = 1
         <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
         <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
         <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>

attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckOtherRecordMapperExt.xml

@@ -11,7 +11,7 @@
             SUM(CASE subAddType WHEN 1 THEN score ELSE score*-1 END) as sumScore
         FROM
             mortals_xhx_check_other_record
-        WHERE 1 = 1 and auditStatus = 1
+        WHERE checkStatus = 2 and auditStatus = 1
         <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
         <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
         <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
@@ -30,7 +30,7 @@
         SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as otherScoreSub
         FROM
         mortals_xhx_check_other_record
-        WHERE 1 = 1 and auditStatus = 1
+        WHERE checkStatus = 2 and auditStatus = 1
         <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
         <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
         <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
@@ -49,7 +49,7 @@
         SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as otherScoreSub
         FROM
         mortals_xhx_check_other_record
-        WHERE 1 = 1 and auditStatus = 1
+        WHERE checkStatus = 2 and auditStatus = 1
         <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
         <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
         <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>

attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckReviewRecordMapperExt.xml

@@ -11,7 +11,7 @@
             SUM(CASE subAddType WHEN 1 THEN score ELSE score*-1 END) as sumScore
         FROM
             mortals_xhx_check_review_record
-        WHERE 1 = 1 and auditStatus = 1
+        WHERE checkStatus = 2 and auditStatus = 1
         <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
         <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
         <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
@@ -30,7 +30,7 @@
         SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as reviewScoreSub
         FROM
         mortals_xhx_check_review_record
-        WHERE 1 = 1 and auditStatus = 1
+        WHERE checkStatus = 2 and auditStatus = 1
         <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
         <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
         <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
@@ -49,7 +49,7 @@
         SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as reviewScoreSub
         FROM
         mortals_xhx_check_review_record
-        WHERE 1 = 1 and auditStatus = 1
+        WHERE checkStatus = 2 and auditStatus = 1
         <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
         <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
         <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>

attendance-performance-manager/src/main/resources/sqlmap/module/staff/StaffPerformSummaryMapper.xml

@@ -554,9 +554,11 @@
                 <include refid="_condition_"/>
             </trim>
         </trim>
-        <include refid="_orderCols_"/>
+        <include refid="_orderColsNew_"/>
     </select>
-
+    <sql id="_orderColsNew_">
+        order by CONVERT(a.salaName USING gbk),CONVERT(a.deptName USING gbk),CONVERT(a.staffName USING gbk)
+    </sql>
 
 
     <!-- 获取 -->