purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

createTime返回前端有时分秒，updateTime返回没有，有人对createTime做了特殊处理，在此处加上updateTime

Browse Source
This commit is contained in:
cjl
2019-01-23 15:59:56 +08:00
parent 4744dee4fb
commit 53bc050552
2 changed files with 119 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
erp_web/pages/manage/serialNumber.html
View File

@@ -162,8 +162,8 @@
return value ? "是" : "否"; return value ? "是" : "否";
} }
}, },
{title: '创建时间', field: 'createTime', width: 70}, {title: '创建时间', field: 'createTime', width: 140,formatter: formatDatebox},
{title: '更新时间', field: 'updateTime', width: 70}, {title: '更新时间', field: 'updateTime', width: 140,formatter: formatDatebox},
{title: '备注', field: 'remark',width: 300} {title: '备注', field: 'remark',width: 300}
]], ]],
toolbar: [ toolbar: [
@@ -448,6 +448,40 @@
$("#searchBtn").click(); $("#searchBtn").click();
} }
}); });
/**时间格式化*/
Date.prototype.format = function (format) {
var o = {
"M+": this.getMonth() + 1, // month
"d+": this.getDate(), // day
"h+": this.getHours(), // hour
"m+": this.getMinutes(), // minute
"s+": this.getSeconds(), // second
"q+": Math.floor((this.getMonth() + 3) / 3), // quarter
"S": this.getMilliseconds()
// millisecond
}
if (/(y+)/.test(format))
format = format.replace(RegExp.$1, (this.getFullYear() + "")
.substr(4 - RegExp.$1.length));
for (var k in o)
if (new RegExp("(" + k + ")").test(format))
format = format.replace(RegExp.$1, RegExp.$1.length == 1 ? o[k] : ("00" + o[k]).substr(("" + o[k]).length));
return format;
}
function formatDatebox(value) {
if (value == null || value == '') {
return '';
}
var dt;
if (value instanceof Date) {
dt = value;
} else {
dt = new Date(value);
}
return dt.format("yyyy-MM-dd hh:mm:ss"); //扩展的Date的format方法(上述插件实现)
}
</script> </script>
</body> </body>
</html> </html>

166
src/main/java/com/jsh/erp/utils/ResponseJsonUtil.java
View File

@@ -1,83 +1,83 @@
package com.jsh.erp.utils; package com.jsh.erp.utils;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.serializer.SerializerFeature; import com.alibaba.fastjson.serializer.SerializerFeature;
import com.alibaba.fastjson.serializer.ValueFilter; import com.alibaba.fastjson.serializer.ValueFilter;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Date; import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.TimeZone; import java.util.TimeZone;
public class ResponseJsonUtil { public class ResponseJsonUtil {
public static final SimpleDateFormat FORMAT = new SimpleDateFormat("yyyy-MM-dd"); public static final SimpleDateFormat FORMAT = new SimpleDateFormat("yyyy-MM-dd");
static { static {
FORMAT.setTimeZone(TimeZone.getTimeZone("GMT+8")); FORMAT.setTimeZone(TimeZone.getTimeZone("GMT+8"));
} }
/** /**
* 响应过滤器 * 响应过滤器
*/ */
public static final class ResponseFilter extends ExtJsonUtils.ExtFilter implements ValueFilter { public static final class ResponseFilter extends ExtJsonUtils.ExtFilter implements ValueFilter {
@Override @Override
public Object process(Object object, String name, Object value) { public Object process(Object object, String name, Object value) {
if (name.equals("createTime") || name.equals("modifyTime")) { if (name.equals("createTime") || name.equals("modifyTime")||name.equals("updateTime")) {
return value; return value;
} else if (value instanceof Date) { } else if (value instanceof Date) {
return FORMAT.format(value); return FORMAT.format(value);
} else { } else {
return value; return value;
} }
} }
} }
/** /**
* *
* @param responseCode * @param responseCode
* @return * @return
*/ */
public static String backJson4HttpApi(ResponseCode responseCode) { public static String backJson4HttpApi(ResponseCode responseCode) {
if (responseCode != null) { if (responseCode != null) {
String result = JSON.toJSONString(responseCode, new ResponseFilter(), String result = JSON.toJSONString(responseCode, new ResponseFilter(),
SerializerFeature.DisableCircularReferenceDetect, SerializerFeature.DisableCircularReferenceDetect,
SerializerFeature.WriteNonStringKeyAsString); SerializerFeature.WriteNonStringKeyAsString);
result = result.replaceFirst("\"data\":\\{", ""); result = result.replaceFirst("\"data\":\\{", "");
return result.substring(0, result.length() - 1); return result.substring(0, result.length() - 1);
} }
return null; return null;
} }
/** /**
* 验证失败的json串 * 验证失败的json串
* @param code * @param code
* @return * @return
*/ */
public static String backJson4VerifyFailure(int code) { public static String backJson4VerifyFailure(int code) {
Map<String, Object> map = new HashMap<String, Object>(); Map<String, Object> map = new HashMap<String, Object>();
map.put("message", "未通过验证"); map.put("message", "未通过验证");
return JSON.toJSONString(new ResponseCode(code, map), new ResponseFilter(), return JSON.toJSONString(new ResponseCode(code, map), new ResponseFilter(),
SerializerFeature.DisableCircularReferenceDetect, SerializerFeature.DisableCircularReferenceDetect,
SerializerFeature.WriteNonStringKeyAsString); SerializerFeature.WriteNonStringKeyAsString);
} }
/** /**
* 成功的json串 * 成功的json串
* @param responseCode * @param responseCode
* @return * @return
*/ */
public static String backJson(ResponseCode responseCode) { public static String backJson(ResponseCode responseCode) {
if (responseCode != null) { if (responseCode != null) {
return JSON.toJSONString(responseCode, new ResponseFilter(), return JSON.toJSONString(responseCode, new ResponseFilter(),
SerializerFeature.DisableCircularReferenceDetect, SerializerFeature.DisableCircularReferenceDetect,
SerializerFeature.WriteNonStringKeyAsString); SerializerFeature.WriteNonStringKeyAsString);
} }
return null; return null;
} }
public static String returnJson(Map<String, Object> map, String message, int code) { public static String returnJson(Map<String, Object> map, String message, int code) {
map.put("message", message); map.put("message", message);
return backJson(new ResponseCode(code, map)); return backJson(new ResponseCode(code, map));
} }
} }