失能人员信息列表

apply/apply-service/src/main/java/com/hungraim/ism/controller/DisableController.java

 package com.hungraim.ism.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.hungraim.ism.pojo.vo.disable.ApplicationManagementVO;
+import com.hungraim.ism.pojo.vo.disable.DisableVO;
 import com.hungraim.ism.service.DisableService;
 import com.hungraim.ltc.util.Result;
 import lombok.extern.slf4j.Slf4j;
@@ -25,7 +25,7 @@ public class DisableController {
     private DisableService disableService;
 
     /**
-     * 待遇申请管理列表
+     * 失能人员信息列表
      *
      * @param organId            适用机构代码
      * @param districtProvincial 所在省
@@ -35,16 +35,17 @@ public class DisableController {
      * @param certiCode          参保人身份证号码
      * @param treatmentType      待遇类型
      * @param applyStatus        审核状态
-     * @param currentPage        当前页
-     * @return 待遇申请管理列表
+     * @param pageNum            当前页
+     * @param pageSize           每页几条数据
+     * @return 失能人员信息列表
      */
-    @RequestMapping("/applicationManagementList")
-    public Result<List<ApplicationManagementVO>> disableList(String organId, String districtProvincial,
-                                                             String districtCity, String districtArea,
-                                                             String realName, String certiCode, String treatmentType,
-                                                             String applyStatus, int currentPage) {
-        IPage<ApplicationManagementVO> iPage = disableService.applicationManagementList(organId, districtProvincial,
-                districtCity, districtArea, realName, certiCode, treatmentType, applyStatus, currentPage, 10);
+    @RequestMapping("/disableList")
+    public Result<List<DisableVO>> disableList(String organId, String districtProvincial,
+                                               String districtCity, String districtArea,
+                                               String realName, String certiCode, String treatmentType,
+                                               String applyStatus, int pageNum, int pageSize) {
+        IPage<DisableVO> iPage = disableService.disableList(organId, districtProvincial,
+                districtCity, districtArea, realName, certiCode, treatmentType, applyStatus, pageNum, pageSize);
         return Result.success(iPage.getRecords());
     }
 

apply/apply-service/src/main/java/com/hungraim/ism/dao/DisableApplyHisMapper.java

@@ -3,7 +3,7 @@ package com.hungraim.ism.dao;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hungraim.ism.pojo.vo.disable.ApplicationManagementInfoVO;
-import com.hungraim.ism.pojo.vo.disable.ApplicationManagementVO;
+import com.hungraim.ism.pojo.vo.disable.DisableVO;
 import com.hungraim.ltc.pojo.entity.disable.ChDisableApplyHis;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Repository;
@@ -28,7 +28,7 @@ public interface DisableApplyHisMapper extends BaseMapper<ChDisableApplyHis> {
      * @param treatmentType 待遇类型
      * @param applyStatus   审核状态
      */
-    Page<ApplicationManagementVO> applicationManagementList(Page<ApplicationManagementVO> page, String organId, String provincial, String city, String area, String name, String certiCode, String treatmentType, String applyStatus);
+    Page<DisableVO> disableList(Page<DisableVO> page, String organId, String provincial, String city, String area, String name, String certiCode, String treatmentType, String applyStatus);
 
     ApplicationManagementInfoVO selectApplicationManagementInfoById(String id);
 }

apply/apply-service/src/main/java/com/hungraim/ism/service/DisableService.java

 package com.hungraim.ism.service;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.hungraim.ism.pojo.vo.disable.ApplicationManagementVO;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.hungraim.ism.pojo.vo.disable.DisableVO;
 import org.springframework.stereotype.Service;
 
 /**
@@ -25,6 +25,6 @@ public interface DisableService {
      * @param applyStatus        审核状态
      * @return list
      */
-    IPage<ApplicationManagementVO> applicationManagementList(String organId, String districtProvincial, String districtCity, String districtArea, String realName, String certiCode, String treatmentType, String applyStatus, int page, int pageSize);
+    Page<DisableVO> disableList(String organId, String districtProvincial, String districtCity, String districtArea, String realName, String certiCode, String treatmentType, String applyStatus, int page, int pageSize);
 
 }

apply/apply-service/src/main/java/com/hungraim/ism/service/impl/DisableServiceImpl.java

@@ -2,7 +2,7 @@ package com.hungraim.ism.service.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hungraim.ism.dao.DisableApplyHisMapper;
-import com.hungraim.ism.pojo.vo.disable.ApplicationManagementVO;
+import com.hungraim.ism.pojo.vo.disable.DisableVO;
 import com.hungraim.ism.service.DisableService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -14,10 +14,10 @@ public class DisableServiceImpl implements DisableService {
     private DisableApplyHisMapper disableApplyHisMapper;
 
     @Override
-    public Page<ApplicationManagementVO> applicationManagementList(String organId, String districtProvincial, String districtCity,
-                                                                   String districtArea, String realName, String certiCode, String treatmentType,
-                                                                   String applyStatus, int page, int pageSize) {
-        return disableApplyHisMapper.applicationManagementList(new Page(page, 10), organId, districtProvincial, districtCity, districtArea, realName, certiCode, treatmentType, applyStatus);
+    public Page<DisableVO> disableList(String organId, String districtProvincial, String districtCity,
+                                                     String districtArea, String realName, String certiCode, String treatmentType,
+                                                     String applyStatus, int page, int pageSize) {
+        return disableApplyHisMapper.disableList(new Page(page, pageSize), organId, districtProvincial, districtCity, districtArea, realName, certiCode, treatmentType, applyStatus);
     }
 
 }
\ No newline at end of file

apply/apply-service/src/main/resources/bootstrap.yml

@@ -31,4 +31,4 @@ server:
 mybatis-plus:
   configuration:
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-  mapper-locations: classpath*:mapper/**/*Mapper.xml
+  mapper-locations: classpath*:mapper/*Mapper.xml

apply/apply-service/src/main/resources/mapper/ChDisableApplyHisMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hungraim.ism.mapper.disable.chDisableApplyHisMapper">
+<mapper namespace="com.hungraim.ism.dao.DisableApplyHisMapper">
     <resultMap id="BaseResultMap" type="com.hungraim.ltc.pojo.entity.disable.ChDisableApplyHis">
         <constructor>
             <idArg column="APPLY_HIS_ID" javaType="java.lang.Integer" jdbcType="DECIMAL"/>
@@ -144,7 +144,7 @@
         HEIGHT, WEIGHT, LEFT_HAND_GRIP, RIGHT_HAND_GRIP, BODY_INCOMPLETE, VISION_OBSTACLE,
         HEARING_OBSTACLE, MEDICAL_HISTORY, HIS_TIME, HIS_EMP, OPER_FIXED_TEL, TREATMENT_TYPE
     </sql>
-    <select id="applicationManagementList" resultType="com.hungraim.ism.pojo.vo.disable.ApplicationManagementVO">
+    <select id="disableList" resultType="com.hungraim.ism.pojo.vo.disable.DisableVO">
         select h.APPLY_HIS_ID applyHisId,
         o.organ_name organName,
         h.organ_id organId,
@@ -178,9 +178,9 @@
         <if test="applyStatus != null">
             and h.APPLY_STATUS = #{applyStatus}
         </if>
-        and h.organ_id = o.organ_id
+        and h.organ_id = o.organ_code
     </select>
-    <select id="selectApplicationManagementInfoByIdno" resultType="com.hungraim.ism.pojo.vo.disable.ApplicationManagementVO">
+    <select id="selectApplicationManagementInfoByIdno" resultType="com.hungraim.ism.pojo.vo.disable.DisableVO">
         select h.DISTRICT_PROVINCIAL provincial,
                h.DISTRICT_CITY       city,
                h.DISTRICT_AREA       area,
@@ -199,6 +199,6 @@
         from CH_DISABLE_APPLY_HIS h,
              CH_APR_ORGAN o
         where h.APPLY_HIS_ID = #{id}
-          and h.SRV_ORGAN_ID = o.organ_id
+          and h.SRV_ORGAN_ID = o.organ_code
     </select>
 </mapper>
\ No newline at end of file

common/common-core/src/main/java/com/hungraim/ism/pojo/vo/disable/ApplicationManagementVO.java

-package com.hungraim.ism.pojo.vo.disable;
-
-/**
- * 待遇申请管理列表VO
- */
-public class ApplicationManagementVO {
-    //适用机构
-    private String organName;
-    //机构代码
-    private String organId;
-    //所在省市
-    //参保人姓名
-    //参保人身份证号码
-    //待遇类型
-    //联系人姓名
-    //联系人身份证号码
-    //申请人电话
-    //居住地址
-    //审核状态
-}

common/common-core/src/main/java/com/hungraim/ism/pojo/vo/disable/DisableVO.java

+package com.hungraim.ism.pojo.vo.disable;
+
+/**
+ * 失能人员信息列表VO
+ */
+public class DisableVO {
+    //id
+    private String applyHisId;
+    //适用机构
+    private String organName;
+    //机构代码
+    private String organId;
+    //所在省市
+    private String provincial;
+    private String city;
+    private String area;
+    //参保人姓名
+    private String name;
+    //参保人身份证号码
+    private String certiCode;
+    //待遇类型
+    private String treatmentTyte;
+    //联系人姓名
+    private String operName;
+    //联系人身份证号码
+    private String operCertiCode;
+    //申请人电话
+    private String tel;
+    //居住地址
+    private String aderssDistrictCode;
+    //审核状态
+    private String adressDetail;
+
+    public String getApplyHisId() {
+        return applyHisId;
+    }
+
+    public void setApplyHisId(String applyHisId) {
+        this.applyHisId = applyHisId;
+    }
+
+    public String getOrganName() {
+        return organName;
+    }
+
+    public void setOrganName(String organName) {
+        this.organName = organName;
+    }
+
+    public String getOrganId() {
+        return organId;
+    }
+
+    public void setOrganId(String organId) {
+        this.organId = organId;
+    }
+
+    public String getProvincial() {
+        return provincial;
+    }
+
+    public void setProvincial(String provincial) {
+        this.provincial = provincial;
+    }
+
+    public String getCity() {
+        return city;
+    }
+
+    public void setCity(String city) {
+        this.city = city;
+    }
+
+    public String getArea() {
+        return area;
+    }
+
+    public void setArea(String area) {
+        this.area = area;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getCertiCode() {
+        return certiCode;
+    }
+
+    public void setCertiCode(String certiCode) {
+        this.certiCode = certiCode;
+    }
+
+    public String getTreatmentTyte() {
+        return treatmentTyte;
+    }
+
+    public void setTreatmentTyte(String treatmentTyte) {
+        this.treatmentTyte = treatmentTyte;
+    }
+
+    public String getOperName() {
+        return operName;
+    }
+
+    public void setOperName(String operName) {
+        this.operName = operName;
+    }
+
+    public String getOperCertiCode() {
+        return operCertiCode;
+    }
+
+    public void setOperCertiCode(String operCertiCode) {
+        this.operCertiCode = operCertiCode;
+    }
+
+    public String getTel() {
+        return tel;
+    }
+
+    public void setTel(String tel) {
+        this.tel = tel;
+    }
+
+    public String getAderssDistrictCode() {
+        return aderssDistrictCode;
+    }
+
+    public void setAderssDistrictCode(String aderssDistrictCode) {
+        this.aderssDistrictCode = aderssDistrictCode;
+    }
+
+    public String getAdressDetail() {
+        return adressDetail;
+    }
+
+    public void setAdressDetail(String adressDetail) {
+        this.adressDetail = adressDetail;
+    }
+}