xinyilu/PostDischargePatientManage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改DepartMent类

Browse Source
This commit is contained in:
youxilong 2024-02-28 15:46:51 +08:00
parent e33553cf38
commit 8726639e80
4 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
postdischarge-manage/src/main/java/com/xinelu/manage/controller/department/DepartmentController.java
View File

@ -10,11 +10,8 @@ import com.xinelu.common.utils.poi.ExcelUtil;
import com.xinelu.manage.domain.department.Department;
import com.xinelu.manage.dto.department.DepartmentDTO;
import com.xinelu.manage.service.department.IDepartmentService;
<<<<<<< HEAD
import com.xinelu.manage.vo.department.DepartmentVO;
=======
import org.apache.commons.lang3.StringUtils;
>>>>>>> 3ab9d2a39c0f0ba3275ddf18e924f21867a7ceba
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

8
postdischarge-manage/src/main/java/com/xinelu/manage/mapper/department/DepartmentMapper.java
View File

@ -1,13 +1,9 @@
package com.xinelu.manage.mapper.department;
import com.xinelu.manage.domain.department.Department;
<<<<<<< HEAD
import com.xinelu.manage.dto.department.DepartmentDTO;
import com.xinelu.manage.vo.department.DepartmentVO;
=======
import com.xinelu.manage.dto.DepartmentDto;
import org.apache.ibatis.annotations.Param;
>>>>>>> 3ab9d2a39c0f0ba3275ddf18e924f21867a7ceba
import java.util.List;
@ -91,7 +87,7 @@ public interface DepartmentMapper {
*/
List<DepartmentVO> selectDepartmentListWechatTemplateNum(DepartmentDTO departmentDto);
<<<<<<< HEAD
/**
* 查询科室信息列表及包含短信库数量
*
@ -99,7 +95,6 @@ public interface DepartmentMapper {
* @return
*/
List<DepartmentVO> selectDepartmentListMessageNum(DepartmentDTO departmentDto);
=======
/**
* 查询所有的机构信息
@ -116,5 +111,4 @@ public interface DepartmentMapper {
* @return int
**/
int insertDepartmentList(List<Department> departmentList);
>>>>>>> 3ab9d2a39c0f0ba3275ddf18e924f21867a7ceba
}

4
postdischarge-manage/src/main/java/com/xinelu/manage/service/department/IDepartmentService.java
View File

@ -85,7 +85,6 @@ public interface IDepartmentService {
* @param departmentDto
* @return
*/
<<<<<<< HEAD
List<DepartmentVO> selectDepartmentListWechatTemplateNum(DepartmentDTO departmentDto);
/**
@ -95,8 +94,6 @@ public interface IDepartmentService {
* @return
*/
List<DepartmentVO> selectDepartmentListMessageNum(DepartmentDTO departmentDto);
=======
List<DepartmentDto> selectDepartmentListWechatTemplateNum(DepartmentDto departmentDto);
/**
* 科室信息导入
@ -105,5 +102,4 @@ public interface IDepartmentService {
* @return int
**/
AjaxResult insertDepartmentList(List<Department> departmentList);
>>>>>>> 3ab9d2a39c0f0ba3275ddf18e924f21867a7ceba
}

13
postdischarge-manage/src/main/java/com/xinelu/manage/service/department/impl/DepartmentServiceImpl.java
View File

@ -11,12 +11,9 @@ import com.xinelu.manage.domain.department.Department;
import com.xinelu.manage.dto.department.DepartmentDTO;
import com.xinelu.manage.mapper.department.DepartmentMapper;
import com.xinelu.manage.service.department.IDepartmentService;
<<<<<<< HEAD
import com.xinelu.manage.vo.department.DepartmentVO;
=======
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.BooleanUtils;
>>>>>>> 3ab9d2a39c0f0ba3275ddf18e924f21867a7ceba
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -143,7 +140,7 @@ public class DepartmentServiceImpl implements IDepartmentService {
}
/**
<<<<<<< HEAD
*
* 查询科室信息列表及包含短信库数量
*
* @param departmentDto
@ -154,12 +151,13 @@ public class DepartmentServiceImpl implements IDepartmentService {
return departmentMapper.selectDepartmentListMessageNum(departmentDto);
}
=======
/**
* 科室信息导入
*
* @param departmentList 科室信息
* @return 导入结果
**/
* @return
*/
@Transactional(rollbackFor = Exception.class)
@Override
public AjaxResult insertDepartmentList(List<Department> departmentList) {
@ -199,5 +197,4 @@ public class DepartmentServiceImpl implements IDepartmentService {
}
return AjaxResult.success();
}
>>>>>>> 3ab9d2a39c0f0ba3275ddf18e924f21867a7ceba
}