diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpProjectPlan.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpProjectPlan.java
index 6211b8ae..98878859 100644
--- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpProjectPlan.java
+++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpProjectPlan.java
@@ -32,6 +32,11 @@ public class ErpProjectPlan extends TenantEntity {
*/
private Long projectId;
+ /**
+ * 项目计划编号
+ */
+ private String projectPlanCode;
+
/**
* 项目经理
*/
@@ -67,6 +72,11 @@ public class ErpProjectPlan extends TenantEntity {
*/
private Long contractId;
+ /**
+ * 附件ID
+ */
+ private String ossId;
+
/**
* 备注
*/
@@ -89,4 +99,22 @@ public class ErpProjectPlan extends TenantEntity {
@TableField(exist = false )
private String createName;
+ /**
+ * 项目经理名称
+ */
+ @TableField(exist = false )
+ private String managerName;
+
+ /**
+ * 部门负责人名称
+ */
+ @TableField(exist = false )
+ private String chargeName;
+
+ /**
+ * 项目经理部门名称
+ */
+ @TableField(exist = false )
+ private String managerDeptName;
+
}
diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpProjectPlanBo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpProjectPlanBo.java
index 04bd18bb..2d4e1f24 100644
--- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpProjectPlanBo.java
+++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpProjectPlanBo.java
@@ -37,6 +37,11 @@ public class ErpProjectPlanBo extends BaseEntity {
*/
private Long projectId;
+ /**
+ * 项目计划编号
+ */
+ private String projectPlanCode;
+
/**
* 项目经理
*/
@@ -72,6 +77,11 @@ public class ErpProjectPlanBo extends BaseEntity {
*/
private Long contractId;
+ /**
+ * 附件ID
+ */
+ private String ossId;
+
/**
* 备注
*/
diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpProjectPlanVo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpProjectPlanVo.java
index 10b77d62..ee3509af 100644
--- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpProjectPlanVo.java
+++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpProjectPlanVo.java
@@ -43,6 +43,12 @@ public class ErpProjectPlanVo implements Serializable {
@ExcelProperty(value = "项目ID")
private Long projectId;
+ /**
+ * 项目计划编号
+ */
+ @ExcelProperty(value = "项目计划编号")
+ private String projectPlanCode;
+
/**
* 项目经理
*/
@@ -86,6 +92,12 @@ public class ErpProjectPlanVo implements Serializable {
@ExcelProperty(value = "合同ID(预留)")
private Long contractId;
+ /**
+ * 附件ID
+ */
+ @ExcelProperty(value = "附件ID")
+ private String ossId;
+
/**
* 备注
*/
@@ -116,6 +128,12 @@ public class ErpProjectPlanVo implements Serializable {
@ExcelProperty(value = "项目经理名称")
private String managerName;
+ /**
+ * 项目经理部门名称
+ */
+ @ExcelProperty(value = "项目经理部门名称")
+ private String managerDeptName;
+
/**
* 部门负责人名称
*/
diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectPlanServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectPlanServiceImpl.java
index c7c2c4d5..76896d27 100644
--- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectPlanServiceImpl.java
+++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectPlanServiceImpl.java
@@ -117,6 +117,7 @@ public class ErpProjectPlanServiceImpl implements IErpProjectPlanService {
.select(ErpProjectInfo::getProjectName)
.leftJoin(ErpProjectInfo.class,ErpProjectInfo::getProjectId, ErpProjectPlan::getProjectId)
.eq(bo.getProjectId() != null, ErpProjectPlan::getProjectId, bo.getProjectId())
+ .eq(StringUtils.isNotBlank(bo.getProjectPlanCode()), ErpProjectPlan::getProjectPlanCode, bo.getProjectPlanCode())
.eq(bo.getManagerId() != null, ErpProjectPlan::getManagerId, bo.getManagerId())
.eq(bo.getChargeId() != null, ErpProjectPlan::getChargeId, bo.getChargeId())
.eq(StringUtils.isNotBlank(bo.getPaymentMethod()), ErpProjectPlan::getPaymentMethod, bo.getPaymentMethod())
@@ -124,6 +125,7 @@ public class ErpProjectPlanServiceImpl implements IErpProjectPlanService {
.eq(StringUtils.isNotBlank(bo.getFlowStatus()), ErpProjectPlan::getFlowStatus, bo.getFlowStatus())
.eq(bo.getSortOrder() != null, ErpProjectPlan::getSortOrder, bo.getSortOrder())
.eq(bo.getContractId() != null, ErpProjectPlan::getContractId, bo.getContractId())
+ .eq(StringUtils.isNotBlank(bo.getOssId()), ErpProjectPlan::getOssId, bo.getOssId())
.eq(StringUtils.isNotBlank(bo.getActiveFlag()), ErpProjectPlan::getActiveFlag, bo.getActiveFlag());
return lqw;
}
diff --git a/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpProjectPlanMapper.xml b/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpProjectPlanMapper.xml
index 97abedb8..7ae0f312 100644
--- a/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpProjectPlanMapper.xml
+++ b/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpProjectPlanMapper.xml
@@ -10,6 +10,7 @@
select t.project_plan_id,
t.tenant_id,
t.project_id,
+ t.project_plan_code,
t.manager_id,
t.charge_id,
t.payment_method,
@@ -17,6 +18,7 @@
t.flow_status,
t.sort_order,
t.contract_id,
+ t.oss_id,
t.remark,
t.active_flag,
t.del_flag,
@@ -27,14 +29,16 @@
t.update_time,
p.project_name,
u1.nick_name as managerName,
+ d1.dept_name as managerDeptName,
u2.nick_name as chargeName,
c.contract_name as contractName,
u3.nick_name as createName
from erp_project_plan t
left join erp_project_info p on t.project_id = p.project_id
left join sys_user u1 on t.manager_id = u1.user_id
+ left join sys_dept d1 on u1.dept_id = d1.dept_id
left join sys_user u2 on t.charge_id = u2.user_id
- left join sys_user u3 on t.create_by = u3.user_id
+ left join sys_user u3 on t.create_by = u3.user_id
left join erp_contract_info c on t.contract_id = c.contract_id
${ew.getCustomSqlSegment}
@@ -44,6 +48,7 @@
select t.project_plan_id,
t.tenant_id,
t.project_id,
+ t.project_plan_code,
t.manager_id,
t.charge_id,
t.payment_method,
@@ -51,6 +56,7 @@
t.flow_status,
t.sort_order,
t.contract_id,
+ t.oss_id,
t.remark,
t.active_flag,
t.del_flag,
@@ -61,11 +67,13 @@
t.update_time,
p.project_name,
u1.nick_name as managerName,
+ d1.dept_name as managerDeptName,
u2.nick_name as chargeName,
c.contract_name as contractName
from erp_project_plan t
left join erp_project_info p on t.project_id = p.project_id
left join sys_user u1 on t.manager_id = u1.user_id
+ left join sys_dept d1 on u1.dept_id = d1.dept_id
left join sys_user u2 on t.charge_id = u2.user_id
left join erp_contract_info c on t.contract_id = c.contract_id
where t.project_plan_id = #{projectPlanId}
@@ -76,6 +84,7 @@
select t.project_plan_id,
t.tenant_id,
t.project_id,
+ t.project_plan_code,
t.manager_id,
t.charge_id,
t.payment_method,
@@ -83,6 +92,7 @@
t.flow_status,
t.sort_order,
t.contract_id,
+ t.oss_id,
t.remark,
t.active_flag,
t.del_flag,
@@ -93,11 +103,13 @@
t.update_time,
p.project_name,
u1.nick_name as managerName,
+ d1.dept_name as managerDeptName,
u2.nick_name as chargeName,
c.contract_name as contractName
from erp_project_plan t
left join erp_project_info p on t.project_id = p.project_id
left join sys_user u1 on t.manager_id = u1.user_id
+ left join sys_dept d1 on u1.dept_id = d1.dept_id
left join sys_user u2 on t.charge_id = u2.user_id
left join erp_contract_info c on t.contract_id = c.contract_id
where t.project_plan_id in
@@ -117,6 +129,7 @@
select t.project_plan_id,
t.tenant_id,
t.project_id,
+ t.project_plan_code,
t.manager_id,
t.charge_id,
t.payment_method,
@@ -124,6 +137,7 @@
t.flow_status,
t.sort_order,
t.contract_id,
+ t.oss_id,
t.remark,
t.active_flag,
t.del_flag,
@@ -134,11 +148,13 @@
t.update_time,
p.project_name,
u1.nick_name as managerName,
+ d1.dept_name as managerDeptName,
u2.nick_name as chargeName,
c.contract_name as contractName
from erp_project_plan t
left join erp_project_info p on t.project_id = p.project_id
left join sys_user u1 on t.manager_id = u1.user_id
+ left join sys_dept d1 on u1.dept_id = d1.dept_id
left join sys_user u2 on t.charge_id = u2.user_id
left join erp_contract_info c on t.contract_id = c.contract_id
${ew.getCustomSqlSegment}
@@ -151,6 +167,8 @@
project_id,
+ project_plan_code,
+
manager_id,
charge_id,
@@ -165,6 +183,8 @@
contract_id,
+ oss_id,
+
remark,
active_flag,
@@ -189,6 +209,8 @@
#{item.projectId},
+ #{item.projectPlanCode},
+
#{item.managerId},
#{item.chargeId},
@@ -203,6 +225,8 @@
#{item.contractId},
+ #{item.ossId},
+
#{item.remark},
#{item.activeFlag},
@@ -234,6 +258,9 @@
project_id = #{item.projectId},
+
+ project_plan_code = #{item.projectPlanCode},
+
manager_id = #{item.managerId},
@@ -255,6 +282,9 @@
contract_id = #{item.contractId},
+
+ oss_id = #{item.ossId},
+
remark = #{item.remark},