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 d51949c..cfdc25a 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 @@ -233,6 +233,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 095382a..650146a 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) @@ -146,6 +147,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 9f100d7..335b2d5 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 @@ -13,6 +13,7 @@ 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 6ac33e2..c3b4deb 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 @@ -56,5 +56,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 381e8c2..8ca1514 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 @@ -17,6 +17,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 @@ -170,4 +172,26 @@ public class ImprovementProposalServiceImpl extends ServiceImpl