From af9ec149abd293dd97b6e869cec6f48dbae148a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=B7=91=E5=8B=A4?= <13326422+wang-shuqin98@user.noreply.gitee.com> Date: Mon, 27 Jul 2026 11:08:14 +0800 Subject: [PATCH] =?UTF-8?q?wsq-=E5=90=8E=E7=AB=AF-20260727-=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=8A=9F=E8=83=BD-=E6=94=B9=E5=96=84=E6=8F=90?= =?UTF-8?q?=E6=A1=88=E7=BC=96=E5=8F=B7=E6=9C=80=E6=96=B0=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ImprovementProposalController.java | 8 +++++++ .../entity/ImprovementProposal.java | 2 ++ .../mapper/ImprovementProposalMapper.java | 2 ++ .../mapper/xml/ImprovementProposalMapper.xml | 8 +++++++ .../service/IImprovementProposalService.java | 8 +++++++ .../impl/ImprovementProposalServiceImpl.java | 24 +++++++++++++++++++ 6 files changed, 52 insertions(+) diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/controller/ImprovementProposalController.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/controller/ImprovementProposalController.java index 66e7ca2..46bd949 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/controller/ImprovementProposalController.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/controller/ImprovementProposalController.java @@ -202,6 +202,14 @@ public class ImprovementProposalController { return Result.OK(improvementInstituteVoteList); } + @AutoLog(value = "improvement_proposal-获取年度最新提案编号序列") + @Operation(summary="获取年度最新提案编号序列") + @GetMapping(value = "/getLatestProposalSequence") + public Result getLatestProposalSequence(@RequestParam(name="year", required=true) Integer year) { + Integer sequence = improvementProposalService.getLatestProposalSequence(year); + return Result.OK("查询成功", sequence); + } + /** * 导出excel * diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/entity/ImprovementProposal.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/entity/ImprovementProposal.java index ba3569d..0727838 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/entity/ImprovementProposal.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/entity/ImprovementProposal.java @@ -74,6 +74,7 @@ public class ImprovementProposal implements Serializable { /**提案类别*/ @Excel(name = "提案类别", width = 15) @Schema(description = "提案类别") + @Dict(dicCode = "proposal_category") private String proposalCategory; /**问题描述*/ @Excel(name = "问题描述", width = 15) @@ -142,6 +143,7 @@ public class ImprovementProposal implements Serializable { /**业务展示状态*/ @Excel(name = "业务展示状态", width = 15) @Schema(description = "业务展示状态") + @Dict(dicCode = "bpm_status") private String bpmStatus; /**归档人ID*/ @Excel(name = "归档人ID", width = 15) diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/mapper/ImprovementProposalMapper.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/mapper/ImprovementProposalMapper.java index 167f101..d607042 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/mapper/ImprovementProposalMapper.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/mapper/ImprovementProposalMapper.java @@ -14,4 +14,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface ImprovementProposalMapper extends BaseMapper { + String selectLatestProposalNoByYear(@Param("year") Integer year); + } diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/mapper/xml/ImprovementProposalMapper.xml b/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/mapper/xml/ImprovementProposalMapper.xml index a54a5a9..f21cac3 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/mapper/xml/ImprovementProposalMapper.xml +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/mapper/xml/ImprovementProposalMapper.xml @@ -2,4 +2,12 @@ + + diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/service/IImprovementProposalService.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/service/IImprovementProposalService.java index 6ef7e75..2c73003 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/service/IImprovementProposalService.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/service/IImprovementProposalService.java @@ -47,5 +47,13 @@ public interface IImprovementProposalService extends IService idList); + + /** + * 获取指定年度最新提案编号中的XXXX部分 + * + * @param year 年份 + * @return XXXX的int值，如果没有记录返回0 + */ + public Integer getLatestProposalSequence(Integer year); } diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/service/impl/ImprovementProposalServiceImpl.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/service/impl/ImprovementProposalServiceImpl.java index 7e41be7..6901dce 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/service/impl/ImprovementProposalServiceImpl.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/service/impl/ImprovementProposalServiceImpl.java @@ -14,6 +14,8 @@ import org.springframework.transaction.annotation.Transactional; import java.io.Serializable; import java.util.List; import java.util.Collection; +import java.util.regex.Matcher; +import java.util.regex.Pattern; /** * @Description: improvement_proposal @@ -112,4 +114,26 @@ public class ImprovementProposalServiceImpl extends ServiceImpl