Merge remote-tracking branch 'origin/master'

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/dao/CheckAttendRecordDao.java

@@ -4,6 +4,8 @@ import com.mortals.framework.dao.ICRUDDao;
 import com.mortals.xhx.module.check.model.CheckAttendRecordEntity;
 import com.mortals.xhx.module.check.model.vo.StaffCheckSummaryQuery;
 import com.mortals.xhx.module.check.model.vo.StaffCheckSummaryVo;
+import com.mortals.xhx.module.dept.model.DeptPerformStatEntity;
+import com.mortals.xhx.module.staff.model.StaffPerformStatEntity;
 
 import java.util.List;
 /**
@@ -22,4 +24,18 @@ public interface  CheckAttendRecordDao extends ICRUDDao<CheckAttendRecordEntity,
      * @return
      */
     List<StaffCheckSummaryVo> summaryCheck(StaffCheckSummaryQuery query);
+
+    /**
+     * 个人绩效统计
+     * @param query
+     * @return
+     */
+    List<StaffPerformStatEntity> getStaffPerformStat(StaffCheckSummaryQuery query);
+
+    /**
+     * 部门绩效统计
+     * @param query
+     * @return
+     */
+    List<DeptPerformStatEntity> getDeptPerformStat(StaffCheckSummaryQuery query);
 }

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/dao/CheckComplainRecordDao.java

@@ -4,6 +4,8 @@ import com.mortals.framework.dao.ICRUDDao;
 import com.mortals.xhx.module.check.model.CheckComplainRecordEntity;
 import com.mortals.xhx.module.check.model.vo.StaffCheckSummaryQuery;
 import com.mortals.xhx.module.check.model.vo.StaffCheckSummaryVo;
+import com.mortals.xhx.module.dept.model.DeptPerformStatEntity;
+import com.mortals.xhx.module.staff.model.StaffPerformStatEntity;
 
 import java.util.List;
 /**
@@ -22,4 +24,18 @@ public interface  CheckComplainRecordDao extends ICRUDDao<CheckComplainRecordEnt
      * @return
      */
     List<StaffCheckSummaryVo> summaryCheck(StaffCheckSummaryQuery query);
+
+    /**
+     * 个人绩效统计
+     * @param query
+     * @return
+     */
+    List<StaffPerformStatEntity> getStaffPerformStat(StaffCheckSummaryQuery query);
+
+    /**
+     * 部门绩效统计
+     * @param query
+     * @return
+     */
+    List<DeptPerformStatEntity> getDeptPerformStat(StaffCheckSummaryQuery query);
 }

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/dao/CheckEffectRecordDao.java

@@ -4,6 +4,8 @@ import com.mortals.framework.dao.ICRUDDao;
 import com.mortals.xhx.module.check.model.CheckEffectRecordEntity;
 import com.mortals.xhx.module.check.model.vo.StaffCheckSummaryQuery;
 import com.mortals.xhx.module.check.model.vo.StaffCheckSummaryVo;
+import com.mortals.xhx.module.dept.model.DeptPerformStatEntity;
+import com.mortals.xhx.module.staff.model.StaffPerformStatEntity;
 
 import java.util.List;
 /**
@@ -22,4 +24,18 @@ public interface  CheckEffectRecordDao extends ICRUDDao<CheckEffectRecordEntity,
      * @return
      */
     List<StaffCheckSummaryVo> summaryCheck(StaffCheckSummaryQuery query);
+
+    /**
+     * 个人绩效统计
+     * @param query
+     * @return
+     */
+    List<StaffPerformStatEntity> getStaffPerformStat(StaffCheckSummaryQuery query);
+
+    /**
+     * 部门绩效统计
+     * @param query
+     * @return
+     */
+    List<DeptPerformStatEntity> getDeptPerformStat(StaffCheckSummaryQuery query);
 }

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/dao/CheckGoworkRecordDao.java

@@ -4,6 +4,8 @@ import com.mortals.framework.dao.ICRUDDao;
 import com.mortals.xhx.module.check.model.CheckGoworkRecordEntity;
 import com.mortals.xhx.module.check.model.vo.StaffCheckSummaryQuery;
 import com.mortals.xhx.module.check.model.vo.StaffCheckSummaryVo;
