update
This commit is contained in:
parent
9aa9b1eeae
commit
59465a45ea
|
@ -8,7 +8,7 @@ import lombok.Data;
|
|||
public class AppointVoteRequest {
|
||||
|
||||
@ApiModelProperty(value = "任免督职id", required = true)
|
||||
private String appointId;
|
||||
private String id;
|
||||
|
||||
@ApiModelProperty(value = "投票 (0待投票 1赞成 2反对 3弃权)", required = true)
|
||||
private Integer vote;
|
||||
|
|
|
@ -153,10 +153,10 @@ public class AppointService extends BaseService<AppointMapper, Appoint> {
|
|||
* @return
|
||||
*/
|
||||
public Ret vote(AppointVoteRequest voteRequest, User loginUser) {
|
||||
Appoint appoint = getById(voteRequest.getAppointId());
|
||||
Appoint appoint = getById(voteRequest.getId());
|
||||
Assert.notNull(appoint, "未找到该记录");
|
||||
AppointUser appointUser = appointUserService.getOne(new LambdaQueryWrapper<AppointUser>()
|
||||
.eq(AppointUser::getAppointId, voteRequest.getAppointId())
|
||||
.eq(AppointUser::getAppointId, voteRequest.getId())
|
||||
.eq(AppointUser::getType, Appoint.STATE_VOTE)
|
||||
.eq(AppointUser::getUserId, loginUser.getId()));
|
||||
if (appointUser == null) return Ret.fail("您没有投票的权限");
|
||||
|
@ -168,7 +168,7 @@ public class AppointService extends BaseService<AppointMapper, Appoint> {
|
|||
|
||||
//如果所有人都投完了票,自动进入下一环节
|
||||
int waitCount = appointUserService.count(Wrappers.lambdaQuery(AppointUser.class)
|
||||
.eq(AppointUser::getAppointId, voteRequest.getAppointId())
|
||||
.eq(AppointUser::getAppointId, voteRequest.getId())
|
||||
.eq(AppointUser::getType, Appoint.STATE_VOTE)
|
||||
.eq(AppointUser::getVote, AppointUser.VOTE_WAIT));
|
||||
if (waitCount == 0) {
|
||||
|
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -0,0 +1 @@
|
|||
.van-pagination[data-v-5abe7237]{position:fixed;bottom:0;width:100%;z-index:999;background:#fff}.box[data-v-5abe7237]{display:flex;flex-direction:column;height:100%;font-size:.42667rem}.box .add[data-v-5abe7237]{width:2.13333rem;height:2.13333rem;position:fixed;right:.32rem;bottom:20%}.box[data-v-5abe7237] .van-tab.van-tab--active{font-size:.42667rem;font-weight:800}.box .tab-contain[data-v-5abe7237]{padding:.32rem;padding-bottom:1.12rem}.box .tab-contain .van-cell[data-v-5abe7237]{margin-bottom:.37333rem}.box .tab-contain .van-cell .custom-title[data-v-5abe7237]{font-weight:700;font-size:.42667rem}.box .tab-contain .van-cell .custom-title1[data-v-5abe7237]{font-weight:700;margin-left:.8rem;font-size:.37333rem;color:#47aef3}.box .tab-contain .van-cell .custom-title2[data-v-5abe7237]{font-weight:700;margin-left:.8rem;font-size:.37333rem;color:#c86b1d}.box .tab-contain .van-cell .van-icon[data-v-5abe7237]{color:#333}
|
File diff suppressed because one or more lines are too long
|
@ -1 +0,0 @@
|
|||
.van-pagination[data-v-6faccfc5]{position:fixed;bottom:0;width:100%;z-index:999;background:#fff}.box[data-v-6faccfc5]{display:flex;flex-direction:column;height:100%;font-size:.42667rem}.box .add[data-v-6faccfc5]{width:2.13333rem;height:2.13333rem;position:fixed;right:.32rem;bottom:20%}.box[data-v-6faccfc5] .van-tab.van-tab--active{font-size:.42667rem;font-weight:800}.box .tab-contain[data-v-6faccfc5]{padding:.32rem;padding-bottom:1.12rem}.box .tab-contain .van-cell[data-v-6faccfc5]{margin-bottom:.37333rem}.box .tab-contain .van-cell .custom-title[data-v-6faccfc5]{font-weight:700;font-size:.42667rem}.box .tab-contain .van-cell .custom-title1[data-v-6faccfc5]{font-weight:700;margin-left:.8rem;font-size:.37333rem;color:#47aef3}.box .tab-contain .van-cell .custom-title2[data-v-6faccfc5]{font-weight:700;margin-left:.8rem;font-size:.37333rem;color:#c86b1d}.box .tab-contain .van-cell .van-icon[data-v-6faccfc5]{color:#333}
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue