From b061776fb9e0e93cfae61fb832cb6ff29d63adde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Fri, 11 Oct 2024 15:02:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=AF=BC=E5=85=A5=E9=80=9A?= =?UTF-8?q?=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ni/entity/ProcessNewStandardImport.java | 2 +- .../xml/ProcessNewStandardImportMapper.xml | 4 +- .../impl/LawsImportInfoServiceImpl.java | 44 ++++++++++++++++--- 3 files changed, 41 insertions(+), 9 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/entity/ProcessNewStandardImport.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/entity/ProcessNewStandardImport.java index 7796a32b..fccbf946 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/entity/ProcessNewStandardImport.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/entity/ProcessNewStandardImport.java @@ -116,7 +116,7 @@ public class ProcessNewStandardImport implements Serializable { private String copyUser; /**通知发起人*/ @ApiModelProperty(value = "通知发起人") - @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username") + @Dict(dictTable = "sys_user", dicText = "CONCAT(realname,'(',username,')')", dicCode = "username") @Excel(name = "法规要求简要描述", width = 15,dictTable = "sys_user", dicText = "realname", dicCode = "username") private String createBy; /**实施日期*/ diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/mapper/xml/ProcessNewStandardImportMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/mapper/xml/ProcessNewStandardImportMapper.xml index f2784ba2..d4a53901 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/mapper/xml/ProcessNewStandardImportMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/mapper/xml/ProcessNewStandardImportMapper.xml @@ -15,9 +15,11 @@ diff --git a/laws-modules/src/main/java/com/jero/modules/laws/lead/service/impl/LawsImportInfoServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/lead/service/impl/LawsImportInfoServiceImpl.java index 3fd58c26..01bda886 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/lead/service/impl/LawsImportInfoServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/lead/service/impl/LawsImportInfoServiceImpl.java @@ -7,14 +7,14 @@ import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.query.QueryGenerator; import com.jero.modules.activiti.process.ni.entity.ProcessNewStandardImport; import com.jero.modules.activiti.process.ni.mapper.ProcessNewStandardImportMapper; -import com.jero.modules.activiti.process.ni.service.IProcessNewStandardImportService; import com.jero.modules.laws.lead.service.ILawsImportInfoService; -import com.jero.modules.laws.lead.vo.ProcessNewStandardImportExcel; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; import org.jeecgframework.poi.excel.entity.enmus.ExcelType; import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jetbrains.annotations.NotNull; import org.springframework.stereotype.Service; import org.springframework.web.servlet.ModelAndView; @@ -35,17 +35,47 @@ public class LawsImportInfoServiceImpl implements ILawsImportInfoService { @Override public IPage page(ProcessNewStandardImport processNewStandardImport, Integer pageNo, Integer pageSize, HttpServletRequest req) { + QueryWrapper queryWrapper = getProcessNewStandardImportQueryWrapper(processNewStandardImport, req); + Page page = new Page<>(pageNo, pageSize); + return processNewStandardImportMapper.queryByPage(page, queryWrapper); + } + + @NotNull + private QueryWrapper getProcessNewStandardImportQueryWrapper(ProcessNewStandardImport processNewStandardImport, HttpServletRequest req) { + String applicableMarket = ""; + if (!StringUtils.isEmpty(processNewStandardImport.getApplicableMarket())) { + applicableMarket = processNewStandardImport.getApplicableMarket(); + processNewStandardImport.setApplicableMarket(null); + } + String mainDeptProfMode = ""; + if (!StringUtils.isEmpty(processNewStandardImport.getMainDeptProfMode())) { + mainDeptProfMode = processNewStandardImport.getMainDeptProfMode(); + processNewStandardImport.setMainDeptProfMode(null); + } + String createBy = ""; + if (!StringUtils.isEmpty(processNewStandardImport.getCreateBy())) { + createBy = processNewStandardImport.getCreateBy(); + processNewStandardImport.setCreateBy(null); + } QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(processNewStandardImport, req.getParameterMap()); - Page page = new Page<>(pageNo, pageSize); - IPage re = processNewStandardImportMapper.queryByPage(page, queryWrapper); - return re; + queryWrapper.eq("p.del_flag", "0"); + queryWrapper.like(!StringUtils.isEmpty(processNewStandardImport.getStandardNumber()), + "p1.standard_number", processNewStandardImport.getStandardNumber()); + queryWrapper.like(!StringUtils.isEmpty(processNewStandardImport.getStandardName()), + "p1.standard_name", processNewStandardImport.getStandardName()); + queryWrapper.like(!StringUtils.isEmpty(applicableMarket), + "concat(',',p.applicable_market,',')", "," + applicableMarket + ","); + queryWrapper.like(!StringUtils.isEmpty(mainDeptProfMode), + "concat(',',p.main_dept_prof_mode,',')", "," + mainDeptProfMode + ","); + queryWrapper.like(!StringUtils.isEmpty(createBy), + "s1.realname", createBy); + return queryWrapper; } @Override public ModelAndView export(ProcessNewStandardImport processNewStandardImport, HttpServletRequest request) { - QueryWrapper queryWrapper = - QueryGenerator.initQueryWrapper(processNewStandardImport, request.getParameterMap()); + QueryWrapper queryWrapper = getProcessNewStandardImportQueryWrapper(processNewStandardImport, request); List re = processNewStandardImportMapper.queryByPage(queryWrapper); // Step.2 AutoPoi 导出Excel ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());