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

fix 81419 专项项目库-标准状态没有回显

Browse Source
This commit is contained in:
lijiarao
2024-02-01 11:28:00 +08:00
parent c34cc2ebb7
commit d97dbd0d12
6 changed files with 145 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsSpecialProjectLibraryServiceImpl.java
+25 -4
View File
@@ -1,16 +1,28 @@
package com.jero.modules.projectLibrary.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.jero.common.constant.CommonConstant;
import com.jero.modules.laws.standard.entity.LawsDomesticStandard;
import com.jero.modules.laws.standard.entity.LawsOverseasStandard;
import com.jero.modules.laws.standard.service.ILawsDomesticStandardService;
import com.jero.modules.laws.standard.service.ILawsOverseasStandardService;
import com.jero.modules.projectLibrary.entity.LawsSpecialProjectLibrary;
import com.jero.modules.projectLibrary.mapper.LawsSpecialProjectLibraryMapper;
import com.jero.modules.projectLibrary.service.ILawsSpecialProjectLibraryService;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.util.Strings;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.jero.common.exception.JeroBootException;
import java.util.Arrays;
import java.util.List;
import java.util.Date;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.system.query.QueryGenerator;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -25,7 +37,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@Service
@Transactional(rollbackFor = JeroBootException.class)
public class LawsSpecialProjectLibraryServiceImpl extends ServiceImpl<LawsSpecialProjectLibraryMapper, LawsSpecialProjectLibrary> implements ILawsSpecialProjectLibraryService {
@Autowired
private ILawsDomesticStandardService lawsDomesticStandardService; //国内标准
@Autowired
private ILawsOverseasStandardService lawsOverseasStandardService; //海外标准
@Resource
private LawsSpecialProjectLibraryMapper specialProjectLibraryMapper;
/**
* 分页查询
@@ -39,9 +56,13 @@ public class LawsSpecialProjectLibraryServiceImpl extends ServiceImpl<LawsSpecia
@Override
public IPage<LawsSpecialProjectLibrary> queryPage(LawsSpecialProjectLibrary lawsSpecialProjectLibrary, Integer pageNo, Integer pageSize,
HttpServletRequest req) {
QueryWrapper<LawsSpecialProjectLibrary> queryWrapper = QueryGenerator.initQueryWrapper(lawsSpecialProjectLibrary, req.getParameterMap());
Page<LawsSpecialProjectLibrary> page = new Page<>(pageNo, pageSize);
return page(page, queryWrapper);
String modelSeries = lawsSpecialProjectLibrary.getModelSeries();
if (StringUtils.isNotBlank(modelSeries)){
lawsSpecialProjectLibrary.setModelSeries(Strings.join(Arrays.asList(modelSeries.split(",")),'|'));
}
Page<LawsSpecialProjectLibrary> page = new Page<>(pageNo, pageSize);
Page<LawsSpecialProjectLibrary> pageList = specialProjectLibraryMapper.pageList(page, lawsSpecialProjectLibrary);
return pageList;
}
/**