From f8d07b907fa157f84d702bc0a52936dd14b3a674 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Tue, 18 Jan 2022 15:10:29 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=94=E5=BB=BA=E5=8D=95=E4=BD=8D=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90=E6=83=85=E5=86=B5=EF=BC=8C=E7=A7=AF=E5=88=86=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dto/form/PointRecordFormDTO.java | 5 +++--
 .../epmet/controller/IcPartyUnitCompletionController.java    | 2 +-
 .../src/main/java/com/epmet/dao/IcUserDemandRecDao.java      | 2 +-
 .../com/epmet/service/impl/IcUserDemandRecServiceImpl.java   | 4 ++--
 .../src/main/resources/mapper/IcUserDemandRecDao.xml         | 4 ++--
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PointRecordFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PointRecordFormDTO.java
index bacdc786f6..3e809dccab 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PointRecordFormDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PointRecordFormDTO.java
@@ -5,6 +5,7 @@ import lombok.NoArgsConstructor;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * @Description
@@ -27,12 +28,12 @@ public class PointRecordFormDTO implements Serializable {
      * 开始时间
      */
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    private String startTime;
+    private Date startTime;
     /**
      * 结束时间
      */
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    private String endTime;
+    private Date endTime;
     private Integer pageNo = 1;
     private Integer pageSize = 10;
     private String customerId;
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitCompletionController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitCompletionController.java
index 42dc75a6c1..b49c577f00 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitCompletionController.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitCompletionController.java
@@ -27,7 +27,7 @@ public class IcPartyUnitCompletionController {
     private IcPartyUnitCompletionService icPartyUnitCompletionService;
 
     @PostMapping("list")
-    public Result<PageData<IcPartyUnitCompletionDTO>> page(@RequestParam CompletionFormDTO formDTO){
+    public Result<PageData<IcPartyUnitCompletionDTO>> page(@RequestBody CompletionFormDTO formDTO){
         PageData<IcPartyUnitCompletionDTO> page = icPartyUnitCompletionService.page(formDTO);
         return new Result<PageData<IcPartyUnitCompletionDTO>>().ok(page);
     }
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcUserDemandRecDao.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcUserDemandRecDao.java
index 60b437ceb5..fa34fd7497 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcUserDemandRecDao.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcUserDemandRecDao.java
@@ -128,5 +128,5 @@ public interface IcUserDemandRecDao extends BaseDao<IcUserDemandRecEntity> {
      */
     List<PointRecordDTO> getPointRecordList(PointRecordFormDTO formDTO);
 
-    int getTotalPoint(PointRecordFormDTO formDTO);
+    Integer getTotalPoint(PointRecordFormDTO formDTO);
 }
\ No newline at end of file
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java
index 4bf7846cd0..591d08130c 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java
@@ -1662,9 +1662,9 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
             result.setTotalPoint(NumConstant.ZERO);
             result.setPage(new PageData<>(Collections.emptyList(), NumConstant.ZERO));
         }
-
+        Integer total = baseDao.getTotalPoint(formDTO);
         //总积分
-        result.setTotalPoint(baseDao.getTotalPoint(formDTO));
+        result.setTotalPoint(null == total?NumConstant.ZERO:total);
         //分页查询
         PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize());
         List<PointRecordDTO> list = baseDao.getPointRecordList(formDTO);
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml
index eb1260f58b..486f1eade4 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml
@@ -591,10 +591,10 @@
             a.DEL_FLAG = '0'
             AND a.`STATUS` = 'finished'
             AND a.EVALUATE_FLAG = 1
-            <if test="null != startTime">
+            <if test="null != startTime and startTime != ''">
                 AND c.EVALUATE_TIME &gt;= #{startTime}
             </if>
-            <if test="null != endTime">
+            <if test="null != endTime and endTime != ''">
                 AND c.EVALUATE_TIME &lt;= #{endTime}
             </if>
         ORDER BY c.EVALUATE_TIME DESC