commit

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, "bxr.unitid", "=", unitId);
-        Vi.cndPlus(cnd, "u.unionid", "=", unionId);
+        Vi.cndPlus(cnd, "bxr.unionid", "=", unionId);
         sql.setCondition(cnd);
         return activityBxService.listPageMap(pageNumber, pageSize, sql);
     }

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, "bxr.unitid", "=", unitId);
-        Vi.cndPlus(cnd, "u.unionid", "=", unionId);
+        Vi.cndPlus(cnd, "bxr.unionid", "=", unionId);
 
         if (Vi.isNotBlank(pageOrderName, pageOrderBy)) {
             cnd.orderBy(pageOrderName, pageOrderBy);

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);
         }
 

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

src/main/java/io/v/nutz/question/service/impl/QuestionAnswerRankingServiceImpl.java

@@ -416,6 +416,7 @@ public class QuestionAnswerRankingServiceImpl extends BaseServiceImpl<QuestionUs
             exportEntities.add(new ExcelExportEntity("所属工会", "unionname", 20));
             exportEntities.add(new ExcelExportEntity("联系方式", "mobile", 20));
             exportEntities.add(new ExcelExportEntity("分数", "score", 20));
+            exportEntities.add(new ExcelExportEntity("答题日期", "answerDate", 20));
 
             ExportParams exportParams = new ExportParams();
             exportParams.setType(ExcelType.XSSF);

src/main/resources/views/mobile/meeting/myMeeting.html

@@ -479,7 +479,7 @@ layout("/mobile/platform.html"){
                 }
                 const paramArray = []
                 let valid = false
-                this.checked.forEach(item => {
+                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

src/main/resources/views/mobile/question/list.html

@@ -157,7 +157,7 @@ layout("/mobile/platform.html"){
                                     <!--                                    </span>-->
                                     <span class="quizzes-item-info-text" style="position: absolute;right: 0;bottom: 0">
                                         <van-tag @click.stop="showWinInfo(item)" type="primary" class="win_tag"
-                                                 v-if="item.qlx===2 && item.isRaffle && moment().isAfter(moment('2024-06-18 00:05:00'))">获奖信息</van-tag>
+                                                 v-if="item.qlx===2 && item.isRaffle && item.zjTotal>0">获奖信息</van-tag>
                                     </span>
                                 </div>
                             </div>

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">
                     </el-date-picker>
 
                 </div>