创建show分支

renren-admin/src/main/java/io/renren/modules/resource/controller/ResourceController.java

@@ -203,6 +203,7 @@ public class ResourceController {
             List<Long> ids = jdbcTemplate.queryForList("SELECT id FROM tb_data_resource", Long.class);
             ids.forEach(id -> {
                 ResourceDTO data = resourceService.selectWithAttrs(id);
+                data.setUpdateDate(new Date());
                 resourceService.update(data);
             });
         }, executor);

renren-admin/src/main/java/io/renren/modules/sys/service/impl/SysUserServiceImpl.java

@@ -97,6 +97,8 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
 
     @Override
     public List<SysUserDTO> list(Map<String, Object> params) {
+        //转换成like
+        paramsToLike(params, "username", "real_name");
         // 普通管理员，只能查询所属部门及子部门的数据
         UserDetail user = SecurityUser.getUser();
         if (user.getSuperAdmin() == SuperAdminEnum.NO.value()) {

renren-admin/src/main/resources/application.yml

@@ -18,7 +18,7 @@ big_date:
   assignee_meet_role_id: 1576849766277849089
 # 需要进行统计数目的资源 type/需要进行统计申请的资源类型 applyType
 census:
-  type: 组件服务,应用资源,基础设施,数据资源,知识库
+  type: 应用资源,组件服务,基础设施,数据资源,知识库
   applyType: 应用资源,业务组件,图层服务,开发组件,智能算法
 # 海信网关
 hisense:

renren-admin/src/main/resources/mapper/notice/SysNoticeDao.xml

@@ -25,6 +25,7 @@
     </select>
 
     <update id="updateApplyState">
-        update sys_notice set apply_state = #{applyState} where receiver_type_ids like concat('%', #{userId}, '%') and apply_id=#{applyId}
+        update sys_notice set apply_state = #{applyState} where receiver_type_ids like concat('%', #{userId}, '%') and
+        apply_id=#{applyId}
     </update>
 </mapper>

renren-admin/src/main/resources/mapper/resource/ResourceDao.xml

@@ -1639,7 +1639,22 @@
     <select id="selectTypeCountByName" resultType="java.util.Map">
         SELECT
         type,
-        count(id) AS "count"
+        count(id) AS "count",
+        (
+        CASE
+        type
+        WHEN '应用资源' THEN
+        1
+        WHEN '组件服务' THEN
+        2
+        WHEN '基础设施' THEN
+        3
+        WHEN '知识库' THEN
+        5
+        WHEN '数据资源' THEN
+        4
+        END
+        ) AS "type_index"
         FROM tb_data_resource
         WHERE 1 = 1
         AND del_flag = 0
@@ -1797,7 +1812,7 @@
         GROUP BY
         sd.id,
         tdr.type
-        <if test="type == null or type == '' or type == '会议室'">
+        <if test="type == null or type == '' or type == '会客厅'">
             UNION
 
             SELECT
@@ -1986,14 +2001,14 @@
             AND SUBSTR(taa.create_date, 1, 10) BETWEEN #{startDate} AND #{endDate}
         </if>
 
-        <if test="type == null or type == '' or type == '会议室'">
+        <if test="type == null or type == '' or type == '会客厅'">
             UNION ALL
 
             SELECT
             tmb.dept AS 'deptName',
             tm.`name` AS 'resourceName',
             '青岛市大数据发展管理局' AS 'resourceDeptName',
-            '会议室' AS 'type',
+            '会客厅' AS 'type',
             tmb.create_date AS 'createDate',
             CASE tmb.state WHEN 1 THEN '审核中' WHEN 2 THEN '通过' WHEN 3 THEN '不通过' ELSE '审核中' END AS
             'approveStatus',
@@ -2040,9 +2055,13 @@
         FROM tb_data_attr a INNER JOIN mysql.help_topic b ON a.attr_type='应用领域' AND a.del_flag=0 AND b.help_topic_id
         <![CDATA[ < ]]> (length(a.attr_value) - length(REPLACE(a.attr_value, ';', '')) + 1)) tda
         ON tdr.id=tda.data_resource_id
+        LEFT JOIN (select sdd.sort, sdd.dict_label from sys_dict_data sdd left join tb_data_category tdc on
+        sdd.dict_type_id=tdc.link_value
+        where 1=1 and sdd.status=1 and tdc.del_flag=0 and tdc.name='应用领域' and tdc.root_category='应用资源') dict ON
+        dict.dict_label=tda.attr_value
         WHERE 1=1 AND tdr.del_flag=0 AND tdr.type='应用资源'
         GROUP BY tda.attr_value
-        ORDER BY count DESC
+        ORDER BY ANY_VALUE(IFNULL(dict.sort, 9999)) ASC
     </select>
 
     <select id="getPraiseList" resultType="java.util.Map">
@@ -2272,18 +2291,18 @@
 
     <select id="getAppListByDept" resultType="java.util.Map">
         SELECT
-            tdr.id,
-            tdr.NAME,
-            tdr.create_date
+        tdr.id,
+        tdr.NAME,
+        tdr.create_date
         FROM
-            tb_data_resource tdr
+        tb_data_resource tdr
         WHERE
-            1 = 1
-            AND tdr.del_flag = 0
-            AND tdr.dept_id = #{deptId}
-            <if test="key != null and key != ''">
-                AND tdr.name like CONCAT('%', #{key}, '%')
-            </if>
+        1 = 1
+        AND tdr.del_flag = 0
+        AND tdr.dept_id = #{deptId}
+        <if test="key != null and key != ''">
+            AND tdr.name like CONCAT('%', #{key}, '%')
+        </if>
         ORDER BY create_date DESC
     </select>
 

renren-admin/src/main/resources/mapper/sys/SysDeptDao.xml

@@ -7,7 +7,7 @@
         select t1.*,(select t2.name from sys_dept t2 where t2.id=t1.pid)parentName from sys_dept t1
         where 1 = 1 AND name != '访客部门'
         <if test="deptIdList != null">
-           AND t1.id in
+            AND t1.id in
             <foreach item="id" collection="deptIdList" open="(" separator="," close=")">
                 #{id}
             </foreach>