Merge remote-tracking branch 'origin/developer' into developer

gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/controller/DownloadReportController.java

@@ -9,6 +9,7 @@ import com.gic.enterprise.qo.DownloadReportQO;
 import com.gic.enterprise.service.DownloadReportApiService;
 import com.gic.enterprise.utils.ResultControllerUtils;
 import com.gic.enterprise.utils.UserDetailUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -29,6 +30,12 @@ public class DownloadReportController {
     @RequestMapping("/list-download-report")
     public RestResponse listDownloadReport(@Validated({DownloadReportQO.SelectValidView.class}) DownloadReportQO downloadReportQO) {
         downloadReportQO.setEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId());
+        if (StringUtils.isNotBlank(downloadReportQO.getStartTime())) {
+            downloadReportQO.setStartTime(downloadReportQO.getStartTime() + " 00:00:00");
+        }
+        if (StringUtils.isNotBlank(downloadReportQO.getEndTime())) {
+            downloadReportQO.setEndTime(downloadReportQO.getEndTime() + " 23:59:59");
+        }
         ServiceResponse<Page<DownloadReportDTO>> serviceResponse = downloadReportApiService.listDownloadReport(downloadReportQO);
         return ResultControllerUtils.commonResult(serviceResponse);
     }