diff --git a/src/main/java/io/v/nutz/jf/controller/activitybx/AccountingCon.java b/src/main/java/io/v/nutz/jf/controller/activitybx/AccountingCon.java index f6d60fd..8cb542e 100644 --- a/src/main/java/io/v/nutz/jf/controller/activitybx/AccountingCon.java +++ b/src/main/java/io/v/nutz/jf/controller/activitybx/AccountingCon.java @@ -92,8 +92,8 @@ public class AccountingCon { } else { cnd.asc("bx.state_id").desc("bx.apply_time"); } - Vi.cndPlus(cnd, "u.unitid", "=", unitId); - Vi.cndPlus(cnd, "u.unionid", "=", unionId); + Vi.cndPlus(cnd, "bxr.unitid", "=", unitId); + Vi.cndPlus(cnd, "bxr.unionid", "=", unionId); sql.setCondition(cnd); return activityBxService.listPageMap(pageNumber, pageSize, sql); } diff --git a/src/main/java/io/v/nutz/jf/controller/activitybx/ReimbursementViewCon.java b/src/main/java/io/v/nutz/jf/controller/activitybx/ReimbursementViewCon.java index 76ee86f..63e46cd 100644 --- a/src/main/java/io/v/nutz/jf/controller/activitybx/ReimbursementViewCon.java +++ b/src/main/java/io/v/nutz/jf/controller/activitybx/ReimbursementViewCon.java @@ -105,8 +105,8 @@ public class ReimbursementViewCon { if (Vi.isNotBlank(searchName, searchKeyword)) { cnd.where().andLike(searchName, searchKeyword); } - Vi.cndPlus(cnd, "u.unitid", "=", unitId); - Vi.cndPlus(cnd, "u.unionid", "=", unionId); + Vi.cndPlus(cnd, "bxr.unitid", "=", unitId); + Vi.cndPlus(cnd, "bxr.unionid", "=", unionId); if (Vi.isNotBlank(pageOrderName, pageOrderBy)) { cnd.orderBy(pageOrderName, pageOrderBy); diff --git a/src/main/java/io/v/nutz/msgNotify/MsgNotifyController.java b/src/main/java/io/v/nutz/msgNotify/MsgNotifyController.java index f4b8d40..7448e77 100644 --- a/src/main/java/io/v/nutz/msgNotify/MsgNotifyController.java +++ b/src/main/java/io/v/nutz/msgNotify/MsgNotifyController.java @@ -309,7 +309,7 @@ public class MsgNotifyController { RIGHT JOIN `user` u ON u.id = sur.userid $condition """); - if (module.equals(TAXT)) { + if (module.equals(TAXT) || module.equals(JDHXT)) { cnd.and("sur.jdhid", "=", teacherMeetingId); } diff --git a/src/main/java/io/v/nutz/question/controller/QuestionH5Controller.java b/src/main/java/io/v/nutz/question/controller/QuestionH5Controller.java index 447054e..af10f3d 100644 --- a/src/main/java/io/v/nutz/question/controller/QuestionH5Controller.java +++ b/src/main/java/io/v/nutz/question/controller/QuestionH5Controller.java @@ -92,7 +92,9 @@ public class QuestionH5Controller { public Object pageData(PageForm pageForm, int status, int type) { Sql sql = Sqls.create(""" select - q.* + q.*, + (select count(1) from question_issue where iqid = q.qid) as topicTotal , + (select count(1) from question_winner where questionId = q.qid) as zjTotal from question q $condition diff --git a/src/main/java/io/v/nutz/question/service/impl/QuestionAnswerRankingServiceImpl.java b/src/main/java/io/v/nutz/question/service/impl/QuestionAnswerRankingServiceImpl.java index e0efab6..7422050 100644 --- a/src/main/java/io/v/nutz/question/service/impl/QuestionAnswerRankingServiceImpl.java +++ b/src/main/java/io/v/nutz/question/service/impl/QuestionAnswerRankingServiceImpl.java @@ -416,6 +416,7 @@ public class QuestionAnswerRankingServiceImpl extends BaseServiceImpl { + for (const item of this.checked) { if (item.leaveReason === '' || item.leaveReason === undefined) { vant.Toast('请填写请假原因'); valid = true @@ -494,7 +494,7 @@ layout("/mobile/platform.html"){ } ) } - }) + } if (paramArray.length === 0) { vant.Toast('请选择请假时间段'); return diff --git a/src/main/resources/views/mobile/question/list.html b/src/main/resources/views/mobile/question/list.html index 103513e..b0e3770 100644 --- a/src/main/resources/views/mobile/question/list.html +++ b/src/main/resources/views/mobile/question/list.html @@ -157,7 +157,7 @@ layout("/mobile/platform.html"){ 获奖信息 + v-if="item.qlx===2 && item.isRaffle && item.zjTotal>0">获奖信息 diff --git a/src/main/resources/views/platform/meeting/statistics/basic.html b/src/main/resources/views/platform/meeting/statistics/basic.html index 567d00c..0b51fab 100644 --- a/src/main/resources/views/platform/meeting/statistics/basic.html +++ b/src/main/resources/views/platform/meeting/statistics/basic.html @@ -18,7 +18,7 @@ layout("/layouts/platform.html"){ start-placeholder="开始日期" type="daterange" v-model="pageForm.meetingTime" - value-format="yyyy-MM-dd HH:mm:ss"> + value-format="yyyy-MM-dd">