From 9f564c72ab5d67585d2fe0f327b366eff0549179 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期五, 28 二月 2025 11:19:35 +0800
Subject: [PATCH] 标准查新代码迁移
---
cnas-process/src/main/java/com/ruoyi/process/mapper/ProcessMethodSearchNewBackupsMapper.java | 3 +
cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonBasicInfoController.java | 8 ++--
ruoyi-admin/src/main/java/com/ruoyi/web/controller/dto/UpdateUserDto.java | 11 +++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/UserController.java | 14 +++++++
cnas-personnel/src/main/resources/mapper/PersonTrainingRecordMapper.xml | 3 -
cnas-process/src/main/java/com/ruoyi/process/controller/ProcessMethodSearchNewController.java | 2
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserServiceImpl.java | 14 +++++++
cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonTrainingRecordMapper.java | 2
cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonTrainingDetailedMapper.java | 11 +++--
ruoyi-system/src/main/java/com/ruoyi/system/service/UserService.java | 5 ++
cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonBasicInfoMapper.java | 3 +
cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonTrainingMapper.java | 3 +
cnas-personnel/src/main/resources/mapper/PersonBasicInfoMapper.xml | 1
cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonTrainingService.java | 3 +
14 files changed, 65 insertions(+), 18 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 01b44d4..979c1cb 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
@@ -74,7 +74,7 @@
@ApiOperation(value = "浜哄憳鏄庣粏鍒嗛〉鏌ヨ")
@GetMapping("basicInformationOfPersonnelSelectPage")
- public Result<IPage<Map<String, Object>>> basicInformationOfPersonnelSelectPage(Page<List<PersonBasicInfoDetailsDto>> page, String name, Integer departmentId) {
+ public Result<IPage<Map<String, Object>>> basicInformationOfPersonnelSelectPage(Page page, String name, Integer departmentId) {
return Result.success(personBasicInfoService.basicInformationOfPersonnelSelectPage(page, name, departmentId));
}
@@ -83,7 +83,7 @@
@PostMapping("/saveCNASFile")
public Result saveFile(@RequestPart("file") MultipartFile file) {
String s = FileSaveUtil.uploadWordFile(file);
- return Result.success("涓婁紶鎴愬姛", s);
+ return Result.success(s, "涓婁紶鎴愬姛");
}
@GetMapping("/getAnnexByUserId")
@@ -176,7 +176,7 @@
* @return
*/
@ApiOperation(value = "浜哄憳鍩硅鍩烘湰淇℃伅闄勪欢鍒犻櫎")
- @GetMapping("/delBasicInfoFileList")
+ @DeleteMapping("/delBasicInfoFileList")
public Result delBasicInfoFileList(Integer basicInfoFileId){
return Result.success(personBasicInfoFileService.removeById(basicInfoFileId));
}
@@ -212,7 +212,7 @@
* @return
*/
@ApiOperation(value = "浜哄憳宸ヤ綔缁忓巻鍒犻櫎")
- @GetMapping("/delBasicInfoWorkList")
+ @DeleteMapping("/delBasicInfoWorkList")
public Result delBasicInfoWorkList(Integer basicInfoWorkId){
return Result.success(personBasicInfoWorkService.removeById(basicInfoWorkId));
}
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonBasicInfoMapper.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonBasicInfoMapper.java
index f23ba5f..b915ccf 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonBasicInfoMapper.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonBasicInfoMapper.java
@@ -6,6 +6,7 @@
import com.ruoyi.common.core.domain.entity.DepartmentDto;
import com.ruoyi.personnel.dto.PersonBasicInfoDto;
import com.ruoyi.personnel.pojo.PersonBasicInfo;
+import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
@@ -31,7 +32,7 @@
* @param departmentId
* @return
*/
- IPage<Map<String, Object>> selectPersonBasecInfoAndUser(Page page, String name, Integer departmentId);
+ IPage<Map<String, Object>> selectPersonBasecInfoAndUser(Page page, @Param("name") String name, @Param("departmentId") Integer departmentId);
/**
* 瀵煎嚭鏌ヨ浜哄憳淇℃伅
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonTrainingDetailedMapper.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonTrainingDetailedMapper.java
index 47c397b..0fa5306 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonTrainingDetailedMapper.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonTrainingDetailedMapper.java
@@ -20,11 +20,12 @@
public interface PersonTrainingDetailedMapper extends MyBaseMapper<PersonTrainingDetailed> {
IPage<PersonTrainingDetailedDto> queryTheAnnualPlanDetailsTable(Page page,
- String trainingLecturerName,
- String courseCode, String trainingDate,
- Integer id,
- Integer userId,
- Integer loginUserId);
+ @Param("trainingLecturerName") String trainingLecturerName,
+ @Param("courseCode") String courseCode,
+ @Param("trainingDate") String trainingDate,
+ @Param("id") Integer id,
+ @Param("userId") Integer userId,
+ @Param("loginUserId") Integer loginUserId);
/**
* 鏍规嵁涓昏〃id鏌ヨ璇︽儏
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonTrainingMapper.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonTrainingMapper.java
index f5dd8a6..1798f6c 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonTrainingMapper.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonTrainingMapper.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.personnel.dto.PersonTrainingDto;
import com.ruoyi.personnel.pojo.PersonTraining;
+import org.apache.ibatis.annotations.Param;
/**
* <p>
@@ -16,5 +17,5 @@
*/
public interface PersonTrainingMapper extends BaseMapper<PersonTraining> {
- IPage<PersonTrainingDto> personTrainingSelect(Page page, String compilerName, String departLimsId);
+ IPage<PersonTrainingDto> personTrainingSelect(Page page, @Param("compilerName") String compilerName,@Param("departLimsId") String departLimsId);
}
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonTrainingRecordMapper.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonTrainingRecordMapper.java
index a10ed81..6f59398 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonTrainingRecordMapper.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonTrainingRecordMapper.java
@@ -21,7 +21,7 @@
*/
public interface PersonTrainingRecordMapper extends BaseMapper<PersonTrainingRecord> {
- List<PersonTrainingRecordDto> trainingAndAssessmentRecordsPage(Integer trainingDetailedId, String userName);
+ List<PersonTrainingRecordDto> trainingAndAssessmentRecordsPage(@Param("trainingDetailedId") Integer trainingDetailedId,@Param("userName") String userName);
IPage<PersonTrainingRecordListDto> personnelTrainingPersonnel(Page page, String userName, Integer userId, Integer departLimsId);
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonTrainingService.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonTrainingService.java
index 046cf24..46e3fab 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonTrainingService.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonTrainingService.java
@@ -6,6 +6,7 @@
import com.ruoyi.personnel.dto.PersonTrainingDto;
import com.ruoyi.personnel.pojo.PersonTraining;
import com.ruoyi.personnel.pojo.PersonTrainingDetailed;
+import org.apache.ibatis.annotations.Param;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
@@ -22,7 +23,7 @@
public interface PersonTrainingService extends IService<PersonTraining> {
IPage<PersonTrainingDto> personTrainingSelect(Page page,
- String compilerName, String departmentId);
+ @Param("compilerName") String compilerName, @Param("departmentId") String departmentId);
void personTrainingImport(MultipartFile file, PersonTraining training);
diff --git a/cnas-personnel/src/main/resources/mapper/PersonBasicInfoMapper.xml b/cnas-personnel/src/main/resources/mapper/PersonBasicInfoMapper.xml
index 206013d..da32169 100644
--- a/cnas-personnel/src/main/resources/mapper/PersonBasicInfoMapper.xml
+++ b/cnas-personnel/src/main/resources/mapper/PersonBasicInfoMapper.xml
@@ -35,7 +35,6 @@
cpbi.professional_title professionalTitle
from user u
left join cnas_person_basic_info cpbi on cpbi.user_id = u.id
- left join user u1 on u1.id = u.create_user
<where>
FIND_IN_SET(#{departmentId},u.depart_lims_id)
<if test="name != null and name != ''">
diff --git a/cnas-personnel/src/main/resources/mapper/PersonTrainingRecordMapper.xml b/cnas-personnel/src/main/resources/mapper/PersonTrainingRecordMapper.xml
index c57dd3d..93360e5 100644
--- a/cnas-personnel/src/main/resources/mapper/PersonTrainingRecordMapper.xml
+++ b/cnas-personnel/src/main/resources/mapper/PersonTrainingRecordMapper.xml
@@ -3,10 +3,9 @@
<mapper namespace="com.ruoyi.personnel.mapper.PersonTrainingRecordMapper">
<select id="trainingAndAssessmentRecordsPage" resultType="com.ruoyi.personnel.dto.PersonTrainingRecordDto">
- select cptr.*, u.account, u.name user_name, u.phone, r.name role_name
+ select cptr.*, u.account, u.name user_name, u.phone
from cnas_person_training_record cptr
left join user u on u.id = cptr.user_id
- left join role r on r.id = u.role_id
where cptr.course_id = #{trainingDetailedId}
<if test="userName != null and userName != ''">
and u.name like concat('%', #{userName}, '%')
diff --git a/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessMethodSearchNewController.java b/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessMethodSearchNewController.java
index 7ba9d7d..b206980 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessMethodSearchNewController.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessMethodSearchNewController.java
@@ -100,7 +100,7 @@
*/
@ApiOperation(value = "鏌ヨ瀛樻。")
@GetMapping("/pageSearchNewArchived")
- public Result<IPage<ProcessMethodSearchNewArchivedDto>> pageSearchNewArchived(ProcessMethodSearchNewArchivedDto archived,Page page) throws Exception {
+ public Result pageSearchNewArchived(ProcessMethodSearchNewArchivedDto archived,Page page) throws Exception {
return Result.success(processMethodSearchNewService.pageSearchNewArchived(page, archived));
}
diff --git a/cnas-process/src/main/java/com/ruoyi/process/mapper/ProcessMethodSearchNewBackupsMapper.java b/cnas-process/src/main/java/com/ruoyi/process/mapper/ProcessMethodSearchNewBackupsMapper.java
index 9c9ebf7..9d7b089 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/mapper/ProcessMethodSearchNewBackupsMapper.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/mapper/ProcessMethodSearchNewBackupsMapper.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.process.pojo.ProcessMethodSearchNewBackups;
+import org.apache.ibatis.annotations.Param;
/**
* <p>
@@ -22,5 +23,5 @@
* @param ew
* @return
*/
- IPage<ProcessMethodSearchNewBackups> pageSearchNewBackups(Page page, QueryWrapper<ProcessMethodSearchNewBackups> ew);
+ IPage<ProcessMethodSearchNewBackups> pageSearchNewBackups(Page page, @Param("ew") QueryWrapper<ProcessMethodSearchNewBackups> ew);
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/dto/UpdateUserDto.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/dto/UpdateUserDto.java
new file mode 100644
index 0000000..474b874
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/dto/UpdateUserDto.java
@@ -0,0 +1,11 @@
+package com.ruoyi.web.controller.dto;
+
+import lombok.Data;
+
+@Data
+public class UpdateUserDto {
+
+ private String id;
+
+ private String ids;
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/UserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/UserController.java
index d9b9781..fba3273 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/UserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/UserController.java
@@ -5,6 +5,7 @@
import com.ruoyi.common.core.domain.Result;
import com.ruoyi.common.core.domain.entity.User;
import com.ruoyi.system.service.UserService;
+import com.ruoyi.web.controller.dto.UpdateUserDto;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
@@ -58,5 +59,18 @@
return Result.success("鎴愬姛", userService.selectUserDepartmentLimsName());
}
+ @PostMapping("/upUserDepardLimsId")
+ @ApiOperation(value = "淇敼浜哄憳鏄庣粏鎵�鍦ㄧ粍缁囨灦鏋�")
+ public Result<?> upUserDepardLimsId(@RequestBody UpdateUserDto dto){
+ return Result.success(userService.upUserDepardLimsId(dto.getIds(), dto.getId()));
+ }
+
+ @DeleteMapping("/delUserDepardLimsId")
+ @ApiOperation(value = "鍒犻櫎浜哄憳鏄庣粏鎵�鍦ㄧ粍缁囨灦鏋�")
+ public Result<?> delUserDepardLimsId(Integer id){
+ return Result.success(userService.delUserDepardLimsId(id));
+ }
+
+
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/UserService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/UserService.java
index 5ef005e..b75fdb4 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/UserService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/UserService.java
@@ -33,5 +33,10 @@
* @return
*/
String selectUserDepartmentLimsName();
+
+
+ int upUserDepardLimsId(String ids, String id);
+
+ int delUserDepardLimsId(Integer id);
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserServiceImpl.java
index 6bc48f5..cc655fc 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserServiceImpl.java
@@ -1,5 +1,7 @@
package com.ruoyi.system.service.impl;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.domain.entity.User;
import com.ruoyi.common.utils.QueryWrappers;
@@ -8,6 +10,7 @@
import com.ruoyi.system.service.UserService;
import org.springframework.stereotype.Service;
+import java.time.LocalDateTime;
import java.util.List;
/**
@@ -47,5 +50,16 @@
public String selectUserDepartmentLimsName() {
return baseMapper.selectUserDepartmentLimsName(SecurityUtils.getUserId().intValue());
}
+
+ @Override
+ public int upUserDepardLimsId(String ids, String id) {
+ List<Integer> userIds = JSON.parseArray(ids, Integer.class);
+ return baseMapper.update(null, Wrappers.<User>lambdaUpdate().in(User::getId, userIds).set(User::getDepartLimsId, id).set(User::getUpdateTime, LocalDateTime.now()).set(User::getUpdateBy,SecurityUtils.getLoginUser().getUsername()));
+ }
+
+ @Override
+ public int delUserDepardLimsId(Integer id) {
+ return baseMapper.update(null, Wrappers.<User>lambdaUpdate().eq(User::getId, id).set(User::getDepartLimsId, null).set(User::getUpdateTime, LocalDateTime.now()).set(User::getUpdateBy, SecurityUtils.getUsername()));
+ }
}
--
Gitblit v1.9.3