From 657fc596ddabb0aa9cf1fd81d3dfc85c377d0884 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期四, 13 三月 2025 14:01:04 +0800
Subject: [PATCH] 人员组织树问题修改
---
cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonBasicInfoServiceImpl.java | 42 +++++++++++++++++++++
cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonBasicInfoController.java | 14 +++++++
cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonBasicInfoService.java | 15 +++++++
inspect-server/src/main/java/com/ruoyi/inspect/controller/InformationNotificationController.java | 14 +++++++
inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderRatesController.java | 4 +-
5 files changed, 87 insertions(+), 2 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 979c1cb..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
@@ -6,6 +6,7 @@
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;
@@ -226,4 +227,17 @@
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));
+ }
}
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonBasicInfoService.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonBasicInfoService.java
index fcc4d69..a55f8f6 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonBasicInfoService.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonBasicInfoService.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.domain.entity.DepartmentDto;
+import com.ruoyi.common.core.domain.entity.DepartmentLims;
import com.ruoyi.personnel.dto.PersonBasicInfoDto;
import com.ruoyi.personnel.dto.UserPageDto;
import com.ruoyi.personnel.pojo.PersonBasicInfo;
@@ -42,4 +43,18 @@
* @return
*/
boolean uploadBasicInfoFile(Integer basicInfoId, MultipartFile file);
+
+ /**
+ * 娣诲姞缁勭粐鏋舵瀯
+ * @param department
+ * @return
+ */
+ int addDepartment(DepartmentLims department);
+
+ /**
+ * 鍒犻櫎缁勭粐鏋舵瀯
+ * @param id
+ * @return
+ */
+ boolean delDepartment(Integer id);
}
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonBasicInfoServiceImpl.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonBasicInfoServiceImpl.java
index 0ae552c..33077b3 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonBasicInfoServiceImpl.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonBasicInfoServiceImpl.java
@@ -70,6 +70,7 @@
@Autowired
private DepartmentLimsMapper departmentMapper;
+
@Value("${file.path}")
private String imgUrl;
@Value("${wordUrl}")
@@ -301,6 +302,47 @@
}
/**
+ * 鏂板缁勭粐鏍�
+ * @param department
+ * @return
+ */
+ @Override
+ public int addDepartment(DepartmentLims department) {
+ departmentMapper.insert(department);
+ return department.getId();
+ }
+
+ /**
+ * 鍒犻櫎缁勭粐鏍�
+ * @param id
+ * @return
+ */
+ @Override
+ public boolean delDepartment(Integer id) {
+ //鍒ゆ柇鏄惁鏈夊瓙绫�,鐩村埌娌℃湁涓烘
+ List<DepartmentLims> department = getDepartment(id);
+ List<Integer> ids = department.stream().map(DepartmentLims::getId).collect(Collectors.toList());
+ departmentMapper.delete(Wrappers.<DepartmentLims>lambdaQuery()
+ .in(DepartmentLims::getId, ids));
+ return true;
+ }
+
+ //鍒ゆ柇鏄惁鏈夊瓙绫�,鐩村埌娌℃湁涓烘
+ public List<DepartmentLims> getDepartment(Integer id) {
+ List<DepartmentLims> list = new ArrayList<>();
+ DepartmentLims depart = departmentMapper.selectById(id);
+ list.add(depart);
+ List<DepartmentLims> departments = departmentMapper.selectList(Wrappers.<DepartmentLims>lambdaQuery().eq(DepartmentLims::getFatherId, id));
+ if (ObjectUtils.isNotEmpty(departments)) {
+ list.addAll(departments);
+ for (DepartmentLims department : departments) {
+ list.addAll(getDepartment(department.getId()));
+ }
+ }
+ return list;
+ }
+
+ /**
* 閫掑綊鏌ヨ瀛愯妭鐐�
* @param root 鏍硅妭鐐�
* @param all 鎵�鏈夎妭鐐�
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InformationNotificationController.java b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InformationNotificationController.java
index d20b89b..63320de 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InformationNotificationController.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InformationNotificationController.java
@@ -37,4 +37,18 @@
public Result<?> msgRoll(Page page) {
return Result.success(informationNotificationService.msgRoll(page));
}
+
+ @ApiOperation(value = "娑堟伅閫氱煡-鐐瑰嚮璇︽儏瑙﹀彂淇敼鐘舵�佷负宸茶")
+ @PostMapping("triggerModificationStatusToRead/{id}")
+ public Result<?> triggerModificationStatusToRead(@PathVariable("id") Integer id) {
+ informationNotificationService.triggerModificationStatusToRead(id);
+ return Result.success();
+ }
+
+ @ApiOperation(value = "娑堟伅閫氱煡-鏍囪鎵�鏈変俊鎭负宸茶/鍒犻櫎鎵�鏈夊凡璇绘秷鎭�")
+ @PostMapping("informationReadOrDelete/{isMarkAllInformationRead}")
+ public Result<?> markAllInformationReadOrDeleteAllReadMessages(@PathVariable("isMarkAllInformationRead") Boolean isMarkAllInformationRead) {
+ informationNotificationService.markAllInformationReadOrDeleteAllReadMessages(isMarkAllInformationRead);
+ return Result.success();
+ }
}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderRatesController.java b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderRatesController.java
index d34c041..1d3a486 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderRatesController.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderRatesController.java
@@ -50,8 +50,8 @@
*/
@ApiOperation(value = "鏌ヨ璁㈠崟璐圭敤璇︽儏")
@GetMapping("/selectRatesDetail")
- public Result selectRatesDetail(Integer insOrderId) {
- return Result.success(insOrderRatesService.list(Wrappers.<InsOrderRates>lambdaQuery()
+ public Result selectRatesDetail(Page page, Integer insOrderId) {
+ return Result.success(insOrderRatesService.page(page, Wrappers.<InsOrderRates>lambdaQuery()
.eq(InsOrderRates::getInsOrderId, insOrderId)));
}
--
Gitblit v1.9.3