From 4e027e9f04bfc54e1daa5243510d6e9c5c0e003d Mon Sep 17 00:00:00 2001
From: lizhicheng <lizhicheng2@hisense.com>
Date: Wed, 14 Sep 2022 17:09:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=8A=E6=9E=B6=E3=80=81?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E8=AF=A6=E6=83=85=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/controller/CensusController.java   | 28 ++++++++++
 .../modules/resource/dao/ResourceDao.java     |  8 +++
 .../resource/service/ResourceService.java     |  4 ++
 .../service/impl/ResourceServiceImpl.java     | 35 +++++++++++-
 .../resources/mapper/resource/ResourceDao.xml | 53 +++++++++++++++++++
 5 files changed, 127 insertions(+), 1 deletion(-)

diff --git a/renren-admin/src/main/java/io/renren/common/controller/CensusController.java b/renren-admin/src/main/java/io/renren/common/controller/CensusController.java
index 606c6aa7..6658fb0d 100644
--- a/renren-admin/src/main/java/io/renren/common/controller/CensusController.java
+++ b/renren-admin/src/main/java/io/renren/common/controller/CensusController.java
@@ -372,4 +372,32 @@ public class CensusController {
         return new Result().ok(resourceService.selectDeptDetailTypeCountList(params));
     }
 
+    @GetMapping("/selectCensusResourceTable")
+    @ApiOperation("查询部门上架资源及审批结果详细信息")
+    @LogOperation("查询部门上架资源及审批结果详细信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "startDate", value = "开始时间", paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "endDate", value = "结束时间", paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "type", value = "资源类型", paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "deptId", value = "所属部门", paramType = "query", dataType = "long"),
+            @ApiImplicitParam(name = "approveStatus", value = "审核状态", paramType = "query", dataType = "String"),
+    })
+    public Result selectCensusResourceTable(@RequestParam Map<String, Object> params){
+        return new Result().ok(resourceService.selectCensusResourceTable(params));
+    }
+
+    @GetMapping("/selectCensusApplyTable")
+    @ApiOperation("查询部门申请资源及审批结果详细信息")
+    @LogOperation("查询部门申请资源及审批结果详细信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "startDate", value = "开始时间", paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "endDate", value = "结束时间", paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "type", value = "资源类型", paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "deptId", value = "所属部门", paramType = "query", dataType = "long"),
+            @ApiImplicitParam(name = "approveStatus", value = "审核状态", paramType = "query", dataType = "String"),
+    })
+    public Result selectCensusApplyTable(@RequestParam Map<String, Object> params){
+        return new Result().ok(resourceService.selectCensusApplyTable(params));
+    }
+
 }
diff --git a/renren-admin/src/main/java/io/renren/modules/resource/dao/ResourceDao.java b/renren-admin/src/main/java/io/renren/modules/resource/dao/ResourceDao.java
index d32053eb..c52428d9 100644
--- a/renren-admin/src/main/java/io/renren/modules/resource/dao/ResourceDao.java
+++ b/renren-admin/src/main/java/io/renren/modules/resource/dao/ResourceDao.java
@@ -192,4 +192,12 @@ public interface ResourceDao extends BaseDao<ResourceEntity> {
                                                             @Param("deptId") Long deptId,
                                                             @Param("startDate") String startDate,
                                                             @Param("endDate") String endDate);
+
+    List<Map> selectCensusResourceTable(@Param("delFlags") List<Integer> delFlags,
+                                        @Param("deptId") Long deptId,
+                                        @Param("type") String type,
+                                        @Param("startDate") String startDate,
+                                        @Param("endDate") String endDate);
+
+    List<Map> selectCensusApplyTable(Map params);
 }
\ No newline at end of file
diff --git a/renren-admin/src/main/java/io/renren/modules/resource/service/ResourceService.java b/renren-admin/src/main/java/io/renren/modules/resource/service/ResourceService.java
index 3c0510d3..dc2d9411 100644
--- a/renren-admin/src/main/java/io/renren/modules/resource/service/ResourceService.java
+++ b/renren-admin/src/main/java/io/renren/modules/resource/service/ResourceService.java
@@ -142,4 +142,8 @@ public interface ResourceService extends CrudService<ResourceEntity, ResourceDTO
     Object selectApplyDeptDetailTypeCountList(Map params);
 
     Object selectDeptDetailTypeCountList(Map params);
+
+    Object selectCensusResourceTable(Map params);
+
+    Object selectCensusApplyTable(Map params);
 }
