已收款首页6种数据

module_kzks/src/main/java/org/jeecg/modules/Index/entity/dto/IndexInfoParamDto.java

@@ -1,6 +1,5 @@
 package org.jeecg.modules.Index.entity.dto;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
@@ -8,12 +7,13 @@ import java.util.Date;
 @Data
 public class IndexInfoParamDto {
 
-    /*年/月
-    private String time;
+
+    /*年/月*/
+    private String Time;
 
     /*起始时间*/
-    private Date beginDate;
+    private String beginDate;
 
     /*截止时间*/
-    private Date endDate;
+    private String endDate;
 }

module_kzks/src/main/java/org/jeecg/modules/Index/entity/vo/IndexChartInfoVo.java

@@ -10,7 +10,7 @@ import java.util.List;
 public class  IndexChartInfoVo<T> {
 
     /*横坐标集合*/
-    private List<Date> XAxisData;
+    private List<String> XAxisData;
 
     /*纵坐标集合*/
     private List<T> SeriesData;

module_kzks/src/main/java/org/jeecg/modules/Index/service/impl/IndexServiceImpl.java

@@ -567,8 +567,6 @@ public class IndexServiceImpl implements IndexService {
 
 
     public String getContractAmountInfoIfYear(HttpServletRequest request, IndexInfoParamDto indexInfoParamDto) {
-        Date beginDate = indexInfoParamDto.getBeginDate();
-        Date endDate = indexInfoParamDto.getEndDate();
 
 
 
@@ -576,16 +574,14 @@ public class IndexServiceImpl implements IndexService {
     }
 
     public String getContractAmountInfoIfMonth(HttpServletRequest request, IndexInfoParamDto indexInfoParamDto) {
-        Date beginDate = indexInfoParamDto.getBeginDate();
-        Date endDate = indexInfoParamDto.getEndDate();
+
 
         return null;
     }
 
 
     public String getContractAmountInfoIfDay(HttpServletRequest request, IndexInfoParamDto indexInfoParamDto) {
-        Date beginDate = indexInfoParamDto.getBeginDate();
-        Date endDate = indexInfoParamDto.getEndDate();
+
 
         return null;
     }

module_kzks/src/main/java/org/jeecg/modules/xmcbDetail/mapper/xml/ComContractInfoExchangeMapper.xml

@@ -5,9 +5,8 @@
     <select id="getIncomeYearTotalByTasknoListAndByQsrqRange" resultType="java.math.BigDecimal">
         select sum(a.htfpe)
         from (select rwbh,htfpe,qsrq from com_contract_info_exchange where sjly = 20) a
-        where a.qsrq = #{beginDate}
-        and a.qsrq &gt; #{beginDate}
-        and a.qsrq &lt; #{endDate}
+        where a.qsrq between #{beginDate}
+        and #{endDate}
         and a.rwbh in
         <foreach item='item' index='index' collection='tasknoList' open='(' separator=',' close=')'>
             #{item}
@@ -16,9 +15,8 @@
     <select id="getContractNumYearTotalByTasknoListAndByQsrqRange" resultType="java.math.BigDecimal">
         select count(distinct(a.htbh))
         from (select rwbh,qsrq,htbh from com_contract_info_exchange where sjly = 20) a
-        where a.qsrq = #{beginDate}
-        and a.qsrq &gt; #{beginDate}
-        and a.qsrq &lt; #{endDate}
+        where a.qsrq between #{beginDate}
+        and #{endDate}
         and a.htbh is not null
         and a.rwbh in
         <foreach item='item' index='index' collection='tasknoList' open='(' separator=',' close=')'>
@@ -28,9 +26,8 @@
     <select id="getReceivedYearTotalByTasknoListAndByQsrqRange" resultType="java.math.BigDecimal">
         select sum(a.rwskje)
         from (select rwbh,dkhpdqrq,rwskje from com_contract_info_exchange where sjly = 40) a
-        where a.dkhpdqrq = #{beginDate}
-        and a.dkhpdqrq &gt; #{beginDate}
-        and a.dkhpdqrq &lt; #{endDate}
+        where a.dkhpdqrq between #{beginDate}
+        and #{endDate}
         and a.rwbh in
         <foreach item='item' index='index' collection='tasknoList' open='(' separator=',' close=')'>
             #{item}