测试修改公司及护理人员新增

ruoyi-admin/src/main/java/com/ruoyi/web/controller/care/CareCompaniesController.java

@@ -126,6 +126,13 @@ public class CareCompaniesController extends BaseController
     @GetMapping("/listAll")
     public List<CareCompanies> listAll(CareCompanies careCompanies)
     {
+        //判断当前用户是不是公司，如果是公司，则直接返回自己
+        CareCompanies currCompany=new CareCompanies();
+        currCompany.setUserId(getUserId());
+        List<CareCompanies> lst=careCompaniesService.selectCareCompaniesList(currCompany);
+        if(lst.size()>0){
+            return lst;
+        }
         List<CareCompanies> list = careCompaniesService.selectCareCompaniesList(careCompanies);
         return list;
     }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/care/CareNursesController.java

@@ -4,6 +4,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
 import com.ruoyi.care.domain.CareCompanies;
+import com.ruoyi.care.service.ICareCompaniesService;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.system.service.ISysUserService;
@@ -40,6 +41,8 @@ public class CareNursesController extends BaseController
     private ICareNursesService careNursesService;
     @Autowired
     private ISysUserService userService;
+    @Autowired
+    private ICareCompaniesService careCompaniesService;
     /**
      * 查询护理人员列表
      */
@@ -48,6 +51,14 @@ public class CareNursesController extends BaseController
     public TableDataInfo list(CareNurses careNurses)
     {
         startPage();
+        //判断当前用户是不是公司，如果是公司，则只获取自己公司的
+        CareCompanies careCompanies=new CareCompanies();
+        careCompanies.setUserId(getUserId());
+        List<CareCompanies> lst=careCompaniesService.selectCareCompaniesList(careCompanies);
+        if(lst.size()>0){
+            careNurses.setCompanyId(lst.get(0).getCompanyId());
+        }
+
         List<CareNurses> list = careNursesService.selectCareNursesList(careNurses);
         return getDataTable(list);
     }
@@ -56,9 +67,25 @@ public class CareNursesController extends BaseController
      * 获取所有的护理人员信息
      */
     @GetMapping("/listAll")
-    public List<CareNurses> listAll(CareNurses careCompanies)
+    public List<CareNurses> listAll(CareNurses careNurses)
+    {
+        List<CareNurses> list = careNursesService.selectCareNursesList(careNurses);
+        return list;
+    }
+
+    /**
+     * 获取当前公司护理人员信息
+     */
+    @GetMapping("/listCompanyNurses")
+    public List<CareNurses> listCompanyNurses(CareNurses careNurses)
     {
-        List<CareNurses> list = careNursesService.selectCareNursesList(careCompanies);
+        CareCompanies careCompanies=new CareCompanies();
+        careCompanies.setUserId(getUserId());
+        List<CareCompanies> lst=careCompaniesService.selectCareCompaniesList(careCompanies);
+        if(lst.size()>0){
+            careNurses.setCompanyId(lst.get(0).getCompanyId());
+        }
+        List<CareNurses> list = careNursesService.selectCareNursesList(careNurses);
         return list;
     }
 

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java

@@ -50,8 +50,7 @@ public class SysUser extends BaseEntity
     private String sex;
 
     /** 用户类型 */
-    @Excel(name = "用户类型", readConverterExp = "0=男,1=女,2=未知")
-    private String user_type;
+    private String userType;
 
     private String openId;
 
@@ -63,12 +62,13 @@ public class SysUser extends BaseEntity
         this.openId = openId;
     }
 
-    public String getUser_type() {
-        return user_type;
+
+    public String getUserType() {
+        return userType;
     }
 
-    public void setUser_type(String user_type) {
-        this.user_type = user_type;
+    public void setUserType(String userType) {
+        this.userType = userType;
     }
 
     /** 用户头像 */

ruoyi-system/src/main/java/com/ruoyi/care/service/impl/CareCompaniesServiceImpl.java

@@ -78,7 +78,7 @@ public class CareCompaniesServiceImpl implements ICareCompaniesService
         if(StringUtils.isNotEmpty(careCompanies.getPassword())){
             user.setPassword(SecurityUtils.encryptPassword(careCompanies.getPassword()));
         }
-        user.setUser_type("01");//企业用户
+        user.setUserType("01");//企业用户
         userMapper.insertUser(user);
 
         // 新增企业信息信息

ruoyi-system/src/main/java/com/ruoyi/care/service/impl/CareNursesServiceImpl.java

@@ -78,7 +78,7 @@ public class CareNursesServiceImpl implements ICareNursesService
         if(StringUtils.isNotEmpty(careNurses.getPassword())){
             user.setPassword(SecurityUtils.encryptPassword(careNurses.getPassword()));
         }
-        user.setUser_type("02");//护理人员
+        user.setUserType("02");//护理人员
         userMapper.insertUser(user);
 
         // 新增护理人员信息

ruoyi-system/src/main/resources/mapper/care/CareNursesMapper.xml

@@ -117,8 +117,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="licenseNumber != null and licenseNumber != ''">#{licenseNumber},</if>
             <if test="experienceYears != null">#{experienceYears},</if>
             <if test="companyId != null">#{companyId},</if>
-            <if test="age != null">#{age},</if>
             <if test="userId != null">#{userId},</if>
+            <if test="age != null">#{age},</if>
             <if test="delFlag != null">#{delFlag},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>

ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -160,6 +160,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="status != null and status != ''">status,</if>
  			<if test="createBy != null and createBy != ''">create_by,</if>
  			<if test="remark != null and remark != ''">remark,</if>
+		<if test="userType != null and userType != ''">user_type,</if>
  			create_time
  		)values(
  			<if test="userId != null and userId != ''">#{userId},</if>
@@ -174,6 +175,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="status != null and status != ''">#{status},</if>
  			<if test="createBy != null and createBy != ''">#{createBy},</if>
  			<if test="remark != null and remark != ''">#{remark},</if>
+		<if test="userType != null and userType != ''">#{userType},</if>
  			sysdate()
  		)
 	</insert>

ruoyi-vue/src/api/care/nurses.js

@@ -64,4 +64,14 @@ export function listAllNurses(query) {
     method: 'get',
     params: query
   })
-}
+}
+
+// 查询当前公司所有的护理人列表
+export function listCompanyNurses(query) {
+  return request({
+    url: '/care/nurses/listCompanyNurses',
+    method: 'get',
+    params: query
+  })
+}
+

ruoyi-vue/src/views/care/applications/index_assign_nurse.vue

@@ -212,7 +212,7 @@ import {
 } from "@/api/care/applications";
 import { listAllHospital } from "@/api/care/hospital";
 import {listAllPersons} from "@/api/care/persons";
-import {listAllNurses} from "@/api/care/nurses";
+import {listCompanyNurses} from "@/api/care/nurses";
 const { proxy } = getCurrentInstance();
 const { sys_user_sex,care_apply_status } = proxy.useDict('sys_user_sex','care_apply_status');
 
@@ -356,8 +356,8 @@ function handleSelectChange(value) {
 }
 
 /** 查询当前公司的护理人员 */
-function listCompanyNurses() {
-  listAllNurses().then(response => {
+function companyNurses() {
+  listCompanyNurses().then(response => {
     nursesList.value = response;
   });
 }
@@ -369,6 +369,6 @@ function listHispital() {
   });
 }
 getAssignList();
-listCompanyNurses();
+companyNurses();
 listHispital();
 </script>