bugfix

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;
 }

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;
 }

ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/mapper/JProjectFundMapper.java

@@ -21,7 +21,7 @@ public interface JProjectFundMapper extends BaseMapper<JProjectFund> {
      *
      * @return 所有数据
      */
-    List<JProjectFund> selectFund(String creditCode);
+    List<JProjectFund> selectFund(@Param("creditCode") String creditCode,@Param("years") String years);
 
     /**
      * 政务端-工作台 资金引导拨付情况统计
@@ -31,7 +31,7 @@ public interface JProjectFundMapper extends BaseMapper<JProjectFund> {
     /**
      * 政务端-工作台 拨付资金企业申请情况TOP5
      */
-    List<JProjectFund> appropriationTop5();
+    List<JProjectFundResponse> appropriationTop5();
 
 
     /**

ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/JProjectFundService.java

@@ -30,7 +30,7 @@ public interface JProjectFundService extends IService<JProjectFund> {
     /**
      * 政务端-工作台 拨付资金企业申请情况TOP5
      */
-    List<JProjectFund> appropriationTop5();
+    List<JProjectFundResponse> appropriationTop5();
 
     /**
      * 企业端-首页 企业荣誉资质

ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JProjectFundServiceImpl.java

@@ -37,7 +37,7 @@ public class JProjectFundServiceImpl  extends ServiceImpl<JProjectFundMapper, JP
         if(jp.getProjectSmallType()!=3&jp.getProjectSmallType()!=7){
             throw new ServiceException("暂无资金拨付!");
         }else {
-            return baseMapper.selectFund(jp.getCreditCode());
+            return baseMapper.selectFund(jp.getCreditCode(),jp.getProjectYear());
         }
     }
 
@@ -54,7 +54,7 @@ public class JProjectFundServiceImpl  extends ServiceImpl<JProjectFundMapper, JP
      * 政务端-工作台 拨付资金企业申请情况TOP5
      */
     @Override
-    public List<JProjectFund> appropriationTop5() {
+    public List<JProjectFundResponse> appropriationTop5() {
         return baseMapper.appropriationTop5();
     }
 

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 = '市级服务业领军')
+            ( a.project_name = '区级总部' or a.project_name = '市级服务业领军')
-           and a.tyshxydm=#{creditCode}
+          and a.tyshxydm=#{creditCode}
+          and a.appropriation_time like concat(#{years}, '%')
     </select>
 
     <select id="fundStatistics" resultType="com.ruoyi.jjh.ent.entity.response.FundStatisticsResponse">
@@ -23,16 +24,23 @@
         GROUP BY
             b.type
     </select>
-    <select id="appropriationTop5" resultType="com.ruoyi.jjh.ent.entity.JProjectFund">
+    <select id="appropriationTop5" resultType="com.ruoyi.jjh.ent.entity.response.JProjectFundResponse">
         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