1

src/main/java/com/budwk/app/sys/controller/SysHomeController.java

@@ -205,9 +205,9 @@ public class SysHomeController {
             Date startDate = activity.getStartDate();
             Date endDate = activity.getEndDate();
             // 判断当前时间是否在活动范围内，不在就过滤掉
-//            if (!DateUtil.isIn(today, startDate, endDate)) {
+            if (!DateUtil.isIn(today, startDate, endDate)) {
-//                continue;
+                continue;
-//            }
+            }
 			// 只过滤结束的
 			if (DateUtil.compare(today, endDate) > 0) {
 				continue;

src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/h5controller/H5HealthCheckupController.java

@@ -22,6 +22,7 @@ import org.nutz.dao.Cnd;
 import org.nutz.dao.Dao;
 import org.nutz.dao.Sqls;
 import org.nutz.dao.sql.Sql;
+import org.nutz.dao.util.cri.SqlExpressionGroup;
 import org.nutz.dao.util.cri.Static;
 import org.nutz.ioc.aop.Aop;
 import org.nutz.ioc.loader.annotation.Inject;
@@ -95,7 +96,10 @@ public class H5HealthCheckupController {
         // 根据 status 参数筛选进行中或已结束的项目
         if ("ongoing".equals(status)) {
             // 进行中的项目：结束时间大于等于当前时间
-            cnd.and("p.choiceTimeEnd", ">=", DateUtil.now());
+            SqlExpressionGroup group = Cnd.NEW().where();
+            group.and("p.choiceTimeStart", "<=", DateUtil.now());
+            group.and("p.choiceTimeEnd", ">=", DateUtil.now());
+            cnd.and(group);
         } else if ("finished".equals(status)) {
             // 已结束的项目：结束时间小于当前时间
             cnd.and("p.choiceTimeEnd", "<", DateUtil.now());

src/main/java/com/budwk/app/zhgh/democratic/teachercongress/discussiongroup/controller/TeacherCongressDiscussionGroupController.java

@@ -84,7 +84,7 @@ public class TeacherCongressDiscussionGroupController {
             cnd.and("tcdg.delegationCodes", "like", "%" + pageParam.getDelegationCode() + "%");
         }
         if (StrUtil.isBlank(pageParam.getPageOrderName())) {
-            cnd.desc("tcdg.createdAt");
+            cnd.asc(" CONVERT(code, SIGNED int) ");
         }
         sql.setCondition(cnd);
         Pagination pagination = baseService.listPageMap(pageParam.getPageNumber(), pageParam.getPageSize(), sql);

src/main/resources/views/platform/zhgh/democratic/teachercongress/discussiongroup/index.html

@@ -36,8 +36,8 @@ layout("/layouts/platform.html"){
         </table-tool>
         <el-table :data="tableData" @sort-change="pageOrder" header-align="center" style="width: 100%">
             <el-table-column type="index" :index="indexMethod" label="序号" width="70"></el-table-column>
-            <el-table-column prop="code" label="讨论组编码" min-width="140"></el-table-column>
+            <el-table-column prop="code" label="讨论组编码" min-width="140" sortable></el-table-column>
-            <el-table-column prop="name" label="讨论组名称" min-width="180" sortable></el-table-column>
+            <el-table-column prop="name" label="讨论组名称" min-width="180"></el-table-column>
             <el-table-column prop="recorderUserName" label="记录人" min-width="140">
                 <template slot-scope="{row}">
                     {{ row.recorderUserName }}<span v-if="row.recorderUserCode">({{ row.recorderUserCode }})</span>