任务模块 责任人下拉查询 根据 任务开始时间查询

ant-design-vue-jeecg/src/views/task/TaskList.vue

@@ -42,9 +42,11 @@
               <j-input placeholder="" v-model="queryParam.taskName"></j-input>
             </a-form-item>
           </a-col>
-          <a-col :md="6" :sm="12">
+          <a-col :md="4" :sm="12">
             <a-form-item label="责任人">
-              <j-input placeholder="" v-model="queryParam.userName"></j-input>
+              <j-dict-select-tag v-model="queryParam.managerUsers" placeholder="请选责任人"
+                                 dict-code="sys_user,realname,id"
+                                 style="width: 100%"></j-dict-select-tag>
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="12">

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/task/controller/TaskController.java

@@ -119,8 +119,8 @@ public class TaskController extends JeecgController<Task, ITaskService> {
                 case 1: {//当前天
                     Date startTime = sdf.parse(year + "-" + month + "-" + day + " 00:00:00");
                     Date endTime = sdf.parse(year + "-" + month + "-" + day + " 23:59:59");
-                    queryWrapper.ge("create_time", startTime);
+                    queryWrapper.ge("start_time", startTime);
-                    queryWrapper.le("create_time", endTime);
+                    queryWrapper.le("start_time", endTime);
                     break;
                 }
                 case 2: {//当前周
@@ -135,16 +135,16 @@ public class TaskController extends JeecgController<Task, ITaskService> {
                     int day2 = now1.get(Calendar.DAY_OF_MONTH);
                     Date startTime = sdf.parse(year1 + "-" + month1 + "-" + day1 + " 00:00:00");
                     Date endTime = sdf.parse(year2 + "-" + month2 + "-" + day2 + " 23:59:59");
-                    queryWrapper.ge("create_time", startTime);
+                    queryWrapper.ge("start_time", startTime);
-                    queryWrapper.le("create_time", endTime);
+                    queryWrapper.le("start_time", endTime);
                 }
                 case 3: {//当前月
                     int minDay = now.getActualMinimum(Calendar.DAY_OF_MONTH);
                     int lastDay = now.getActualMaximum(Calendar.DAY_OF_MONTH);
                     Date startTime = sdf.parse(year + "-" + month + "-" + minDay + " 00:00:00");
                     Date endTime = sdf.parse(year + "-" + month + "-" + lastDay + " 23:59:59");
-                    queryWrapper.ge("create_time", startTime);
+                    queryWrapper.ge("start_time", startTime);
-                    queryWrapper.le("create_time", endTime);
+                    queryWrapper.le("start_time", endTime);
                     break;
                 }
 //                case 4: {
@@ -164,16 +164,23 @@ public class TaskController extends JeecgController<Task, ITaskService> {
             String projectId = task.getProjectId();
             queryWrapper.like("project_id", projectId);
         }
+        if (task != null && StringUtils.isNotBlank(task.getTypeId())) {
+            String typeId = task.getTypeId();
+            queryWrapper.like("type_id", typeId);
+        }
 
-        List<SysUser> sysUsers = taskService.UserIdByUserName(userName);
+        if (task != null && StringUtils.isNotBlank(task.getManagerUsers())) {
-        if (sysUsers != null && sysUsers.size() > 0)
+            String managerUsers = task.getManagerUsers();
-            queryWrapper.and(qw -> {
+            queryWrapper.like("manager_users", managerUsers);
-                for (int i = 0; i < sysUsers.size(); i++) {
+        }
-                    qw.like("manager_users", sysUsers.get(i).getId());
+//        List<SysUser> sysUsers = taskService.UserIdByUserName(userName);
-                    if (i != sysUsers.size() - 1)
+//            queryWrapper.and(qw -> {
-                        qw.or();
+//                for (int i = 0; i < sysUsers.size(); i++) {
-                }
+//                    qw.like("manager_users", sysUsers.get(i).getId());
-            });
+//                    if (i != sysUsers.size() - 1)
+//                        qw.or();
+//                }
+//            });
         if (task != null && StringUtils.isNotBlank(task.getTaskName())) {
             String tas = task.getTaskName();
             if (tas.startsWith("*") && tas.endsWith("*"))