ResourceEntity 增加infoList json字段
This commit is contained in:
wangliwen
parent
5b66808e7c
commit
0063546e5e
|
|
@ -0,0 +1 @@
|
|||
ALTER TABLE `share_platform`.`tb_data_resource` ADD COLUMN `info_list` json NULL COMMENT '属性信息';
|
||||
|
|
@ -1,11 +1,15 @@
|
|||
package io.renren.modules.resource.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import com.baomidou.mybatisplus.annotation.FieldFill;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
|
||||
import io.renren.common.entity.BaseEntity;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 资源表
|
||||
|
|
@ -130,4 +134,7 @@ public class ResourceEntity extends BaseEntity {
|
|||
* 提起下架人员
|
||||
*/
|
||||
private String undercarriageUserName;
|
||||
|
||||
@TableField(value = "info_list", typeHandler = FastjsonTypeHandler.class)
|
||||
private List<AttrEntity> infoList;
|
||||
}
|
||||
|
|
@ -0,0 +1 @@
|
|||
ALTER TABLE `share_platform`.`tb_data_resource` ADD COLUMN `info_list` json NULL COMMENT '属性信息';
|
||||
|
|
@ -33,6 +33,8 @@
|
|||
<result property="enclosure" column="enclosure"/>
|
||||
<result property="undercarriageReason" column="undercarriage_reason"/>
|
||||
<result property="undercarriageUserName" column="undercarriage_user_name"/>
|
||||
<result property="infoList" column="info_list"
|
||||
typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
|
||||
</resultMap>
|
||||
|
||||
<resultMap id="resourceDTO" type="io.renren.modules.resource.dto.ResourceDTO">
|
||||
|
|
@ -103,7 +105,7 @@
|
|||
|
||||
<select id="selectWithAttrs" resultMap="resourceDTO">
|
||||
SELECT
|
||||
tdr.*,
|
||||
DISTINCT tdr.*,
|
||||
IFNULL(taa2.approve_status, '未申请') AS "applyState",
|
||||
IFNULL(trs.score, 0 ) AS "score",
|
||||
IFNULL(taa.applyCount, 0 ) AS "applyCount",
|
||||
|
|
@ -215,34 +217,34 @@
|
|||
</select>
|
||||
|
||||
<select id="selectDTOById" resultMap="resourceDTO">
|
||||
<!-- SELECT-->
|
||||
<!-- tdr.*,-->
|
||||
<!--<!– tda.*,–>-->
|
||||
<!-- IFNULL(trs.score, 0 ) AS "score",-->
|
||||
<!-- IFNULL(taa.applyCount, 0 ) AS "applyCount",-->
|
||||
<!-- IFNULL(trc.collectCount, 0) AS "collectCount",-->
|
||||
<!-- sd.name as "deptName",-->
|
||||
<!-- IFNULL(trc2.isCollect, 'false') AS "isCollect",-->
|
||||
<!-- IFNULL(taa2.approve_status, '未申请') AS "applyState"-->
|
||||
<!-- FROM-->
|
||||
<!-- tb_data_resource tdr-->
|
||||
<!--<!– LEFT JOIN tb_data_attr tda ON tdr.id = tda.data_resource_id–>-->
|
||||
<!-- LEFT JOIN ( SELECT resource_id, AVG(score) AS "score" FROM tb_resource_score WHERE 1 = 1 AND del_flag = 0 GROUP-->
|
||||
<!-- BY resource_id ) trs ON tdr.id = trs.resource_id-->
|
||||
<!-- LEFT JOIN ( SELECT resource_id, COUNT(id) AS "applyCount" FROM t_ability_application WHERE 1 = 1 AND del_flag =-->
|
||||
<!-- 0 GROUP BY resource_id ) taa ON tdr.id = taa.resource_id-->
|
||||
<!-- LEFT JOIN ( SELECT resource_id, COUNT(id) AS "collectCount" FROM tb_resource_collection WHERE 1 = 1 AND del_flag-->
|
||||
<!-- = 0 GROUP BY resource_id ) trc ON tdr.id = trc.resource_id-->
|
||||
<!-- LEFT JOIN ( SELECT resource_id, user_id, ( CASE COUNT( id ) WHEN 1 THEN 'true' ELSE 'false' END ) AS "isCollect"-->
|
||||
<!-- FROM tb_resource_collection WHERE-->
|
||||
<!-- 1 = 1 AND del_flag = 0 AND user_id = #{userId}-->
|
||||
<!-- GROUP BY resource_id) trc2 ON tdr.id = trc2.resource_id-->
|
||||
<!-- LEFT JOIN ( SELECT resource_id, approve_status FROM t_ability_application WHERE-->
|
||||
<!-- 1 = 1 AND del_flag = 0 AND user_id = #{userId}-->
|
||||
<!-- GROUP BY id LIMIT 1) taa2 ON tdr.id = taa2.resource_id-->
|
||||
<!-- LEFT JOIN sys_dept sd ON tdr.dept_id = sd.id-->
|
||||
<!-- WHERE 1 = 1-->
|
||||
<!-- AND tdr.id = #{id}-->
|
||||
<!-- SELECT-->
|
||||
<!-- tdr.*,-->
|
||||
<!--<!– tda.*,–>-->
|
||||
<!-- IFNULL(trs.score, 0 ) AS "score",-->
|
||||
<!-- IFNULL(taa.applyCount, 0 ) AS "applyCount",-->
|
||||
<!-- IFNULL(trc.collectCount, 0) AS "collectCount",-->
|
||||
<!-- sd.name as "deptName",-->
|
||||
<!-- IFNULL(trc2.isCollect, 'false') AS "isCollect",-->
|
||||
<!-- IFNULL(taa2.approve_status, '未申请') AS "applyState"-->
|
||||
<!-- FROM-->
|
||||
<!-- tb_data_resource tdr-->
|
||||
<!--<!– LEFT JOIN tb_data_attr tda ON tdr.id = tda.data_resource_id–>-->
|
||||
<!-- LEFT JOIN ( SELECT resource_id, AVG(score) AS "score" FROM tb_resource_score WHERE 1 = 1 AND del_flag = 0 GROUP-->
|
||||
<!-- BY resource_id ) trs ON tdr.id = trs.resource_id-->
|
||||
<!-- LEFT JOIN ( SELECT resource_id, COUNT(id) AS "applyCount" FROM t_ability_application WHERE 1 = 1 AND del_flag =-->
|
||||
<!-- 0 GROUP BY resource_id ) taa ON tdr.id = taa.resource_id-->
|
||||
<!-- LEFT JOIN ( SELECT resource_id, COUNT(id) AS "collectCount" FROM tb_resource_collection WHERE 1 = 1 AND del_flag-->
|
||||
<!-- = 0 GROUP BY resource_id ) trc ON tdr.id = trc.resource_id-->
|
||||
<!-- LEFT JOIN ( SELECT resource_id, user_id, ( CASE COUNT( id ) WHEN 1 THEN 'true' ELSE 'false' END ) AS "isCollect"-->
|
||||
<!-- FROM tb_resource_collection WHERE-->
|
||||
<!-- 1 = 1 AND del_flag = 0 AND user_id = #{userId}-->
|
||||
<!-- GROUP BY resource_id) trc2 ON tdr.id = trc2.resource_id-->
|
||||
<!-- LEFT JOIN ( SELECT resource_id, approve_status FROM t_ability_application WHERE-->
|
||||
<!-- 1 = 1 AND del_flag = 0 AND user_id = #{userId}-->
|
||||
<!-- GROUP BY id LIMIT 1) taa2 ON tdr.id = taa2.resource_id-->
|
||||
<!-- LEFT JOIN sys_dept sd ON tdr.dept_id = sd.id-->
|
||||
<!-- WHERE 1 = 1-->
|
||||
<!-- AND tdr.id = #{id}-->
|
||||
|
||||
SELECT
|
||||
tdr.*,
|
||||
|
|
@ -567,7 +569,8 @@
|
|||
tdav.data_resource_id AS resourceId
|
||||
FROM
|
||||
tb_data_attr tdav
|
||||
JOIN mysql.help_topic b ON b.help_topic_id < ( LENGTH( tdav.attr_value ) - LENGTH( REPLACE ( tdav.attr_value, ';', '' ) ) + 1 )
|
||||
JOIN mysql.help_topic b ON b.help_topic_id < ( LENGTH( tdav.attr_value ) - LENGTH( REPLACE ( tdav.attr_value,
|
||||
';', '' ) ) + 1 )
|
||||
WHERE
|
||||
1 = 1
|
||||
AND tdav.attr_type = '应用领域'
|
||||
|
|
@ -830,7 +833,8 @@
|
|||
COUNT( tdav.data_resource_id ) AS "count"
|
||||
FROM
|
||||
tb_data_attr tdav
|
||||
JOIN mysql.help_topic b ON b.help_topic_id < ( LENGTH( tdav.attr_value ) - LENGTH( REPLACE ( tdav.attr_value, ';', '' ) ) + 1 )
|
||||
JOIN mysql.help_topic b ON b.help_topic_id < ( LENGTH( tdav.attr_value ) - LENGTH( REPLACE ( tdav.attr_value,
|
||||
';', '' ) ) + 1 )
|
||||
WHERE
|
||||
1 = 1
|
||||
AND tdav.attr_type = '应用领域'
|
||||
|
|
@ -850,7 +854,8 @@
|
|||
COUNT( tdav.data_resource_id ) AS "count"
|
||||
FROM
|
||||
tb_data_attr tdav
|
||||
JOIN mysql.help_topic b ON b.help_topic_id < ( LENGTH( tdav.attr_value ) - LENGTH( REPLACE ( tdav.attr_value, ';', '' ) ) + 1 )
|
||||
JOIN mysql.help_topic b ON b.help_topic_id < ( LENGTH( tdav.attr_value ) - LENGTH( REPLACE ( tdav.attr_value,
|
||||
';', '' ) ) + 1 )
|
||||
WHERE
|
||||
1 = 1
|
||||
AND tdav.attr_type = '应用领域'
|
||||
|
|
@ -883,7 +888,8 @@
|
|||
COUNT( tdav.data_resource_id ) AS "total"
|
||||
FROM
|
||||
tb_data_attr tdav
|
||||
JOIN mysql.help_topic b ON b.help_topic_id < ( LENGTH( tdav.attr_value ) - LENGTH( REPLACE ( tdav.attr_value, ';', '' ) ) + 1 )
|
||||
JOIN mysql.help_topic b ON b.help_topic_id < ( LENGTH( tdav.attr_value ) - LENGTH( REPLACE ( tdav.attr_value,
|
||||
';', '' ) ) + 1 )
|
||||
WHERE
|
||||
1 = 1
|
||||
AND tdav.attr_type = '应用领域'
|
||||
|
|
|
|||
Loading…
Reference in New Issue