QR/laws_chery_serve
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

完善市场法规库清单导出

Browse Source
This commit is contained in:
梁琦涛
2024-07-04 20:30:28 +08:00
parent 9744cc9e56
commit eea8b0a278
2 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandardDetail.java
+1
View File
@@ -127,6 +127,7 @@ public class LawsMarketStandardDetail implements Serializable {
*/
@Excel(name = "国家/地区", width = 15,dicCode = "market_state")
@ApiModelProperty(value = "国家")
@Dict(dicCode = "market_state")
private String country;
/**
laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java
+21 -17
View File
@@ -27,6 +27,7 @@ import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.jetbrains.annotations.NotNull;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -77,8 +78,14 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
@Override
public IPage<LawsMarketStandard> queryPage(LawsMarketStandard marketStandard, Integer pageNo, Integer pageSize) {
QueryWrapper<LawsMarketStandard> queryWrapper = new QueryWrapper<>();
Page<LawsMarketStandard> page = new Page<>(pageNo, pageSize);
QueryWrapper<LawsMarketStandard> queryWrapper = getLawsMarketStandardQueryWrapper(marketStandard);
return marketStandardMapper.queryByPage(page, queryWrapper);
}
@NotNull
private QueryWrapper<LawsMarketStandard> getLawsMarketStandardQueryWrapper(LawsMarketStandard marketStandard) {
QueryWrapper<LawsMarketStandard> queryWrapper = new QueryWrapper<>();
queryWrapper.like(StringUtils.isNotBlank(marketStandard.getManifestNo()),
"ms.manifest_no", marketStandard.getManifestNo());
queryWrapper.like(StringUtils.isNotBlank(marketStandard.getManifestName()),
@@ -94,12 +101,21 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
}
});
}
queryWrapper.eq(StringUtils.isNotBlank(marketStandard.getDrivePosition()),
"ms.drive_position", marketStandard.getDrivePosition());
if (StringUtils.isNotBlank(marketStandard.getDrivePosition())) {
String[] str = marketStandard.getDrivePosition().split(",");
queryWrapper.and(i->{
for (int i1 = 0; i1 < str.length; i1++) {
i.like("ms.drive_position", str[i1]);
if(i1 != str.length - 1){
i.or();
}
}
});
}
queryWrapper.like(StringUtils.isNotBlank(marketStandard.getAuthor()),
"CONCAT(u.realname, '(', u.username, ')')", marketStandard.getAuthor());
queryWrapper.orderByDesc("ms.create_time");
return marketStandardMapper.queryByPage(page, queryWrapper);
return queryWrapper;
}
@Override
@@ -182,19 +198,7 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
@Override
public ModelAndView export(HttpServletResponse response, LawsMarketStandard marketStandard, String fileName, String sheetName, HttpServletRequest req) {
QueryWrapper<LawsMarketStandard> queryWrapper = new QueryWrapper<>();
queryWrapper.like(StringUtils.isNotBlank(marketStandard.getManifestNo()),
"ms.manifest_no", marketStandard.getManifestNo());
queryWrapper.like(StringUtils.isNotBlank(marketStandard.getManifestName()),
"ms.manifest_name", marketStandard.getManifestName());
if (StringUtils.isNotBlank(marketStandard.getCountry())) {
queryWrapper.in("ms.country", Arrays.asList(marketStandard.getCountry().split(",")));
}
queryWrapper.eq(StringUtils.isNotBlank(marketStandard.getDrivePosition()),
"ms.drive_position", marketStandard.getDrivePosition());
queryWrapper.like(StringUtils.isNotBlank(marketStandard.getAuthor()),
"CONCAT(u.realname, '(', u.username, ')')", marketStandard.getAuthor());
queryWrapper.orderByDesc("ms.create_time");
QueryWrapper<LawsMarketStandard> queryWrapper = getLawsMarketStandardQueryWrapper(marketStandard);
List<LawsMarketStandard> listLawsMarketStandard = marketStandardMapper.queryByPage(queryWrapper);
if(!CollectionUtils.isEmpty(listLawsMarketStandard)){
for (LawsMarketStandard lawsMarketStandard : listLawsMarketStandard) {