活码链接数据统计接口入参调整

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/hm/HmLinkController.java

@@ -621,6 +621,7 @@ public class HmLinkController {
         Date startTime = qo.getStartTime();
         Date endTime = qo.getEndTime();
         JSONObject jsonObject = new JSONObject();
+        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         jsonObject.put("enterpriseId", loginUser.getEnterpriseId());
         jsonObject.put("linkId", linkId);
         if (startTime == null) {
@@ -630,12 +631,12 @@ public class HmLinkController {
             startTime = cl.getTime();
         }
         startTime = DateUtil.getStartTimeOfDay(startTime);
-        jsonObject.put("startTime", startTime);
+        jsonObject.put("startTime", df.format(startTime));
         if (endTime == null) {
             endTime = new Date();
         }
         endTime = DateUtil.getEndTimeOfDay(endTime);
-        jsonObject.put("endTime", endTime);
+        jsonObject.put("endTime", df.format(endTime));
         // 日期填充
         List<String> dateList;
         // 用于链接添加趋势图数据 企业+链接+日期
@@ -685,10 +686,10 @@ public class HmLinkController {
         WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
         qo.getInFields().setEnterpriseId(loginUser.getEnterpriseId());
         if (qo.getInFields().getStartTime() != null) {
-            qo.getInFields().setStartTime(DateUtil.getStartTimeOfDay(qo.getInFields().getStartTime()));
+            qo.getInFields().setStartTime(qo.getInFields().getStartTime() + " 00:00:00");
         }
         if (qo.getInFields().getEndTime() != null) {
-           qo.getInFields().setEndTime(DateUtil.getEndTimeOfDay(qo.getInFields().getEndTime()));
+           qo.getInFields().setEndTime(qo.getInFields().getEndTime() + " 23:59:59");
         }
         return DataStatisticsParamUtils
                 .responsePage(DataHttpUtil.post(StatisticsApolloKeyConstant.data_haoban_link_detail, qo));

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/qo/hm/data/HmLinkClerkListQO.java

@@ -35,8 +35,8 @@ public class HmLinkClerkListQO implements Serializable {
     public static class InFields {
         private String enterpriseId;
         private Long linkId;
-        private Date startTime;
-        private Date endTime;
+        private String startTime;
+        private String endTime;
         private String orderByField;
         /**
          * 门店名/code
@@ -65,20 +65,20 @@ public class HmLinkClerkListQO implements Serializable {
             return this;
         }
 
-        public Date getStartTime() {
+        public String getStartTime() {
             return startTime;
         }
 
-        public InFields setStartTime(Date startTime) {
+        public InFields setStartTime(String startTime) {
             this.startTime = startTime;
             return this;
         }
 
-        public Date getEndTime() {
+        public String getEndTime() {
             return endTime;
         }
 
-        public InFields setEndTime(Date endTime) {
+        public InFields setEndTime(String endTime) {
             this.endTime = endTime;
             return this;
         }