Merge remote-tracking branch 'origin/master'

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

@@ -23,7 +23,7 @@ public class AttendanceStatEntity extends AttendanceStatVo {
     /**
      * 窗口类别
      */
-    @Excel(name = "窗口类别")
+    //@Excel(name = "窗口类别")
     private String windowCategory;
     /**
      * 员工ID
@@ -34,6 +34,15 @@ public class AttendanceStatEntity extends AttendanceStatVo {
      */
     @Excel(name = "员工姓名")
     private String staffName;
+    /**
+     * 所属大厅
+     */
+    private Long salaId;
+    /**
+     * 所属大厅名称
+     */
+    @Excel(name = "所属大厅")
+    private String salaName;
     /**
      * 所属部门
      */
@@ -241,15 +250,7 @@ public class AttendanceStatEntity extends AttendanceStatVo {
      */
     @Excel(name = "陪产假")
     private BigDecimal paternityLeaveDays;
-    /**
-     * 所属大厅
-     */
-    private Long salaId;
-    /**
-     * 所属大厅名称
-     */
-    @Excel(name = "所属大厅")
-    private String salaName;
+
 
     @Override
     public int hashCode() {

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

@@ -64,10 +64,12 @@
             </foreach>
         </if>
         GROUP BY
-        s.staffId,
-        s.staffName,
+        s.salaId,
+        s.salaName,
         s.deptId,
         s.deptName,
+        s.staffId,
+        s.staffName,
         s.phoneNumer
         ) AS a
     </select>
@@ -133,10 +135,12 @@
             </foreach>
         </if>
         GROUP BY
-        s.staffId,
-        s.staffName,
+        s.salaId,
+        s.salaName,
         s.deptId,
         s.deptName,
+        s.staffId,
+        s.staffName,
         s.phoneNumer
         ) AS a
     </select>