Commit 2909e997 authored by hongguangwu's avatar hongguangwu

MVP1.6.2-工资原表识别-优化

parent 9b3c7542
...@@ -144,9 +144,9 @@ public class SalaryAccountUtil implements Serializable { ...@@ -144,9 +144,9 @@ public class SalaryAccountUtil implements Serializable {
BigDecimal phoneSubsidyMoney; BigDecimal phoneSubsidyMoney;
TSalaryAccountItem phoneSubsidyItem; TSalaryAccountItem phoneSubsidyItem;
// 基础的数据行,用于返回信息 // 基础的数据行,用于返回信息
int dataRow = 1; int dataRow = 2;
if (Common.isNotNull(vo.getDataNum())) { if (Common.isNotNull(vo.getDataNum())) {
dataRow += vo.getDataNum(); dataRow = 1 + vo.getDataNum();
} }
for (int i = 0; i < rows; i++) { for (int i = 0; i < rows; i++) {
annualBonusFlag = false; annualBonusFlag = false;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment