From 681b767d28eb5ebb6f6a11ffce9921b6899e6443 Mon Sep 17 00:00:00 2001
From: lh <ch2203598@outlook.com>
Date: Fri, 14 Nov 2025 15:29:08 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=91=A8=E6=8A=A5=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E5=8A=9F=E8=83=BD=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ErpProjectInfoController.java  | 10 ------
 .../oa/erp/domain/vo/ErpProjectReportVo.java  | 28 +++++++++++++++++
 .../oa/erp/mapper/ErpProjectReportMapper.java | 10 ++++++
 .../impl/ErpProjectReportServiceImpl.java     |  2 +-
 .../mapper/oa/erp/ErpProjectReportMapper.xml  | 31 ++++++++++++++++++-
 5 files changed, 69 insertions(+), 12 deletions(-)

diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/controller/ErpProjectInfoController.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/controller/ErpProjectInfoController.java
index fb53bbc4..be8e283c 100644
--- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/controller/ErpProjectInfoController.java
+++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/controller/ErpProjectInfoController.java
@@ -127,14 +127,4 @@ public class ErpProjectInfoController extends BaseController {
         List<ErpProjectInfoVo> list = erpProjectInfoService.queryList(bo);
         return R.ok(list);
     }
-
-    /**
-     * 根据部门id查询项目信息列表
-     */
-    @SaCheckPermission("oa/erp:projectInfo:listByDept")
-    @GetMapping("/listByDept")
-    public TableDataInfo<ErpProjectInfoVo> listByDept(ErpProjectInfoBo bo, PageQuery pageQuery) {
-        bo.setDeptId(LoginHelper.getDeptId());
-        return erpProjectInfoService.queryPageList(bo, pageQuery);
-    }
 }
diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpProjectReportVo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpProjectReportVo.java
index f3a58af1..e449f6bd 100644
--- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpProjectReportVo.java
+++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpProjectReportVo.java
@@ -111,6 +111,34 @@ public class ErpProjectReportVo implements Serializable {
      */
     @ExcelProperty(value = "项目编码")
     private String projectCode;
+    /**
+     * 项目类型名称
+     */
+    @ExcelProperty(value = "项目类型名称")
+    private String typeName;
 
+    /**
+     * 部门名称
+     */
+    @ExcelProperty(value = "部门名称")
+    private String deptName;
+
+    /**
+     * 项目经理名称
+     */
+    @ExcelProperty(value = "项目经理名称")
+    private String managerName;
+
+    /**
+     * 部门负责人名称
+     */
+    @ExcelProperty(value = "部门负责人名称")
+    private String chargeName;
+
+    /**
+     * 分管副总名称
+     */
+    @ExcelProperty(value = "分管副总名称")
+    private String deputyName;
 
 }
diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/mapper/ErpProjectReportMapper.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/mapper/ErpProjectReportMapper.java
index 55858d8b..7cde812d 100644
--- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/mapper/ErpProjectReportMapper.java
+++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/mapper/ErpProjectReportMapper.java
@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import org.apache.ibatis.annotations.Param;
+import org.dromara.common.mybatis.annotation.DataColumn;
+import org.dromara.common.mybatis.annotation.DataPermission;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 import org.dromara.oa.erp.domain.ErpProjectReport;
 import org.dromara.oa.erp.domain.vo.ErpProjectReportVo;
@@ -25,6 +27,10 @@ public interface ErpProjectReportMapper extends BaseMapperPlus<ErpProjectReport,
      * @param queryWrapper 条件
      * @return 项目周报信息集合
      */
+    @DataPermission({
+        @DataColumn(key = "deptName", value = "t.dept_id"),
+        @DataColumn(key = "userName", value = "t.create_by")
+    })
     public Page<ErpProjectReportVo> selectCustomErpProjectReportVoList(@Param("page") Page<ErpProjectReportVo> page, @Param(Constants.WRAPPER) MPJLambdaWrapper<ErpProjectReport> queryWrapper);
 
     /**
@@ -33,6 +39,10 @@ public interface ErpProjectReportMapper extends BaseMapperPlus<ErpProjectReport,
      * @param queryWrapper 条件
      * @return 项目周报信息集合
      */
+    @DataPermission({
+        @DataColumn(key = "deptName", value = "t.dept_id"),
+        @DataColumn(key = "userName", value = "t.create_by")
+    })
     public List<ErpProjectReportVo> selectCustomErpProjectReportVoList(@Param(Constants.WRAPPER) MPJLambdaWrapper<ErpProjectReport> queryWrapper);
 
 }
diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectReportServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectReportServiceImpl.java
index e896faee..10e74258 100644
--- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectReportServiceImpl.java
+++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectReportServiceImpl.java
@@ -52,7 +52,7 @@ public class ErpProjectReportServiceImpl implements IErpProjectReportService {
         @Override
         public TableDataInfo<ErpProjectReportVo> queryPageList(ErpProjectReportBo bo, PageQuery pageQuery) {
             MPJLambdaWrapper<ErpProjectReport> lqw = buildQueryWrapper(bo);
-            Page<ErpProjectReportVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+            Page<ErpProjectReportVo> result = baseMapper.selectCustomErpProjectReportVoList(pageQuery.build(), lqw);
             return TableDataInfo.build(result);
         }
 
diff --git a/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpProjectReportMapper.xml b/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpProjectReportMapper.xml
index 34b86e80..f31353d3 100644
--- a/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpProjectReportMapper.xml
+++ b/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpProjectReportMapper.xml
@@ -7,7 +7,36 @@
     </resultMap>
 
     <select id="selectCustomErpProjectReportVoList" resultMap="ErpProjectReportResult">
-        select report_id, tenant_id, project_id, project_name, milestone_plan, manager_id, dept_id, charge_id, deputy_id, information_note, sort_order, oss_id, remark, active_flag, del_flag, create_dept, create_by, create_time, update_by, update_time, project_code from erp_project_report t
+        select t.report_id,
+               t.tenant_id,
+               t.project_id,
+               t.project_name,
+               t.milestone_plan,
+               t.manager_id,
+               t.dept_id,
+               t.charge_id,
+               t.deputy_id,
+               t.information_note,
+               t.sort_order,
+               t.oss_id,
+               t.remark,
+               t.active_flag,
+               t.del_flag,
+               t.create_dept,
+               t.create_by,
+               t.create_time,
+               t.update_by,
+               t.update_time,
+               t.project_code,
+               d.dept_name                             deptName,
+               u1.nick_name                            managerName,
+               u2.nick_name                            chargeName,
+               u3.nick_name                            deputyName
+        from erp_project_report t
+            left join sys_dept d on d.dept_id = t.dept_id
+            left join sys_user u1 on u1.user_id = t.manager_id
+            left join sys_user u2 on u2.user_id = t.charge_id
+            left join sys_user u3 on u3.user_id = t.deputy_id
             ${ew.getCustomSqlSegment}
     </select>