Commit 77bb7089 authored by eddie.woo's avatar eddie.woo

tb

parent 20ca08a2
...@@ -124,13 +124,13 @@ public class DataImportService extends BaseService { ...@@ -124,13 +124,13 @@ public class DataImportService extends BaseService {
private GlBalance getGlBalance(String code, List<GlBalance> seg3, List<GlBalance> seg4) { private GlBalance getGlBalance(String code, List<GlBalance> seg3, List<GlBalance> seg4) {
for (GlBalance balance : seg3) { for (GlBalance balance : seg3) {
if (StringUtils.equals(code, balance.getAttr3())) { if (StringUtils.equals(code, balance.getSegment3())) {
return balance; return balance;
} }
} }
for (GlBalance balance : seg4) { for (GlBalance balance : seg4) {
if (StringUtils.equals(code, balance.getAttr3())) { if (StringUtils.equals(code, balance.getSegment3())) {
return balance; return balance;
} }
} }
......
...@@ -72,9 +72,10 @@ public class LgGlBalanceService extends BaseService { ...@@ -72,9 +72,10 @@ public class LgGlBalanceService extends BaseService {
GlBalance glBalance = new GlBalance(); GlBalance glBalance = new GlBalance();
beanUtil.copyProperties(list.get(0), glBalance); beanUtil.copyProperties(list.get(0), glBalance);
glBalance.setPeriodName(period);
GlBalanceExample example = new GlBalanceExample(); GlBalanceExample example = new GlBalanceExample();
example.createCriteria().andSegment1EqualTo(glBalance.getSegment1()).andSegment3EqualTo(glBalance.getSegment3()) example.createCriteria().andSegment1EqualTo(glBalance.getSegment1()).andSegment3EqualTo(glBalance.getSegment3())
.andSegment4EqualTo(glBalance.getSegment4()).andPeriodNameEqualTo(glBalance.getPeriodName()); .andSegment4EqualTo(glBalance.getSegment4()).andPeriodNameEqualTo(period);
List<GlBalance> tmpList; List<GlBalance> tmpList;
if ((tmpList = glBalanceMapper.selectByExample(example)).size() > 0) { if ((tmpList = glBalanceMapper.selectByExample(example)).size() > 0) {
glBalance.setId(tmpList.get(0).getId()); glBalance.setId(tmpList.get(0).getId());
......
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