Commit 1ed2d148 authored by 蔡镇泽's avatar 蔡镇泽

失能人员信息列表省市区、机构

parent a6672fb2
......@@ -5,7 +5,8 @@ import com.hungraim.ism.pojo.vo.disable.DisableExamineInfoVO;
import com.hungraim.ism.pojo.vo.disable.DisableVO;
import com.hungraim.ism.service.DisableService;
import com.hungraim.ltc.pojo.entity.disable.ChDisableApply;
import com.hungraim.ltc.pojo.entity.disable.District;
import com.hungraim.ltc.pojo.entity.disable.ChFndDistrict;
import com.hungraim.ltc.pojo.entity.disable.ChFndOrgan;
import com.hungraim.ltc.util.Result;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
......@@ -35,12 +36,21 @@ public class DisableController {
* @param districtCode 上级区域代码
*/
@RequestMapping("/district")
public Result<List<District>> district(String districtLevel, String districtCode) {
List<District> districts = disableService.district(districtLevel, districtCode);
public Result<List<ChFndDistrict>> district(String districtLevel, String districtCode) {
List<ChFndDistrict> districts = disableService.district(districtLevel, districtCode);
return Result.success(districts);
}
/**
* 查询所有父机构
*/
@RequestMapping("/fndOrganRoot")
public Result<List<ChFndOrgan>> fndOrganRoot() {
List<ChFndOrgan> organs = disableService.fndOrganRoot();
return Result.success(organs);
}
/**
* 失能人员信息列表
*
* @param organId 适用机构代码
......
package com.hungraim.ism.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.hungraim.ltc.pojo.entity.disable.District;
import com.hungraim.ltc.pojo.entity.disable.ChFndDistrict;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
......@@ -12,5 +12,5 @@ import org.springframework.stereotype.Repository;
*/
@Mapper
@Repository
public interface DistrictMapper extends BaseMapper<District> {
public interface DistrictMapper extends BaseMapper<ChFndDistrict> {
}
package com.hungraim.ism.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.hungraim.ltc.pojo.entity.disable.ChFndOrgan;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
/**
* 商保机构Mapper
*
* @author czz
*/
@Mapper
@Repository
public interface FndOrganMapper extends BaseMapper<ChFndOrgan> {
}
......@@ -4,7 +4,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.hungraim.ism.pojo.vo.disable.DisableExamineInfoVO;
import com.hungraim.ism.pojo.vo.disable.DisableVO;
import com.hungraim.ltc.pojo.entity.disable.ChDisableApply;
import com.hungraim.ltc.pojo.entity.disable.District;
import com.hungraim.ltc.pojo.entity.disable.ChFndDistrict;
import com.hungraim.ltc.pojo.entity.disable.ChFndOrgan;
import org.springframework.stereotype.Service;
import java.util.List;
......@@ -48,5 +49,7 @@ public interface DisableService {
void disableExamine(String applyId, String checkName, Short applyStatus, String checkRemark);
List<District> district(String districtLevel, String districtCode);
List<ChFndDistrict> district(String districtLevel, String districtCode);
List<ChFndOrgan> fndOrganRoot();
}
......@@ -4,12 +4,14 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.hungraim.ism.dao.DisableApplyMapper;
import com.hungraim.ism.dao.DistrictMapper;
import com.hungraim.ism.dao.FndOrganMapper;
import com.hungraim.ism.pojo.vo.disable.DisableExamineInfoVO;
import com.hungraim.ism.pojo.vo.disable.DisableVO;
import com.hungraim.ism.pojo.vo.disable.ExamineRecord;
import com.hungraim.ism.service.DisableService;
import com.hungraim.ltc.pojo.entity.disable.ChDisableApply;
import com.hungraim.ltc.pojo.entity.disable.District;
import com.hungraim.ltc.pojo.entity.disable.ChFndDistrict;
import com.hungraim.ltc.pojo.entity.disable.ChFndOrgan;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -22,6 +24,8 @@ public class DisableServiceImpl implements DisableService {
private DisableApplyMapper disableApplyMapper;
@Autowired
private DistrictMapper districtMapper;
@Autowired
private FndOrganMapper fndOrganMapper;
@Override
public Page<DisableVO> disableList(String organId, String districtProvincial, String districtCity,
......@@ -53,8 +57,8 @@ public class DisableServiceImpl implements DisableService {
}
@Override
public List<District> district(String districtLevel, String districtCode) {
QueryWrapper<District> queryWrapper = new QueryWrapper<District>();
public List<ChFndDistrict> district(String districtLevel, String districtCode) {
QueryWrapper<ChFndDistrict> queryWrapper = new QueryWrapper<ChFndDistrict>();
queryWrapper.eq("DISTRICT_LEVEL", districtLevel);
if (!"1".equals(districtLevel)) {
queryWrapper.eq("PARENT_DISTIRCT_CODE", districtCode);
......@@ -62,4 +66,11 @@ public class DisableServiceImpl implements DisableService {
return districtMapper.selectList(queryWrapper);
}
@Override
public List<ChFndOrgan> fndOrganRoot() {
QueryWrapper<ChFndOrgan> queryWrapper = new QueryWrapper<ChFndOrgan>();
queryWrapper.eq("IS_LEAF", "1");
return fndOrganMapper.selectList(queryWrapper);
}
}
\ No newline at end of file
......@@ -7,8 +7,8 @@ import lombok.Data;
* 省市区数据
*/
@Data
@TableName("CH_DISABLE_APPLY")
public class District {
@TableName("CH_FND_DISTRICT")
public class ChFndDistrict {
private String districtCode;
private String organId;
private Integer organRegion;
......
package com.hungraim.ltc.pojo.entity.disable;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
/**
* 商保机构
*/
@Data
@TableName("CH_FND_ORGAN")
public class ChFndOrgan {
private String organId;
private String zIP;
private String hrOrgId;
private String areaCode;
private String eMAIL;
private String csEmail;
private String organAbbr;
private String sTATUS;
private java.util.Date revokeDate;
private Integer revokeCause;
private Integer gradeId;
private String isSpecificOrgan;
private String tELEPHONE;
private String bANK;
private java.util.Date fCD;
private String registerCode;
private java.util.Date foundDate;
private java.util.Date lCD;
private String organName;
private String parentId;
private Integer organCate;
private String isLeaf;
private String clmOrganAbbr;
private String orgCode;
private String aDDRESS;
private String districtCode;
private Integer gRADE;
private Integer fCU;
private String fAX;
private String taxCode;
private String bankAcct;
private String dELEGATE;
private String csTel;
private String wEBSITE;
private Integer lCU;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment