suzhou-jichuang-lanhai
/
JinJiHuJava
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

数据大屏为空的数据改为 -

Browse Source
wushunjie
杜函宇 9 months ago
parent 9fe01f6a7e
commit a21553bcf0
12 changed files with 58 additions and 62 deletions
Show Stats Download Patch File Download Diff File

8
ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/JHeadQuartersRevenue.java
Unescape View File

@ -49,13 +49,13 @@ public class JHeadQuartersRevenue {
* 营收 * 营收
*/ */
@ApiModelProperty("营收") @ApiModelProperty("营收")
private Double revenue; private String revenue;
/** /**
* 税收 * 税收
*/ */
@ApiModelProperty("税收") @ApiModelProperty("税收")
private Double taxation; private String taxation;
/** /**
* 年份 * 年份
@ -67,11 +67,11 @@ public class JHeadQuartersRevenue {
* 产值 * 产值
*/ */
@ApiModelProperty("产值") @ApiModelProperty("产值")
private Double output; private String output;
/** /**
* 销售额 * 销售额
*/ */
@ApiModelProperty("销售额") @ApiModelProperty("销售额")
private Double sales; private String sales;
} }

2
ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/JServicesList.java
Unescape View File

@ -61,7 +61,7 @@ public class JServicesList extends BaseInfoEntity {
*/ */
@TableField(exist = false) @TableField(exist = false)
@ApiModelProperty("全年营收") @ApiModelProperty("全年营收")
private Double revenue; private String revenue;
/** /**
* 年份 * 年份

8
ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/response/HonorResponse.java
Unescape View File

@ -29,7 +29,7 @@ public class HonorResponse {
* 大类数量 * 大类数量
*/ */
@ApiModelProperty("大类数量") @ApiModelProperty("大类数量")
private Integer count1; private String count1;
/** /**
* 项目中类名字 * 项目中类名字
@ -48,7 +48,7 @@ public class HonorResponse {
* 中类数量 * 中类数量
*/ */
@ApiModelProperty("中类数量") @ApiModelProperty("中类数量")
private Integer count2; private String count2;
/** /**
* 项目小类名字 * 项目小类名字
@ -66,12 +66,12 @@ public class HonorResponse {
* 小类数量 * 小类数量
*/ */
@ApiModelProperty("小类数量") @ApiModelProperty("小类数量")
private Integer count3; private String count3;
/** /**
* 当前年增加项目数量 * 当前年增加项目数量
*/ */
@ApiModelProperty("当前年增加项目数量") @ApiModelProperty("当前年增加项目数量")
private Integer currentYearAdd; private String currentYearAdd;
} }

8
ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/response/JAllIndustryResponse.java
Unescape View File

@ -47,25 +47,25 @@ public class JAllIndustryResponse {
* 全年营收（亿元） * 全年营收（亿元）
*/ */
@ApiModelProperty("全年营收（亿元）") @ApiModelProperty("全年营收（亿元）")
private Double yearRevenue; private String yearRevenue;
/** /**
* 增加值（亿元） * 增加值（亿元）
*/ */
@ApiModelProperty("增加值（亿元）") @ApiModelProperty("增加值（亿元）")
private Double addValue; private String addValue;
/** /**
* 增加值增速（按不变价） * 增加值增速（按不变价）
*/ */
@ApiModelProperty("增加值增速（按不变价）%") @ApiModelProperty("增加值增速（按不变价）%")
private Double growth; private String growth;
/** /**
* 增加值占GDP比重 * 增加值占GDP比重
*/ */
@ApiModelProperty("增加值占GDP比重 %") @ApiModelProperty("增加值占GDP比重 %")
private Double gdpProportion; private String gdpProportion;
} }

8
ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/response/JBigMiddleIndustryResponse.java
Unescape View File

@ -32,24 +32,24 @@ public class JBigMiddleIndustryResponse {
* 全年营收（亿元） * 全年营收（亿元）
*/ */
@ApiModelProperty("全年营收（亿元）") @ApiModelProperty("全年营收（亿元）")
private Double yearRevenue; private String yearRevenue;
/** /**
* 增加值（亿元） * 增加值（亿元）
*/ */
@ApiModelProperty("增加值（亿元）") @ApiModelProperty("增加值（亿元）")
private Double addValue; private String addValue;
/** /**
* 增加值增速（按不变价） * 增加值增速（按不变价）
*/ */
@ApiModelProperty("增加值增速（按不变价）%") @ApiModelProperty("增加值增速（按不变价）%")
private Double growth; private String growth;
/** /**
* 增加值占GDP比重 * 增加值占GDP比重
*/ */
@ApiModelProperty("增加值占GDP比重 %") @ApiModelProperty("增加值占GDP比重 %")
private Double gdpProportion; private String gdpProportion;
} }

