机构SaaS角色修改

server/src/main/java/com/pica/cloud/account/account/server/controller/HospitalSaasRoleController.java

@@ -3,6 +3,7 @@ package com.pica.cloud.account.account.server.controller;
 
 import com.pica.cloud.account.account.server.req.HospitalRoleDetailReq;
 import com.pica.cloud.account.account.server.req.HospitalRoleListReq;
+import com.pica.cloud.account.account.server.resp.HospitalRoleDto;
 import com.pica.cloud.account.account.server.resp.HospitalRoleResp;
 import com.pica.cloud.account.account.server.service.HospitalSaasRoleService;
 import com.pica.cloud.foundation.entity.PicaResponse;
@@ -32,9 +33,9 @@ public class HospitalSaasRoleController extends AccountBaseController {
     }
 
     @ApiOperation("机构saas角色-删除")
-    @DeleteMapping(value = "/hospital/role/delete")
+    @DeleteMapping(value = "/hospital/role/delete{id}")
     @EnabledLoginValidate
-    public PicaResponse<Integer> delete(@RequestParam("id") Long id) {
+    public PicaResponse<Integer> delete(@PathVariable("id") Long id) {
         return PicaResponse.toResponse(hospitalSaasRoleService.delete(id));
     }
 
@@ -45,4 +46,12 @@ public class HospitalSaasRoleController extends AccountBaseController {
         HospitalRoleResp hospitalRoleResp = hospitalSaasRoleService.ListByPage(req);
         return PicaResponse.toResponse(hospitalRoleResp);
     }
+
+
+    @ApiOperation("机构saas角色-角色")
+    @GetMapping(value = "/hospital/role/getRoleDetail/{id}")
+    @EnabledLoginValidate
+    public PicaResponse<HospitalRoleDto> getRoleDetail(@PathVariable("id") Long id) {
+        return PicaResponse.toResponse(hospitalSaasRoleService.getRoleDetail(id));
+    }
 }
\ No newline at end of file

server/src/main/java/com/pica/cloud/account/account/server/resp/HospitalRoleDto.java

@@ -14,7 +14,7 @@ public class HospitalRoleDto {
 
     private Long roleId;
 
-    private String describe;
+    private String remark;
 
     private String createId;
 

server/src/main/java/com/pica/cloud/account/account/server/service/HospitalSaasRoleService.java

@@ -3,13 +3,10 @@ package com.pica.cloud.account.account.server.service;
 
 import com.pica.cloud.account.account.server.req.HospitalRoleDetailReq;
 import com.pica.cloud.account.account.server.req.HospitalRoleListReq;
+import com.pica.cloud.account.account.server.resp.HospitalRoleDto;
 import com.pica.cloud.account.account.server.resp.HospitalRoleResp;
 import com.pica.cloud.account.account.server.resp.HospitalSaasRoleResp;
-import com.pica.cloud.account.account.server.resp.RoleDto;
 import com.pica.cloud.foundation.utils.entity.PicaUser;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
 
 /**
  * @Author qinwh
@@ -27,4 +24,6 @@ public interface HospitalSaasRoleService {
 
     HospitalSaasRoleResp querySaasRoles();
 
+    HospitalRoleDto getRoleDetail(Long id);
+
 }

server/src/main/java/com/pica/cloud/account/account/server/service/impl/HospitalSaasRoleServiceImpl.java

@@ -7,6 +7,7 @@ import com.pica.cloud.account.account.server.mapper.PermissionDoctorRoleMapper;
 import com.pica.cloud.account.account.server.mapper.PermissionRoleMapper;
 import com.pica.cloud.account.account.server.req.HospitalRoleDetailReq;
 import com.pica.cloud.account.account.server.req.HospitalRoleListReq;
+import com.pica.cloud.account.account.server.resp.HospitalRoleDto;
 import com.pica.cloud.account.account.server.resp.HospitalRoleResp;
 import com.pica.cloud.account.account.server.resp.HospitalSaasRoleResp;
 import com.pica.cloud.account.account.server.resp.RoleDto;
@@ -14,6 +15,7 @@ import com.pica.cloud.account.account.server.service.HospitalSaasRoleService;
 import com.pica.cloud.foundation.entity.PicaWarnException;
 import com.pica.cloud.foundation.utils.entity.PicaUser;
 import com.pica.cloud.foundation.utils.utils.CommonUtil;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -41,6 +43,7 @@ public class HospitalSaasRoleServiceImpl implements HospitalSaasRoleService {
             if (null != byNameCode && !byNameCode.getId().equals(req.getId())) {
                 throw new PicaWarnException(AccountExceptionEnum.PAT_ACCT_HAS_EXIST.getCode(), AccountExceptionEnum.PAT_ACCT_HAS_EXIST.getMessage());
             }
+            role.setId(req.getId());
             role.setRoleName(req.getName());
             role.setRemark(req.getDescribe());
             role.setModifiedId(Long.valueOf(user.getId()));
@@ -92,7 +95,8 @@ public class HospitalSaasRoleServiceImpl implements HospitalSaasRoleService {
         }
         map.put("pageNo", (req.getPageNo() - 1) * req.getPageSize());
         map.put("pageSize", req.getPageSize());
-        return new HospitalRoleResp(permissionRoleMapper.ListByPage(map), count);
+        List<HospitalRoleDto> roleDtos = permissionRoleMapper.ListByPage(map);
+        return new HospitalRoleResp(roleDtos, count);
     }
 
     @Override
@@ -109,4 +113,13 @@ public class HospitalSaasRoleServiceImpl implements HospitalSaasRoleService {
         List<RoleDto> roleDtos = permissionRoleMapper.querySaasRoles();
         return new HospitalSaasRoleResp(roleDtos);
     }
+
+    @Override
+    public HospitalRoleDto getRoleDetail(Long id) {
+        HospitalRoleDto roleDto = new HospitalRoleDto();
+        PermissionRole permissionRole = permissionRoleMapper.selectByPrimaryKey(id);
+        BeanUtils.copyProperties(permissionRole,roleDto);
+        roleDto.setRoleId(permissionRole.getId());
+        return roleDto;
+    }
 }

server/src/main/resources/mybatis/PermissionRoleMapper.xml

@@ -144,7 +144,9 @@
     <sql id="list_by_page">
         <if test="list!=null and list.size>0">
             and pr.id not in (
-            <foreach collection="list" item="item" separator=","></foreach>
+            <foreach collection="list" item="item" separator=",">
+                #{item}
+            </foreach>
             )
         </if>
         <if test="name != null and  name != ''">
@@ -160,7 +162,11 @@
     </select>
 
     <select id="ListByPage" resultType="com.pica.cloud.account.account.server.resp.HospitalRoleDto">
-        select pr.created_time c
+        select
+        pr.created_time as createTime,
+        pr.role_name as roleName,
+        pr.id as roleId,
+        pr.remark
         from permission_role as pr
         where pr.delete_flag = 1
         <include refid="list_by_page"></include>