\ No newline at end of file
diff --git a/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java b/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java
index 26913ff9..b4c00fad 100644
--- a/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java
+++ b/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java
@@ -2025,7 +2025,10 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
     public Object selectDeptDetailTypeCountList(Map params) {
         String startDate= (String) params.get("startDate");
         String endDate= (String) params.get("endDate");
-        Long deptId= Long.parseLong((String) params.get("deptId"));
+        Long deptId=null;
+        if(params.get("deptId") != null){
+            deptId= Long.parseLong((String) params.get("deptId"));
+        }
         List<Integer> delFlags=new ArrayList<>();
         if(params.get("approveStatus") != null){
             if("审核完成".equals(params.get("approveStatus"))){
@@ -2051,4 +2054,34 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
         return resultList;
     }
 
+    @Override
+    public Object selectCensusResourceTable(Map params){
+        String startDate= (String) params.get("startDate");
+        String endDate= (String) params.get("endDate");
+        Long deptId=null;
+        if(params.get("deptId") != null){
+            deptId= Long.parseLong((String) params.get("deptId"));
+        }
+        String type= (String) params.get("type");
+        List<Integer> delFlags=new ArrayList<>();
+        if(params.get("approveStatus") != null){
+            if("审核完成".equals(params.get("approveStatus"))){
+                delFlags.add(0);
+            }else if("审核中".equals(params.get("approveStatus"))){
+                delFlags.add(2);
+                delFlags.add(3);
+            }
+        }else {
+            delFlags.add(0);
+            delFlags.add(2);
+            delFlags.add(3);
+        }
+        return resourceDao.selectCensusResourceTable(delFlags, deptId, type, startDate, endDate);
+    }
+
+    @Override
+    public Object selectCensusApplyTable(Map params){
+        return resourceDao.selectCensusApplyTable(params);
+    }
+
 }
\ No newline at end of file
diff --git a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
index fdb83a31..9e0a2c9e 100644
--- a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
+++ b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
@@ -1761,4 +1761,57 @@
             tdr.dept_id,
             tdr.type
     </select>
+
+    <select id="selectCensusResourceTable" resultType="java.util.Map">
+        SELECT sd.name AS deptName, tdr.name AS resourceName, tdr.type, tdr.create_date AS createDate, if(tdr.del_flag=0, '审核通过', '审核中') AS approveStatus
+        FROM (SELECT IF(d.type='组件服务', A.attr_value, d.type) AS type, d.id, d.del_flag, d.dept_id, d.create_date, d.name
+                FROM tb_data_resource d LEFT JOIN tb_data_attr a ON d.id=a.data_resource_id AND a.attr_type='组件类型' AND a.del_flag=0
+                WHERE d.type NOT IN ('知识库','基础设施','数据资源')) tdr,
+             sys_dept sd
+        WHERE 1=1 AND tdr.dept_id=sd.id
+        <if test="null != delFlags">
+            AND tdr.del_flag in
+            <foreach item="delFlag" collection="delFlags" open="(" separator="," close=")">
+                #{delFlag}
+            </foreach>
+        </if>
+        <if test="deptId != null and deptId != ''">
+            AND sd.id = #{deptId}
+        </if>
+        <if test="type != null and type != ''">
+            AND tdr.type = #{type}
+        </if>
+        <if test="startDate != null and startDate != '' and endDate != null and endDate != ''">
+            AND SUBSTR(tdr.create_date, 1, 10) BETWEEN #{startDate} AND #{endDate}
+        </if>
+        ORDER BY tdr.create_date DESC
+    </select>
+
+    <select id="selectCensusApplyTable" resultType="java.util.Map">
+        SELECT sd.name AS deptName, tdr.name AS resourceName, tdr.type, taa.create_date AS createDate, taa.approve_status AS approveStatus
+        FROM (SELECT IF(d.type='组件服务', A.attr_value, d.type) AS type, d.id, d.del_flag, d.dept_id, d.create_date, d.name
+             FROM tb_data_resource d LEFT JOIN tb_data_attr a ON d.id=a.data_resource_id AND a.attr_type='组件类型' AND a.del_flag=0
+             WHERE d.type NOT IN ('知识库','基础设施','数据资源')) tdr,
+            sys_dept sd,
+            sys_user su,
+            t_ability_application taa
+        WHERE 1 = 1
+          AND tdr.del_flag = 0
+          AND taa.user_id = su.id
+          AND su.dept_id = sd.id
+          AND taa.resource_id = tdr.id
+        <if test="approveStatus != null and approveStatus != ''">
+            AND taa.approve_status = #{approveStatus}
+        </if>
+        <if test="deptId != null and deptId != ''">
+            AND sd.id = #{deptId}
+        </if>
+        <if test="type != null and type != ''">
+            AND tdr.type = #{type}
+        </if>
+        <if test="startDate != null and startDate != '' and endDate != null and endDate != ''">
+            AND SUBSTR(taa.create_date, 1, 10) BETWEEN #{startDate} AND #{endDate}
+        </if>
+        ORDER BY taa.create_date DESC
+    </select>
 </mapper>
\ No newline at end of file