Merge branch 'master' of http://129.211.99.254:8088/hg-hubin/long-tern-care-service

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/serviceManage/ChCfgAprOrganType.java

+package com.hungraim.ltc.pojo.entity.serviceManage;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * CH_CFG_APR_ORGAN_TYPE
+ *
+ * @author
+ */
+@Data
+@TableName("CH_CFG_APR_ORGAN_TYPE")
+public class ChCfgAprOrganType implements Serializable {
+    /**
+     * 鉴定务机构类型id
+     */
+    @TableId(type = IdType.INPUT)
+    private Long organTypeId;
+
+    /**
+     * 鉴定机构类型名称
+     */
+    private String organTypeName;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 基础参数配置id
+     */
+    private Long paraId;
+
+    /**
+     * 首次操作时间
+     */
+    private Date fcd;
+
+    /**
+     * 首次操作人
+     */
+    private Long fcu;
+
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file

common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/governance/AprOrganVO.java

@@ -12,7 +12,11 @@ public class AprOrganVO {
      */
     private String aprOrganId;
     /**
-     * 适用机构
+     * 适用机构id
+     */
+    private String organId;
+    /**
+     * 适用机构名称
      */
     private String organName;
     /**

governance/src/main/java/com/hungraim/ltc/governance/controller/AprOrganController.java

@@ -2,7 +2,9 @@ package com.hungraim.ltc.governance.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hungraim.ltc.governance.service.AprOrganService;
+import com.hungraim.ltc.pojo.entity.assessment.ChCfgAprGroupDetail;
 import com.hungraim.ltc.pojo.entity.serviceManage.ChAprOrgan;
+import com.hungraim.ltc.pojo.entity.serviceManage.ChCfgAprOrganType;
 import com.hungraim.ltc.pojo.vo.governance.AprOrganVO;
 import com.hungraim.ltc.util.Result;
 import com.hungraim.ltc.util.ResultCode;
@@ -11,6 +13,8 @@ import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * 评定机构及评定机构人员信息管理Controller
  *
@@ -167,4 +171,22 @@ public class AprOrganController {
         return Result.success();
     }
 
+    /**
+     * 获取所有鉴定机构类型
+     */
+    @GetMapping("/cfgAprOrganTypes")
+    public Result<List<ChCfgAprOrganType>> getCfgAprOrganTypes() {
+        List<ChCfgAprOrganType> chCfgAprOrganTypes = aprOrganService.getCfgAprOrganTypes();
+        return Result.success(chCfgAprOrganTypes);
+    }
+
+    /**
+     * 获取评定参数列表
+     */
+    @GetMapping("/cfgAprGroupDetail")
+    public Result<List<ChCfgAprGroupDetail>> getCfgAprGroupDetail() {
+        List<ChCfgAprGroupDetail> chCfgAprGroupDetails = aprOrganService.getCfgAprGroupDetail();
+        return Result.success(chCfgAprGroupDetails);
+    }
+
 }

governance/src/main/java/com/hungraim/ltc/governance/dao/ChCfgAprGroupDetailMapper.java

+package com.hungraim.ltc.governance.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hungraim.ltc.pojo.entity.assessment.ChCfgAprGroupDetail;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface ChCfgAprGroupDetailMapper extends BaseMapper<ChCfgAprGroupDetail> {
+}

governance/src/main/java/com/hungraim/ltc/governance/dao/ChCfgAprOrganTypeMapper.java

+package com.hungraim.ltc.governance.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hungraim.ltc.pojo.entity.serviceManage.ChCfgAprOrganType;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface ChCfgAprOrganTypeMapper extends BaseMapper<ChCfgAprOrganType> {
+}

governance/src/main/java/com/hungraim/ltc/governance/service/AprOrganService.java

 package com.hungraim.ltc.governance.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.hungraim.ltc.pojo.entity.assessment.ChCfgAprGroupDetail;
 import com.hungraim.ltc.pojo.entity.serviceManage.ChAprOrgan;
+import com.hungraim.ltc.pojo.entity.serviceManage.ChCfgAprOrganType;
 import com.hungraim.ltc.pojo.vo.governance.AprOrganVO;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 监管机构及监管机构人员信息管理Service
  *
@@ -19,4 +23,9 @@ public interface AprOrganService {
     void addOrUpdateAprOrgan(ChAprOrgan chAprOrgan);
 
     ChAprOrgan getAprOrganInfo(Long aprOrganId);
+
+    List<ChCfgAprOrganType> getCfgAprOrganTypes();
+
+    List<ChCfgAprGroupDetail> getCfgAprGroupDetail();
+
 }

governance/src/main/java/com/hungraim/ltc/governance/service/impl/AprOrganServiceImpl.java

 package com.hungraim.ltc.governance.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hungraim.ltc.api.OrganFeignService;
 import com.hungraim.ltc.governance.dao.AprOrganMapper;
+import com.hungraim.ltc.governance.dao.ChCfgAprGroupDetailMapper;
+import com.hungraim.ltc.governance.dao.ChCfgAprOrganTypeMapper;
 import com.hungraim.ltc.governance.service.AprOrganService;
+import com.hungraim.ltc.pojo.entity.assessment.ChCfgAprGroupDetail;
 import com.hungraim.ltc.pojo.entity.serviceManage.ChAprOrgan;
+import com.hungraim.ltc.pojo.entity.serviceManage.ChCfgAprOrganType;
 import com.hungraim.ltc.pojo.vo.governance.AprOrganVO;
 import com.hungraim.ltc.util.Result;
 import lombok.AllArgsConstructor;
@@ -20,8 +25,10 @@ import java.util.List;
 @AllArgsConstructor
 public class AprOrganServiceImpl implements AprOrganService {
 
-    private final AprOrganMapper aprOrganMapper;
     private final OrganFeignService organFeignService;
+    private final AprOrganMapper aprOrganMapper;
+    private final ChCfgAprOrganTypeMapper cfgAprOrganTypeMapper;
+    private final ChCfgAprGroupDetailMapper cfgAprGroupDetailMapper;
 
     @Override
     public Page<AprOrganVO> aprOrganList(Page<AprOrganVO> page, Long organId, Boolean isIncluded, String organName, String code) {
@@ -82,4 +89,14 @@ public class AprOrganServiceImpl implements AprOrganService {
     public ChAprOrgan getAprOrganInfo(Long aprOrganId) {
         return aprOrganMapper.selectById(aprOrganId);
     }
+
+    @Override
+    public List<ChCfgAprOrganType> getCfgAprOrganTypes() {
+        return cfgAprOrganTypeMapper.selectList(new QueryWrapper<>());
+    }
+
+    @Override
+    public List<ChCfgAprGroupDetail> getCfgAprGroupDetail() {
+        return cfgAprGroupDetailMapper.selectList(new QueryWrapper<>());
+    }
 }

governance/src/main/resources/com/hungraim/ltc/governance/mapper/AprOrganMapper.xml

@@ -7,6 +7,7 @@
         SELECT--评定机构id
         organ.APR_ORGAN_ID aprOrganId,
         --适用机构
+        srvOrgan.ORGAN_ID organId,
         srvOrgan.ORGAN_NAME organName,
         --机构代码
         organ.ORGAN_CODE organCode,