From 2883b631fad80102cce6beb13ddaf465cf11be9a Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 17 十月 2024 17:29:04 +0800
Subject: [PATCH] 新增/修改学员优化
---
src/main/java/com/ycl/jxkg/controller/admin/UserController.java | 23 +++++++----------------
1 files changed, 7 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/controller/admin/UserController.java b/src/main/java/com/ycl/jxkg/controller/admin/UserController.java
index 29ae991..8e08622 100644
--- a/src/main/java/com/ycl/jxkg/controller/admin/UserController.java
+++ b/src/main/java/com/ycl/jxkg/controller/admin/UserController.java
@@ -1,9 +1,7 @@
package com.ycl.jxkg.controller.admin;
-import com.alibaba.excel.EasyExcel;
-import com.alibaba.excel.ExcelWriter;
-import com.alibaba.excel.write.metadata.WriteSheet;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
+import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
import com.github.pagehelper.PageInfo;
import com.ycl.jxkg.base.BaseApiController;
import com.ycl.jxkg.base.Result;
@@ -22,7 +20,6 @@
import com.ycl.jxkg.utils.DateTimeUtil;
import com.ycl.jxkg.utils.PageInfoHelper;
import lombok.RequiredArgsConstructor;
-import lombok.SneakyThrows;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.*;
@@ -30,9 +27,11 @@
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
-import java.util.ArrayList;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
+import java.util.Objects;
import java.util.UUID;
import java.util.stream.Collectors;
@@ -119,11 +118,9 @@
return new Result<>(3, "瀵嗙爜涓嶈兘涓虹┖");
}
}
- if (StringUtils.isBlank(model.getBirthDay())) {
- model.setBirthDay(null);
- }
User user = new User();
BeanUtils.copyProperties(model, user);
+ user.setAge(model.getAge());
if (model.getId() == null) {
String encodePwd = authenticationService.pwdEncode(model.getPassword());
@@ -169,7 +166,7 @@
@RequestMapping(value = "/delete/{id}", method = RequestMethod.POST)
public Result delete(@PathVariable Integer id) {
User user = userService.getUserById(id);
- userService.updateById(user);
+ userService.removeById(user.getId());
return Result.ok();
}
@@ -181,14 +178,8 @@
}
@GetMapping("importTemplate")
- @SneakyThrows
public void importTemplate(HttpServletResponse response) {
- List<UserExcelVo> list = new ArrayList<>();
- list.add(new UserExcelVo().setUserName("zhangSan").setPassword("123456").setRealName("寮犱笁").setSex(1).setRole(1).setPhone("12345678901").setAge(24).setBirthDay("2000-01-01"));
- ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), UserExcelVo.class).build();
- WriteSheet writeSheet = EasyExcel.writerSheet(0, "鐢ㄦ埛淇℃伅").build();
- excelWriter.write(list, writeSheet);
- excelWriter.finish();
+ userService.importTemplate(response);
}
@PostMapping("import")
--
Gitblit v1.8.0