From 3c901b2289729b8d13689a52faaffb3cd1124594 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期四, 27 三月 2025 13:25:08 +0800
Subject: [PATCH] 修改标准库查询bug
---
cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonBasicInfoController.java | 468 ++++++++++++++++++++++++++++++----------------------------
1 files changed, 243 insertions(+), 225 deletions(-)
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonBasicInfoController.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonBasicInfoController.java
index 32b9224..4060c65 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonBasicInfoController.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonBasicInfoController.java
@@ -1,225 +1,243 @@
-//package com.ruoyi.personnel.controller;
-//
-//import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-//import com.baomidou.mybatisplus.core.metadata.IPage;
-//import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-//import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-//import com.ruoyi.personnel.service.AnnexService;
-//import com.ruoyi.personnel.service.PersonBasicInfoFileService;
-//import com.ruoyi.personnel.service.PersonBasicInfoService;
-//import com.ruoyi.personnel.service.PersonBasicInfoWorkService;
-//import io.swagger.annotations.Api;
-//import io.swagger.annotations.ApiOperation;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.RestController;
-//import org.springframework.web.multipart.MultipartFile;
-//
-//import javax.annotation.Resource;
-//import javax.servlet.http.HttpServletResponse;
-//import java.util.List;
-//import java.util.Map;
-//
-///**
-// * <p>
-// * 鍓嶇鎺у埗鍣�
-// * </p>
-// *
-// * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
-// * @since 2024-08-30 09:19:57
-// */
-//@Api(tags = "浜哄憳-浜哄憳鍩烘湰淇℃伅")
-//@RestController
-//@RequestMapping("/personBasicInfo")
-//public class PersonBasicInfoController {
-//
-// @Resource
-// private PersonBasicInfoService personBasicInfoService;
-//
-// @Resource
-// private PersonBasicInfoFileService personBasicInfoFileService;
-// @Resource
-// private PersonBasicInfoWorkService personBasicInfoWorkService;
-//
-// @Resource
-// private AnnexService annexService;
-//
-//
-// @ValueClassify("浜哄憳鍩烘湰淇℃伅")
-// @ApiOperation(value = "鏌ヨCNAS浜哄憳渚ц竟鏍�")
-// @GetMapping("/selectCNSAPersonTree")
-// public Result<List<DepartmentDto>> selectCNSAPersonTree() {
-// return Result.success(personBasicInfoService.selectCNSAPersonTree());
-// }
-//
-// @ValueClassify("浜哄憳鍩烘湰淇℃伅")
-// @ApiOperation(value = "鑾峰彇CNAS浜哄憳鍩烘湰淇℃伅")
-// @GetMapping("/getCNASPersonnelInfo")
-// public Result getCNASPersonnelInfo(Integer userId) {
-// return Result.success(personBasicInfoService.getCNASPersonnelInfo(userId));
-// }
-//
-// @ValueClassify("浜哄憳鍩烘湰淇℃伅")
-// @ApiOperation(value = "淇濆瓨CNAS浜哄憳鍩烘湰淇℃伅")
-// @PostMapping("/saveCNASPersonnelInfo")
-// public Result saveCNASPersonnelInfo(@RequestBody PersonBasicInfoDto personBasicInfoDto) {
-// personBasicInfoService.saveCNASPersonnelInfo(personBasicInfoDto);
-// return Result.success();
-// }
-//
-// @ApiOperation(value = "浜哄憳鏄庣粏鍒嗛〉鏌ヨ")
-// @ValueClassify("浜哄憳鍩烘湰淇℃伅")
-// @GetMapping("basicInformationOfPersonnelSelectPage")
-// public Result<IPage<Map<String, Object>>> basicInformationOfPersonnelSelectPage(Page<List<PersonBasicInfoDetailsDto>> page, String name, Integer departmentId) {
-// return Result.success(personBasicInfoService.basicInformationOfPersonnelSelectPage(page, name, departmentId));
-// }
-//
-// // 涓婁紶鏂囦欢鎺ュ彛
-// @ApiOperation(value = "涓婁紶鏂囦欢鎺ュ彛")
-// @PostMapping("/saveCNASFile")
-// public Result saveFile(@RequestPart("file") MultipartFile file) {
-// String s = FileSaveUtil.uploadWordFile(file);
-// return Result.success("涓婁紶鎴愬姛", s);
-// }
-//
-// @GetMapping("/getAnnexByUserId")
-// public Result<List<Annex>> getAnnexByUserId(Integer userId) {
-// List<Annex> list = annexService.list(new LambdaQueryWrapper<Annex>().eq(Annex::getUserId, userId));
-// return Result.success(list);
-// }
-//
-// // 鍒犻櫎鏂囦欢
-// @DeleteMapping("/deleteCNASFile")
-// public Result saveFile(String fileName) {
-// String[] split = fileName.split(",");
-// for (String s : split) {
-// FileSaveUtil.DeleteFile(s);
-// }
-// return Result.success();
-//
-// }
-//
-// /**
-// * 浜哄憳鍩烘湰淇℃伅闄勪欢鏂板
-// */
-// @PostMapping("/addAnnex")
-// public Result addAnnex(@RequestBody Annex annex) {
-// annexService.save(annex);
-// return Result.success();
-// }
-//
-// @GetMapping("/getAnnex")
-// public Result<Annex> getAnnex(Integer id) {
-// return Result.success(annexService.getById(id));
-// }
-// /**
-// * 浜哄憳鍩烘湰淇℃伅闄勪欢鍒犻櫎
-// */
-// @DeleteMapping("/deleteAnnex/{id}")
-// public Result deleteAnnex(@PathVariable("id") Integer id) {
-// annexService.removeById(id);
-// return Result.success();
-// }
-//
-// /**
-// * 浜哄憳鍩烘湰淇℃伅闄勪欢淇敼
-// *
-// */
-// @PostMapping("/updateAnnex")
-// public Result updateAnnex(@RequestBody Annex annex) {
-// annexService.updateById(annex);
-// return Result.success();
-// }
-//
-// @ApiOperation(value = "瀵煎嚭浜哄憳鍩烘湰淇℃伅")
-// @PostMapping("/exportPersonBasicInfo")
-// public void exportPersonBasicInfo(@RequestBody Map<String, Object> data, HttpServletResponse response) throws Exception {
-// UserPageDto userPageDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), UserPageDto.class);
-// personBasicInfoService.exportPersonBasicInfo(userPageDto,response);
-// }
-//
-// @ApiOperation(value = "涓嬭浇浜哄憳妗ｆ鍗�")
-// @GetMapping("/exportPersonBasicInfoById")
-// public Result exportPersonBasicInfoById(Integer id, HttpServletResponse response) {
-// return Result.success(personBasicInfoService.exportPersonBasicInfoById(id,response));
-// }
-//
-// /**
-// * 浜哄憳鍩硅鍩烘湰淇℃伅闄勪欢鏂板
-// * @param userId
-// * @param file
-// * @return
-// */
-// @ApiOperation(value = "浜哄憳鍩硅鍩烘湰淇℃伅闄勪欢鏂板")
-// @PostMapping("/uploadBasicInfoFile")
-// public Result<?> uploadBasicInfoFile(Integer userId, MultipartFile file) {
-// return Result.success(personBasicInfoService.uploadBasicInfoFile(userId, file));
-// }
-//
-//
-// /**
-// * 浜哄憳鍩硅鍩烘湰淇℃伅闄勪欢鍒楄〃
-// * @return
-// */
-// @ApiOperation(value = "浜哄憳鍩硅鍩烘湰淇℃伅闄勪欢鍒楄〃")
-// @GetMapping("/getBasicInfoFileList")
-// public Result<List<PersonBasicInfoFile>> getBasicInfoFileList(Integer userId){
-// return Result.success(personBasicInfoFileService.list(Wrappers.<PersonBasicInfoFile>lambdaQuery()
-// .eq(PersonBasicInfoFile::getUserId, userId)));
-// }
-//
-// /**
-// * 浜哄憳鍩硅鍩烘湰淇℃伅闄勪欢鍒犻櫎
-// * @return
-// */
-// @ApiOperation(value = "浜哄憳鍩硅鍩烘湰淇℃伅闄勪欢鍒犻櫎")
-// @GetMapping("/delBasicInfoFileList")
-// public Result delBasicInfoFileList(Integer basicInfoFileId){
-// return Result.success(personBasicInfoFileService.removeById(basicInfoFileId));
-// }
-//
-// /**
-// * 浜哄憳鍩硅鍩烘湰淇℃伅宸ヤ綔缁忓巻鏂板
-// * @return
-// */
-// @ApiOperation(value = "浜哄憳鍩硅鍩烘湰淇℃伅宸ヤ綔缁忓巻鏂板")
-// @PostMapping("/addBasicInfoWork")
-// public Result<?> addBasicInfoWork(@RequestBody PersonBasicInfoWork basicInfoWork) {
-// if (basicInfoWork.getUserId() == null) {
-// throw new ErrorException("缂哄皯浜哄憳id");
-// }
-// basicInfoWork.setUserId(basicInfoWork.getUserId());
-// return Result.success(personBasicInfoWorkService.save(basicInfoWork));
-// }
-//
-//
-// /**
-// * 浜哄憳宸ヤ綔缁忓巻鍒楄〃
-// * @return
-// */
-// @ApiOperation(value = "浜哄憳宸ヤ綔缁忓巻鍒楄〃")
-// @GetMapping("/getBasicInfoWorkList")
-// public Result<List<PersonBasicInfoWork>> getBasicInfoWorkList(Integer userId){
-// return Result.success(personBasicInfoWorkService.list(Wrappers.<PersonBasicInfoWork>lambdaQuery()
-// .eq(PersonBasicInfoWork::getUserId, userId)));
-// }
-//
-// /**
-// * 浜哄憳宸ヤ綔缁忓巻鍒犻櫎
-// * @return
-// */
-// @ApiOperation(value = "浜哄憳宸ヤ綔缁忓巻鍒犻櫎")
-// @GetMapping("/delBasicInfoWorkList")
-// public Result delBasicInfoWorkList(Integer basicInfoWorkId){
-// return Result.success(personBasicInfoWorkService.removeById(basicInfoWorkId));
-// }
-//
-// /**
-// * 浜哄憳鍩烘湰淇℃伅闄勪欢鍒犻櫎
-// * @return
-// */
-// @ApiOperation(value = "浜哄憳宸ヤ綔缁忓巻淇敼")
-// @PostMapping("/updateBasicInfoWorkList")
-// public Result updateBasicInfoWorkList(@RequestBody PersonBasicInfoWork basicInfoWork){
-// return Result.success(personBasicInfoWorkService.updateById(basicInfoWork));
-// }
-//}
+package com.ruoyi.personnel.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.core.domain.entity.DepartmentDto;
+import com.ruoyi.common.core.domain.entity.DepartmentLims;
+import com.ruoyi.common.utils.FileSaveUtil;
+import com.ruoyi.framework.exception.ErrorException;
+import com.ruoyi.personnel.dto.PersonBasicInfoDetailsDto;
+import com.ruoyi.personnel.dto.PersonBasicInfoDto;
+import com.ruoyi.personnel.dto.UserPageDto;
+import com.ruoyi.personnel.pojo.Annex;
+import com.ruoyi.personnel.pojo.PersonBasicInfoFile;
+import com.ruoyi.personnel.pojo.PersonBasicInfoWork;
+import com.ruoyi.personnel.service.AnnexService;
+import com.ruoyi.personnel.service.PersonBasicInfoFileService;
+import com.ruoyi.personnel.service.PersonBasicInfoService;
+import com.ruoyi.personnel.service.PersonBasicInfoWorkService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2024-08-30 09:19:57
+ */
+@Api(tags = "浜哄憳-浜哄憳鍩烘湰淇℃伅")
+@RestController
+@RequestMapping("/personBasicInfo")
+public class PersonBasicInfoController {
+
+ @Resource
+ private PersonBasicInfoService personBasicInfoService;
+
+ @Resource
+ private PersonBasicInfoFileService personBasicInfoFileService;
+ @Resource
+ private PersonBasicInfoWorkService personBasicInfoWorkService;
+
+ @Resource
+ private AnnexService annexService;
+
+
+ @ApiOperation(value = "鏌ヨCNAS浜哄憳渚ц竟鏍�")
+ @GetMapping("/selectCNSAPersonTree")
+ public Result<List<DepartmentDto>> selectCNSAPersonTree() {
+ return Result.success(personBasicInfoService.selectCNSAPersonTree());
+ }
+
+ @ApiOperation(value = "鑾峰彇CNAS浜哄憳鍩烘湰淇℃伅")
+ @GetMapping("/getCNASPersonnelInfo")
+ public Result getCNASPersonnelInfo(Integer userId) {
+ return Result.success(personBasicInfoService.getCNASPersonnelInfo(userId));
+ }
+
+ @ApiOperation(value = "淇濆瓨CNAS浜哄憳鍩烘湰淇℃伅")
+ @PostMapping("/saveCNASPersonnelInfo")
+ public Result saveCNASPersonnelInfo(@RequestBody PersonBasicInfoDto personBasicInfoDto) {
+ personBasicInfoService.saveCNASPersonnelInfo(personBasicInfoDto);
+ return Result.success();
+ }
+
+ @ApiOperation(value = "浜哄憳鏄庣粏鍒嗛〉鏌ヨ")
+ @GetMapping("basicInformationOfPersonnelSelectPage")
+ public Result<IPage<Map<String, Object>>> basicInformationOfPersonnelSelectPage(Page page, String name, Integer departmentId) {
+ return Result.success(personBasicInfoService.basicInformationOfPersonnelSelectPage(page, name, departmentId));
+ }
+
+ // 涓婁紶鏂囦欢鎺ュ彛
+ @ApiOperation(value = "涓婁紶鏂囦欢鎺ュ彛")
+ @PostMapping("/saveCNASFile")
+ public Result saveFile(@RequestPart("file") MultipartFile file) {
+ String s = FileSaveUtil.uploadWordFile(file);
+ return Result.success(s, "涓婁紶鎴愬姛");
+ }
+
+ @GetMapping("/getAnnexByUserId")
+ public Result<List<Annex>> getAnnexByUserId(Integer userId) {
+ List<Annex> list = annexService.list(new LambdaQueryWrapper<Annex>().eq(Annex::getUserId, userId));
+ return Result.success(list);
+ }
+
+ // 鍒犻櫎鏂囦欢
+ @DeleteMapping("/deleteCNASFile")
+ public Result saveFile(String fileName) {
+ String[] split = fileName.split(",");
+ for (String s : split) {
+ FileSaveUtil.DeleteFile(s);
+ }
+ return Result.success();
+
+ }
+
+ /**
+ * 浜哄憳鍩烘湰淇℃伅闄勪欢鏂板
+ */
+ @PostMapping("/addAnnex")
+ public Result addAnnex(@RequestBody Annex annex) {
+ annexService.save(annex);
+ return Result.success();
+ }
+
+ @GetMapping("/getAnnex")
+ public Result<Annex> getAnnex(Integer id) {
+ return Result.success(annexService.getById(id));
+ }
+ /**
+ * 浜哄憳鍩烘湰淇℃伅闄勪欢鍒犻櫎
+ */
+ @DeleteMapping("/deleteAnnex")
+ public Result deleteAnnex(Integer id) {
+ annexService.removeById(id);
+ return Result.success();
+ }
+
+ /**
+ * 浜哄憳鍩烘湰淇℃伅闄勪欢淇敼
+ *
+ */
+ @PostMapping("/updateAnnex")
+ public Result updateAnnex(@RequestBody Annex annex) {
+ annexService.updateById(annex);
+ return Result.success();
+ }
+
+ @ApiOperation(value = "瀵煎嚭浜哄憳鍩烘湰淇℃伅")
+ @GetMapping("/exportPersonBasicInfo")
+ public void exportPersonBasicInfo(UserPageDto userPageDto, HttpServletResponse response) throws Exception {
+ personBasicInfoService.exportPersonBasicInfo(userPageDto,response);
+ }
+
+ @ApiOperation(value = "涓嬭浇浜哄憳妗ｆ鍗�")
+ @GetMapping("/exportPersonBasicInfoById")
+ public Result exportPersonBasicInfoById(Integer id, HttpServletResponse response) {
+ return Result.success(personBasicInfoService.exportPersonBasicInfoById(id,response));
+ }
+
+ /**
+ * 浜哄憳鍩硅鍩烘湰淇℃伅闄勪欢鏂板
+ * @param userId
+ * @param file
+ * @return
+ */
+ @ApiOperation(value = "浜哄憳鍩硅鍩烘湰淇℃伅闄勪欢鏂板")
+ @PostMapping("/uploadBasicInfoFile")
+ public Result<?> uploadBasicInfoFile(Integer userId, MultipartFile file) {
+ return Result.success(personBasicInfoService.uploadBasicInfoFile(userId, file));
+ }
+
+
+ /**
+ * 浜哄憳鍩硅鍩烘湰淇℃伅闄勪欢鍒楄〃
+ * @return
+ */
+ @ApiOperation(value = "浜哄憳鍩硅鍩烘湰淇℃伅闄勪欢鍒楄〃")
+ @GetMapping("/getBasicInfoFileList")
+ public Result<List<PersonBasicInfoFile>> getBasicInfoFileList(Integer userId){
+ return Result.success(personBasicInfoFileService.list(Wrappers.<PersonBasicInfoFile>lambdaQuery()
+ .eq(PersonBasicInfoFile::getUserId, userId)));
+ }
+
+ /**
+ * 浜哄憳鍩硅鍩烘湰淇℃伅闄勪欢鍒犻櫎
+ * @return
+ */
+ @ApiOperation(value = "浜哄憳鍩硅鍩烘湰淇℃伅闄勪欢鍒犻櫎")
+ @DeleteMapping("/delBasicInfoFileList")
+ public Result delBasicInfoFileList(Integer basicInfoFileId){
+ return Result.success(personBasicInfoFileService.removeById(basicInfoFileId));
+ }
+
+ /**
+ * 浜哄憳鍩硅鍩烘湰淇℃伅宸ヤ綔缁忓巻鏂板
+ * @return
+ */
+ @ApiOperation(value = "浜哄憳鍩硅鍩烘湰淇℃伅宸ヤ綔缁忓巻鏂板")
+ @PostMapping("/addBasicInfoWork")
+ public Result<?> addBasicInfoWork(@RequestBody PersonBasicInfoWork basicInfoWork) {
+ if (basicInfoWork.getUserId() == null) {
+ throw new ErrorException("缂哄皯浜哄憳id");
+ }
+ basicInfoWork.setUserId(basicInfoWork.getUserId());
+ return Result.success(personBasicInfoWorkService.save(basicInfoWork));
+ }
+
+
+ /**
+ * 浜哄憳宸ヤ綔缁忓巻鍒楄〃
+ * @return
+ */
+ @ApiOperation(value = "浜哄憳宸ヤ綔缁忓巻鍒楄〃")
+ @GetMapping("/getBasicInfoWorkList")
+ public Result<List<PersonBasicInfoWork>> getBasicInfoWorkList(Integer userId){
+ return Result.success(personBasicInfoWorkService.list(Wrappers.<PersonBasicInfoWork>lambdaQuery()
+ .eq(PersonBasicInfoWork::getUserId, userId)));
+ }
+
+ /**
+ * 浜哄憳宸ヤ綔缁忓巻鍒犻櫎
+ * @return
+ */
+ @ApiOperation(value = "浜哄憳宸ヤ綔缁忓巻鍒犻櫎")
+ @DeleteMapping("/delBasicInfoWorkList")
+ public Result delBasicInfoWorkList(Integer basicInfoWorkId){
+ return Result.success(personBasicInfoWorkService.removeById(basicInfoWorkId));
+ }
+
+ /**
+ * 浜哄憳鍩烘湰淇℃伅闄勪欢鍒犻櫎
+ * @return
+ */
+ @ApiOperation(value = "浜哄憳宸ヤ綔缁忓巻淇敼")
+ @PostMapping("/updateBasicInfoWorkList")
+ public Result updateBasicInfoWorkList(@RequestBody PersonBasicInfoWork basicInfoWork){
+ return Result.success(personBasicInfoWorkService.updateById(basicInfoWork));
+ }
+
+
+ @ApiOperation(value = "娣诲姞缁勭粐鏋舵瀯")
+ @PostMapping("/addDepartmentLims")
+ public Result addDepartmentLims(@RequestBody DepartmentLims department) {
+ return Result.success(personBasicInfoService.addDepartment(department));
+ }
+
+ @ApiOperation(value = "鍒犻櫎缁勭粐鏋舵瀯")
+ @DeleteMapping("/delDepartmentLims")
+ public Result delDepartmentLims(Integer id) {
+ return Result.success(personBasicInfoService.delDepartment(id));
+ }
+}
--
Gitblit v1.9.3