8
ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/response/JIndustryDepthResponse.java
Unescape View File

@ -31,24 +31,24 @@ public class JIndustryDepthResponse {
* 全年营收（亿元） * 全年营收（亿元）
*/ */
@ApiModelProperty("全年营收（亿元）") @ApiModelProperty("全年营收（亿元）")
private Double yearRevenue; private String yearRevenue;
/** /**
* 增加值（亿元） * 增加值（亿元）
*/ */
@ApiModelProperty("增加值（亿元）") @ApiModelProperty("增加值（亿元）")
private Double addValue; private String addValue;
/** /**
* 增加值增速（按不变价） * 增加值增速（按不变价）
*/ */
@ApiModelProperty("增加值增速（按不变价）%") @ApiModelProperty("增加值增速（按不变价）%")
private Double growth; private String growth;
/** /**
* 增加值占GDP比重 * 增加值占GDP比重
*/ */
@ApiModelProperty("增加值占GDP比重 %") @ApiModelProperty("增加值占GDP比重 %")
private Double gdpProportion; private String gdpProportion;
} }

8
ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/response/JServicesDevelopResponse.java
Unescape View File

@ -23,23 +23,23 @@ public class JServicesDevelopResponse {
* 季度 * 季度
*/ */
@ApiModelProperty("季度") @ApiModelProperty("季度")
private Integer quarterly; private String quarterly;
/** /**
* 服务业增加值(亿元) * 服务业增加值(亿元)
*/ */
@ApiModelProperty("服务业增加值(亿元)") @ApiModelProperty("服务业增加值(亿元)")
private Double valueAdded; private String valueAdded;
/** /**
* 服务业增速(%,可比价) * 服务业增速(%,可比价)
*/ */
@ApiModelProperty("服务业增速(%,可比价)") @ApiModelProperty("服务业增速(%,可比价)")
private Double increaseSpeed; private String increaseSpeed;
/** /**
* 服务业增加值占GDP比重(%) * 服务业增加值占GDP比重(%)
*/ */
@ApiModelProperty("服务业增加值占GDP比重(%)") @ApiModelProperty("服务业增加值占GDP比重(%)")
private Double gdpProportion; private String gdpProportion;
} }

4
ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/response/JServicesListCountResponse.java
Unescape View File

@ -29,11 +29,11 @@ public class JServicesListCountResponse {
* 规上企业营收 * 规上企业营收
*/ */
@ApiModelProperty("规上企业营收(亿元) / 税收贡献") @ApiModelProperty("规上企业营收(亿元) / 税收贡献")
private Double allRevenue; private String allRevenue;
/** /**
* 全口径增加值 * 全口径增加值
*/ */
@ApiModelProperty("全口径增加值(亿元) / 经营数据") @ApiModelProperty("全口径增加值(亿元) / 经营数据")
private Double addValue; private String addValue;
} }

13
ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JDataScreenImpl.java
Unescape View File