+import com.mortals.xhx.module.dept.model.DeptPerformStatEntity;
+import com.mortals.xhx.module.staff.model.StaffPerformStatEntity;
 
 import java.util.List;
 /**
@@ -22,4 +24,18 @@ public interface  CheckGoworkRecordDao extends ICRUDDao<CheckGoworkRecordEntity,
      * @return
      */
     List<StaffCheckSummaryVo> summaryCheck(StaffCheckSummaryQuery query);
+
+    /**
+     * 个人绩效统计
+     * @param query
+     * @return
+     */
+    List<StaffPerformStatEntity> getStaffPerformStat(StaffCheckSummaryQuery query);
+
+    /**
+     * 部门绩效统计
+     * @param query
+     * @return
+     */
+    List<DeptPerformStatEntity> getDeptPerformStat(StaffCheckSummaryQuery query);
 }

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/dao/CheckOtherRecordDao.java

@@ -4,6 +4,8 @@ import com.mortals.framework.dao.ICRUDDao;
 import com.mortals.xhx.module.check.model.CheckOtherRecordEntity;
 import com.mortals.xhx.module.check.model.vo.StaffCheckSummaryQuery;
 import com.mortals.xhx.module.check.model.vo.StaffCheckSummaryVo;
+import com.mortals.xhx.module.dept.model.DeptPerformStatEntity;
+import com.mortals.xhx.module.staff.model.StaffPerformStatEntity;
 
 import java.util.List;
 /**
@@ -22,4 +24,18 @@ public interface  CheckOtherRecordDao extends ICRUDDao<CheckOtherRecordEntity,Lo
      * @return
      */
     List<StaffCheckSummaryVo> summaryCheck(StaffCheckSummaryQuery query);
+
+    /**
+     * 个人绩效统计
+     * @param query
+     * @return
+     */
+    List<StaffPerformStatEntity> getStaffPerformStat(StaffCheckSummaryQuery query);
+
+    /**
+     * 部门绩效统计
+     * @param query
+     * @return
+     */
+    List<DeptPerformStatEntity> getDeptPerformStat(StaffCheckSummaryQuery query);
 }

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/dao/CheckReviewRecordDao.java

@@ -4,6 +4,8 @@ import com.mortals.framework.dao.ICRUDDao;
 import com.mortals.xhx.module.check.model.CheckReviewRecordEntity;
 import com.mortals.xhx.module.check.model.vo.StaffCheckSummaryQuery;
 import com.mortals.xhx.module.check.model.vo.StaffCheckSummaryVo;
+import com.mortals.xhx.module.dept.model.DeptPerformStatEntity;
+import com.mortals.xhx.module.staff.model.StaffPerformStatEntity;
 
 import java.util.List;
 /**
@@ -22,4 +24,18 @@ public interface  CheckReviewRecordDao extends ICRUDDao<CheckReviewRecordEntity,
      * @return
      */
     List<StaffCheckSummaryVo> summaryCheck(StaffCheckSummaryQuery query);
+
+    /**
+     * 个人绩效统计
+     * @param query
+     * @return
+     */
+    List<StaffPerformStatEntity> getStaffPerformStat(StaffCheckSummaryQuery query);
+
+    /**
+     * 部门绩效统计
+     * @param query
+     * @return
+     */
+    List<DeptPerformStatEntity> getDeptPerformStat(StaffCheckSummaryQuery query);
 }

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/dao/ibatis/CheckAttendRecordDaoImpl.java

@@ -3,6 +3,8 @@ package com.mortals.xhx.module.check.dao.ibatis;
 
 import com.mortals.xhx.module.check.model.vo.StaffCheckSummaryQuery;
 import com.mortals.xhx.module.check.model.vo.StaffCheckSummaryVo;
+import com.mortals.xhx.module.dept.model.DeptPerformStatEntity;
+import com.mortals.xhx.module.staff.model.StaffPerformStatEntity;
 import org.springframework.stereotype.Repository;
 import com.mortals.xhx.module.check.dao.CheckAttendRecordDao;
 import com.mortals.xhx.module.check.model.CheckAttendRecordEntity;
