ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(企标稽查流程):79375

Browse Source
This commit is contained in:
yjz
2024-01-02 13:40:30 +08:00
parent 692d810c43
commit cad6f3f7df
1 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectReportServiceImpl.java
+19 -6
View File
@@ -3,6 +3,7 @@ package com.jero.modules.laws.enterprise.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.constant.enums.LanguageEnum; import com.jero.common.constant.enums.LanguageEnum;
@@ -163,8 +164,12 @@ public class EnterpriseStandardInspectReportServiceImpl extends ServiceImpl<Ente
// 稽查内容查询 // 稽查内容查询
EnterpriseStandardInspectContent enterpriseStandardInspectContent = enterpriseStandardInspectContentService.getById(enterpriseStandardInspectReport.getInspectContentId()); EnterpriseStandardInspectContent enterpriseStandardInspectContent = enterpriseStandardInspectContentService.getById(enterpriseStandardInspectReport.getInspectContentId());
if (!Objects.isNull(enterpriseStandardInspectContent)){ if (!Objects.isNull(enterpriseStandardInspectContent)){
enterpriseStandardInspectReport.setBaseClause(enterpriseStandardInspectContent.getClause()); if (StringUtils.isNotBlank(enterpriseStandardInspectContent.getClause())){
enterpriseStandardInspectReport.setStandardRequire(enterpriseStandardInspectContent.getRequirement()); enterpriseStandardInspectReport.setBaseClause(enterpriseStandardInspectContent.getClause());
}
if (StringUtils.isNotBlank(enterpriseStandardInspectContent.getRequirement())){
enterpriseStandardInspectReport.setStandardRequire(enterpriseStandardInspectContent.getRequirement());
}
} }
return enterpriseStandardInspectReport; return enterpriseStandardInspectReport;
} }
@@ -177,8 +182,12 @@ public class EnterpriseStandardInspectReportServiceImpl extends ServiceImpl<Ente
// 稽查内容查询 // 稽查内容查询
EnterpriseStandardInspectContent enterpriseStandardInspectContent = enterpriseStandardInspectContentService.getById(enterpriseStandardInspectReport.getInspectContentId()); EnterpriseStandardInspectContent enterpriseStandardInspectContent = enterpriseStandardInspectContentService.getById(enterpriseStandardInspectReport.getInspectContentId());
if (!Objects.isNull(enterpriseStandardInspectContent)){ if (!Objects.isNull(enterpriseStandardInspectContent)){
enterpriseStandardInspectReport.setBaseClause(enterpriseStandardInspectContent.getClause()); if (StringUtils.isNotBlank(enterpriseStandardInspectContent.getClause())){
enterpriseStandardInspectReport.setStandardRequire(enterpriseStandardInspectContent.getRequirement()); enterpriseStandardInspectReport.setBaseClause(enterpriseStandardInspectContent.getClause());
}
if (StringUtils.isNotBlank(enterpriseStandardInspectContent.getRequirement())){
enterpriseStandardInspectReport.setStandardRequire(enterpriseStandardInspectContent.getRequirement());
}
} }
return enterpriseStandardInspectReport; return enterpriseStandardInspectReport;
} }
@@ -195,8 +204,12 @@ public class EnterpriseStandardInspectReportServiceImpl extends ServiceImpl<Ente
if (Objects.isNull(enterpriseStandardInspectContent)){ if (Objects.isNull(enterpriseStandardInspectContent)){
continue; continue;
} }
enterpriseStandardInspectReport.setBaseClause(enterpriseStandardInspectContent.getClause()); if (StringUtils.isNotBlank(enterpriseStandardInspectContent.getClause())){
enterpriseStandardInspectReport.setStandardRequire(enterpriseStandardInspectContent.getRequirement()); enterpriseStandardInspectReport.setBaseClause(enterpriseStandardInspectContent.getClause());
}
if (StringUtils.isNotBlank(enterpriseStandardInspectContent.getRequirement())){
enterpriseStandardInspectReport.setStandardRequire(enterpriseStandardInspectContent.getRequirement());
}
} }
return list; return list;
} }