Merge remote-tracking branch 'origin/master'

# Conflicts:
#	attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckAllRecordMapper.xml

attendance-performance-manager/src/main/java/com/mortals/xhx/common/code/CheckTypeEnum.java

@@ -4,7 +4,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 /***
- * 核查类型枚举(1.考勤绩效,2.效能绩效,3.评价绩效,4.办件绩效,5.评价差评绩效,6.其它绩效)
+ * 核查类型枚举(1.考勤绩效,2.评价绩效,3.办件绩效,4.效能绩效,5.其它绩效,6.投诉绩效)
  */
 public enum CheckTypeEnum {
     考勤绩效(1, "考勤绩效"),
@@ -12,6 +12,7 @@ public enum CheckTypeEnum {
     办件绩效(3, "办件绩效"),
     效能绩效(4, "效能绩效"),
     其它绩效(5, "其它绩效"),
+    投诉绩效(6, "投诉绩效"),
     ;
     private Integer value;
     private String desc;

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

@@ -4,7 +4,7 @@
 <mapper namespace="com.mortals.xhx.module.check.dao.ibatis.CheckAllRecordDaoImpl">
 
     <select id="getList" parameterType="com.mortals.xhx.module.check.model.CheckAllRecordQuery" resultType="com.mortals.xhx.module.check.model.vo.CheckAllRecordVo">
-        SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,subAddType,score,subMethod,checkTime,createTime AS deductTime,1 AS checkType ,'attend' AS performType FROM mortals_xhx_check_attend_record WHERE 1=1
+        SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,subAddType,score,subMethod,checkTime,createTime AS deductTime,1 AS checkType FROM mortals_xhx_check_attend_record WHERE 1=1
         <if test="checkStatus != null and checkStatus!=''"> AND checkStatus = #{checkStatus} </if>
         <if test="subMethod != null and subMethod!=''"> AND subMethod = #{subMethod} </if>
         <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
@@ -12,7 +12,7 @@
         <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>
         <if test="createUserId != null and createUserId!=''"> AND createUserId = #{createUserId} </if>
         UNION
-        SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,2 AS subAddType,score,subMethod,checkTime,createTime AS deductTime,2 AS checkType,'effect' AS performType FROM mortals_xhx_check_effect_record WHERE 1=1
+        SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,2 AS subAddType,score,subMethod,checkTime,createTime AS deductTime,4 AS checkType FROM mortals_xhx_check_effect_record WHERE 1=1
         <if test="checkStatus != null and checkStatus!=''"> AND checkStatus = #{checkStatus} </if>
         <if test="subMethod != null and subMethod!=''"> AND subMethod = #{subMethod} </if>
         <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
@@ -20,7 +20,7 @@
         <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>
         <if test="createUserId != null and createUserId!=''"> AND createUserId = #{createUserId} </if>
         UNION
-        SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,2 AS subAddType,score,subMethod,checkTime,createTime AS deductTime,3 AS checkType ,'complain' AS performType FROM mortals_xhx_check_complain_record WHERE 1=1
+        SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,2 AS subAddType,score,subMethod,checkTime,createTime AS deductTime,6 AS checkType FROM mortals_xhx_check_complain_record WHERE 1=1
         <if test="checkStatus != null and checkStatus!=''"> AND checkStatus = #{checkStatus} </if>
         <if test="subMethod != null and subMethod!=''"> AND subMethod = #{subMethod} </if>
         <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
@@ -28,7 +28,7 @@
         <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>
         <if test="createUserId != null and createUserId!=''"> AND createUserId = #{createUserId} </if>
         UNION
-        SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,2 AS subAddType,score,subMethod,checkTime,createTime AS deductTime,4 AS checkType ,'gowork' AS performType FROM mortals_xhx_check_gowork_record WHERE 1=1
+        SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,2 AS subAddType,score,subMethod,checkTime,createTime AS deductTime,3 AS checkType FROM mortals_xhx_check_gowork_record WHERE 1=1
         <if test="checkStatus != null and checkStatus!=''"> AND checkStatus = #{checkStatus} </if>
         <if test="subMethod != null and subMethod!=''"> AND subMethod = #{subMethod} </if>
         <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
@@ -36,7 +36,7 @@
         <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>
         <if test="createUserId != null and createUserId!=''"> AND createUserId = #{createUserId} </if>
         UNION
-        SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,2 AS subAddType,score,subMethod,checkTime,createTime AS deductTime,5 AS checkType ,'review' AS performType FROM mortals_xhx_check_review_record WHERE 1=1
+        SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,2 AS subAddType,score,subMethod,checkTime,createTime AS deductTime,2 AS checkType FROM mortals_xhx_check_review_record WHERE 1=1
         <if test="checkStatus != null and checkStatus!=''"> AND checkStatus = #{checkStatus} </if>
         <if test="subMethod != null and subMethod!=''"> AND subMethod = #{subMethod} </if>
         <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
@@ -44,7 +44,7 @@
         <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>
         <if test="createUserId != null and createUserId!=''"> AND createUserId = #{createUserId} </if>
         UNION
-        SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,2 AS subAddType,score,subMethod,checkTime,createTime AS deductTime,6 AS checkType ,'other' AS performType FROM mortals_xhx_check_other_record WHERE 1=1
+        SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,2 AS subAddType,score,subMethod,checkTime,createTime AS deductTime,5 AS checkType FROM mortals_xhx_check_other_record WHERE 1=1
         <if test="checkStatus != null and checkStatus!=''"> AND checkStatus = #{checkStatus} </if>
         <if test="subMethod != null and subMethod!=''"> AND subMethod = #{subMethod} </if>
         <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>