@@ -23,4 +25,14 @@ public class CheckAttendRecordDaoImpl extends BaseCRUDDaoMybatis<CheckAttendReco
     public List<StaffCheckSummaryVo> summaryCheck(StaffCheckSummaryQuery query) {
         return this.getSqlSession().selectList(this.getSqlId("getSummaryCheckList"), query);
     }
+
+    @Override
+    public List<StaffPerformStatEntity> getStaffPerformStat(StaffCheckSummaryQuery query) {
+        return this.getSqlSession().selectList(this.getSqlId("getStaffPerformStat"), query);
+    }
+
+    @Override
+    public List<DeptPerformStatEntity> getDeptPerformStat(StaffCheckSummaryQuery query) {
+        return this.getSqlSession().selectList(this.getSqlId("getDeptPerformStat"), query);
+    }
 }

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/dao/ibatis/CheckComplainRecordDaoImpl.java

@@ -3,6 +3,8 @@ package com.mortals.xhx.module.check.dao.ibatis;
 
 import com.mortals.xhx.module.check.model.vo.StaffCheckSummaryQuery;
 import com.mortals.xhx.module.check.model.vo.StaffCheckSummaryVo;
+import com.mortals.xhx.module.dept.model.DeptPerformStatEntity;
+import com.mortals.xhx.module.staff.model.StaffPerformStatEntity;
 import org.springframework.stereotype.Repository;
 import com.mortals.xhx.module.check.dao.CheckComplainRecordDao;
 import com.mortals.xhx.module.check.model.CheckComplainRecordEntity;
@@ -23,4 +25,14 @@ public class CheckComplainRecordDaoImpl extends BaseCRUDDaoMybatis<CheckComplain
     public List<StaffCheckSummaryVo> summaryCheck(StaffCheckSummaryQuery query) {
         return this.getSqlSession().selectList(this.getSqlId("getSummaryCheckList"), query);
     }
+
+    @Override
+    public List<StaffPerformStatEntity> getStaffPerformStat(StaffCheckSummaryQuery query) {
+        return this.getSqlSession().selectList(this.getSqlId("getStaffPerformStat"), query);
+    }
+
+    @Override
+    public List<DeptPerformStatEntity> getDeptPerformStat(StaffCheckSummaryQuery query) {
+        return this.getSqlSession().selectList(this.getSqlId("getDeptPerformStat"), query);
+    }
 }

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/dao/ibatis/CheckEffectRecordDaoImpl.java

@@ -3,6 +3,8 @@ package com.mortals.xhx.module.check.dao.ibatis;
 
 import com.mortals.xhx.module.check.model.vo.StaffCheckSummaryQuery;
 import com.mortals.xhx.module.check.model.vo.StaffCheckSummaryVo;
+import com.mortals.xhx.module.dept.model.DeptPerformStatEntity;
+import com.mortals.xhx.module.staff.model.StaffPerformStatEntity;
 import org.springframework.stereotype.Repository;
 import com.mortals.xhx.module.check.dao.CheckEffectRecordDao;
 import com.mortals.xhx.module.check.model.CheckEffectRecordEntity;
@@ -23,4 +25,14 @@ public class CheckEffectRecordDaoImpl extends BaseCRUDDaoMybatis<CheckEffectReco
     public List<StaffCheckSummaryVo> summaryCheck(StaffCheckSummaryQuery query) {
         return this.getSqlSession().selectList(this.getSqlId("getSummaryCheckList"), query);
     }
+
+    @Override
+    public List<StaffPerformStatEntity> getStaffPerformStat(StaffCheckSummaryQuery query) {
+        return this.getSqlSession().selectList(this.getSqlId("getStaffPerformStat"), query);
+    }
+
+    @Override
+    public List<DeptPerformStatEntity> getDeptPerformStat(StaffCheckSummaryQuery query) {
+        return this.getSqlSession().selectList(this.getSqlId("getDeptPerformStat"), query);
+    }
 }

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/dao/ibatis/CheckGoworkRecordDaoImpl.java

@@ -3,6 +3,8 @@ package com.mortals.xhx.module.check.dao.ibatis;
 
 import com.mortals.xhx.module.check.model.vo.StaffCheckSummaryQuery;
 import com.mortals.xhx.module.check.model.vo.StaffCheckSummaryVo;
