08 06 01 fix show select

src/main/java/com/imed/costaccount/mapper/RoleMenuMapper.java

@@ -18,7 +18,7 @@ import java.util.List;
 public interface RoleMenuMapper extends BaseMapper<RoleMenu> {
 
     /**
-     * 通过roleid和hospId 获取role关联的menu信息
+     * 通过roleId和hospId 获取role关联的menu信息
      * @param roleId 角色id
      * @param hospId 医院id
      * @return id name

src/main/java/com/imed/costaccount/service/impl/ReportRelationServiceImpl.java

@@ -77,48 +77,48 @@ public class ReportRelationServiceImpl extends ServiceImpl<ReportRelationMapper,
     public List<RelationVO> getRelationList(Long reportId, Integer relation, Long hospId) {
         List<RelationVO> list = new ArrayList<>();
         if (relation == 1) {
-            List<RelationVO> accountRelation = this.getAccountRelation(reportId, hospId);
-            List<Accounting> accounts = accountingService.list(new LambdaQueryWrapper<Accounting>().select(Accounting::getAccountingCode, Accounting::getAccountingName).eq(Accounting::getHospId, hospId));
-            if (accounts.isEmpty()) {
-                return list;
-            }
-            list = accounts.stream().map(i -> {
-                RelationVO relationVO = new RelationVO();
-                relationVO.setIsSelect(false);
-                relationVO.setRelation(1);
-                relationVO.setCode(i.getAccountingCode());
-                relationVO.setName(i.getAccountingName());
-                return relationVO;
-            }).collect(Collectors.toList());
-            for (RelationVO relationVO : accountRelation) {
-                for (RelationVO vo : list) {
-                    if (vo.getCode().equals(relationVO.getCode())) {
-                        vo.setIsSelect(true);
-                    }
-                }
-            }
+            list = this.getAccountRelation(reportId, hospId);
+//            List<Accounting> accounts = accountingService.list(new LambdaQueryWrapper<Accounting>().select(Accounting::getAccountingCode, Accounting::getAccountingName).eq(Accounting::getHospId, hospId));
+//            if (accounts.isEmpty()) {
+//                return list;
+//            }
+//            list = accounts.stream().map(i -> {
+//                RelationVO relationVO = new RelationVO();
+//                relationVO.setIsSelect(false);
+//                relationVO.setRelation(1);
+//                relationVO.setCode(i.getAccountingCode());
+//                relationVO.setName(i.getAccountingName());
+//                return relationVO;
+//            }).collect(Collectors.toList());
+//            for (RelationVO relationVO : accountRelation) {
+//                for (RelationVO vo : list) {
+//                    if (vo.getCode().equals(relationVO.getCode())) {
+//                        vo.setIsSelect(true);
+//                    }
+//                }
+//            }
 
         } else if (relation == 2) {
-            List<RelationVO> accountRelation = this.getShareParam(reportId, hospId);
-            List<CostShareParam> accounts = shareParamService.list(new LambdaQueryWrapper<CostShareParam>().select(CostShareParam::getShareParamCode, CostShareParam::getShareParamName).eq(CostShareParam::getHospId, hospId));
-            if (accounts.isEmpty()) {
-                return list;
-            }
-            list = accounts.stream().map(i -> {
-                RelationVO relationVO = new RelationVO();
-                relationVO.setIsSelect(false);
-                relationVO.setRelation(1);
-                relationVO.setCode(i.getShareParamCode());
-                relationVO.setName(i.getShareParamName());
-                return relationVO;
-            }).collect(Collectors.toList());
-            for (RelationVO relationVO : accountRelation) {
-                for (RelationVO vo : list) {
-                    if (vo.getCode().equals(relationVO.getCode())) {
-                        vo.setIsSelect(true);
-                    }
-                }
-            }
+            list = this.getShareParam(reportId, hospId);
+//            List<CostShareParam> accounts = shareParamService.list(new LambdaQueryWrapper<CostShareParam>().select(CostShareParam::getShareParamCode, CostShareParam::getShareParamName).eq(CostShareParam::getHospId, hospId));
+//            if (accounts.isEmpty()) {
+//                return list;
+//            }
+//            list = accounts.stream().map(i -> {
+//                RelationVO relationVO = new RelationVO();
+//                relationVO.setIsSelect(false);
+//                relationVO.setRelation(1);
+//                relationVO.setCode(i.getShareParamCode());
+//                relationVO.setName(i.getShareParamName());
+//                return relationVO;
+//            }).collect(Collectors.toList());
+//            for (RelationVO relationVO : accountRelation) {
+//                for (RelationVO vo : list) {
+//                    if (vo.getCode().equals(relationVO.getCode())) {
+//                        vo.setIsSelect(true);
+//                    }
+//                }
+//            }
         }
         return list;
     }

src/main/java/com/imed/costaccount/web/ReportFormController.java

@@ -107,6 +107,14 @@ public class ReportFormController extends AbstractController {
         return Result.ok(list);
     }
 
+
+    /**
+     *
+     * @since 2021-8-6 10:50:59
+     * @param reportId
+     * @param relation
+     * @return 只返回已经选择过的数据列表
+     */
     @ApiOperation("根据关系类型，获取可绑定的关系数据（包含回显）")
     @GetMapping("/getRelationList")
     @ApiImplicitParams({