MVP1.2:项目薪资导入报账 按导入行号升序

yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/entity/TSalaryAccount.java

@@ -520,4 +520,7 @@ public class TSalaryAccount extends BaseEntity {
 	 */
 	@TableField(exist = false)
 	private String salaryMonthEnd;
+
+	@ExcelProperty(value = "导入行号")
+	private int rowIndex;
 }

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/SalaryUploadServiceImpl.java

@@ -886,11 +886,14 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 			}
 		}
 		TPauseSalary ps;
+		int  i =1;
 		for (TSalaryAccount account : aList) {
 			saiList = account.getSaiList();
 			account.setSaiList(null);
 			account.setSalaryFormId(salary.getId());
 			account.setOrderId(salary.getOrderId());
+			account.setRowIndex(i);
+			i++;
 			tSalaryAccountService.save(account);
 			money = SalaryConstants.B_ZERO;
 			for (TSalaryAccountItem item : saiList) {

yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryAccountMapper.xml

@@ -658,7 +658,7 @@
 				t_salary_account_hro_2021 a
 			</if>
 		where a.SALARY_FORM_ID = #{searchVo.salaryFormId}
-		ORDER BY a.CREATE_TIME desc
+		ORDER BY a.ROW_INDEX ASC
 	</select>
 
 	<!-- 计算收入需要的报账明细 -->