绩效汇总查询排序bug修改

attendance-performance-manager/src/main/java/com/mortals/xhx/module/window/service/impl/WindowWorkmanPerformServiceImpl.java

@@ -106,6 +106,8 @@ public class WindowWorkmanPerformServiceImpl extends AbstractCRUDServiceImpl<Win
                     item.setDeptName(staff.getDeptName());
                     item.setSalaId(staff.getSalaId());
                     item.setSalaName(staff.getSalaName());
+                    item.setYear(entity.getYear());
+                    item.setMonth(entity.getMonth());
                 }
             });
             windowWorkmanPerformDetailService.save(entity.getWorkmanPerformDetailList());
@@ -133,6 +135,8 @@ public class WindowWorkmanPerformServiceImpl extends AbstractCRUDServiceImpl<Win
                     item.setDeptName(staff.getDeptName());
                     item.setSalaId(staff.getSalaId());
                     item.setSalaName(staff.getSalaName());
+                    item.setYear(entity.getYear());
+                    item.setMonth(entity.getMonth());
                 }
             });
             windowWorkmanPerformDetailService.save(entity.getWorkmanPerformDetailList());

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

@@ -557,7 +557,13 @@
         <include refid="_orderColsNew_"/>
     </select>
     <sql id="_orderColsNew_">
-        order by CONVERT(a.salaName USING gbk),CONVERT(a.deptName USING gbk),CONVERT(a.staffName USING gbk)
+        order by
+        <if test="orderColList != null and !orderColList.isEmpty()">
+            <foreach collection="orderColList" open="" close="," index="index" item="item" separator=",">
+                a.${item.colName} ${item.sortKind}
+            </foreach>
+        </if>
+        CONVERT(a.salaName USING gbk),CONVERT(a.deptName USING gbk),CONVERT(a.staffName USING gbk)
     </sql>