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> page(@RequestParam CompletionFormDTO formDTO){ + public Result> page(@RequestBody CompletionFormDTO formDTO){ PageData page = icPartyUnitCompletionService.page(formDTO); return new Result>().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 { */ List 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(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 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 - + AND c.EVALUATE_TIME >= #{startTime} - + AND c.EVALUATE_TIME <= #{endTime} ORDER BY c.EVALUATE_TIME DESC