admin/gr_report_java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Gjm
2026-04-09 11:00:35 +08:00
parent 94bef88b74 0317f8596e
commit cecdafcace
2 changed files with 1253 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
lidee-core/src/main/java/com/lideeyunji/core/framework/service/impl/GrNhServiceImpl.java
View File

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

1232
sql/gzgl.sql
View File

File diff suppressed because one or more lines are too long