+import com.mortals.xhx.module.dept.model.DeptPerformStatEntity;
+import com.mortals.xhx.module.staff.model.StaffPerformStatEntity;
 import org.springframework.stereotype.Repository;
 import com.mortals.xhx.module.check.dao.CheckGoworkRecordDao;
 import com.mortals.xhx.module.check.model.CheckGoworkRecordEntity;
@@ -23,4 +25,14 @@ public class CheckGoworkRecordDaoImpl extends BaseCRUDDaoMybatis<CheckGoworkReco
     public List<StaffCheckSummaryVo> summaryCheck(StaffCheckSummaryQuery query) {
         return this.getSqlSession().selectList(this.getSqlId("getSummaryCheckList"), query);
     }
+
+    @Override
+    public List<StaffPerformStatEntity> getStaffPerformStat(StaffCheckSummaryQuery query) {
+        return this.getSqlSession().selectList(this.getSqlId("getStaffPerformStat"), query);
+    }
+
+    @Override
+    public List<DeptPerformStatEntity> getDeptPerformStat(StaffCheckSummaryQuery query) {
+        return this.getSqlSession().selectList(this.getSqlId("getDeptPerformStat"), query);
+    }
 }

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/dao/ibatis/CheckOtherRecordDaoImpl.java

@@ -3,6 +3,8 @@ package com.mortals.xhx.module.check.dao.ibatis;
 
 import com.mortals.xhx.module.check.model.vo.StaffCheckSummaryQuery;
 import com.mortals.xhx.module.check.model.vo.StaffCheckSummaryVo;
+import com.mortals.xhx.module.dept.model.DeptPerformStatEntity;
+import com.mortals.xhx.module.staff.model.StaffPerformStatEntity;
 import org.springframework.stereotype.Repository;
 import com.mortals.xhx.module.check.dao.CheckOtherRecordDao;
 import com.mortals.xhx.module.check.model.CheckOtherRecordEntity;
@@ -23,4 +25,14 @@ public class CheckOtherRecordDaoImpl extends BaseCRUDDaoMybatis<CheckOtherRecord
     public List<StaffCheckSummaryVo> summaryCheck(StaffCheckSummaryQuery query) {
         return this.getSqlSession().selectList(this.getSqlId("getSummaryCheckList"), query);
     }
+
+    @Override
+    public List<StaffPerformStatEntity> getStaffPerformStat(StaffCheckSummaryQuery query) {
+        return this.getSqlSession().selectList(this.getSqlId("getStaffPerformStat"), query);
+    }
+
+    @Override
+    public List<DeptPerformStatEntity> getDeptPerformStat(StaffCheckSummaryQuery query) {
+        return this.getSqlSession().selectList(this.getSqlId("getDeptPerformStat"), query);
+    }
 }

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/dao/ibatis/CheckReviewRecordDaoImpl.java

@@ -3,6 +3,8 @@ package com.mortals.xhx.module.check.dao.ibatis;
 
 import com.mortals.xhx.module.check.model.vo.StaffCheckSummaryQuery;
 import com.mortals.xhx.module.check.model.vo.StaffCheckSummaryVo;
+import com.mortals.xhx.module.dept.model.DeptPerformStatEntity;
+import com.mortals.xhx.module.staff.model.StaffPerformStatEntity;
 import org.springframework.stereotype.Repository;
 import com.mortals.xhx.module.check.dao.CheckReviewRecordDao;
 import com.mortals.xhx.module.check.model.CheckReviewRecordEntity;
@@ -23,4 +25,14 @@ public class CheckReviewRecordDaoImpl extends BaseCRUDDaoMybatis<CheckReviewReco
     public List<StaffCheckSummaryVo> summaryCheck(StaffCheckSummaryQuery query) {
         return this.getSqlSession().selectList(this.getSqlId("getSummaryCheckList"), query);
     }
+
+    @Override
+    public List<StaffPerformStatEntity> getStaffPerformStat(StaffCheckSummaryQuery query) {
+        return this.getSqlSession().selectList(this.getSqlId("getStaffPerformStat"), query);
+    }
+
+    @Override
+    public List<DeptPerformStatEntity> getDeptPerformStat(StaffCheckSummaryQuery query) {
+        return this.getSqlSession().selectList(this.getSqlId("getDeptPerformStat"), query);
+    }
 }

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

