Merge branch 'refs/heads/dev_2026-03-23'

This commit is contained in:
Gjm
2026-04-09 11:00:35 +08:00
2 changed files with 1253 additions and 63 deletions

View File

@@ -35,27 +35,27 @@ public class GrNhServiceImpl extends ServiceImpl<GrNhMapper, GrNhEntity> impleme
@Override @Override
@DSTransactional @DSTransactional
public Integer deltetNH(GrNhEntity grNhEntity) { public Integer deltetNH(GrNhEntity grNhEntity) {
GrNhEntity old = baseMapper.selectOne(new Wrapper<GrNhEntity>() { // GrNhEntity old = baseMapper.selectOne(new Wrapper<GrNhEntity>() {
@Override // @Override
public GrNhEntity getEntity() { // public GrNhEntity getEntity() {
return null; // return null;
} // }
//
@Override // @Override
public MergeSegments getExpression() { // public MergeSegments getExpression() {
return null; // return null;
} // }
//
@Override // @Override
public void clear() { // public void clear() {
//
} // }
//
@Override // @Override
public String getSqlSegment() { // public String getSqlSegment() {
return ""; // return "";
} // }
}).setAddTime(new Date()); // }).setAddTime(new Date());
int re = this.baseMapper.deltetNH(lideeYunJiBaseConstant.DS_ERP_BI_DATA, grNhEntity); int re = this.baseMapper.deltetNH(lideeYunJiBaseConstant.DS_ERP_BI_DATA, grNhEntity);
return re; return re;
} }
@@ -65,27 +65,27 @@ public class GrNhServiceImpl extends ServiceImpl<GrNhMapper, GrNhEntity> impleme
@Override @Override
@DSTransactional @DSTransactional
public Integer saveNH(GrNhEntity grNhEntity) { public Integer saveNH(GrNhEntity grNhEntity) {
GrNhEntity old = baseMapper.selectOne(new Wrapper<GrNhEntity>() { // GrNhEntity old = baseMapper.selectOne(new Wrapper<GrNhEntity>() {
@Override // @Override
public GrNhEntity getEntity() { // public GrNhEntity getEntity() {
return null; // return null;
} // }
//
@Override // @Override
public MergeSegments getExpression() { // public MergeSegments getExpression() {
return null; // return null;
} // }
//
@Override // @Override
public void clear() { // public void clear() {
//
} // }
//
@Override // @Override
public String getSqlSegment() { // public String getSqlSegment() {
return ""; // return "";
} // }
}).setAddTime(new Date()); // }).setAddTime(new Date());
int re = this.baseMapper.save(lideeYunJiBaseConstant.DS_ERP_BI_DATA, grNhEntity); int re = this.baseMapper.save(lideeYunJiBaseConstant.DS_ERP_BI_DATA, grNhEntity);
return re; return re;
} }

File diff suppressed because one or more lines are too long