From 7933bfbe9282f6a51b9cc8ac25a0d1573ef0f01b Mon Sep 17 00:00:00 2001
From: du <1725534722@qq.com>
Date: Fri, 12 Jul 2024 16:04:25 +0800
Subject: [PATCH] bugfix

---
 .../com/ruoyi/jjh/ent/controller/JProjectController.java    | 5 +++--
 .../src/main/java/com/ruoyi/jjh/ent/entity/JPolicyFile.java | 6 +++---
 .../main/java/com/ruoyi/jjh/ent/mapper/JProjectMapper.java  | 2 +-
 .../java/com/ruoyi/jjh/ent/service/JProjectService.java     | 2 +-
 .../com/ruoyi/jjh/ent/service/impl/JProjectServiceImpl.java | 4 ++--
 .../src/main/resources/mapper/jjh/ent/JProjectMapper.xml    | 3 +++
 6 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JProjectController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JProjectController.java
index d596bc3..610bf15 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JProjectController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JProjectController.java
@@ -70,6 +70,7 @@ public class JProjectController extends BaseController {
      * @param jProject 查询实体
      * @return 所有数据
      */
+    @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov,ent')")
     @ApiOperation(value = "分页查询项目", response = JProject.class)
     @GetMapping
     public AjaxResult selectPage(Page<JProject> page, JProject jProject) {
@@ -98,8 +99,8 @@ public class JProjectController extends BaseController {
     @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")
     @ApiOperation(value = "作业台查询所有项目(政务端)", response = JProject.class)
     @GetMapping("/selectAll")
-    public AjaxResult selectAll(@RequestParam String name) {
-        return success(jProjectService.selectAll(name));
+    public AjaxResult selectAll(@RequestParam String name,@RequestParam(required = false) Integer status) {
+        return success(jProjectService.selectAll(name,status));
     }
 
     /**
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/JPolicyFile.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/JPolicyFile.java
index 9b7d678..0f4dd36 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/JPolicyFile.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/JPolicyFile.java
@@ -53,9 +53,9 @@ public class JPolicyFile  extends BaseInfoEntity {
     /**
      * 政策等级
      */
-    @Excel(name = "政策等级")
-    @ApiModelProperty("政策等级")
-    private String policyLevel;
+    @Excel(name = "政策等级",readConverterExp = "1=国家级,2=江苏省级,3=苏州市级,4=园区本级")
+    @ApiModelProperty("政策等级 1国家级、2江苏省级、3苏州市级、4园区本级")
+    private Integer policyLevel;
 
     /**
      * 发文时间
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/mapper/JProjectMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/mapper/JProjectMapper.java
index e7e2405..5850167 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/mapper/JProjectMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/mapper/JProjectMapper.java
@@ -38,7 +38,7 @@ public interface JProjectMapper extends BaseMapper<JProject> {
 
 
 
-    List<JProject> selectAll(@Param("name") String name);
+    List<JProject> selectAll(@Param("name") String name,@Param("status") Integer status);
 
 }
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/JProjectService.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/JProjectService.java
index 8437e28..7afaf47 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/JProjectService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/JProjectService.java
@@ -47,7 +47,7 @@ public interface JProjectService extends IService<JProject> {
      * @param jProject 查询实体
      * @return 所有数据
      */
-    List<JProject> selectAll(String jProject);
+    List<JProject> selectAll(String jProject,Integer status);
 
 
     /**
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JProjectServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JProjectServiceImpl.java
index b6212d1..057d803 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JProjectServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JProjectServiceImpl.java
@@ -77,8 +77,8 @@ public class JProjectServiceImpl extends ServiceImpl<JProjectMapper, JProject> i
 
 
     @Override
-    public List<JProject> selectAll(String jProject) {
-        return baseMapper.selectAll(jProject);
+    public List<JProject> selectAll(String jProject,Integer status) {
+        return baseMapper.selectAll(jProject,status);
     }
 
 
diff --git a/ruoyi-admin/src/main/resources/mapper/jjh/ent/JProjectMapper.xml b/ruoyi-admin/src/main/resources/mapper/jjh/ent/JProjectMapper.xml
index ae30e97..8d8064d 100644
--- a/ruoyi-admin/src/main/resources/mapper/jjh/ent/JProjectMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/jjh/ent/JProjectMapper.xml
@@ -62,6 +62,9 @@
                 and credit_code like concat('%',#{name},'%')
                  or declare_unit like concat('%',#{name},'%')
             </if>
+            <if test="status != null and status != '' ">
+                and status = #{status}
+            </if>
         </where>
         order by create_time desc ,project_year desc
     </select>