@@ -6,6 +6,8 @@ import com.mortals.xhx.module.check.model.CheckAttendRecordEntity;
 import com.mortals.xhx.module.check.dao.CheckAttendRecordDao;
 import com.mortals.xhx.module.check.model.vo.StaffCheckSummaryQuery;
 import com.mortals.xhx.module.check.model.vo.StaffCheckSummaryVo;
+import com.mortals.xhx.module.dept.model.DeptPerformStatEntity;
+import com.mortals.xhx.module.staff.model.StaffPerformStatEntity;
 
 import java.util.List;
 
@@ -35,4 +37,18 @@ public interface CheckAttendRecordService extends ICRUDService<CheckAttendRecord
      * @return
      */
     List<StaffCheckSummaryVo> summaryCheck(StaffCheckSummaryQuery query) throws AppException;
+
+    /**
+     * 个人绩效统计
+     * @param query
+     * @return
+     */
+    void doSaveStaffPerformStat(StaffCheckSummaryQuery query);
+
+    /**
+     * 部门绩效统计
+     * @param query
+     * @return
+     */
+    void doSaveDeptPerformStat(StaffCheckSummaryQuery query);
 }
\ No newline at end of file

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

@@ -35,4 +35,18 @@ public interface CheckComplainRecordService extends ICRUDService<CheckComplainRe
      * @return
      */
     List<StaffCheckSummaryVo> summaryCheck(StaffCheckSummaryQuery query) throws AppException;
+
+    /**
+     * 个人绩效统计
+     * @param query
+     * @return
+     */
+    void doSaveStaffPerformStat(StaffCheckSummaryQuery query);
+
+    /**
+     * 部门绩效统计
+     * @param query
+     * @return
+     */
+    void doSaveDeptPerformStat(StaffCheckSummaryQuery query);
 }
\ No newline at end of file

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

@@ -35,4 +35,18 @@ public interface CheckEffectRecordService extends ICRUDService<CheckEffectRecord
      * @return
      */
     List<StaffCheckSummaryVo> summaryCheck(StaffCheckSummaryQuery query) throws AppException;
+
+    /**
+     * 个人绩效统计
+     * @param query
+     * @return
+     */
+    void doSaveStaffPerformStat(StaffCheckSummaryQuery query);
+
+    /**
+     * 部门绩效统计
+     * @param query
+     * @return
+     */
+    void doSaveDeptPerformStat(StaffCheckSummaryQuery query);
 }
\ No newline at end of file

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

@@ -35,4 +35,18 @@ public interface CheckGoworkRecordService extends ICRUDService<CheckGoworkRecord
      * @return
      */
     List<StaffCheckSummaryVo> summaryCheck(StaffCheckSummaryQuery query) throws AppException;
+
+    /**
+     * 个人绩效统计
+     * @param query
+     * @return
+     */
+    void doSaveStaffPerformStat(StaffCheckSummaryQuery query);
+
+    /**
+     * 部门绩效统计
+     * @param query
+     * @return
+     */
+    void doSaveDeptPerformStat(StaffCheckSummaryQuery query);
 }
\ No newline at end of file

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

@@ -35,4 +35,18 @@ public interface CheckOtherRecordService extends ICRUDService<CheckOtherRecordEn
      * @return
      */
     List<StaffCheckSummaryVo> summaryCheck(StaffCheckSummaryQuery query) throws AppException;
+
+    /**
+     * 个人绩效统计
+     * @param query
+     * @return
+     */
+    void doSaveStaffPerformStat(StaffCheckSummaryQuery query);
+
+    /**
+     * 部门绩效统计
+     * @param query
+     * @return
+     */
+    void doSaveDeptPerformStat(StaffCheckSummaryQuery query);
 }
\ No newline at end of file

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

@@ -35,4 +35,18 @@ public interface CheckReviewRecordService extends ICRUDService<CheckReviewRecord
      * @return
      */
     List<StaffCheckSummaryVo> summaryCheck(StaffCheckSummaryQuery query) throws AppException;
+
+    /**
+     * 个人绩效统计
+     * @param query
+     * @return
+     */
+    void doSaveStaffPerformStat(StaffCheckSummaryQuery query);
+
+    /**
+     * 部门绩效统计
+     * @param query
+     * @return
+     */
+    void doSaveDeptPerformStat(StaffCheckSummaryQuery query);
 }
