diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/response/FundStatisticsResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/response/FundStatisticsResponse.java index 9a4906b..0d26a1e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/response/FundStatisticsResponse.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/response/FundStatisticsResponse.java @@ -23,5 +23,5 @@ public class FundStatisticsResponse { * 资金之和 (万元) */ @ApiModelProperty("资金之和 (万元)") - private Integer fundSum; + private Double fundSum; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/response/JProjectFundResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/response/JProjectFundResponse.java index 676dc21..127dc02 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/response/JProjectFundResponse.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/response/JProjectFundResponse.java @@ -19,4 +19,10 @@ public class JProjectFundResponse extends JProjectFund { */ @ApiModelProperty("项目大类") private Integer projectBigType; + + /** + * 项目id + */ + @ApiModelProperty("项目id") + private Long projectId; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/mapper/JProjectFundMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/mapper/JProjectFundMapper.java index 123ff4c..81d0756 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/mapper/JProjectFundMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/mapper/JProjectFundMapper.java @@ -21,7 +21,7 @@ public interface JProjectFundMapper extends BaseMapper { * * @return 所有数据 */ - List selectFund(String creditCode); + List selectFund(@Param("creditCode") String creditCode,@Param("years") String years); /** * 政务端-工作台 资金引导拨付情况统计 @@ -31,7 +31,7 @@ public interface JProjectFundMapper extends BaseMapper { /** * 政务端-工作台 拨付资金企业申请情况TOP5 */ - List appropriationTop5(); + List appropriationTop5(); /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/JProjectFundService.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/JProjectFundService.java index 93d86ee..ded855f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/JProjectFundService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/JProjectFundService.java @@ -30,7 +30,7 @@ public interface JProjectFundService extends IService { /** * 政务端-工作台 拨付资金企业申请情况TOP5 */ - List appropriationTop5(); + List appropriationTop5(); /** * 企业端-首页 企业荣誉资质 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JProjectFundServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JProjectFundServiceImpl.java index b8639e6..96f2f9d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JProjectFundServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JProjectFundServiceImpl.java @@ -37,7 +37,7 @@ public class JProjectFundServiceImpl extends ServiceImpl appropriationTop5() { + public List appropriationTop5() { return baseMapper.appropriationTop5(); } diff --git a/ruoyi-admin/src/main/resources/mapper/jjh/ent/JProjectFundMapper.xml b/ruoyi-admin/src/main/resources/mapper/jjh/ent/JProjectFundMapper.xml index e86e783..f6996b4 100644 --- a/ruoyi-admin/src/main/resources/mapper/jjh/ent/JProjectFundMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/jjh/ent/JProjectFundMapper.xml @@ -9,8 +9,9 @@ FROM j_project_fund a WHERE - ( a.project_name = '区级总部' or a.project_name = '市级服务业领军') - and a.tyshxydm=#{creditCode} + ( a.project_name = '区级总部' or a.project_name = '市级服务业领军') + and a.tyshxydm=#{creditCode} + and a.appropriation_time like concat(#{years}, '%') - SELECT - ROUND( a.fund_amount / 100000000 , 1 ) AS fundAmount, + ROUND( a.fund_amount / 100000000, 1 ) AS fundAmount, a.id, a.qymc, a.tyshxydm, a.project_name, - a.appropriation_time + a.appropriation_time, + IF + ( a.project_name = '区级总部' || a.project_name = '市级服务业领军', b.id, NULL ) AS projectId FROM j_project_fund a + LEFT JOIN ( SELECT id,project_year, credit_code FROM j_project WHERE + project_small_type = 3 || project_small_type = 7 ) b ON a.tyshxydm = b.credit_code and SUBSTRING(a.appropriation_time, 1, 4) = b.project_year + GROUP BY + a.id, + a.fund_amount ORDER BY a.fund_amount DESC LIMIT 5