Compare commits
No commits in common. "edb5c683f8e34e8af65911f4fa017ab68a9901a9" and "928237e8e47466ce0626948794a72531469d09c1" have entirely different histories.
edb5c683f8
...
928237e8e4
|
@ -58,10 +58,8 @@ public class TbFuseDTO {
|
||||||
private Integer dataSourceCount;
|
private Integer dataSourceCount;
|
||||||
@ApiModelProperty(value = "组件服务数量")
|
@ApiModelProperty(value = "组件服务数量")
|
||||||
private Integer componentCount;
|
private Integer componentCount;
|
||||||
@ApiModelProperty(value = "赋能场景类型:0市级,1基层")
|
@ApiModelProperty(value = "组件服务数量")
|
||||||
private Integer district;
|
private Integer district;
|
||||||
@ApiModelProperty(value = "基层赋能场景所属地区")
|
|
||||||
private String area;
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -80,5 +80,5 @@ public class TbFuseEntity extends BaseEntity {
|
||||||
private Integer dataSourceCount;
|
private Integer dataSourceCount;
|
||||||
private Integer componentCount;
|
private Integer componentCount;
|
||||||
private Integer district;
|
private Integer district;
|
||||||
private String area;
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,2 +1 @@
|
||||||
ALTER TABLE tb_fuse ADD COLUMN `district` int(2) DEFAULT 0 COMMENT '赋能场景类型:0市级、1基层场景',
|
ALTER TABLE tb_fuse ADD COLUMN `district` int(2) DEFAULT 0 COMMENT '赋能场景类型:0市级、1基层场景';
|
||||||
ADD COLUMN `area` varchar(128) NULL COMMENT '基层赋能场景所属地区';
|
|
|
@ -20,7 +20,6 @@
|
||||||
<result property="dataSourceCount" column="data_source_count"/>
|
<result property="dataSourceCount" column="data_source_count"/>
|
||||||
<result property="componentCount" column="component_count"/>
|
<result property="componentCount" column="component_count"/>
|
||||||
<result property="district" column="district"/>
|
<result property="district" column="district"/>
|
||||||
<result property="area" column="area"/>
|
|
||||||
</resultMap>
|
</resultMap>
|
||||||
|
|
||||||
<select id="getFuseDTOList" resultMap="fuseDTO">
|
<select id="getFuseDTOList" resultMap="fuseDTO">
|
||||||
|
|
|
@ -1884,20 +1884,20 @@
|
||||||
FROM
|
FROM
|
||||||
(SELECT IF(d.type='组件服务', A.attr_value, d.type) AS type, d.id, d.del_flag, d.dept_id, d.create_date FROM
|
(SELECT IF(d.type='组件服务', A.attr_value, d.type) AS type, d.id, d.del_flag, d.dept_id, d.create_date FROM
|
||||||
tb_data_resource d LEFT JOIN tb_data_attr a ON d.id=a.data_resource_id AND a.attr_type='组件类型' AND
|
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 IN ('应用资源', '组件服务') AND d.del_flag NOT IN (1, 5)) tdr,
|
a.del_flag=0 WHERE d.type IN ('应用资源', '组件服务') AND d.del_flag = 0) tdr,
|
||||||
sys_dept sd
|
sys_dept sd
|
||||||
WHERE
|
WHERE
|
||||||
1 = 1
|
1 = 1
|
||||||
AND tdr.dept_id = sd.id
|
AND tdr.dept_id = sd.id
|
||||||
<choose>
|
<choose>
|
||||||
<when test="approveStatus != null and approveStatus == '通过'">
|
<when test="approveStatus != null and approveStatus == '通过'">
|
||||||
AND tdr.del_flag = 0
|
AND tdr.del_flag=0
|
||||||
</when>
|
</when>
|
||||||
<when test="approveStatus != null and approveStatus == '审核中'">
|
<when test="approveStatus != null and approveStatus == '审核中'">
|
||||||
AND tdr.del_flag in (2, 3, 4)
|
AND tdr.del_flag in (2, 3, 4)
|
||||||
</when>
|
</when>
|
||||||
<when test="approveStatus != null and approveStatus == '不通过'">
|
<when test="approveStatus != null and approveStatus == '不通过'">
|
||||||
AND tdr.del_flag = 6
|
AND tdr.del_flag=6
|
||||||
</when>
|
</when>
|
||||||
<otherwise>
|
<otherwise>
|
||||||
AND tdr.del_flag in (0, 2, 3, 4, 6)
|
AND tdr.del_flag in (0, 2, 3, 4, 6)
|
||||||
|
@ -1926,7 +1926,7 @@
|
||||||
tdr.name AS resourceName,
|
tdr.name AS resourceName,
|
||||||
tdr.type,
|
tdr.type,
|
||||||
DATE_FORMAT(tdr.create_date,'%Y-%m-%d %T') AS createDate,
|
DATE_FORMAT(tdr.create_date,'%Y-%m-%d %T') AS createDate,
|
||||||
CASE WHEN tdr.del_flag = 0 THEN '通过' WHEN tdr.del_flag = 6 THEN '不通过' ELSE '审核中' END AS approveStatus,
|
CASE WHEN (tdr.del_flag = 0 OR tdr.del_flag = 5) THEN '通过' WHEN tdr.del_flag = 6 THEN '不通过' ELSE '审核中' END AS approveStatus,
|
||||||
trma.instance_id AS applyNumber
|
trma.instance_id AS applyNumber
|
||||||
FROM
|
FROM
|
||||||
(SELECT
|
(SELECT
|
||||||
|
@ -1938,10 +1938,7 @@
|
||||||
d.name
|
d.name
|
||||||
FROM tb_data_resource d
|
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
|
LEFT JOIN tb_data_attr a ON d.id = a.data_resource_id AND a.attr_type = '组件类型' AND a.del_flag = 0
|
||||||
WHERE
|
WHERE d.type IN ('应用资源','组件服务')
|
||||||
1 = 1
|
|
||||||
AND d.del_flag NOT IN (1, 5)
|
|
||||||
AND d.type IN ('应用资源','组件服务')
|
|
||||||
) tdr
|
) tdr
|
||||||
LEFT JOIN t_resource_mount_apply trma on tdr.id = trma.resource_id,
|
LEFT JOIN t_resource_mount_apply trma on tdr.id = trma.resource_id,
|
||||||
sys_dept sd
|
sys_dept sd
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="getListByLevel" resultType="io.renren.modules.sys.entity.SysRegionEntity">
|
<select id="getListByLevel" resultType="io.renren.modules.sys.entity.SysRegionEntity">
|
||||||
select id, pid, name from sys_region where tree_level = #{value} order by sort
|
select id, pid, name from sys_region where level = #{value} order by sort
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="getById" resultType="io.renren.modules.sys.entity.SysRegionEntity">
|
<select id="getById" resultType="io.renren.modules.sys.entity.SysRegionEntity">
|
||||||
|
|
Loading…
Reference in New Issue