From f1b0f1a9da89b9d60ee48150f439ea8fc5a1c28d Mon Sep 17 00:00:00 2001
From: 10001392 <1055202292@qq.com>
Date: Thu, 26 Sep 2024 14:49:12 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E7=94=B3=E8=AF=B7=EF=BC=8C?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=80=89=E5=A1=AB=E5=AD=97=E6=AE=B5=20?=
 =?UTF-8?q?=E9=80=9A=E7=94=A8=E7=A8=8B=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/user/material/MaterialMainApi.java     | 12 ++++++++++++
 .../material/pojo/dto/MaterialMainDTO.java     |  6 ++++++
 .../pojo/entity/MaterialMainEntity.java        |  7 +++++++
 .../material/pojo/vo/MaterialMainVO.java       |  6 ++++++
 .../material/service/MaterialMainService.java  | 18 ++++++++++++++++++
 5 files changed, 49 insertions(+)

diff --git a/nflg_project_dev/material/src/main/java/com/nflg/product/material/api/user/material/MaterialMainApi.java b/nflg_project_dev/material/src/main/java/com/nflg/product/material/api/user/material/MaterialMainApi.java
index c7f09d5b..3629c974 100644
--- a/nflg_project_dev/material/src/main/java/com/nflg/product/material/api/user/material/MaterialMainApi.java
+++ b/nflg_project_dev/material/src/main/java/com/nflg/product/material/api/user/material/MaterialMainApi.java
@@ -403,6 +403,18 @@ public class MaterialMainApi extends BaseApi {
         return materialMainService.updateProjectType(paramDto);
     }
 
+    /**
+     * 更新
+     * 申请人才允许更新
+     * @param paramDto
+     * @return
+     */
+    @PostMapping("updateGeneralLevel")
+    @ApiOperation("更新通用程度")
+    public ResultVO<String> updateGeneralLevel(@RequestBody MaterialMainDTO paramDto) {
+        return materialMainService.updateGeneralLevel(paramDto);
+    }
+
     /**
      * 手动执行计算推荐度
      */
diff --git a/nflg_project_dev/material/src/main/java/com/nflg/product/material/pojo/dto/MaterialMainDTO.java b/nflg_project_dev/material/src/main/java/com/nflg/product/material/pojo/dto/MaterialMainDTO.java
index 7206d25a..1190e0bf 100644
--- a/nflg_project_dev/material/src/main/java/com/nflg/product/material/pojo/dto/MaterialMainDTO.java
+++ b/nflg_project_dev/material/src/main/java/com/nflg/product/material/pojo/dto/MaterialMainDTO.java
@@ -190,5 +190,11 @@ public class MaterialMainDTO implements Serializable {
     @ApiModelProperty(value = "申请部门")
     private String applyDeptName;
 
+    /**
+     * 通用程度
+     */
+    @ApiModelProperty("通用程度")
+    private String generalLevel;
+
     private static final long serialVersionUID = 1L;
 }
diff --git a/nflg_project_dev/material/src/main/java/com/nflg/product/material/pojo/entity/MaterialMainEntity.java b/nflg_project_dev/material/src/main/java/com/nflg/product/material/pojo/entity/MaterialMainEntity.java
index 1ff6c005..ef684677 100644
--- a/nflg_project_dev/material/src/main/java/com/nflg/product/material/pojo/entity/MaterialMainEntity.java
+++ b/nflg_project_dev/material/src/main/java/com/nflg/product/material/pojo/entity/MaterialMainEntity.java
@@ -369,6 +369,13 @@ public class MaterialMainEntity implements Serializable {
     @ApiModelProperty(value = "近两年使用量（新）")
     private BigDecimal twoYearsUsage;
 
+    /**
+     * 通用程度
+     */
+    @TableField(value = "general_level")
+    @ApiModelProperty("通用程度")
+    private String generalLevel;
+
     private static final long serialVersionUID = 1L;
 
 }
diff --git a/nflg_project_dev/material/src/main/java/com/nflg/product/material/pojo/vo/MaterialMainVO.java b/nflg_project_dev/material/src/main/java/com/nflg/product/material/pojo/vo/MaterialMainVO.java
index f60446c2..b7d8aecf 100644
--- a/nflg_project_dev/material/src/main/java/com/nflg/product/material/pojo/vo/MaterialMainVO.java
+++ b/nflg_project_dev/material/src/main/java/com/nflg/product/material/pojo/vo/MaterialMainVO.java
@@ -441,6 +441,12 @@ public class MaterialMainVO implements Serializable {
     @ApiModelProperty(value = "项目类别")
     private String projectType;
 
+    /**
+     * 通用程度
+     */
+    @ApiModelProperty("通用程度")
+    private String generalLevel;
+
     // 变更弹窗字段 start
     /**
      * 变更人
diff --git a/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialMainService.java b/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialMainService.java
index c52dd775..72c0b24b 100644
--- a/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialMainService.java
+++ b/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialMainService.java
@@ -2335,6 +2335,24 @@ public class MaterialMainService extends ServiceImpl<MaterialMainMapper, Materia
         return ResultVO.success();
     }
 
+    /**
+     * 更新通用程度
+     * 申请人才允许更新
+     * @param paramDto
+     * @return
+     */
+    public ResultVO<String> updateGeneralLevel(MaterialMainDTO paramDto) {
+        // 暂且和更新项目类别权限一致
+        if (!checkUpdateProjectTypeByDept(paramDto)) {
+            return ResultVO.error("无法更新本部门外申请物料的通用程度");
+        }
+        MaterialMainEntity entity = new MaterialMainEntity();
+        entity.setRowId(paramDto.getRowId());
+        entity.setGeneralLevel(paramDto.getGeneralLevel());
+        this.updateById(entity);
+        return ResultVO.success();
+    }
+
     /**
      * 通过部门判断是否有修改项目类别的权限，以下满足一个即可：
      * 1、自己申请的物料