Parcourir la source

修改责任中心对照表的分页返回

ljx il y a 4 ans
Parent
commit
f30a649d1a

+ 1 - 1
src/main/java/com/imed/costaccount/model/dto/DepartmentRequest.java

@@ -19,7 +19,7 @@ public class DepartmentRequest {
     @ApiModelProperty(name = "departmentName",value = "科室的名称")
     @NotNull(message = "科室名称不能为空")
     private String departmentName;
-    @ApiModelProperty(name = "departmentCode",value = "科室的Id")
+    @ApiModelProperty(name = "departmentCode",value = "科室的代码")
     @NotNull(message = "科室Id不能为空")
     private String departmentCode;
     @ApiModelProperty(name = "hospId",value = "医院的Id")

+ 3 - 0
src/main/java/com/imed/costaccount/service/impl/DepartmentServiceImpl.java

@@ -73,7 +73,10 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
      * @param departmentRequest
      */
     @Override
+    @Transactional(propagation = Propagation.REQUIRED,rollbackFor = Exception.class)
     public void addDepartment(DepartmentRequest departmentRequest) {
+        // 查询所有的科室信息
+//        baseMapper.selectList(new QueryWrapper<Department>().lambda().eq())
         User user = (User) SecurityUtils.getSubject().getPrincipal();
         Integer hospId = user.getHospId();
         departmentRequest.setHospId(hospId);

+ 5 - 9
src/main/java/com/imed/costaccount/web/ResponsibilityDepartmentController.java

@@ -1,23 +1,18 @@
 package com.imed.costaccount.web;
 
-import java.util.Arrays;
-import java.util.List;
-
 import com.imed.costaccount.common.util.Result;
 import com.imed.costaccount.model.User;
 import com.imed.costaccount.model.dto.DepartDTO;
 import com.imed.costaccount.model.vo.CenterDepartmentVO;
+import com.imed.costaccount.service.ResponsibilityDepartmentService;
+import com.imed.costaccount.utils.PageUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.shiro.SecurityUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import com.imed.costaccount.model.ResponsibilityDepartment;
-import com.imed.costaccount.service.ResponsibilityDepartmentService;
-import com.imed.costaccount.utils.PageUtils;
-
 import javax.validation.Valid;
+import java.util.List;
 
 
 /**
@@ -42,7 +37,8 @@ public class ResponsibilityDepartmentController {
     public Result list(){
         User user = (User) SecurityUtils.getSubject().getPrincipal();
         List<CenterDepartmentVO> list = responsibilityDepartmentService.getCenterDepart(user);
-        return Result.ok(list);
+        PageUtils pageUtils = new PageUtils(list, 0, 0, 0);
+        return Result.ok(pageUtils);
     }
 
     @ApiOperation("保存或修改责任中心对照")