diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppOutdoorFairController.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppOutdoorFairController.java index cad40ec..ccc3fec 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppOutdoorFairController.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppOutdoorFairController.java @@ -311,7 +311,7 @@ public class AppOutdoorFairController extends BaseController attendance.setFairId(fairId); attendance.setCompanyId(company.getCompanyId()); attendance.setCreateBy(String.valueOf(appUser.getUserId())); - attendance.setCreateTime(checkInTime); + attendance.setCreateTime(formatBaseTime(checkInTime)); } attendance.setCompanyName(company.getName()); attendance.setContactPerson(company.getContactPerson()); @@ -319,7 +319,7 @@ public class AppOutdoorFairController extends BaseController attendance.setAttendanceStatus("1"); attendance.setCheckInTime(checkInTime); attendance.setUpdateBy(String.valueOf(appUser.getUserId())); - attendance.setUpdateTime(checkInTime); + attendance.setUpdateTime(formatBaseTime(checkInTime)); boolean saved = attendance.getId() == null ? outdoorFairCompanyAttendanceMapper.insert(attendance) > 0 : outdoorFairCompanyAttendanceMapper.updateById(attendance) > 0; @@ -404,6 +404,11 @@ public class AppOutdoorFairController extends BaseController return null; } + private static String formatBaseTime(Date value) + { + return value == null ? null : new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(value); + } + private boolean hasCheckedIn(Long fairId) { if (!SiteSecurityUtils.isLogin()) { diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/OutdoorFairController.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/OutdoorFairController.java index abc9b9d..2bca678 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/OutdoorFairController.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/OutdoorFairController.java @@ -16,6 +16,7 @@ import java.time.ZoneId; import java.time.format.DateTimeFormatter; import java.time.temporal.ChronoUnit; import java.time.temporal.TemporalAdjusters; +import java.text.SimpleDateFormat; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; @@ -677,7 +678,7 @@ public class OutdoorFairController extends BaseController attendance.setFairId(fairId); attendance.setCompanyId(company.getCompanyId()); attendance.setCreateBy(getUsername()); - attendance.setCreateTime(checkInTime); + attendance.setCreateTime(formatBaseTime(checkInTime)); } attendance.setCompanyName(company.getName()); attendance.setContactPerson(company.getContactPerson()); @@ -685,7 +686,7 @@ public class OutdoorFairController extends BaseController attendance.setAttendanceStatus("1"); attendance.setCheckInTime(checkInTime); attendance.setUpdateBy(getUsername()); - attendance.setUpdateTime(checkInTime); + attendance.setUpdateTime(formatBaseTime(checkInTime)); boolean saved = attendance.getId() == null ? outdoorFairCompanyAttendanceMapper.insert(attendance) > 0 : outdoorFairCompanyAttendanceMapper.updateById(attendance) > 0; @@ -938,7 +939,7 @@ public class OutdoorFairController extends BaseController if (company == null || company.getStatus() == null || company.getStatus() != 1) { return AjaxResult.error("只能添加审核通过的企业"); } - FairCompany relation = ensureFairCompany(fairId, companyId); + FairCompany relation = ensureFairCompany(fairId, companyId, "1"); if ("1".equals(relation.getReviewStatus())) { ensureCompanyAttendanceRecord(fairId, company); } @@ -1322,7 +1323,7 @@ public class OutdoorFairController extends BaseController attendance.setContactPhone(company.getContactPersonPhone()); attendance.setAttendanceStatus("0"); attendance.setCreateBy(getUsername()); - attendance.setCreateTime(new Date()); + attendance.setCreateTime(formatBaseTime(new Date())); outdoorFairCompanyAttendanceMapper.insert(attendance); } @@ -1341,6 +1342,11 @@ public class OutdoorFairController extends BaseController .set("update_time", new Date())); } + private static String formatBaseTime(Date value) + { + return value == null ? null : new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(value); + } + private void validateReviewStatus(String reviewStatus) { if (!"0".equals(reviewStatus) && !"1".equals(reviewStatus) && !"2".equals(reviewStatus)) {