Merge branch 'dev_ic_diaodong' into develop

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;

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

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

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

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