@ -47,13 +47,13 @@ public class JDataScreenImpl implements JDataScreenService {
List<HonorResponse> honor = jDataScreenMapper.getHonor(); List<HonorResponse> honor = jDataScreenMapper.getHonor();
for (HonorResponse y : honor) { for (HonorResponse y : honor) {
if (y.getProjectBigType() == 4) { if (y.getProjectBigType() == 4) {
y.setCount1(y.getCount1() - x); y.setCount1(String.valueOf(Integer.parseInt(y.getCount1()) - x));
} }
if (y.getProjectMiddleType() == 4) { if (y.getProjectMiddleType() == 4) {
y.setCount2(y.getCount2() - x); y.setCount2(String.valueOf(Integer.parseInt(y.getCount2()) - x));
} }
if (y.getProjectSmallType() == 6) { if (y.getProjectSmallType() == 6) {
y.setCount3(y.getCount3() - x); y.setCount3(String.valueOf(Integer.parseInt(y.getCount3()) - x));
} }
} }
return honor; return honor;
@ -86,12 +86,7 @@ public class JDataScreenImpl implements JDataScreenService {
*/ */
@Override @Override
public List<JIndustryDepthResponse> getIndustryDepth() { public List<JIndustryDepthResponse> getIndustryDepth() {
List<JIndustryDepthResponse> list = jDataScreenMapper.getIndustryDepth(); return jDataScreenMapper.getIndustryDepth();
list.forEach(x -> {
x.setYearRevenue(x.getYearRevenue() / 10000.0);
x.setAddValue(x.getAddValue() / 10000.0);
});
return list;
} }
/** /**

34
ruoyi-admin/src/main/resources/mapper/jjh/ent/JDataScreenMapper.xml
Unescape View File

@ -7,14 +7,14 @@
<select id="getHonor" resultType="com.ruoyi.jjh.ent.entity.response.HonorResponse"> <select id="getHonor" resultType="com.ruoyi.jjh.ent.entity.response.HonorResponse">
SELECT a.dict_label AS projectBigName, SELECT a.dict_label AS projectBigName,
a.dict_value AS projectBigType, a.dict_value AS projectBigType,
IFNULL(rs.count, 0) AS count1, IFNULL(rs.count, '-') AS count1,
b.dict_label AS projectMiddleName, b.dict_label AS projectMiddleName,
b.dict_value AS projectMiddleType, b.dict_value AS projectMiddleType,
IFNULL(ys.count, 0) AS count2, IFNULL(ys.count, '-') AS count2,
c.dict_label AS projectSmallName, c.dict_label AS projectSmallName,
c.dict_value AS projectSmallType, c.dict_value AS projectSmallType,
IFNULL(us.count, 0) AS count3, IFNULL(us.count, '-') AS count3,
IFNULL(ns.count, 0) AS currentYearAdd IFNULL(ns.count, '-') AS currentYearAdd
FROM sys_dict_data a FROM sys_dict_data a
JOIN sys_dict_data b ON a.remark = b.dict_type JOIN sys_dict_data b ON a.remark = b.dict_type
JOIN sys_dict_data c ON b.remark = c.dict_type JOIN sys_dict_data c ON b.remark = c.dict_type
@ -90,10 +90,10 @@
SELECT SELECT
a.years, a.years,
a.industry_categories, a.industry_categories,
IFNULL(a.year_revenue,0) as yearRevenue, IFNULL( a.year_revenue / 10000, '-' ) AS yearRevenue,
IFNULL(a.add_value,0) as addValue, IFNULL( a.add_value / 10000, '-' ) AS addValue,
IFNULL(a.growth,0) as growth, IFNULL( a.growth / 10000, '-' ) AS growth,
IFNULL(a.gdp_proportion,0) as gdpProportion IFNULL( a.gdp_proportion / 10000, '-' ) AS gdpProportion
FROM FROM
j_industry_depth a j_industry_depth a
WHERE WHERE
@ -103,11 +103,11 @@
resultType="com.ruoyi.jjh.ent.entity.response.JBigMiddleIndustryResponse"> resultType="com.ruoyi.jjh.ent.entity.response.JBigMiddleIndustryResponse">
SELECT SELECT
a.categories, a.categories,
a.middle as nameType, a.middle AS nameType,
ROUND( SUM( IFNULL( b.year_revenue, 0 ))/ 10000, 3 ) AS yearRevenue, IFNULL( ROUND( SUM( b.year_revenue )/ 10000, 3 ), '-' ) AS yearRevenue,
ROUND( SUM( IFNULL( b.add_value, 0 ))/ 10000, 3 ) AS addValue, IFNULL( ROUND( SUM( b.add_value )/ 10000, 3 ), '-' ) AS addValue,
IFNULL( b.growth, 0 ) AS growth, IFNULL( b.growth, '-' ) AS growth,
IFNULL( b.gdp_proportion, 0 ) AS gdpProportion IFNULL( b.gdp_proportion, '-' ) AS gdpProportion
FROM FROM
j_industry_dictionary a j_industry_dictionary a
LEFT JOIN j_small_industry b ON a.middle_code = LEFT ( b.small_code, 2 ) LEFT JOIN j_small_industry b ON a.middle_code = LEFT ( b.small_code, 2 )
@ -123,10 +123,10 @@
<select id="getBigIndustry" resultType="com.ruoyi.jjh.ent.entity.response.JAllIndustryResponse"> <select id="getBigIndustry" resultType="com.ruoyi.jjh.ent.entity.response.JAllIndustryResponse">
SELECT SELECT
a.categories AS nameType, a.categories AS nameType,
ROUND( SUM( IFNULL( b.year_revenue, 0 ))/ 10000, 3 ) AS yearRevenue, IFNULL( ROUND( SUM( b.year_revenue )/ 10000, 3 ), '-' ) AS yearRevenue,
ROUND( SUM( IFNULL( b.add_value, 0 ))/ 10000, 3 ) AS addValue, IFNULL( ROUND( SUM( b.add_value )/ 10000, 3 ), '-' ) AS addValue,
IFNULL( b.growth, 0 ) AS growth, IFNULL( b.growth, '-' ) AS growth,
IFNULL( b.gdp_proportion, 0 ) AS gdpProportion IFNULL( b.gdp_proportion, '-' ) AS gdpProportion
FROM FROM
j_industry_dictionary a j_industry_dictionary a
LEFT JOIN j_small_industry b ON a.middle_code = LEFT ( b.small_code, 2 ) LEFT JOIN j_small_industry b ON a.middle_code = LEFT ( b.small_code, 2 )

8
ruoyi-admin/src/main/resources/mapper/jjh/ent/JHeadQuartersRevenueMapper.xml
Unescape View File

@ -14,11 +14,11 @@
ELSE '服务业总部' ELSE '服务业总部'
END as type, END as type,
a.hydm, a.hydm,
ROUND( IFNULL( a.revenue, 0 )/ 10000, 3 ) AS revenue, IFNULL( ROUND( a.revenue / 10000, 3 ), '-' ) AS revenue,
ROUND( IFNULL( a.taxation, 0 )/ 10000, 3 ) AS taxation, IFNULL( ROUND( a.taxation / 10000, 3 ), '-' ) AS taxation,
a.years, a.years,
IFNULL( a.output, 0 ) AS output, IFNULL( a.output, '-' ) AS output,
IFNULL( a.sales, 0 ) AS sales IFNULL( a.sales, '-' ) AS sales
FROM FROM
( (
SELECT SELECT

11
ruoyi-admin/src/main/resources/mapper/jjh/ent/JServicesListMapper.xml
Unescape View File

@ -6,7 +6,8 @@
<select id="page" resultType="com.ruoyi.jjh.ent.entity.JServicesList"> <select id="page" resultType="com.ruoyi.jjh.ent.entity.JServicesList">
SELECT SELECT
a.*, a.*,
ROUND( IFNULL( b.revenue, 0 )/ 100000, 3 ) AS revenue, IFNULL( ROUND( b.revenue/ 100000, 3 ), '-' )
AS revenue,
b.years b.years
FROM FROM
j_services_list a j_services_list a
@ -30,8 +31,8 @@
SELECT SELECT
a.services_type, a.services_type,
count(*) AS qyCount, count(*) AS qyCount,
IFNULL( b.add_value, 0 ) AS addValue, IFNULL( b.add_value, '-' ) AS addValue,
ROUND( SUM( IFNULL( b.revenue, 0 ))/ 100000, 3 ) AS allRevenue IFNULL( ROUND( SUM( b.revenue)/ 100000, 3 ), '-' )AS allRevenue
FROM FROM
j_services_list a j_services_list a
LEFT JOIN j_business_revenue b ON a.tyshxydm = b.tyshxydm LEFT JOIN j_business_revenue b ON a.tyshxydm = b.tyshxydm
@ -44,8 +45,8 @@
SELECT SELECT
5 AS services_type, 5 AS services_type,
count(*) AS qyCount, count(*) AS qyCount,
ROUND( SUM( IFNULL( taxation, 0 ))/ 100000, 3 ) AS allRevenue, IFNULL( ROUND( SUM( taxation)/ 100000, 3 ), '-' ) AS allRevenue,
ROUND( SUM( IFNULL( revenue, 0 ))/ 100000, 3 ) + ROUND( SUM( IFNULL( output, 0 ))/ 100000, 3 ) + ROUND( SUM( IFNULL( sales, 0 ))/ 100000, 3 ) AS addValue IFNULL( ROUND( SUM( IFNULL( revenue, 0 ))/ 100000, 3 ) + ROUND( SUM( IFNULL( output, 0 ))/ 100000, 3 ) + ROUND( SUM( IFNULL( sales, 0 ))/ 100000, 3 ), '-' ) AS addValue
FROM FROM
j_headquarters_revenue j_headquarters_revenue
</select> </select>

Write Preview
Loading…
Cancel
Save