Merge remote-tracking branch 'origin/master'

attendance-performance-manager-ui/admin/src/views/staff/list.vue

@@ -269,7 +269,7 @@ export default {
 
     handleNodeClick(node) {
       this.currentNode = node;
-      this.query = Object.assign({}, { deptId: node.id }, this.query);
+      this.query = Object.assign({}, this.query, { deptId: node.id });
       this.getData();
     },
     doExport() {

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

@@ -5,7 +5,7 @@
     <!-- 汇总已审核的核查记录 -->
     <select id="getSummaryCheckList" parameterType="com.mortals.xhx.module.check.model.vo.StaffCheckSummaryQuery" resultType="com.mortals.xhx.module.check.model.vo.StaffCheckSummaryVo">
         SELECT
-            staffId,staffName,workNum,deptId,deptName,
+            staffId,staffName,workNum,salaId,salaName,deptId,deptName,
             ANY_VALUE(DATE_FORMAT(checkTime,'%Y')) as `year`,
             ANY_VALUE(DATE_FORMAT(checkTime,'%m')) as `month`,
             SUM(CASE subAddType WHEN 1 THEN score ELSE score*-1 END) as sumScore
@@ -16,13 +16,13 @@
         <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')
+            staffId,staffName,workNum,salaId,salaName,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,
+        staffId,staffName,workNum,salaId,salaName,deptId,deptName,
         ANY_VALUE(DATE_FORMAT(checkTime,'%Y')) as `year`,
         ANY_VALUE(DATE_FORMAT(checkTime,'%m')) as `month`,
         ANY_VALUE(DATE_FORMAT(checkTime,'%d')) as `day`,
@@ -35,7 +35,7 @@
         <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')
+        staffId,staffName,workNum,salaId,salaName,deptId,deptName,DATE_FORMAT(checkTime,'%Y-%m-%d')
     </select>
 
     <!-- 部门绩效统计 -->

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

@@ -5,7 +5,7 @@
     <!-- 汇总已审核的核查记录 -->
     <select id="getSummaryCheckList" parameterType="com.mortals.xhx.module.check.model.vo.StaffCheckSummaryQuery" resultType="com.mortals.xhx.module.check.model.vo.StaffCheckSummaryVo">
         SELECT
-            staffId,staffName,workNum,deptId,deptName,
+            staffId,staffName,workNum,salaId,salaName,deptId,deptName,
             ANY_VALUE(DATE_FORMAT(checkTime,'%Y')) as `year`,
             ANY_VALUE(DATE_FORMAT(checkTime,'%m')) as `month`,
             SUM(CASE subAddType WHEN 1 THEN score ELSE score*-1 END) as sumScore
@@ -16,13 +16,13 @@
         <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')
+            staffId,staffName,workNum,salaId,salaName,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,
+        staffId,staffName,workNum,salaId,salaName,deptId,deptName,
         ANY_VALUE(DATE_FORMAT(checkTime,'%Y')) as `year`,
         ANY_VALUE(DATE_FORMAT(checkTime,'%m')) as `month`,
         ANY_VALUE(DATE_FORMAT(checkTime,'%d')) as `day`,
@@ -35,7 +35,7 @@
         <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');
+        staffId,staffName,workNum,salaId,salaName,deptId,deptName,DATE_FORMAT(checkTime,'%Y-%m-%d');
     </select>
 
     <!-- 部门绩效统计 -->

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

@@ -5,7 +5,7 @@
     <!-- 汇总已审核的核查记录 -->
     <select id="getSummaryCheckList" parameterType="com.mortals.xhx.module.check.model.vo.StaffCheckSummaryQuery" resultType="com.mortals.xhx.module.check.model.vo.StaffCheckSummaryVo">
         SELECT
-            staffId,staffName,workNum,deptId,deptName,
+            staffId,staffName,workNum,salaId,salaName,deptId,deptName,
             ANY_VALUE(DATE_FORMAT(checkTime,'%Y')) as `year`,
             ANY_VALUE(DATE_FORMAT(checkTime,'%m')) as `month`,
             SUM(CASE subAddType WHEN 1 THEN score ELSE score*-1 END) as sumScore
@@ -16,13 +16,13 @@
         <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')
+            staffId,staffName,workNum,salaId,salaName,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,
+        staffId,staffName,workNum,salaId,salaName,deptId,deptName,
         ANY_VALUE(DATE_FORMAT(checkTime,'%Y')) as `year`,
         ANY_VALUE(DATE_FORMAT(checkTime,'%m')) as `month`,
         ANY_VALUE(DATE_FORMAT(checkTime,'%d')) as `day`,
@@ -35,7 +35,7 @@
         <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');
+        staffId,staffName,workNum,salaId,salaName,deptId,deptName,DATE_FORMAT(checkTime,'%Y-%m-%d');
     </select>
 
     <!-- 部门绩效统计 -->

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

@@ -5,7 +5,7 @@
     <!-- 汇总已审核的核查记录 -->
     <select id="getSummaryCheckList" parameterType="com.mortals.xhx.module.check.model.vo.StaffCheckSummaryQuery" resultType="com.mortals.xhx.module.check.model.vo.StaffCheckSummaryVo">
         SELECT
-            staffId,staffName,workNum,deptId,deptName,
+            staffId,staffName,workNum,salaId,salaName,deptId,deptName,
             ANY_VALUE(DATE_FORMAT(checkTime,'%Y')) as `year`,
             ANY_VALUE(DATE_FORMAT(checkTime,'%m')) as `month`,
             SUM(CASE subAddType WHEN 1 THEN score ELSE score*-1 END) as sumScore
@@ -16,13 +16,13 @@
         <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')
+            staffId,staffName,workNum,salaId,salaName,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,
+        staffId,staffName,workNum,salaId,salaName,deptId,deptName,
         ANY_VALUE(DATE_FORMAT(checkTime,'%Y')) as `year`,
         ANY_VALUE(DATE_FORMAT(checkTime,'%m')) as `month`,
         ANY_VALUE(DATE_FORMAT(checkTime,'%d')) as `day`,
@@ -35,7 +35,7 @@
         <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');
+        staffId,staffName,workNum,salaId,salaName,deptId,deptName,DATE_FORMAT(checkTime,'%Y-%m-%d');
     </select>
 
     <!-- 部门绩效统计 -->

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

@@ -5,7 +5,7 @@
     <!-- 汇总已审核的核查记录 -->
     <select id="getSummaryCheckList" parameterType="com.mortals.xhx.module.check.model.vo.StaffCheckSummaryQuery" resultType="com.mortals.xhx.module.check.model.vo.StaffCheckSummaryVo">
         SELECT
-            staffId,staffName,workNum,deptId,deptName,
+            staffId,staffName,workNum,salaId,salaName,deptId,deptName,
             ANY_VALUE(DATE_FORMAT(checkTime,'%Y')) as `year`,
             ANY_VALUE(DATE_FORMAT(checkTime,'%m')) as `month`,
             SUM(CASE subAddType WHEN 1 THEN score ELSE score*-1 END) as sumScore
@@ -16,13 +16,13 @@
         <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')
+            staffId,staffName,workNum,salaId,salaName,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,
+        staffId,staffName,workNum,salaId,salaName,deptId,deptName,
         ANY_VALUE(DATE_FORMAT(checkTime,'%Y')) as `year`,
         ANY_VALUE(DATE_FORMAT(checkTime,'%m')) as `month`,
         ANY_VALUE(DATE_FORMAT(checkTime,'%d')) as `day`,
@@ -35,7 +35,7 @@
         <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');
+        staffId,staffName,workNum,salaId,salaName,deptId,deptName,DATE_FORMAT(checkTime,'%Y-%m-%d');
     </select>
 
     <!-- 部门绩效统计 -->

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

@@ -5,7 +5,7 @@
     <!-- 汇总已审核的核查记录 -->
     <select id="getSummaryCheckList" parameterType="com.mortals.xhx.module.check.model.vo.StaffCheckSummaryQuery" resultType="com.mortals.xhx.module.check.model.vo.StaffCheckSummaryVo">
         SELECT
-            staffId,staffName,workNum,deptId,deptName,
+            staffId,staffName,workNum,salaId,salaName,deptId,deptName,
             ANY_VALUE(DATE_FORMAT(checkTime,'%Y')) as `year`,
             ANY_VALUE(DATE_FORMAT(checkTime,'%m')) as `month`,
             SUM(CASE subAddType WHEN 1 THEN score ELSE score*-1 END) as sumScore
@@ -16,13 +16,13 @@
         <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')
+            staffId,staffName,workNum,salaId,salaName,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,
+        staffId,staffName,workNum,salaId,salaName,deptId,deptName,
         ANY_VALUE(DATE_FORMAT(checkTime,'%Y')) as `year`,
         ANY_VALUE(DATE_FORMAT(checkTime,'%m')) as `month`,
         ANY_VALUE(DATE_FORMAT(checkTime,'%d')) as `day`,
@@ -35,7 +35,7 @@
         <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');
+        staffId,staffName,workNum,salaId,salaName,deptId,deptName,DATE_FORMAT(checkTime,'%Y-%m-%d');
     </select>
 
     <!-- 部门绩效统计 -->