瀏覽代碼

列表开发

anderx 2 年之前
父節點
當前提交
086f58b334

+ 17 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ProjectTaskController.java

@@ -2,6 +2,9 @@ package com.ruoyi.web.controller.project;
 
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.project.bo.ProjectListInput;
+import com.ruoyi.project.bo.ProjectTaskListOut;
 import com.ruoyi.project.domain.ProjectStaff;
 import com.ruoyi.project.domain.ProjectStaffRecord;
 import com.ruoyi.project.domain.ProjectTask;
@@ -12,6 +15,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  *  项目管理
  */
@@ -103,4 +108,16 @@ public class ProjectTaskController extends BaseController {
     }
 
 
+    /**
+     * 项目列表
+     * @param
+     * @return
+     */
+    @GetMapping ("/list")
+    public TableDataInfo list(ProjectListInput in){
+        startPage();
+        List<ProjectTaskListOut> list=projectTaskService.list(in);
+        return getDataTable(list);
+    }
+
 }

+ 4 - 0
ruoyi-system/src/main/java/com/ruoyi/project/bo/ProjectListInput.java

@@ -0,0 +1,4 @@
+package com.ruoyi.project.bo;
+
+public class ProjectListInput {
+}

+ 4 - 0
ruoyi-system/src/main/java/com/ruoyi/project/bo/ProjectTaskListOut.java

@@ -0,0 +1,4 @@
+package com.ruoyi.project.bo;
+
+public class ProjectTaskListOut {
+}

+ 6 - 0
ruoyi-system/src/main/java/com/ruoyi/project/mapper/ProjectTaskMapper.java

@@ -1,7 +1,11 @@
 package com.ruoyi.project.mapper;
 
+import com.ruoyi.project.bo.ProjectListInput;
+import com.ruoyi.project.bo.ProjectTaskListOut;
 import com.ruoyi.project.domain.ProjectTask;
 
+import java.util.List;
+
 public interface ProjectTaskMapper {
     int deleteByPrimaryKey(Long id);
 
@@ -16,4 +20,6 @@ public interface ProjectTaskMapper {
     int updateByPrimaryKey(ProjectTask record);
 
     void updateStaffName(Long pid);
+
+    List<ProjectTaskListOut> selectList(ProjectListInput in);
 }

+ 6 - 0
ruoyi-system/src/main/java/com/ruoyi/project/service/ProjectTaskService.java

@@ -1,12 +1,18 @@
 package com.ruoyi.project.service;
 
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.project.bo.ProjectListInput;
+import com.ruoyi.project.bo.ProjectTaskListOut;
 import com.ruoyi.project.domain.ProjectTask;
 
+import java.util.List;
+
 public interface ProjectTaskService {
     AjaxResult addProjectTask(ProjectTask projectTask);
 
     AjaxResult deleteProject(ProjectTask in);
 
     AjaxResult details(Long id);
+
+    List<ProjectTaskListOut> list(ProjectListInput in);
 }

+ 11 - 0
ruoyi-system/src/main/java/com/ruoyi/project/service/impl/ProjectTaskServiceImpl.java

@@ -1,6 +1,9 @@
 package com.ruoyi.project.service.impl;
 
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.project.bo.ProjectListInput;
+import com.ruoyi.project.bo.ProjectTaskListOut;
 import com.ruoyi.project.bo.ProjectTaskOut;
 import com.ruoyi.project.domain.ProjectStaff;
 import com.ruoyi.project.domain.ProjectTask;
@@ -11,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Set;
 
 @Service
 public class ProjectTaskServiceImpl   implements ProjectTaskService {
@@ -52,4 +56,11 @@ public class ProjectTaskServiceImpl   implements ProjectTaskService {
         }
         return AjaxResult.error("项目不存在");
     }
+
+    @Override
+    public List<ProjectTaskListOut> list(ProjectListInput in) {
+        Set<String> permissions = SecurityUtils.getLoginUser().getPermissions();
+        permissions.forEach( s -> System.out.println(s));
+        return projectTaskMapper.selectList(in);
+    }
 }

+ 11 - 0
ruoyi-system/src/main/resources/mapper/project/ProjectTaskMapper.xml

@@ -20,6 +20,7 @@
     from project_task
     where id = #{id,jdbcType=BIGINT}
   </select>
+
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
     delete from project_task
     where id = #{id,jdbcType=BIGINT}
@@ -124,4 +125,14 @@
         where pid = #{pid} group by  pid) b on a.id=b.pid set a.staff_name =b.name
     where a.id = #{pid}
   </update>
+
+  <select id="selectList" resultType="com.ruoyi.project.bo.ProjectTaskListOut">
+    select  a.id,a.name ,a.admin_name adminName,a.staff_name staffName ,a.create_time
+    from project_task a left join project_staff b on a.id=b.pid
+    where 1=1
+      and a.aid =3
+      and a.name like concat('%','','%')
+      and b.aid=4
+      and a.create_time  between '2023-09-04' and '2023-09-05'
+  </select>
 </mapper>