From 201029ebe1fffdc3335c1bbd60dd6befe0283b7c Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 26 十月 2023 17:46:44 +0800
Subject: [PATCH] 代码修改
---
ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceExternalpersonMapper.java | 9 +
ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonatebaseinfoService.java | 4
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java | 36 +++--
ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonateorganService.java | 2
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java | 136 +++++++++++++++++++++-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoController.java | 8 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateorganController.java | 9 -
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfo.java | 5
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateorganServiceImpl.java | 108 ------------------
ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml | 1
10 files changed, 175 insertions(+), 143 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoController.java
index dd6d729..b7880b6 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoController.java
@@ -928,5 +928,13 @@
return AjaxResult.success(serviceDonatebaseinfoService.countByRecordState(timeVO));
}
+ /**
+ * 鑾峰彇鎹愮尞宸ヤ綔娴�
+ */
+ @ApiOperation("鑾峰彇鎹愮尞宸ヤ綔娴�")
+ @GetMapping(value = "/getWorkFlow/{id}")
+ public AjaxResult getWorkFlow(@PathVariable("id") Long id) {
+ return AjaxResult.success(serviceDonatebaseinfoService.getWorkFlow(id));
+ }
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateorganController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateorganController.java
index e6ed810..8444488 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateorganController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateorganController.java
@@ -261,12 +261,5 @@
return AjaxResult.success(serviceDonateorganService.getOrganCount(timeVO));
}
- /**
- * 鑾峰彇鎹愮尞宸ヤ綔娴�
- */
- @ApiOperation("鑾峰彇鎹愮尞宸ヤ綔娴�")
- @GetMapping(value = "/getWorkFlow/{id}")
- public AjaxResult getWorkFlow(@PathVariable("id") Long id) {
- return AjaxResult.success(serviceDonateorganService.getWorkFlow(id));
- }
+
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfo.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfo.java
index 0bd3edb..51cc028 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfo.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfo.java
@@ -377,4 +377,9 @@
private String annexfiles;
+ @ApiModelProperty("宸ヤ綔娴�")
+ @Excel(name = "宸ヤ綔娴�")
+ private Integer workflow;
+
+
}
\ No newline at end of file
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceExternalpersonMapper.java b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceExternalpersonMapper.java
index ed92ba7..4eaf6d9 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceExternalpersonMapper.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceExternalpersonMapper.java
@@ -2,17 +2,20 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
import java.util.List;
+
import com.ruoyi.project.domain.ServiceExternalperson;
+import org.apache.ibatis.annotations.Mapper;
/**
* 澶栧洿鍗曚綅浜哄憳Mapper鎺ュ彛
- *
+ *
* @author ruoyi
* @date 2021-11-24
*/
-public interface ServiceExternalpersonMapper extends BaseMapper<ServiceExternalperson>
-{
+@Mapper
+public interface ServiceExternalpersonMapper extends BaseMapper<ServiceExternalperson> {
/**
* 鏌ヨ澶栧洿鍗曚綅浜哄憳鍒楄〃
*
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonatebaseinfoService.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonatebaseinfoService.java
index ef1eaca..993ac52 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonatebaseinfoService.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonatebaseinfoService.java
@@ -1,6 +1,8 @@
package com.ruoyi.project.service;
import java.util.List;
+import java.util.Map;
+
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.project.domain.ServiceDonatebaseinfo;
import com.ruoyi.project.domain.vo.TimeVO;
@@ -42,4 +44,6 @@
countByRecordStateVO countByRecordState(TimeVO timeVO);
String getDonateNameById(Long infoid);
+
+ Map<String, Object> getWorkFlow(Long id);
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonateorganService.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonateorganService.java
index ed9dff4..f60a6f6 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonateorganService.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonateorganService.java
@@ -71,5 +71,5 @@
List<organInfoVO> getOrganCount(TimeVO timeVO);
- Map<String, Object> getWorkFlow(Long id);
+
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java
index ed36b4a..0be0fee 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java
@@ -2,19 +2,18 @@
import java.text.SimpleDateFormat;
import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.project.domain.BaseOnlyvalue;
-import com.ruoyi.project.domain.BaseOrganization;
-import com.ruoyi.project.domain.ServiceDonationwitness;
+import com.ruoyi.project.domain.*;
import com.ruoyi.project.domain.vo.TimeVO;
import com.ruoyi.project.domain.vo.countByRecordStateVO;
import com.ruoyi.project.mapper.*;
-import com.ruoyi.project.service.IBaseOnlyvalueService;
+import com.ruoyi.project.service.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -22,9 +21,8 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.project.domain.ServiceDonatebaseinfo;
import com.ruoyi.project.mapper.BaseOrganizationMapper;
-import com.ruoyi.project.service.IServiceDonatebaseinfoService;
+import org.springframework.util.CollectionUtils;
/**
* 鎹愮尞鍩虹Service涓氬姟灞傚鐞�
@@ -49,6 +47,24 @@
@Autowired
private IBaseOnlyvalueService baseOnlyvalueService;
+
+ @Autowired
+ private IServiceMedicalevaluationService serviceMedicalevaluationService;
+
+ @Autowired
+ private IServiceRelativesconfirmationService serviceRelativesconfirmationService;
+
+ @Autowired
+ private IServiceEthicalreviewopinionsService serviceEthicalreviewopinionsService;
+
+ @Autowired
+ private IServiceOrganallocationService serviceOrganallocationService;
+
+ @Autowired
+ private IServiceDonationwitnessService serviceDonationwitnessService;
+
+ @Autowired
+ private IServiceDonatecompletioninfoService serviceDonatecompletioninfoService;
/**
@@ -246,7 +262,115 @@
return serviceDonatebaseinfoMapper.getDonateNameById(infoid);
}
+ @Override
+ public Map<String, Object> getWorkFlow(Long id) {
+ //鐢ㄤ簬杩斿洖
+ Map<String, Object> map = new ConcurrentHashMap<>();
+ ServiceDonatebaseinfo serviceDonatebaseinfo = getById(id);
+ if (ObjectUtils.isEmpty(serviceDonatebaseinfo)) {
+ return null;
+ }
+ //灏佽serviceDonateorgan娼滃湪鎹愮尞鏁版嵁
+ Map<String, String> donateorgan = new HashMap<>();
+ donateorgan.put("createtime", serviceDonatebaseinfo.getCreateTime().toString());
+ donateorgan.put("updatetime", serviceDonatebaseinfo.getUpdateTime().toString());
+ donateorgan.put("process", "");
+ //灏佽serviceDonateorgan娼滃湪鎹愮尞杩斿洖鏁版嵁
+ map.put("donateorgan", donateorgan);
+
+ //灏佽鍖诲璇勪及
+ Map<String, String> medicalevaluation = new HashMap<>();
+ if (serviceDonatebaseinfo.getWorkflow() >= 1) {
+ ServiceMedicalevaluation serviceMedicalevaluation = new ServiceMedicalevaluation();
+ serviceMedicalevaluation.setInfoid(id);
+ List<ServiceMedicalevaluation> serviceMedicalevaluations = serviceMedicalevaluationService.queryList(serviceMedicalevaluation);
+ if (!CollectionUtils.isEmpty(serviceMedicalevaluations)) {
+ medicalevaluation.put("createtime", serviceMedicalevaluations.get(0).getCreateTime().toString());
+ medicalevaluation.put("updatetime", serviceMedicalevaluations.get(0).getUpdateTime().toString());
+ medicalevaluation.put("process", "");
+ }
+ }
+ //灏佽鍖诲璇勪及杩斿洖鏁版嵁
+ map.put("medicalevaluation", medicalevaluation);
+
+ //灏佽鎹愮尞纭
+ Map<String, String> relativesconfirmation = new HashMap<>();
+ if (serviceDonatebaseinfo.getWorkflow() >= 2) {
+ ServiceRelativesconfirmation serviceRelativesconfirmation = new ServiceRelativesconfirmation();
+ serviceRelativesconfirmation.setInfoid(id);
+ List<ServiceRelativesconfirmation> serviceRelativesconfirmations = serviceRelativesconfirmationService.queryList(serviceRelativesconfirmation);
+ if (!CollectionUtils.isEmpty(serviceRelativesconfirmations)) {
+ relativesconfirmation.put("createtime", serviceRelativesconfirmations.get(0).getCreateTime().toString());
+ relativesconfirmation.put("updatetime", serviceRelativesconfirmations.get(0).getUpdateTime().toString());
+ relativesconfirmation.put("process", "");
+ }
+ }
+ //灏佽鎹愮尞纭杩斿洖鏁版嵁
+ map.put("relativesconfirmation", relativesconfirmation);
+
+
+ //灏佽浼︾悊瀹℃煡
+ Map<String, String> ethicalreviewopinions = new HashMap<>();
+ if (serviceDonatebaseinfo.getWorkflow() >= 3) {
+ ServiceEthicalreviewopinions serviceEthicalreviewopinions = new ServiceEthicalreviewopinions();
+ serviceEthicalreviewopinions.setInfoid(id);
+ List<ServiceEthicalreviewopinions> serviceEthicalreviewopinionsList = serviceEthicalreviewopinionsService.queryList(serviceEthicalreviewopinions);
+ if (!CollectionUtils.isEmpty(serviceEthicalreviewopinionsList)) {
+ ethicalreviewopinions.put("createtime", serviceEthicalreviewopinionsList.get(0).getCreateTime().toString());
+ ethicalreviewopinions.put("updatetime", serviceEthicalreviewopinionsList.get(0).getUpdateTime().toString());
+ ethicalreviewopinions.put("process", "");
+ }
+ }
+ //灏佽浼︾悊瀹℃煡杩斿洖鏁版嵁
+ map.put("ethicalreviewopinions", ethicalreviewopinions);
+
+ //灏佽鍣ㄥ畼鍒嗛厤
+ Map<String, String> organallocationService = new HashMap<>();
+ if (serviceDonatebaseinfo.getWorkflow() >= 4) {
+ ServiceOrganallocation serviceOrganallocation = new ServiceOrganallocation();
+ serviceOrganallocation.setOrganid(id);
+ List<ServiceOrganallocation> serviceOrganallocations = serviceOrganallocationService.selectServiceOrganallocationList(serviceOrganallocation);
+ if (!CollectionUtils.isEmpty(serviceOrganallocations)) {
+ organallocationService.put("createtime", serviceOrganallocations.get(0).getCreateTime().toString());
+ organallocationService.put("updatetime", serviceOrganallocations.get(0).getUpdateTime().toString());
+ organallocationService.put("process", "");
+ }
+ }
+ //灏佽鍣ㄥ畼鍒嗛厤杩斿洖鏁版嵁
+ map.put("organallocationService", organallocationService);
+
+ //灏佽鑾峰彇瑙佽瘉
+ Map<String, String> donationwitness = new HashMap<>();
+ if (serviceDonatebaseinfo.getWorkflow() >= 5) {
+ ServiceDonationwitness serviceDonationwitness = serviceDonationwitnessService.getByInfoId(id);
+ if (!ObjectUtils.isEmpty(serviceDonationwitness)) {
+ donationwitness.put("createtime", serviceDonationwitness.getCreateTime().toString());
+ donationwitness.put("updatetime", serviceDonationwitness.getUpdateTime().toString());
+ donationwitness.put("process", "");
+ }
+ }
+ //灏佽鑾峰彇瑙佽瘉杩斿洖鏁版嵁
+ map.put("donationwitness", donationwitness);
+
+ //灏佽瀹屾垚鐧昏
+ Map<String, String> donatecompletioninfo = new HashMap<>();
+ if (serviceDonatebaseinfo.getWorkflow() >= 6) {
+ ServiceDonatecompletioninfo serviceDonatecompletioninfo = new ServiceDonatecompletioninfo();
+ serviceDonatecompletioninfo.setInfoid(id);
+ List<ServiceDonatecompletioninfo> serviceDonatecompletioninfos = serviceDonatecompletioninfoService.queryList(serviceDonatecompletioninfo);
+ if (!CollectionUtils.isEmpty(serviceDonatecompletioninfos)) {
+ donatecompletioninfo.put("createtime", serviceDonatecompletioninfos.get(0).getCreateTime().toString());
+ donatecompletioninfo.put("updatetime", serviceDonatecompletioninfos.get(0).getUpdateTime().toString());
+ donatecompletioninfo.put("process", "");
+ }
+ }
+ //灏佽瀹屾垚鐧昏杩斿洖鏁版嵁
+ map.put("donatecompletioninfo", donatecompletioninfo);
+
+ //灏嗘暟鎹皝闂紝骞惰繑鍥�
+ return map;
+ }
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateorganServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateorganServiceImpl.java
index fced001..355eb56 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateorganServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateorganServiceImpl.java
@@ -61,23 +61,6 @@
@Autowired
private SysDictDataMapper dictDataMapper;
- @Autowired
- private IServiceMedicalevaluationService serviceMedicalevaluationService;
-
- @Autowired
- private IServiceRelativesconfirmationService serviceRelativesconfirmationService;
-
- @Autowired
- private IServiceEthicalreviewopinionsService serviceEthicalreviewopinionsService;
-
- @Autowired
- private IServiceOrganallocationService serviceOrganallocationService;
-
- @Autowired
- private IServiceDonationwitnessService serviceDonationwitnessService;
-
- @Autowired
- private IServiceDonatecompletioninfoService serviceDonatecompletioninfoService;
/**
@@ -753,97 +736,6 @@
return l;
}
- @Override
- public Map<String, Object> getWorkFlow(Long id) {
- //鐢ㄤ簬杩斿洖
- Map<String, Object> map = new ConcurrentHashMap<>();
-
- ServiceDonateorgan serviceDonateorgan = getById(id);
- if (ObjectUtils.isEmpty(serviceDonateorgan)) {
- return null;
- }
- //灏佽serviceDonateorgan娼滃湪鎹愮尞鏁版嵁
- Map<String, String> donateorgan = new HashMap<>();
- donateorgan.put("createtime", serviceDonateorgan.getCreateTime().toString());
- donateorgan.put("updatetime", serviceDonateorgan.getUpdateTime().toString());
- donateorgan.put("process", "");
-
- //灏佽鍖诲璇勪及
- Map<String, String> medicalevaluation = new HashMap<>();
- ServiceMedicalevaluation serviceMedicalevaluation = new ServiceMedicalevaluation();
- serviceMedicalevaluation.setInfoid(id);
- List<ServiceMedicalevaluation> serviceMedicalevaluations = serviceMedicalevaluationService.queryList(serviceMedicalevaluation);
- if (!CollectionUtils.isEmpty(serviceMedicalevaluations)) {
- medicalevaluation.put("createtime", serviceMedicalevaluations.get(0).getCreateTime().toString());
- medicalevaluation.put("updatetime", serviceMedicalevaluations.get(0).getUpdateTime().toString());
- medicalevaluation.put("process", "");
- }
-
- //灏佽鎹愮尞纭
- Map<String, String> relativesconfirmation = new HashMap<>();
- ServiceRelativesconfirmation serviceRelativesconfirmation = new ServiceRelativesconfirmation();
- serviceRelativesconfirmation.setInfoid(id);
- List<ServiceRelativesconfirmation> serviceRelativesconfirmations = serviceRelativesconfirmationService.queryList(serviceRelativesconfirmation);
- if (!CollectionUtils.isEmpty(serviceRelativesconfirmations)) {
- relativesconfirmation.put("createtime", serviceRelativesconfirmations.get(0).getCreateTime().toString());
- relativesconfirmation.put("updatetime", serviceRelativesconfirmations.get(0).getUpdateTime().toString());
- relativesconfirmation.put("process", "");
- }
-
-
- //灏佽浼︾悊瀹℃煡
- Map<String, String> ethicalreviewopinions = new HashMap<>();
- ServiceEthicalreviewopinions serviceEthicalreviewopinions = new ServiceEthicalreviewopinions();
- serviceEthicalreviewopinions.setInfoid(id);
- List<ServiceEthicalreviewopinions> serviceEthicalreviewopinionsList = serviceEthicalreviewopinionsService.queryList(serviceEthicalreviewopinions);
- if (!CollectionUtils.isEmpty(serviceEthicalreviewopinionsList)) {
- ethicalreviewopinions.put("createtime", serviceEthicalreviewopinionsList.get(0).getCreateTime().toString());
- ethicalreviewopinions.put("updatetime", serviceEthicalreviewopinionsList.get(0).getUpdateTime().toString());
- ethicalreviewopinions.put("process", "");
- }
-
- //灏佽鍣ㄥ畼鍒嗛厤
- Map<String, String> organallocationService = new HashMap<>();
- ServiceOrganallocation serviceOrganallocation = new ServiceOrganallocation();
- serviceOrganallocation.setOrganid(id);
- List<ServiceOrganallocation> serviceOrganallocations = serviceOrganallocationService.selectServiceOrganallocationList(serviceOrganallocation);
- if (!CollectionUtils.isEmpty(serviceOrganallocations)) {
- organallocationService.put("createtime", serviceOrganallocations.get(0).getCreateTime().toString());
- organallocationService.put("updatetime", serviceOrganallocations.get(0).getUpdateTime().toString());
- organallocationService.put("process", "");
- }
-
- //灏佽鑾峰彇瑙佽瘉
- Map<String, String> donationwitness = new HashMap<>();
- ServiceDonationwitness serviceDonationwitness = serviceDonationwitnessService.getByInfoId(id);
- if (!ObjectUtils.isEmpty(serviceDonationwitness)) {
- donationwitness.put("createtime", serviceDonationwitness.getCreateTime().toString());
- donationwitness.put("updatetime", serviceDonationwitness.getUpdateTime().toString());
- donationwitness.put("process", "");
- }
-
- //灏佽瀹屾垚鐧昏
- Map<String, String> donatecompletioninfo = new HashMap<>();
- ServiceDonatecompletioninfo serviceDonatecompletioninfo = new ServiceDonatecompletioninfo();
- serviceDonatecompletioninfo.setInfoid(id);
- List<ServiceDonatecompletioninfo> serviceDonatecompletioninfos = serviceDonatecompletioninfoService.queryList(serviceDonatecompletioninfo);
- if (!CollectionUtils.isEmpty(serviceDonatecompletioninfos)) {
- donatecompletioninfo.put("createtime", serviceDonatecompletioninfos.get(0).getCreateTime().toString());
- donatecompletioninfo.put("updatetime", serviceDonatecompletioninfos.get(0).getUpdateTime().toString());
- donatecompletioninfo.put("process", "");
- }
-
- //灏嗘暟鎹皝闂紝骞惰繑鍥�
- map.put("donateorgan", donateorgan);
- map.put("medicalevaluation", medicalevaluation);
- map.put("relativesconfirmation", relativesconfirmation);
- map.put("ethicalreviewopinions", ethicalreviewopinions);
- map.put("organallocationService", organallocationService);
- map.put("donationwitness", donationwitness);
- map.put("donatecompletioninfo", donatecompletioninfo);
-
- return map;
- }
// @Override
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml
index 59c08a2..d9edf63 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml
@@ -91,6 +91,7 @@
<result property="leadername" column="leadername" />
<result property="businessarea" column="businessarea" />
<result property="annexfiles" column="annexfiles" />
+ <result property="workflow" column="workflow" />
</resultMap>
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java
index 2e3816e..90ae6b0 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java
@@ -1,19 +1,21 @@
package com.ruoyi.system.mapper;
import java.util.List;
+
+import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import com.ruoyi.common.core.domain.entity.SysDept;
/**
* 閮ㄩ棬绠＄悊 鏁版嵁灞�
- *
+ *
* @author ruoyi
*/
-public interface SysDeptMapper
-{
+@Mapper
+public interface SysDeptMapper {
/**
* 鏌ヨ閮ㄩ棬绠＄悊鏁版嵁
- *
+ *
* @param dept 閮ㄩ棬淇℃伅
* @return 閮ㄩ棬淇℃伅闆嗗悎
*/
@@ -21,8 +23,8 @@
/**
* 鏍规嵁瑙掕壊ID鏌ヨ閮ㄩ棬鏍戜俊鎭�
- *
- * @param roleId 瑙掕壊ID
+ *
+ * @param roleId 瑙掕壊ID
* @param deptCheckStrictly 閮ㄩ棬鏍戦�夋嫨椤规槸鍚﹀叧鑱旀樉绀�
* @return 閫変腑閮ㄩ棬鍒楄〃
*/
@@ -30,7 +32,7 @@
/**
* 鏍规嵁閮ㄩ棬ID鏌ヨ淇℃伅
- *
+ *
* @param deptId 閮ㄩ棬ID
* @return 閮ㄩ棬淇℃伅
*/
@@ -38,7 +40,7 @@
/**
* 鏍规嵁ID鏌ヨ鎵�鏈夊瓙閮ㄩ棬
- *
+ *
* @param deptId 閮ㄩ棬ID
* @return 閮ㄩ棬鍒楄〃
*/
@@ -46,7 +48,7 @@
/**
* 鏍规嵁ID鏌ヨ鎵�鏈夊瓙閮ㄩ棬锛堟甯哥姸鎬侊級
- *
+ *
* @param deptId 閮ㄩ棬ID
* @return 瀛愰儴闂ㄦ暟
*/
@@ -54,7 +56,7 @@
/**
* 鏄惁瀛樺湪瀛愯妭鐐�
- *
+ *
* @param deptId 閮ㄩ棬ID
* @return 缁撴灉
*/
@@ -62,7 +64,7 @@
/**
* 鏌ヨ閮ㄩ棬鏄惁瀛樺湪鐢ㄦ埛
- *
+ *
* @param deptId 閮ㄩ棬ID
* @return 缁撴灉
*/
@@ -70,7 +72,7 @@
/**
* 鏍￠獙閮ㄩ棬鍚嶇О鏄惁鍞竴
- *
+ *
* @param deptName 閮ㄩ棬鍚嶇О
* @param parentId 鐖堕儴闂↖D
* @return 缁撴灉
@@ -79,7 +81,7 @@
/**
* 鏂板閮ㄩ棬淇℃伅
- *
+ *
* @param dept 閮ㄩ棬淇℃伅
* @return 缁撴灉
*/
@@ -87,7 +89,7 @@
/**
* 淇敼閮ㄩ棬淇℃伅
- *
+ *
* @param dept 閮ㄩ棬淇℃伅
* @return 缁撴灉
*/
@@ -95,14 +97,14 @@
/**
* 淇敼鎵�鍦ㄩ儴闂ㄦ甯哥姸鎬�
- *
+ *
* @param deptIds 閮ㄩ棬ID缁�
*/
public void updateDeptStatusNormal(Long[] deptIds);
/**
* 淇敼瀛愬厓绱犲叧绯�
- *
+ *
* @param depts 瀛愬厓绱�
* @return 缁撴灉
*/
@@ -110,7 +112,7 @@
/**
* 鍒犻櫎閮ㄩ棬绠＄悊淇℃伅
- *
+ *
* @param deptId 閮ㄩ棬ID
* @return 缁撴灉
*/
--
Gitblit v1.9.3