西部信托，个人报表排序

resource/WEB-INF/prop/hrmSalary.properties

@@ -1,5 +1,5 @@
 log=false
 defaultCloseNonStandard149=true
 AESEncryptScrect=990EB004A1C862721C1513AE90038C9E
-version=3.0.2.2510.01s
+version=3.0.3.2510.01s
 openFormulaForcedEditing=false

resource/wiki/二开/xbxtSalaryReport.properties

@@ -1 +1,2 @@
-salaryItemIds=1695204436120,1695204436123,1695204436124,1695204436125,1695204436126,1695204436127,1695204436128,1695204436129,1695204436130,1695204436131,1695204436132,1695204436133,1695204436134,1695204436135,1695204436136,
+## salaryItemIds=1695204436120,1695204436123
+salaryItemIds=

src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml

@@ -746,7 +746,7 @@
                 #{salaryMonth}
             </foreach>
         </if>
-        ORDER BY id DESC
+        ORDER BY salary_month DESC
     </select>
     <select id="getNeedSendInfoList" resultType="com.engine.salary.entity.salaryBill.po.SalarySendInfoPO">
         select id,salary_send_id

src/com/engine/salary/report/wrapper/SalaryStatisticsEmployeeWrapper.java

@@ -414,6 +414,7 @@ public class SalaryStatisticsEmployeeWrapper extends Service {
                 .employeeIds(Collections.singletonList((long) user.getUID()))
                 .build();
         List<SalaryAcctEmployeePO> salaryAcctEmployeeList = getSalaryAcctEmployeeService(user).listByParam(salaryAcctEmployeeQueryParam);
+        salaryAcctEmployeeList = salaryAcctEmployeeList.stream().sorted((a,b)->-a.getSalaryMonth().compareTo(b.getSalaryMonth())).collect(Collectors.toList());
 
         // 获取薪资核算结果
         SalaryStatisticsEmployeeDetailResultDTO salaryStatisticsEmployeeDetailResult = getSalaryStatisticsEmployeeService(user).getDetailSalaryAcctResultByAcctEmp(salaryAcctEmployeeList);