1.0.42 项目信息新增附件字段

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

@@ -128,6 +128,11 @@ public class ErpProjectInfo extends TenantEntity {
      */
     private String activeFlag;
 
+    /**
+     * 附件ID
+     */
+    private String ossId;
+
     /**
      * 删除标志（0代表存在 1代表删除）
      */

ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpProjectInfoBo.java

@@ -50,7 +50,6 @@ public class ErpProjectInfoBo extends BaseEntity {
     /**
      * 业务方向（1智能轮胎 2轮胎工厂 3快递物流 4锂电 5工业软件 6智能制造 7新行业及零售）
      */
-    @NotBlank(message = "业务方向（1智能轮胎 2轮胎工厂 3快递物流 4锂电 5工业软件 6智能制造 7新行业及零售）不能为空", groups = { AddGroup.class, EditGroup.class })
     private String businessDirection;
 
     /**
@@ -134,6 +133,11 @@ public class ErpProjectInfoBo extends BaseEntity {
      */
     private String activeFlag;
 
+    /**
+     * 附件ID
+     */
+    private String ossId;
+
     /**
      * 流程定义编码
      */

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

@@ -161,6 +161,12 @@ public class ErpProjectInfoVo implements Serializable {
     @ExcelDictFormat(dictType = "active_flag")
     private String activeFlag;
 
+    /**
+     * 附件ID
+     */
+    @ExcelProperty(value = "附件ID")
+    private String ossId;
+
     /**
      * 项目类型名称
      */

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

@@ -1,12 +1,8 @@
 package org.dromara.oa.erp.service.impl;
 
-import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.map.MapUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.extern.slf4j.Slf4j;
-import org.dromara.common.core.constant.SystemConstants;
 import org.dromara.common.core.enums.BusinessStatusEnum;
 import org.dromara.common.core.enums.OAStatusEnum;
 import org.dromara.common.core.utils.MapstructUtils;
@@ -62,7 +58,11 @@ public class ErpProjectInfoServiceImpl implements IErpProjectInfoService {
      */
     @Override
     public ErpProjectInfoVo queryById(Long projectId) {
-        return baseMapper.selectVoById(projectId);
+        MPJLambdaWrapper<ErpProjectInfo> lqw = JoinWrappers.lambda(ErpProjectInfo.class)
+                .eq(ErpProjectInfo::getProjectId, projectId)
+                .eq("t.del_flag", "0");
+        List<ErpProjectInfoVo> list = baseMapper.selectCustomErpProjectInfoVoList(lqw);
+        return !list.isEmpty() ? list.get(0) : null;
     }
 
     /**
@@ -206,7 +206,7 @@ public class ErpProjectInfoServiceImpl implements IErpProjectInfoService {
      *
      * @param processEvent 参数
      */
-    @EventListener(condition = "#processEvent.flowCode =='xmsq'")
+    @EventListener(condition = "#processEvent.flowCode.startsWith('xmsq')")
     public void processHandler(ProcessEvent processEvent) {
         TenantHelper.dynamic(processEvent.getTenantId(), () -> {
             log.info("当前任务执行了{}", processEvent.toString());

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

@@ -29,6 +29,7 @@
                t.contract_id,
                t.remark,
                t.active_flag,
+               t.oss_id,
                t.del_flag,
                t.create_dept,
                t.create_by,