From bf50caf042023fb4f9bc84f737d50399d0e387a1 Mon Sep 17 00:00:00 2001 From: admin <1752476835@qq.com> Date: Wed, 5 Jun 2024 23:04:24 +0800 Subject: [PATCH 1/2] fix --- .../shop/controller/PlayShopCarouselInfoController.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/play-admin/src/main/java/com/starry/admin/modules/shop/controller/PlayShopCarouselInfoController.java b/play-admin/src/main/java/com/starry/admin/modules/shop/controller/PlayShopCarouselInfoController.java index f45544f..acf2d3f 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/shop/controller/PlayShopCarouselInfoController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/shop/controller/PlayShopCarouselInfoController.java @@ -7,6 +7,7 @@ import com.starry.admin.modules.shop.module.vo.PlayShopCarouselInfoAddVo; import com.starry.admin.modules.shop.module.vo.PlayShopCarouselInfoQueryVo; import com.starry.admin.modules.shop.module.vo.PlayShopCarouselInfoUpdateStateVo; import com.starry.admin.modules.shop.service.IPlayShopCarouselInfoService; +import com.starry.admin.utils.SecurityUtils; import com.starry.common.annotation.Log; import com.starry.common.enums.BusinessType; import com.starry.common.result.R; @@ -44,8 +45,8 @@ public class PlayShopCarouselInfoController { @PostMapping("/uploadFile") public R uploadFile(@RequestParam("file") MultipartFile file) throws IOException { -// String fileAddress = ossFileService.upload(file.getInputStream(), SecurityUtils.getTenantId(), file.getOriginalFilename()); - return R.ok("https://live-cloud-cvoon.oss-cn-hangzhou.aliyuncs.com/7f7ecd75fd29464db2867982f88e8ef0/2024/06/05/f8a42353c957.jpg"); + String fileAddress = ossFileService.upload(file.getInputStream(), SecurityUtils.getTenantId(), file.getOriginalFilename()); + return R.ok(fileAddress); } From 5c52c9171fa35d8f419e271d312d3c1eff0c88d9 Mon Sep 17 00:00:00 2001 From: admin <1752476835@qq.com> Date: Wed, 5 Jun 2024 23:33:37 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=A6=BB=E8=81=8C=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/PlayClerkUserInfoEntity.java | 21 +++++++++++++++++++ .../module/entity/PlayClerkUserReturnVo.java | 20 ++++++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkUserInfoEntity.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkUserInfoEntity.java index f4e463e..f406188 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkUserInfoEntity.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkUserInfoEntity.java @@ -157,6 +157,27 @@ public class PlayClerkUserInfoEntity extends BaseEntity */ private String onboardingState; + + /** + * 入职时间 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private LocalDateTime entryTime; + + /** + * 离职时间 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private LocalDateTime resignationTime; + + /** + * 在职天数 + */ + private Integer workingHours = 0; + + /** * 是否推荐状态（1：已推荐，0：未推荐） */ diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkUserReturnVo.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkUserReturnVo.java index 57c0461..1f6f8e3 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkUserReturnVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkUserReturnVo.java @@ -165,4 +165,24 @@ public class PlayClerkUserReturnVo { private LocalDateTime addTime; + /** + * 入职时间 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private LocalDateTime entryTime; + + /** + * 离职时间 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private LocalDateTime resignationTime; + + /** + * 在职天数 + */ + private Integer workingHours = 0; + + }