From b41517d4b62932b4fdf27199aee4d14bbb721776 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Tue, 21 Jul 2020 17:35:07 +0800
Subject: [PATCH] 修改获取产品的bug
---
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/dataNeed.html | 5 +++--
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/feedback.html | 4 ++--
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/SysProduct.java | 30 ++++++++++++++++--------------
kidgrow-web/kidgrow-web-manager/src/main/resources/static/module/apiUrl.js | 6 +++---
4 files changed, 24 insertions(+), 21 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/SysProduct.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/SysProduct.java
index 6da3010..aa7327d 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/SysProduct.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/SysProduct.java
@@ -1,5 +1,6 @@
package com.kidgrow.oprationcenter.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -75,20 +76,21 @@
* 状态，1启用，0停用
*/
private Boolean enabled;
- /**
- * 产品结束时间-供前端使用
- */
- @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
- private Date endTime;
- /**
- * 产品结束时间-供前端使用
- */
- @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
- private Date beginTime;
- /**
- * 共享，1是，0不
- */
- private Boolean isShare;
+// /**
+// * 产品结束时间-供前端使用
+// */
+// @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+// private Date endTime;
+// /**
+// * 产品结束时间-供前端使用
+// */
+// @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+// @TableField(exist = false)
+// private Date beginTime;
+// /**
+// * 共享，1是，0不
+// */
+// private Boolean isShare;
/**
* 创建者的部门
*/
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/module/apiUrl.js b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/module/apiUrl.js
index 54f7602..99ce6fd 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/module/apiUrl.js
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/module/apiUrl.js
@@ -1,6 +1,6 @@
// var my_api_server_url = 'http://zuul.kidgrow.com/';
-// var my_api_server_url = 'http://192.168.2.240:8888/';
-// var my_api_server_url = 'http://127.0.0.1:8888/';
+// var my_api_server_url = 'http://192.168.2.240:8888/';
+var my_api_server_url = 'http://127.0.0.1:8888/';
// var my_api_server_url = 'http://uat-zuul.kidgrow.cloud/';
-var my_api_server_url = 'http://123.57.164.62:8888/';
+//var my_api_server_url = 'http://123.57.164.62:8888/';
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/dataNeed.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/dataNeed.html
index a1ba4e5..71cf9ca 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/dataNeed.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/dataNeed.html
@@ -9,8 +9,8 @@
<div class="layui-card-body">
<div class="layui-form toolbar">
<input id="app-edit-search" class="layui-input search-input" type="text" placeholder="输入医生姓名" /> 
- <input type="text" class="layui-input search-input" id="test1"> 至 <input type="text"
- class="layui-input search-input" id="test2">  
+ <input type="text" class="layui-input search-input" id="test1" placeholder="请输入开始时间" > 至 <input type="text"
+ class="layui-input search-input" id="test2" placeholder="请输入结束时间" >  
<button id="app-btn-search" class="layui-btn icon-btn permissions" permissions="diagnostic-get"><i class="layui-icon"></i>搜索</button>
<!-- <button id="app-btn-add" class="layui-btn icon-btn"><i class="layui-icon"></i>添加</button> -->
<button id="app-btn-export" class="layui-btn icon-btn permissions" permissions="dataneed-export"><i class="layui-icon"></i>导出</button>
@@ -245,6 +245,7 @@
}
// 导出
$('#app-btn-export').click(function () {
+ //获取
var url = config.base_server + 'api-opration/dataneed/export';
var xhr = new XMLHttpRequest();
xhr.open('POST', url, true);
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/feedback.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/feedback.html
index a4f180f..14462d0 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/feedback.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/feedback.html
@@ -9,10 +9,10 @@
<div class="layui-card-body">
<div class="layui-form toolbar"> 
<input id="user-search-value" class="layui-input search-input" type="text" placeholder="输入医生姓名" /> 
- <input type="text" name="date" id="datebegin" lay-verify="date" placeholder="yyyy-MM-dd" autocomplete="off"
+ <input type="text" name="date" id="datebegin" lay-verify="date" placeholder="请输入开始时间" autocomplete="off"
class="layui-input search-input">
至
- <input type="text" name="date" id="dateend" lay-verify="date" placeholder="yyyy-MM-dd" autocomplete="off"
+ <input type="text" name="date" id="dateend" lay-verify="date" placeholder="请输入结束时间" autocomplete="off"
class="layui-input search-input">  
<button id="user-btn-search" class="layui-btn icon-btn permissioins" permissioins="feedback-list"><i class="layui-icon"></i>搜索</button>
</div>
--
Gitblit v1.8.0