\ No newline at end of file

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

@@ -18,4 +18,42 @@
         GROUP BY
             staffId,staffName,workNum,deptId,deptName,DATE_FORMAT(checkTime,'%Y-%m')
     </select>
+
+    <!-- 个人绩效统计 -->
+    <select id="getStaffPerformStat" parameterType="com.mortals.xhx.module.check.model.vo.StaffCheckSummaryQuery" resultType="com.mortals.xhx.module.staff.model.StaffPerformStatEntity">
+        SELECT
+        staffId,staffName,workNum,deptId,deptName,
+        DATE_FORMAT(checkTime,'%Y') as `year`,
+        DATE_FORMAT(checkTime,'%m') as `month`,
+        DATE_FORMAT(checkTime,'%d') as `day`,
+        SUM(CASE subAddType WHEN 1 THEN score ELSE 0 END) as attendScoreAdd,
+        SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as attendScoreSub
+        FROM
+        mortals_xhx_check_attend_record
+        WHERE checkStatus = 2
+        <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>
+        GROUP BY
+        staffId,staffName,workNum,deptId,deptName,DATE_FORMAT(checkTime,'%Y-%m-%d');
+    </select>
+
+    <!-- 部门绩效统计 -->
+    <select id="getDeptPerformStat" parameterType="com.mortals.xhx.module.check.model.vo.StaffCheckSummaryQuery" resultType="com.mortals.xhx.module.dept.model.DeptPerformStatEntity">
+        SELECT
+        deptId,deptName,
+        DATE_FORMAT(checkTime,'%Y') as `year`,
+        DATE_FORMAT(checkTime,'%m') as `month`,
+        DATE_FORMAT(checkTime,'%d') as `day`,
+        SUM(CASE subAddType WHEN 1 THEN score ELSE 0 END) as attendScoreAdd,
+        SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as attendScoreSub
+        FROM
+        mortals_xhx_check_attend_record
+        WHERE checkStatus = 2
+        <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>
+        GROUP BY
+        deptId,deptName,DATE_FORMAT(checkTime,'%Y-%m-%d');
+    </select>
 </mapper>
\ No newline at end of file

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

@@ -18,4 +18,42 @@
         GROUP BY
             staffId,staffName,workNum,deptId,deptName,DATE_FORMAT(checkTime,'%Y-%m')
     </select>
+
+    <!-- 个人绩效统计 -->
+    <select id="getStaffPerformStat" parameterType="com.mortals.xhx.module.check.model.vo.StaffCheckSummaryQuery" resultType="com.mortals.xhx.module.staff.model.StaffPerformStatEntity">
+        SELECT
+        staffId,staffName,workNum,deptId,deptName,
+        DATE_FORMAT(checkTime,'%Y') as `year`,
+        DATE_FORMAT(checkTime,'%m') as `month`,
+        DATE_FORMAT(checkTime,'%d') as `day`,
+        SUM(CASE subAddType WHEN 1 THEN score ELSE 0 END) as complainScoreAdd,
+        SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as complainScoreSub
+        FROM
+        mortals_xhx_check_complain_record
+        WHERE checkStatus = 2
+        <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>
+        GROUP BY
+        staffId,staffName,workNum,deptId,deptName,DATE_FORMAT(checkTime,'%Y-%m-%d');
+    </select>
+
+    <!-- 部门绩效统计 -->
+    <select id="getDeptPerformStat" parameterType="com.mortals.xhx.module.check.model.vo.StaffCheckSummaryQuery" resultType="com.mortals.xhx.module.dept.model.DeptPerformStatEntity">
+        SELECT
+        deptId,deptName,
+        DATE_FORMAT(checkTime,'%Y') as `year`,
+        DATE_FORMAT(checkTime,'%m') as `month`,
+        DATE_FORMAT(checkTime,'%d') as `day`,
+        SUM(CASE subAddType WHEN 1 THEN score ELSE 0 END) as complainScoreAdd,
+        SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as complainScoreSub
+        FROM
+        mortals_xhx_check_complain_record
+        WHERE checkStatus = 2
+        <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>
+        GROUP BY
+        deptId,deptName,DATE_FORMAT(checkTime,'%Y-%m-%d');
+    </select>
 </mapper>
