Merge remote-tracking branch 'origin/master'

attendance-performance-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/StaffCheckSummaryService.java

@@ -106,8 +106,8 @@ public class StaffCheckSummaryService implements IApplicationStartedService {
                             if(query.getStaffId()!=null){
                                 condition.put("staffId",query.getStaffId());
                             }
-                            staffPerformSummaryService.getDao().update(staffPerformSummaryEntity,condition);
-
+                            //staffPerformSummaryService.getDao().update(staffPerformSummaryEntity,condition);
+                            staffPerformSummaryService.getDao().updateSumScore(condition);
                             if(query.getCheckType() == CheckTypeEnum.考勤绩效.getValue()){
                                 checkAttendRecordService.summaryCheck(query);
                             }

attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/dao/StaffPerformSummaryDao.java

@@ -3,6 +3,8 @@ package com.mortals.xhx.module.staff.dao;
 import com.mortals.framework.dao.ICRUDDao;
 import com.mortals.xhx.module.staff.model.StaffPerformSummaryEntity;
 import java.util.List;
+import java.util.Map;
+
 /**
 * 员工绩效统计Dao
 * 员工绩效统计 DAO接口
@@ -13,5 +15,5 @@ import java.util.List;
 
 public interface  StaffPerformSummaryDao extends ICRUDDao<StaffPerformSummaryEntity,Long>{
 
-
+    int updateSumScore(Map<String,Object> condition);
 }

attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/dao/ibatis/StaffPerformSummaryDaoImpl.java

@@ -7,6 +7,8 @@ import com.mortals.xhx.module.staff.model.StaffPerformSummaryEntity;
 import java.util.Date;
 import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
 import java.util.List;
+import java.util.Map;
+
 /**
 * 员工绩效统计DaoImpl DAO接口
 *
@@ -17,5 +19,8 @@ import java.util.List;
 public class StaffPerformSummaryDaoImpl extends BaseCRUDDaoMybatis<StaffPerformSummaryEntity,Long> implements StaffPerformSummaryDao {
 
 
-
+    @Override
+    public int updateSumScore(Map<String,Object> condition) {
+        return this.getSqlSession().update(this.getSqlId("updateSumScore"),condition);
+    }
 }

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "mybatis-3-mapper.dtd">
+<mapper namespace="com.mortals.xhx.module.staff.dao.ibatis.StaffPerformSummaryDaoImpl">
+
+    <update id="updateSumScore" parameterType="map">
+        update mortals_xhx_staff_perform_summary
+        set attendScore=0,reviewScore=0,complainScore=0,goworkScore=0,effectScore=0,otherScore=0,errorScore=0,totalScore=100,
+        sumScore = totalScore + addTotalScore,updateTime = NOW()
+        where 1 = 1
+        <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
+        <if test="year != null and year!=''"> AND `year` = #{year} </if>
+        <if test="month != null and month!=''"> AND `month` = #{month} </if>
+    </update>
+</mapper>
\ No newline at end of file