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 bce03ee..515fdae 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 @@ -140,9 +140,9 @@ public class ImprovementProposal implements Serializable { @Excel(name = "所级评议不同意票数", width = 15) @Schema(description = "所级评议不同意票数") private Integer instituteDisagreeCount; - /**所级评议结果:passed/failed*/ - @Excel(name = "所级评议结果:passed/failed", width = 15) - @Schema(description = "所级评议结果:passed/failed") + /**所级评议结果:通过/不通过*/ + @Excel(name = "所级评议结果:通过/不通过", width = 15) + @Schema(description = "所级评议结果:通过/不通过") private String instituteVoteResult; /**金奖未通过后的经办人手动确认结果*/ @Excel(name = "金奖未通过后的经办人手动确认结果", width = 15) 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 352889b..dadc51b 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 @@ -64,6 +64,8 @@ public class ImprovementProposalServiceImpl extends ServiceImpl= (long) totalVoters * 2 ? "passed" : "failed"; + String voteResult = agreeCount * 3 >= (long) totalVoters * 2 + ? INSTITUTE_VOTE_RESULT_PASSED + : INSTITUTE_VOTE_RESULT_FAILED; ImprovementProposal update = new ImprovementProposal(); update.setId(proposal.getId()); update.setInstituteAgreeCount((int) agreeCount); diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/vo/ImprovementProposalPage.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/vo/ImprovementProposalPage.java index 064a54a..47c01a5 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/vo/ImprovementProposalPage.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/vo/ImprovementProposalPage.java @@ -128,9 +128,9 @@ public class ImprovementProposalPage { @Excel(name = "所级评议不同意票数", width = 15) @Schema(description = "所级评议不同意票数") private Integer instituteDisagreeCount; - /**所级评议结果:passed/failed*/ - @Excel(name = "所级评议结果:passed/failed", width = 15) - @Schema(description = "所级评议结果:passed/failed") + /**所级评议结果:通过/不通过*/ + @Excel(name = "所级评议结果:通过/不通过", width = 15) + @Schema(description = "所级评议结果:通过/不通过") private String instituteVoteResult; /**金奖未通过后的经办人手动确认结果*/ @Excel(name = "金奖未通过后的经办人手动确认结果", width = 15)