sz-team/supervision-test-repo
17
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

yxk-20260729

Browse Source 
改善提案
所级评议结果：通过/不通过
This commit is contained in:
ye1023
2026-07-29 14:12:49 +08:00
parent 47bef7b81f
commit 526a4df4ff
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/entity/ImprovementProposal.java
+3 -3
View File
@@ -140,9 +140,9 @@ public class ImprovementProposal implements Serializable {
@Excel(name = "所级评议不同意票数", width = 15) @Excel(name = "所级评议不同意票数", width = 15)
@Schema(description = "所级评议不同意票数") @Schema(description = "所级评议不同意票数")
private Integer instituteDisagreeCount; private Integer instituteDisagreeCount;
/**所级评议结果：passed/failed*/ /**所级评议结果：通过/不通过*/
@Excel(name = "所级评议结果：passed/failed", width = 15) @Excel(name = "所级评议结果：通过/不通过", width = 15)
@Schema(description = "所级评议结果：passed/failed") @Schema(description = "所级评议结果：通过/不通过")
private String instituteVoteResult; private String instituteVoteResult;
/**金奖未通过后的经办人手动确认结果*/ /**金奖未通过后的经办人手动确认结果*/
@Excel(name = "金奖未通过后的经办人手动确认结果", width = 15) @Excel(name = "金奖未通过后的经办人手动确认结果", width = 15)
jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/service/impl/ImprovementProposalServiceImpl.java
+6 -2
View File
@@ -64,6 +64,8 @@ public class ImprovementProposalServiceImpl extends ServiceImpl<ImprovementPropo
private static final String AWARD_SILVER = "1"; private static final String AWARD_SILVER = "1";
private static final String AWARD_BRONZE = "2"; private static final String AWARD_BRONZE = "2";
private static final String AWARD_PARTICIPATION = "3"; private static final String AWARD_PARTICIPATION = "3";
private static final String INSTITUTE_VOTE_RESULT_PASSED = "通过";
private static final String INSTITUTE_VOTE_RESULT_FAILED = "不通过";
@Autowired @Autowired
private ImprovementProposalMapper improvementProposalMapper; private ImprovementProposalMapper improvementProposalMapper;
@@ -407,7 +409,7 @@ public class ImprovementProposalServiceImpl extends ServiceImpl<ImprovementPropo
update.setFinalAward(action.getFinalAward()); update.setFinalAward(action.getFinalAward());
update.setArchiveBy(loginUser.getId()); update.setArchiveBy(loginUser.getId());
update.setArchiveTime(new Date()); update.setArchiveTime(new Date());
if (AWARD_GOLD.equals(proposal.getLeaderFinalAward()) && "failed".equals(proposal.getInstituteVoteResult())) { if (AWARD_GOLD.equals(proposal.getLeaderFinalAward()) && INSTITUTE_VOTE_RESULT_FAILED.equals(proposal.getInstituteVoteResult())) {
update.setManualConfirmResult("confirmed"); update.setManualConfirmResult("confirmed");
} }
improvementProposalMapper.updateById(update); improvementProposalMapper.updateById(update);
@@ -514,7 +516,9 @@ public class ImprovementProposalServiceImpl extends ServiceImpl<ImprovementPropo
if (agreeCount + disagreeCount != totalVoters) { if (agreeCount + disagreeCount != totalVoters) {
throw new IllegalStateException("所级评议投票结果不完整"); throw new IllegalStateException("所级评议投票结果不完整");
} }
String voteResult = agreeCount * 3 >= (long) totalVoters * 2 ? "passed" : "failed"; String voteResult = agreeCount * 3 >= (long) totalVoters * 2
? INSTITUTE_VOTE_RESULT_PASSED
: INSTITUTE_VOTE_RESULT_FAILED;
ImprovementProposal update = new ImprovementProposal(); ImprovementProposal update = new ImprovementProposal();
update.setId(proposal.getId()); update.setId(proposal.getId());
update.setInstituteAgreeCount((int) agreeCount); update.setInstituteAgreeCount((int) agreeCount);
jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/vo/ImprovementProposalPage.java
+3 -3
View File
@@ -128,9 +128,9 @@ public class ImprovementProposalPage {
@Excel(name = "所级评议不同意票数", width = 15) @Excel(name = "所级评议不同意票数", width = 15)
@Schema(description = "所级评议不同意票数") @Schema(description = "所级评议不同意票数")
private Integer instituteDisagreeCount; private Integer instituteDisagreeCount;
/**所级评议结果：passed/failed*/ /**所级评议结果：通过/不通过*/
@Excel(name = "所级评议结果：passed/failed", width = 15) @Excel(name = "所级评议结果：通过/不通过", width = 15)
@Schema(description = "所级评议结果：passed/failed") @Schema(description = "所级评议结果：通过/不通过")
private String instituteVoteResult; private String instituteVoteResult;
/**金奖未通过后的经办人手动确认结果*/ /**金奖未通过后的经办人手动确认结果*/
@Excel(name = "金奖未通过后的经办人手动确认结果", width = 15) @Excel(name = "金奖未通过后的经办人手动确认结果", width = 15)