\ No newline at end of file

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

@@ -18,4 +18,42 @@
         GROUP BY
             staffId,staffName,workNum,deptId,deptName,DATE_FORMAT(checkTime,'%Y-%m')
     </select>
+
+    <!-- 个人绩效统计 -->
+    <select id="getStaffPerformStat" parameterType="com.mortals.xhx.module.check.model.vo.StaffCheckSummaryQuery" resultType="com.mortals.xhx.module.staff.model.StaffPerformStatEntity">
+        SELECT
+        staffId,staffName,workNum,deptId,deptName,
+        DATE_FORMAT(checkTime,'%Y') as `year`,
+        DATE_FORMAT(checkTime,'%m') as `month`,
+        DATE_FORMAT(checkTime,'%d') as `day`,
+        SUM(CASE subAddType WHEN 1 THEN score ELSE 0 END) as effectScoreAdd,
+        SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as effectScoreSub
+        FROM
+        mortals_xhx_check_effect_record
+        WHERE checkStatus = 2
+        <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>
+        GROUP BY
+        staffId,staffName,workNum,deptId,deptName,DATE_FORMAT(checkTime,'%Y-%m-%d');
+    </select>
+
+    <!-- 部门绩效统计 -->
+    <select id="getDeptPerformStat" parameterType="com.mortals.xhx.module.check.model.vo.StaffCheckSummaryQuery" resultType="com.mortals.xhx.module.dept.model.DeptPerformStatEntity">
+        SELECT
+        deptId,deptName,
+        DATE_FORMAT(checkTime,'%Y') as `year`,
+        DATE_FORMAT(checkTime,'%m') as `month`,
+        DATE_FORMAT(checkTime,'%d') as `day`,
+        SUM(CASE subAddType WHEN 1 THEN score ELSE 0 END) as effectScoreAdd,
+        SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as effectScoreSub
+        FROM
+        mortals_xhx_check_effect_record
+        WHERE checkStatus = 2
+        <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>
+        GROUP BY
+        deptId,deptName,DATE_FORMAT(checkTime,'%Y-%m-%d');
+    </select>
 </mapper>
\ No newline at end of file

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

@@ -18,4 +18,42 @@
         GROUP BY
             staffId,staffName,workNum,deptId,deptName,DATE_FORMAT(checkTime,'%Y-%m')
     </select>
+
+    <!-- 个人绩效统计 -->
+    <select id="getStaffPerformStat" parameterType="com.mortals.xhx.module.check.model.vo.StaffCheckSummaryQuery" resultType="com.mortals.xhx.module.staff.model.StaffPerformStatEntity">
+        SELECT
+        staffId,staffName,workNum,deptId,deptName,
+        DATE_FORMAT(checkTime,'%Y') as `year`,
+        DATE_FORMAT(checkTime,'%m') as `month`,
+        DATE_FORMAT(checkTime,'%d') as `day`,
+        SUM(CASE subAddType WHEN 1 THEN score ELSE 0 END) as attendScoreAdd,
+        SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as attendScoreSub
+        FROM
+        mortals_xhx_check_gowork_record
+        WHERE checkStatus = 2
+        <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>
+        GROUP BY
+        staffId,staffName,workNum,deptId,deptName,DATE_FORMAT(checkTime,'%Y-%m-%d');
+    </select>
+
+    <!-- 部门绩效统计 -->
+    <select id="getDeptPerformStat" parameterType="com.mortals.xhx.module.check.model.vo.StaffCheckSummaryQuery" resultType="com.mortals.xhx.module.dept.model.DeptPerformStatEntity">
+        SELECT
+        deptId,deptName,
+        DATE_FORMAT(checkTime,'%Y') as `year`,
+        DATE_FORMAT(checkTime,'%m') as `month`,
+        DATE_FORMAT(checkTime,'%d') as `day`,
+        SUM(CASE subAddType WHEN 1 THEN score ELSE 0 END) as goworkScoreAdd,
+        SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as goworkScoreSub
+        FROM
+        mortals_xhx_check_gowork_record
+        WHERE checkStatus = 2
+        <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>
+        GROUP BY
+        deptId,deptName,DATE_FORMAT(checkTime,'%Y-%m-%d');
+    </select>
 </mapper>
