|
@@ -1247,7 +1247,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
|
|
|
if (wbsTreeContractByP != null) {
|
|
|
//处理文件提名
|
|
|
String fileName = this.wbsParamService.createFileTitle(wbsTreeContractByP);
|
|
|
- if(wbsTreeContract.getMajorDataType()!=null&&wbsTreeContract.getMajorDataType()==4){
|
|
|
+ if(wbsTreeContractByP.getMajorDataType()!=null&&wbsTreeContractByP.getMajorDataType()==4){
|
|
|
String sql1="Select sg_suffix,jl_suffix from m_project_info where id="+wbsTreeContractByP.getProjectId()+" and is_deleted=0";
|
|
|
List<ProjectInfo> query = jdbcTemplate.query(sql1, new BeanPropertyRowMapper<>(ProjectInfo.class));
|
|
|
if(query.size()>0){
|
|
@@ -1294,7 +1294,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
|
|
|
.eq(WbsTreeContract::getId, wbsTreeContract.getParentId()).eq(WbsTreeContract::getContractId, wbsTreeContract.getContractId()));
|
|
|
//处理文件提名
|
|
|
fileName1= this.wbsParamService.createFileTitle(wbsTreeContractByP);
|
|
|
- if(wbsTreeContract.getMajorDataType()!=null&&wbsTreeContract.getMajorDataType()==4){
|
|
|
+ if(wbsTreeContractByP.getMajorDataType()!=null&&wbsTreeContractByP.getMajorDataType()==4){
|
|
|
String sql1="Select sg_suffix,jl_suffix from m_project_info where id="+wbsTreeContractByP.getProjectId()+" and is_deleted=0";
|
|
|
List<ProjectInfo> query = jdbcTemplate.query(sql1, new BeanPropertyRowMapper<>(ProjectInfo.class));
|
|
|
if(query.size()>0){
|