1.0.40 项目计划关联项目编号

ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpProjectPlanVo.java

@@ -122,6 +122,12 @@ public class ErpProjectPlanVo implements Serializable {
     @ExcelProperty(value = "项目名称")
     private String projectName;
 
+    /**
+     * 项目编号
+     */
+    @ExcelProperty(value = "项目编号")
+    private String projectCode;
+
     /**
      * 项目经理名称
      */

ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectPlanServiceImpl.java

@@ -59,6 +59,7 @@ public class ErpProjectPlanServiceImpl implements IErpProjectPlanService {
 
     @DubboReference(timeout = 30000)
     private RemoteWorkflowService remoteWorkflowService;
+
     @DubboReference(timeout = 30000)
     private RemoteCodeRuleService remoteCodeRuleService;
 
@@ -118,9 +119,6 @@ public class ErpProjectPlanServiceImpl implements IErpProjectPlanService {
         MPJLambdaWrapper<ErpProjectPlan> lqw = JoinWrappers.lambda(ErpProjectPlan.class)
                 .selectAll(ErpProjectPlan.class)
                 .eq(ErpProjectPlan::getDelFlag, "0")
-            // 关联项目信息
-            .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())
@@ -131,7 +129,8 @@ public class ErpProjectPlanServiceImpl implements IErpProjectPlanService {
                 .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());
+                .eq(StringUtils.isNotBlank(bo.getActiveFlag()), ErpProjectPlan::getActiveFlag, bo.getActiveFlag())
+                .orderByDesc(ErpProjectPlan::getCreateTime);
         return lqw;
     }
 

ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpProjectPlanMapper.xml

@@ -28,6 +28,7 @@
                t.update_by,
                t.update_time,
                p.project_name,
+               p.project_code  as projectCode,
                u1.nick_name    as managerName,
                d1.dept_name    as managerDeptName,
                u2.nick_name    as chargeName,
@@ -66,6 +67,7 @@
                t.update_by,
                t.update_time,
                p.project_name,
+               p.project_code as projectCode,
                u1.nick_name as managerName,
                d1.dept_name  as managerDeptName,
                u2.nick_name as chargeName,
@@ -102,6 +104,7 @@
                t.update_by,
                t.update_time,
                p.project_name,
+               p.project_code as projectCode,
                u1.nick_name as managerName,
                d1.dept_name  as managerDeptName,
                u2.nick_name as chargeName,
@@ -147,6 +150,7 @@
                t.update_by,
                t.update_time,
                p.project_name,
+               p.project_code as projectCode,
                u1.nick_name as managerName,
                d1.dept_name  as managerDeptName,
                u2.nick_name as chargeName,