From 50a39809f7d163576d50701f02b8d89a4c2ae97a Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Sat, 2 Jul 2022 16:21:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=88=E6=8A=A5=E5=A1=AB=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LawsMonthlyReportWriteEOController.java | 47 ++++---- .../entity/LawsMonthlyReportWriteEO.java | 26 +++-- .../report/enums/ContentTemplateEnum.java | 2 +- .../modules/report/enums/ExportStateEnum.java | 48 +++++++++ .../ILawsMonthlyReportWriteEOService.java | 19 ++-- .../LawsMonthlyReportWriteEOServiceImpl.java | 100 ++++++++++++++++-- 6 files changed, 193 insertions(+), 49 deletions(-) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/enums/ExportStateEnum.java diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportWriteEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportWriteEOController.java index ea0dc4d54..aef3b081d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportWriteEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportWriteEOController.java @@ -1,25 +1,30 @@ package com.jero.modules.report.controller; -import java.util.Arrays; -import java.util.List; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.common.api.vo.Result; -import com.jero.common.system.query.QueryGenerator; +import com.jero.common.aspect.annotation.AutoLog; +import com.jero.common.system.base.controller.JeroController; import com.jero.modules.report.entity.LawsMonthlyReportWriteEO; import com.jero.modules.report.service.ILawsMonthlyReportWriteEOService; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.extern.slf4j.Slf4j; -import com.jero.common.system.base.controller.JeroController; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.servlet.ModelAndView; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import com.jero.common.aspect.annotation.AutoLog; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.servlet.ModelAndView; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; /** @@ -52,9 +57,7 @@ public class LawsMonthlyReportWriteEOController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(lawsMonthlyReportWriteEO, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = lawsMonthlyReportWriteEOService.getPageInfo(page, queryWrapper); + IPage pageList = lawsMonthlyReportWriteEOService.getPageInfo(lawsMonthlyReportWriteEO, pageNo,pageSize,req); return Result.OK(pageList); } @@ -136,12 +139,14 @@ public class LawsMonthlyReportWriteEOController extends JeroController queryById(@RequestParam(name="id",required=true) String id) { - LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO = lawsMonthlyReportWriteEOService.queryById(id); + public Result queryById(@RequestParam(name="id",required=true) String id,String cut) { + LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO = lawsMonthlyReportWriteEOService.queryById(id,cut); if(lawsMonthlyReportWriteEO==null) { return Result.error("未找到对应数据"); } - return Result.OK(lawsMonthlyReportWriteEO); + List lawsMonthlyReportWriteEOList = new ArrayList<>(); + lawsMonthlyReportWriteEOList.add(lawsMonthlyReportWriteEO); + return Result.OK(lawsMonthlyReportWriteEOList); } /** diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportWriteEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportWriteEO.java index c7b84b430..92462c36b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportWriteEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportWriteEO.java @@ -1,25 +1,21 @@ package com.jero.modules.report.entity; -import java.io.Serializable; -import java.io.UnsupportedEncodingException; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.List; - 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 lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; -import org.jeecgframework.poi.excel.annotation.Excel; import com.jero.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.List; /** @@ -99,24 +95,31 @@ public class LawsMonthlyReportWriteEO implements Serializable { @ApiModelProperty(value = "相关领域") private java.lang.String technologyTerritory; + @TableField(exist = false) + private java.lang.String technologyTerritoryName; + /**适用车型*/ @Excel(name = "适用车型", width = 15) @ApiModelProperty(value = "适用车型") + @Dict(dicCode ="car_type") private java.lang.String applyCar; /**适用范围*/ @Excel(name = "适用范围", width = 15) @ApiModelProperty(value = "适用范围") + @Dict(dicCode ="apply_scope") private java.lang.String applyScope; /**状态*/ @Excel(name = "状态", width = 15) @ApiModelProperty(value = "状态") + @Dict(dicCode = "state") private java.lang.String state; /**用法*/ @Excel(name = "用法", width = 15) @ApiModelProperty(value = "用法") + @Dict(dicCode ="yong4_fa3") private java.lang.String useMethod; /**实施车型*/ @@ -179,6 +182,9 @@ public class LawsMonthlyReportWriteEO implements Serializable { @ApiModelProperty(value = "导出状态") private java.lang.String exportState; + @TableField(exist = false) + private java.lang.String exportStateName; + //新征求意见清单模板 @TableField(exist = false) private List newOpinionTemplateEOList; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/enums/ContentTemplateEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/enums/ContentTemplateEnum.java index 26fa31c6d..7fb5ff88c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/enums/ContentTemplateEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/enums/ContentTemplateEnum.java @@ -7,7 +7,7 @@ package com.jero.modules.report.enums; * @auth zhn */ public enum ContentTemplateEnum { - DEFAULT_TEMPLATE("Content template","1"), + DEFAULT_TEMPLATE("默认模板","1"), NEW_REQUEST_LIST_TEMPLATE("新征求意见清单模板","2"), NEW_RELEASE_STANDARD_MANIFEST_TEMPLATE("新发布标准清单模板","3"); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/enums/ExportStateEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/enums/ExportStateEnum.java new file mode 100644 index 000000000..b4802d3f1 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/enums/ExportStateEnum.java @@ -0,0 +1,48 @@ +package com.jero.modules.report.enums; + + +/** + * @description + * @date 2022/1/21 15:22 + * @auth zhn + */ +public enum ExportStateEnum { + NOT_EXPORT("未导出","Not export","1"), + HAS_BEEN_EXPORT("已导出","Has been export","2"); + + + String name; + String nameEn; + String value; + + + + private ExportStateEnum(String name, String nameEn, String value) { + this.name = name; + this.nameEn = nameEn; + this.value = value; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + public String getNameEn() { + return nameEn; + } + + public void setNameEn(String nameEn) { + this.nameEn = nameEn; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/ILawsMonthlyReportWriteEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/ILawsMonthlyReportWriteEOService.java index 733f6d18f..82c461d68 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/ILawsMonthlyReportWriteEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/ILawsMonthlyReportWriteEOService.java @@ -1,10 +1,10 @@ package com.jero.modules.report.service; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.jero.modules.report.entity.LawsMonthlyReportWriteEO; import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.modules.report.entity.LawsMonthlyReportWriteEO; + +import javax.servlet.http.HttpServletRequest; import java.util.List; /** @@ -53,7 +53,7 @@ public interface ILawsMonthlyReportWriteEOService extends IService getPageInfo(Page page, QueryWrapper queryWrapper); + IPage getPageInfo(LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO, + Integer pageNo, + Integer pageSize, + HttpServletRequest req); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java index 5cd7e09cd..2377af0f0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java @@ -4,27 +4,31 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.constant.enums.CutEnum; +import com.jero.common.system.query.QueryGenerator; import com.jero.modules.report.entity.LawsMonthlyReportTitleTemplateEO; import com.jero.modules.report.entity.LawsMonthlyReportWriteEO; import com.jero.modules.report.entity.NewOpinionTemplateEO; import com.jero.modules.report.entity.NewStandardTemplateEO; import com.jero.modules.report.enums.ContentTemplateEnum; +import com.jero.modules.report.enums.ExportStateEnum; import com.jero.modules.report.mapper.LawsMonthlyReportWriteEOMapper; import com.jero.modules.report.service.ILawsMonthlyReportTitleTemplateEOService; import com.jero.modules.report.service.ILawsMonthlyReportWriteEOService; import com.jero.modules.report.service.INewOpinionTemplateEOService; import com.jero.modules.report.service.INewStandardTemplateEOService; +import com.jero.modules.system.entity.SysCategory; +import com.jero.modules.system.service.impl.SysCategoryServiceImpl; import com.jero.modules.system.util.StringUtils; -import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.List; -import java.util.Date; -import java.util.UUID; -import java.util.stream.Collectors; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import javax.servlet.http.HttpServletRequest; +import java.util.Arrays; +import java.util.Date; +import java.util.List; +import java.util.stream.Collectors; /** * @Description: 月报填写 @@ -41,6 +45,8 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl newStandardTemplateEOList = iNewStandardTemplateEOService.list(queryWrapper); lawsMonthlyReportWriteEO.setNewStandardTemplateEOList(newStandardTemplateEOList); } - return lawsMonthlyReportWriteEO; + //数据转换(章节目录,相关领域,导出状态) + dataTransition(cut, lawsMonthlyReportWriteEO); + return lawsMonthlyReportWriteEO; } - /** + private void dataTransition(String cut, LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO) { + //处理章节目录 + List lawsMonthlyReportTitleTemplateEOList = lawsMonthlyReportTitleTemplateEOService.list(); + if(StringUtils.isNotBlank(lawsMonthlyReportWriteEO.getMemoriesChapter())){ + List lawsMonthlyReportTitleTemplateEOS = lawsMonthlyReportTitleTemplateEOList.stream() + .filter(e -> lawsMonthlyReportWriteEO.getMemoriesChapter().equals(e.getId())).collect(Collectors.toList()); + if(CutEnum.CN.getValue().equals(cut) && lawsMonthlyReportTitleTemplateEOS.size() != 0){ + lawsMonthlyReportWriteEO.setMemoriesChapterName(lawsMonthlyReportTitleTemplateEOS.get(0).getTitleCn()); + }else if(CutEnum.EN.getValue().equals(cut) && lawsMonthlyReportTitleTemplateEOS.size() != 0){ + lawsMonthlyReportWriteEO.setMemoriesChapterName(lawsMonthlyReportTitleTemplateEOS.get(0).getTitleEn()); + } + } + //处理相关领域 + //树形结构数据字典(技术领域) + List categoryList = sysCategoryService.queryByTreeDicCode("technology_territory"); + String technologyTerritory = lawsMonthlyReportWriteEO.getTechnologyTerritory(); + if (StringUtils.isNotBlank(technologyTerritory)) { + List technologyTerritoryList = Arrays.asList(technologyTerritory.split(",")); + StringBuilder sb = new StringBuilder(); + for (String technologyTerritoryTemp : technologyTerritoryList) { + List collect = categoryList.stream().filter(e -> technologyTerritoryTemp.equals(e.getId())).collect(Collectors.toList()); + if (collect.size() != 0) { + sb.append(collect.get(0).getEnName() + ","); + } + } + if (StringUtils.isNotBlank(sb)) { + String technologyTerritoryName = sb.substring(0, sb.length() - 1); + lawsMonthlyReportWriteEO.setTechnologyTerritoryName(technologyTerritoryName); + } + } + //处理导出状态 + String exportState = lawsMonthlyReportWriteEO.getExportState(); + if(StringUtils.isNotBlank(exportState)){ + if(ExportStateEnum.NOT_EXPORT.getValue().equals(exportState)){ + if(CutEnum.CN.getValue().equals(cut)){ + lawsMonthlyReportWriteEO.setExportStateName(ExportStateEnum.NOT_EXPORT.getName()); + }else{ + lawsMonthlyReportWriteEO.setExportStateName(ExportStateEnum.NOT_EXPORT.getNameEn()); + } + }else if(ExportStateEnum.HAS_BEEN_EXPORT.getValue().equals(exportState)){ + if(CutEnum.CN.getValue().equals(cut)){ + lawsMonthlyReportWriteEO.setExportStateName(ExportStateEnum.HAS_BEEN_EXPORT.getName()); + }else{ + lawsMonthlyReportWriteEO.setExportStateName(ExportStateEnum.HAS_BEEN_EXPORT.getNameEn()); + } + } + } + } + + /** * 列表查询 * * @return @@ -165,7 +222,12 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl getPageInfo(Page page, QueryWrapper queryWrapper) { + public IPage getPageInfo(LawsMonthlyReportWriteEO lawsMonthlyReportWriteEOTemp, + Integer pageNo, + Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(lawsMonthlyReportWriteEOTemp, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); Page pageInfo = this.page(page, queryWrapper); //法规月报id List lawsMonthlyReportIdList = pageInfo.getRecords().stream().map(LawsMonthlyReportWriteEO::getId).collect(Collectors.toList()); @@ -206,6 +268,24 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl lawsMonthlyReportWriteEO.getId().equals(e.getLawsMonthlyReportWriteId())).collect(Collectors.toList()); lawsMonthlyReportWriteEO.setNewStandardTemplateEOList(collect); } + + //处理导出状态 + String exportState = lawsMonthlyReportWriteEO.getExportState(); + if(StringUtils.isNotBlank(exportState)){ + if(ExportStateEnum.NOT_EXPORT.getValue().equals(exportState)){ + if(CutEnum.CN.getValue().equals(lawsMonthlyReportWriteEOTemp.getCut())){ + lawsMonthlyReportWriteEO.setExportStateName(ExportStateEnum.NOT_EXPORT.getName()); + }else{ + lawsMonthlyReportWriteEO.setExportStateName(ExportStateEnum.NOT_EXPORT.getNameEn()); + } + }else if(ExportStateEnum.HAS_BEEN_EXPORT.getValue().equals(exportState)){ + if(CutEnum.CN.getValue().equals(lawsMonthlyReportWriteEOTemp.getCut())){ + lawsMonthlyReportWriteEO.setExportStateName(ExportStateEnum.HAS_BEEN_EXPORT.getName()); + }else{ + lawsMonthlyReportWriteEO.setExportStateName(ExportStateEnum.HAS_BEEN_EXPORT.getNameEn()); + } + } + } } return pageInfo; }