时间
This commit is contained in:
@@ -41,7 +41,7 @@ public class OpenAreaVO {
|
||||
private Date createTime;
|
||||
|
||||
@ApiModelProperty("更新时间")
|
||||
private Date updateTime;
|
||||
private String updateTime;
|
||||
|
||||
@ApiModelProperty("更新人")
|
||||
private String updateUserId;
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package com.cool.store.service.impl;
|
||||
|
||||
import com.alibaba.excel.util.DateUtils;
|
||||
import com.alibaba.fastjson.JSONArray;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.cool.store.constants.CommonConstants;
|
||||
@@ -175,6 +176,7 @@ public class OpenAreaServiceImpl implements OpenAreaService {
|
||||
hyOpenAreaInfoDOList.stream().forEach(x->{
|
||||
OpenAreaVO openAreaVO = convertDoToVo(x);
|
||||
openAreaVO.setUpdateUserName(userMap.get(x.getUpdateUserId()));
|
||||
openAreaVO.setUpdateTime(DateUtils.format(x.getUpdateTime(),DateUtils.DATE_FORMAT_19));
|
||||
list.add(openAreaVO);
|
||||
});
|
||||
hyOpenAreaInfoDOPageInfo.setList(list);
|
||||
|
||||
@@ -64,7 +64,7 @@ public class OpenAreaController {
|
||||
@PostMapping(path = "/changeOpenAreaStatus")
|
||||
@ApiOperation("变更开放区域状态")
|
||||
public ResponseResult<Boolean> changeOpenAreaStatus(@RequestBody OpenAreaRequest openAreaRequest){
|
||||
String userId = "";
|
||||
String userId = CurrentUserHolder.getUserId();
|
||||
return ResponseResult.success(openAreaService.batchUpdate( userId, openAreaRequest));
|
||||
}
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
spring.application.name=hsay-partner-web
|
||||
spring.profiles.active=@profileActive@
|
||||
spring.profiles.active=test
|
||||
|
||||
server.port=40000
|
||||
server.servlet.context-path=/xfsg
|
||||
|
||||
Reference in New Issue
Block a user