Commit db8f2197 authored by wujiang's avatar wujiang

修改并网产生两个

parent 3f3154ab
...@@ -87,18 +87,15 @@ public class BasicGridAcceptanceServiceImpl ...@@ -87,18 +87,15 @@ public class BasicGridAcceptanceServiceImpl
return pageNew; return pageNew;
} }
public HygfOnGrid saveEntity(HygfOnGrid grid) { public synchronized HygfOnGrid saveEntity(HygfOnGrid grid) {
if (grid.getSequenceNbr() != null) { LambdaQueryWrapper<HygfOnGrid> hog = new LambdaQueryWrapper<>();
onGridMapper.updateById(grid); hog.eq(HygfOnGrid::getPeasantHouseholdId, grid.getPeasantHouseholdId());
} else { hygfOnGridServiceImpl.saveOrUpdate(grid,hog);
onGridMapper.insert(grid);
}
return grid; return grid;
} }
@GlobalTransactional @GlobalTransactional
public HygfOnGrid saveAndCommit(HygfOnGrid grid, String userId) { public synchronized HygfOnGrid saveAndCommit(HygfOnGrid grid, String userId) {
BasicGridAcceptance basicGridAcceptance = basicGridAcceptanceMapper BasicGridAcceptance basicGridAcceptance = basicGridAcceptanceMapper
.selectOne(new LambdaQueryWrapper<BasicGridAcceptance>() .selectOne(new LambdaQueryWrapper<BasicGridAcceptance>()
......
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