BJ_FS / urbanops

Commit 0cd3cc14e05e96fb5e59a9f9fd67047979e315a3

Authored by ็Ž‹ๅฏŒ็”Ÿ
2 parents 70b72d6e eee0c312

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

Inline Side-by-side
Showing 3 changed files with 5 additions and 4 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/oldtrees/OldtreesController.java
  View file @0cd3cc1
... ... @@ -69,6 +69,7 @@ public class OldtreesController {
69 69 public CommonResult<Boolean> updateOldtrees(@Valid @RequestBody OldtreesSaveReqVO updateReqVO) {
70 70 Long userId = SecurityFrameworkUtils.getLoginUserId();
71 71 updateReqVO.setUpdateby(String.valueOf(userId));
  72 + updateReqVO.setUpdatetime(LocalDateTime.now());
72 73 oldtreesService.updateOldtrees(updateReqVO);
73 74 return success(true);
74 75 }
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/oldtrees/OldtreesServiceImpl.java
  View file @0cd3cc1
... ... @@ -100,9 +100,9 @@ public class OldtreesServiceImpl implements OldtreesService {
100 100 changeLog.setId(updateReqVO.getId());
101 101 changeLog.setOldtreeid(updateReqVO.getId());
102 102 changeLog.setCreateby(updateReqVO.getUpdateby());
103   - changeLog.setCreatetime(LocalDateTime.now());
  103 + changeLog.setCreatetime(updateReqVO.getUpdatetime());
104 104 changeLog.setUpdateby(updateReqVO.getUpdateby());
105   - changeLog.setUpdatetime(LocalDateTime.now());
  105 + changeLog.setUpdatetime(updateReqVO.getUpdatetime());
106 106 oldtreesChangeLogMapper.insert(changeLog);
107 107  
108 108 oldtreesMapper.updateById(updateObj);
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/tree/TreeServiceImpl.java
  View file @0cd3cc1
... ... @@ -131,9 +131,9 @@ public class TreeServiceImpl implements TreeService {
131 131 org.springframework.beans.BeanUtils.copyProperties(updateObj, changeLog);
132 132 changeLog.setTreeid(updateObj.getId());
133 133 changeLog.setCreateby(updateReqVO.getUpdateby());
134   - changeLog.setCreatetime(LocalDateTime.now());
  134 + changeLog.setCreatetime(updateReqVO.getUpdatetime());
135 135 changeLog.setUpdateby(updateReqVO.getUpdateby());
136   - changeLog.setUpdatetime(LocalDateTime.now());
  136 + changeLog.setUpdatetime(updateReqVO.getUpdatetime());
137 137 gardenTreeChangeLogMapper.insert(changeLog);
138 138 }
139 139  
... ...