From 4734033048dbe2348bd35def316bff2d8a037f4e Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Tue, 29 Aug 2023 11:14:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ProjectRxswinEOController.java | 7 +- .../project/entity/ProjectRxswinEO.java | 12 +- .../project/entity/ProjectRxswinEOEn.java | 108 ++++++++++++++++++ .../service/IProjectRxswinEOService.java | 6 +- .../impl/ProjectRxswinEOServiceImpl.java | 57 ++++++++- 5 files changed, 176 insertions(+), 14 deletions(-) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRxswinEOEn.java diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRxswinEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRxswinEOController.java index f2d5e03bc..432eb0e1d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRxswinEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRxswinEOController.java @@ -7,6 +7,7 @@ import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.query.QueryGenerator; +import com.jero.common.util.PageUtil; import com.jero.modules.project.entity.ProjectLibraryBase; import com.jero.modules.project.entity.ProjectRxswinEO; import com.jero.modules.project.service.IProjectRxswinEOService; @@ -63,8 +64,9 @@ public class ProjectRxswinEOController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(projectRxswinEO, req.getParameterMap()); - IPage pageList = projectRxswinEOService.getPageInfo(pageNo,pageSize, projectRxswinEO); - return Result.OK(pageList); + List projectRxswinEOList = projectRxswinEOService.getPageInfo(projectRxswinEO); + Page pages = PageUtil.getPages(pageNo, pageSize, projectRxswinEOList); + return Result.OK(pages); } /** @@ -161,6 +163,7 @@ public class ProjectRxswinEOController extends JeroController保存，1->提交）*/ - @Excel(name = "状态（0->保存，1->提交）", width = 15) @ApiModelProperty(value = "状态（0->保存，1->提交）") private java.lang.String state; @@ -93,9 +95,7 @@ public class ProjectRxswinEO implements Serializable { @ApiModelProperty(value = "中英文切换") private String cut; - @TableField(exist = false) - @ApiModelProperty(value = "编号") - private String serialNumber; + @TableField(exist = false) @ApiModelProperty(value = "表头排序字段") diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRxswinEOEn.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRxswinEOEn.java new file mode 100644 index 000000000..5d560ac66 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRxswinEOEn.java @@ -0,0 +1,108 @@ +package com.jero.modules.project.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; + + +/** + * @Description: rxswin表 + * @Author: jero-boot + * @Date: 2023-08-28 + * @Version: V1.0 + */ +@Data +@TableName("project_rxswin") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="project_rxswin对象", description="rxswin表") +public class ProjectRxswinEOEn implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private String id; + + /**创建人*/ + @ApiModelProperty(value = "创建人") + private String createBy; + + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + + /**更新人*/ + @ApiModelProperty(value = "更新人") + private String updateBy; + + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private String sysOrgCode; + + /**项目id*/ + @ApiModelProperty(value = "项目id") + private String projectId; + + /**文档库id（编号）*/ + @ApiModelProperty(value = "文档库id（编号）") + private String documentId; + + @TableField(exist = false) + @ApiModelProperty(value = "编号") + @Excel(name = "No.", width = 15) + private String serialNumber; + + /**主题*/ + @Excel(name = "Theme", width = 15) + @ApiModelProperty(value = "主题") + private String theme; + + /**RXSWIN*/ + @Excel(name = "RXSWIN", width = 15) + @ApiModelProperty(value = "RXSWIN") + private String rxswin; + + /**版本*/ + @Excel(name = "Corresponding version", width = 15) + @ApiModelProperty(value = "版本") + private String version; + + /**状态（0->保存，1->提交）*/ + @ApiModelProperty(value = "状态（0->保存，1->提交）") + private String state; + + @TableField(exist = false) + @ApiModelProperty(value = "中英文切换") + private String cut; + + + + @TableField(exist = false) + @ApiModelProperty(value = "表头排序字段") + private String orderByField; + + @TableField(exist = false) + @ApiModelProperty(value = "排序") + private String orderBy; + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRxswinEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRxswinEOService.java index 13d9b1b03..1804ea89e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRxswinEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRxswinEOService.java @@ -4,7 +4,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.jero.modules.project.entity.ProjectLibraryBase; import com.jero.modules.project.entity.ProjectRxswinEO; +import org.springframework.web.servlet.ModelAndView; +import javax.servlet.http.HttpServletRequest; import java.util.List; /** @@ -62,7 +64,7 @@ public interface IProjectRxswinEOService extends IService { */ List queryList(); - Page getPageInfo(Integer pageNo,Integer pageSize,ProjectRxswinEO projectRxswinEO); + List getPageInfo(ProjectRxswinEO projectRxswinEO); /** * 调取--第一层 @@ -100,4 +102,6 @@ public interface IProjectRxswinEOService extends IService { void addBatch(String projectId,String ids,String flag); List getVersionList(String projectId); + + ModelAndView exportXls(HttpServletRequest request, ProjectRxswinEO projectRxswinEO); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java index 4ce068582..a222d0adf 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java @@ -7,6 +7,7 @@ import com.jero.common.constant.enums.CutEnum; import com.jero.common.exception.JeroBootException; import com.jero.common.system.vo.LoginUser; import com.jero.common.util.PageUtil; +import com.jero.common.util.oConvertUtils; import com.jero.modules.document.entity.BussDocumentLibraryEO; import com.jero.modules.document.service.impl.BussDocumentLibraryEOServiceImpl; import com.jero.modules.dummy.enums.OrderEnum; @@ -17,9 +18,12 @@ import com.jero.modules.project.mapper.ProjectRxswinEOMapper; import com.jero.modules.project.service.IProjectRxswinEOService; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.web.servlet.ModelAndView; +import javax.servlet.http.HttpServletRequest; import java.text.Collator; import java.util.Arrays; import java.util.Collections; @@ -132,7 +136,7 @@ public class ProjectRxswinEOServiceImpl extends ServiceImpl getPageInfo(Integer pageNo,Integer pageSize, ProjectRxswinEO projectRxswinEO) { + public List getPageInfo(ProjectRxswinEO projectRxswinEO) { LambdaQueryWrapper wrapper =new LambdaQueryWrapper<>(); if(StringUtils.isNotBlank(projectRxswinEO.getTheme())){ @@ -165,7 +169,7 @@ public class ProjectRxswinEOServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(ProjectRxswinEO::getId, Arrays.asList(ids.split(","))); + wrapper.in(ProjectRxswinEO::getId, Arrays.asList(ids.split(","))); List rxswinEOList = this.list(wrapper); for (ProjectRxswinEO projectRxswinEO : rxswinEOList) { projectRxswinEO.setId(UUID.randomUUID().toString().replaceAll("-","")); @@ -273,7 +277,7 @@ public class ProjectRxswinEOServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(ProjectRxswinEO::getId, Arrays.asList(ids.split(","))); + wrapper.in(ProjectRxswinEO::getId, Arrays.asList(ids.split(","))); List rxswinEOList = this.list(wrapper); //已存在的 @@ -320,7 +324,7 @@ public class ProjectRxswinEOServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(ProjectRxswinEO::getId, Arrays.asList(ids.split(","))); + wrapper.in(ProjectRxswinEO::getId, Arrays.asList(ids.split(","))); List rxswinEOList = this.list(wrapper); //已存在的 @@ -369,6 +373,49 @@ public class ProjectRxswinEOServiceImpl extends ServiceImpl pageList = getPageInfo(projectRxswinEO); + List exportList = null; + + // 过滤选中数据 + String selections = request.getParameter("selections"); + if (oConvertUtils.isNotEmpty(selections)) { + List selectionList = Arrays.asList(selections.split(",")); + exportList = pageList.stream().filter(e -> selectionList.contains(e.getId())).collect(Collectors.toList()); + } else { + exportList = pageList; + } + + // Step.3 AutoPoi 导出Excel + ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); +// if (CutEnum.CN.getValue().equals(projectRxswinEO.getCut())) { +// List dataList = new ArrayList<>(); +// for (ProjectRxswinEO projectRxswinEOTEmp : exportList) { +// OtaExportCnVO otaExportCnVO = new OtaExportCnVO(); +// BeanUtils.copyProperties(projectRxswinEOTEmp, otaExportCnVO); +// dataList.add(otaExportCnVO); +// } +// mv.addObject(NormalExcelConstants.CLASS, OtaExportCnVO.class); +// mv.addObject(NormalExcelConstants.DATA_LIST, dataList); +// ExportParams exportParams = new ExportParams("RXSWIN", null, "RXSWIN"); +// mv.addObject(NormalExcelConstants.PARAMS, exportParams); +// } else { +// List dataList = new ArrayList<>(); +// for (OtaManageApplyEO manageApplyEO : exportList) { +// OtaExportEnVO otaExportEnVO = new OtaExportEnVO(); +// BeanUtils.copyProperties(manageApplyEO, otaExportEnVO); +// dataList.add(otaExportEnVO); +// } +// mv.addObject(NormalExcelConstants.CLASS, OtaExportEnVO.class); +// mv.addObject(NormalExcelConstants.DATA_LIST, dataList); +// ExportParams exportParams = new ExportParams("RXSWIN", null, "RXSWIN"); +// mv.addObject(NormalExcelConstants.PARAMS, exportParams); +// } + return mv; + } + public List getBussDocumentLibraryEOList(List documentIdList){ LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>();