\ No newline at end of file

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

@@ -18,4 +18,42 @@
         GROUP BY
             staffId,staffName,workNum,deptId,deptName,DATE_FORMAT(checkTime,'%Y-%m')
     </select>
+
+    <!-- 个人绩效统计 -->
+    <select id="getStaffPerformStat" parameterType="com.mortals.xhx.module.check.model.vo.StaffCheckSummaryQuery" resultType="com.mortals.xhx.module.staff.model.StaffPerformStatEntity">
+        SELECT
+        staffId,staffName,workNum,deptId,deptName,
+        DATE_FORMAT(checkTime,'%Y') as `year`,
+        DATE_FORMAT(checkTime,'%m') as `month`,
+        DATE_FORMAT(checkTime,'%d') as `day`,
+        SUM(CASE subAddType WHEN 1 THEN score ELSE 0 END) as otherScoreAdd,
+        SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as otherScoreSub
+        FROM
+        mortals_xhx_check_other_record
+        WHERE checkStatus = 2
+        <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>
+        GROUP BY
+        staffId,staffName,workNum,deptId,deptName,DATE_FORMAT(checkTime,'%Y-%m-%d');
+    </select>
+
+    <!-- 部门绩效统计 -->
+    <select id="getDeptPerformStat" parameterType="com.mortals.xhx.module.check.model.vo.StaffCheckSummaryQuery" resultType="com.mortals.xhx.module.dept.model.DeptPerformStatEntity">
+        SELECT
+        deptId,deptName,
+        DATE_FORMAT(checkTime,'%Y') as `year`,
+        DATE_FORMAT(checkTime,'%m') as `month`,
+        DATE_FORMAT(checkTime,'%d') as `day`,
+        SUM(CASE subAddType WHEN 1 THEN score ELSE 0 END) as otherScoreAdd,
+        SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as otherScoreSub
+        FROM
+        mortals_xhx_check_other_record
+        WHERE checkStatus = 2
+        <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>
+        GROUP BY
+        deptId,deptName,DATE_FORMAT(checkTime,'%Y-%m-%d');
+    </select>
 </mapper>
\ No newline at end of file

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

@@ -18,4 +18,42 @@
         GROUP BY
             staffId,staffName,workNum,deptId,deptName,DATE_FORMAT(checkTime,'%Y-%m')
     </select>
+
+    <!-- 个人绩效统计 -->
+    <select id="getStaffPerformStat" parameterType="com.mortals.xhx.module.check.model.vo.StaffCheckSummaryQuery" resultType="com.mortals.xhx.module.staff.model.StaffPerformStatEntity">
+        SELECT
+        staffId,staffName,workNum,deptId,deptName,
+        DATE_FORMAT(checkTime,'%Y') as `year`,
+        DATE_FORMAT(checkTime,'%m') as `month`,
+        DATE_FORMAT(checkTime,'%d') as `day`,
+        SUM(CASE subAddType WHEN 1 THEN score ELSE 0 END) as reviewScoreAdd,
+        SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as reviewScoreSub
+        FROM
+        mortals_xhx_check_review_record
+        WHERE checkStatus = 2
+        <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>
+        GROUP BY
+        staffId,staffName,workNum,deptId,deptName,DATE_FORMAT(checkTime,'%Y-%m-%d');
+    </select>
+
+    <!-- 部门绩效统计 -->
+    <select id="getDeptPerformStat" parameterType="com.mortals.xhx.module.check.model.vo.StaffCheckSummaryQuery" resultType="com.mortals.xhx.module.dept.model.DeptPerformStatEntity">
+        SELECT
+        deptId,deptName,
+        DATE_FORMAT(checkTime,'%Y') as `year`,
+        DATE_FORMAT(checkTime,'%m') as `month`,
+        DATE_FORMAT(checkTime,'%d') as `day`,
+        SUM(CASE subAddType WHEN 1 THEN score ELSE 0 END) as reviewScoreAdd,
+        SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as reviewScoreSub
+        FROM
+        mortals_xhx_check_review_record
+        WHERE checkStatus = 2
+        <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>
+        GROUP BY
+        deptId,deptName,DATE_FORMAT(checkTime,'%Y-%m-%d');
+    </select>
 </mapper>
\ No newline at end of file