Commit 16272d50 authored by hubin's avatar hubin

Merge remote-tracking branch 'origin/master'

parents bba75c66 f678d460
package com.hungraim.ltc; package com.hungraim.ism;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
......
package com.hungraim.ism.controller;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.hungraim.ism.pojo.vo.disable.ApplicationManagementListVO;
import com.hungraim.ism.service.DisableService;
import com.hungraim.ltc.pojo.entity.disable.ChDisableApplyHis;
import com.hungraim.ltc.util.Result;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
import java.util.List;
/**
* 失能申请Controller
*
* @author czz
*/
@RestController
@RequestMapping("/disable")
@Slf4j
public class DisableController {
@Autowired
private DisableService disableService;
/**
* 待遇申请管理列表
*
* @param organId 适用机构代码
* @param districtProvincial 所在省
* @param districtCity 所在市
* @param districtArea 所在区域
* @param realName 参保人员姓名
* @param certiCode 参保人身份证号码
* @param treatmentType 待遇类型
* @param applyStatus 审核状态
* @return 待遇申请管理列表
*/
@RequestMapping("/applicationManagementList")
public Result<List<ApplicationManagementListVO>> disableList(String organId, String districtProvincial, String districtCity, String districtArea, String realName, String certiCode, Short treatmentType, Short applyStatus) {
IPage<ChDisableApplyHis> iPage = disableService.listDisableInfoByPage(organId, districtProvincial, districtCity, districtArea, realName, certiCode, treatmentType, applyStatus, 1, 10);
List<ChDisableApplyHis> records = iPage.getRecords();
List<ApplicationManagementListVO> vos = new ArrayList<>();
for (ChDisableApplyHis chDisableApplyHis : records) {
ApplicationManagementListVO applicationManagementListVO = new ApplicationManagementListVO();
BeanUtil.copyProperties(chDisableApplyHis, applicationManagementListVO);
vos.add(applicationManagementListVO);
}
return Result.success(vos);
}
}
package com.hungraim.ism.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.hungraim.ltc.pojo.entity.disable.ChDisableApplyHis;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
/**
* 失能人员申请历史Mapper
*
* @author czz
*/
@Mapper
@Repository
public interface DisableApplyHisMapper extends BaseMapper<ChDisableApplyHis> {
}
package com.hungraim.ism.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.hungraim.ltc.pojo.entity.disable.ChDisableApplyHis;
import org.springframework.stereotype.Service;
/**
* 失能申请Service
*
* @author czz
*/
@Service
public interface DisableService {
/**
* 查询所有资源对应的角色
*
* @param organId 适用机构代码
* @param districtProvincial 所在省
* @param districtCity 所在市
* @param districtArea 所在区域
* @param realName 参保人员姓名
* @param certiCode 参保人身份证号码
* @param treatmentType 待遇类型
* @param applyStatus 审核状态
* @return list
*/
IPage<ChDisableApplyHis> listDisableInfoByPage(String organId, String districtProvincial, String districtCity, String districtArea, String realName, String certiCode, Short treatmentType, Short applyStatus, int page, int pageSize);
}
package com.hungraim.ism.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.hungraim.ism.dao.DisableApplyHisMapper;
import com.hungraim.ltc.pojo.entity.disable.ChDisableApplyHis;
import com.hungraim.ism.service.DisableService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@Service
public class DisableServiceImpl implements DisableService {
@Autowired
private DisableApplyHisMapper disableApplyHisMapper;
@Override
public IPage<ChDisableApplyHis> listDisableInfoByPage(String organId, String districtProvincial, String districtCity,
String districtArea, String realName, String certiCode, Short treatmentType,
Short applyStatus, int page, int pageSize) {
QueryWrapper<ChDisableApplyHis> wrapper = new QueryWrapper<>();
ChDisableApplyHis chDisableApplyHis = new ChDisableApplyHis();
chDisableApplyHis.setOrganId(organId);
chDisableApplyHis.setDistrictProvincial(districtProvincial);
chDisableApplyHis.setDistrictCity(districtCity);
chDisableApplyHis.setDistrictArea(districtArea);
chDisableApplyHis.setRealName(realName);
chDisableApplyHis.setCertiCode(certiCode);
chDisableApplyHis.setTreatmentType(treatmentType);
chDisableApplyHis.setApplyStatus(applyStatus);
wrapper.setEntity(chDisableApplyHis);
return disableApplyHisMapper.selectPage(new Page<>(page, pageSize), wrapper);
}
}
\ No newline at end of file
...@@ -15,8 +15,8 @@ ...@@ -15,8 +15,8 @@
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<configuration> <configuration>
<source>7</source> <source>8</source>
<target>7</target> <target>8</target>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>
......
package com.hungraim.ism.pojo.vo.disable;
/**
* 待遇申请管理列表VO
*/
public class ApplicationManagementListVO {
//适用机构
//机构代码
private String organId;
//所在省市
//参保人姓名
//参保人身份证号码
//待遇类型
//联系人姓名
//联系人身份证号码
//申请人电话
//居住地址
//审核状态
}
package com.hungraim.ltc.pojo.entity.disable; package com.hungraim.ltc.pojo.entity.disable;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
/** /**
* 失能人员申请历史 * 失能人员申请历史
*/ */
...@@ -600,4 +600,944 @@ public class ChDisableApplyHis implements Serializable { ...@@ -600,4 +600,944 @@ public class ChDisableApplyHis implements Serializable {
private Short treatmentType; private Short treatmentType;
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
public Long getApplyHisId() {
return applyHisId;
}
public void setApplyHisId(Long applyHisId) {
this.applyHisId = applyHisId;
}
public Long getApplyId() {
return applyId;
}
public void setApplyId(Long applyId) {
this.applyId = applyId;
}
public String getOrganId() {
return organId;
}
public void setOrganId(String organId) {
this.organId = organId;
}
public String getDistrictProvincial() {
return districtProvincial;
}
public void setDistrictProvincial(String districtProvincial) {
this.districtProvincial = districtProvincial;
}
public String getDistrictCity() {
return districtCity;
}
public void setDistrictCity(String districtCity) {
this.districtCity = districtCity;
}
public String getDistrictArea() {
return districtArea;
}
public void setDistrictArea(String districtArea) {
this.districtArea = districtArea;
}
public String getRealName() {
return realName;
}
public void setRealName(String realName) {
this.realName = realName;
}
public String getCertiCode() {
return certiCode;
}
public void setCertiCode(String certiCode) {
this.certiCode = certiCode;
}
public Date getBirthday() {
return birthday;
}
public void setBirthday(Date birthday) {
this.birthday = birthday;
}
public String getGender() {
return gender;
}
public void setGender(String gender) {
this.gender = gender;
}
public String getTel() {
return tel;
}
public void setTel(String tel) {
this.tel = tel;
}
public String getAdressDistrictCode() {
return adressDistrictCode;
}
public void setAdressDistrictCode(String adressDistrictCode) {
this.adressDistrictCode = adressDistrictCode;
}
public String getAdressDetail() {
return adressDetail;
}
public void setAdressDetail(String adressDetail) {
this.adressDetail = adressDetail;
}
public Short getRegist() {
return regist;
}
public void setRegist(Short regist) {
this.regist = regist;
}
public String getDisease() {
return disease;
}
public void setDisease(String disease) {
this.disease = disease;
}
public Long getSrvModeId() {
return srvModeId;
}
public void setSrvModeId(Long srvModeId) {
this.srvModeId = srvModeId;
}
public String getDiseaseDesc() {
return diseaseDesc;
}
public void setDiseaseDesc(String diseaseDesc) {
this.diseaseDesc = diseaseDesc;
}
public Short getMedicalType() {
return medicalType;
}
public void setMedicalType(Short medicalType) {
this.medicalType = medicalType;
}
public String getMedicalCard() {
return medicalCard;
}
public void setMedicalCard(String medicalCard) {
this.medicalCard = medicalCard;
}
public Long getSrvOrganId() {
return srvOrganId;
}
public void setSrvOrganId(Long srvOrganId) {
this.srvOrganId = srvOrganId;
}
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 getOperTel() {
return operTel;
}
public void setOperTel(String operTel) {
this.operTel = operTel;
}
public String getOperRelation() {
return operRelation;
}
public void setOperRelation(String operRelation) {
this.operRelation = operRelation;
}
public String getOperDistrictCode() {
return operDistrictCode;
}
public void setOperDistrictCode(String operDistrictCode) {
this.operDistrictCode = operDistrictCode;
}
public String getOperAddress() {
return operAddress;
}
public void setOperAddress(String operAddress) {
this.operAddress = operAddress;
}
public Long getAprConfId() {
return aprConfId;
}
public void setAprConfId(Long aprConfId) {
this.aprConfId = aprConfId;
}
public Short getApplyStatus() {
return applyStatus;
}
public void setApplyStatus(Short applyStatus) {
this.applyStatus = applyStatus;
}
public String getCheckName() {
return checkName;
}
public void setCheckName(String checkName) {
this.checkName = checkName;
}
public String getCheckRemark() {
return checkRemark;
}
public void setCheckRemark(String checkRemark) {
this.checkRemark = checkRemark;
}
public Date getCheckTime() {
return checkTime;
}
public void setCheckTime(Date checkTime) {
this.checkTime = checkTime;
}
public Long getDefineEmg() {
return defineEmg;
}
public void setDefineEmg(Long defineEmg) {
this.defineEmg = defineEmg;
}
public Date getEffTime() {
return effTime;
}
public void setEffTime(Date effTime) {
this.effTime = effTime;
}
public Long getEndEmg() {
return endEmg;
}
public void setEndEmg(Long endEmg) {
this.endEmg = endEmg;
}
public Date getEndTime() {
return endTime;
}
public void setEndTime(Date endTime) {
this.endTime = endTime;
}
public Date getFcd() {
return fcd;
}
public void setFcd(Date fcd) {
this.fcd = fcd;
}
public Long getFcu() {
return fcu;
}
public void setFcu(Long fcu) {
this.fcu = fcu;
}
public Date getLcd() {
return lcd;
}
public void setLcd(Date lcd) {
this.lcd = lcd;
}
public Long getLcu() {
return lcu;
}
public void setLcu(Long lcu) {
this.lcu = lcu;
}
public Long getAplOrganId() {
return aplOrganId;
}
public void setAplOrganId(Long aplOrganId) {
this.aplOrganId = aplOrganId;
}
public String getAdressDistrictProvincial() {
return adressDistrictProvincial;
}
public void setAdressDistrictProvincial(String adressDistrictProvincial) {
this.adressDistrictProvincial = adressDistrictProvincial;
}
public String getAdressDistrictCity() {
return adressDistrictCity;
}
public void setAdressDistrictCity(String adressDistrictCity) {
this.adressDistrictCity = adressDistrictCity;
}
public String getOperDistrictProvince() {
return operDistrictProvince;
}
public void setOperDistrictProvince(String operDistrictProvince) {
this.operDistrictProvince = operDistrictProvince;
}
public String getOperDistrictCity() {
return operDistrictCity;
}
public void setOperDistrictCity(String operDistrictCity) {
this.operDistrictCity = operDistrictCity;
}
public Long getLastTaskId() {
return lastTaskId;
}
public void setLastTaskId(Long lastTaskId) {
this.lastTaskId = lastTaskId;
}
public Short getDataFrom() {
return dataFrom;
}
public void setDataFrom(Short dataFrom) {
this.dataFrom = dataFrom;
}
public Long getWebDefineEmp() {
return webDefineEmp;
}
public void setWebDefineEmp(Long webDefineEmp) {
this.webDefineEmp = webDefineEmp;
}
public Long getWebEndEmp() {
return webEndEmp;
}
public void setWebEndEmp(Long webEndEmp) {
this.webEndEmp = webEndEmp;
}
public String getStreet() {
return street;
}
public void setStreet(String street) {
this.street = street;
}
public Short getAprTotalScore() {
return aprTotalScore;
}
public void setAprTotalScore(Short aprTotalScore) {
this.aprTotalScore = aprTotalScore;
}
public String getAcptProvincial() {
return acptProvincial;
}
public void setAcptProvincial(String acptProvincial) {
this.acptProvincial = acptProvincial;
}
public String getAcptCity() {
return acptCity;
}
public void setAcptCity(String acptCity) {
this.acptCity = acptCity;
}
public String getAcptArea() {
return acptArea;
}
public void setAcptArea(String acptArea) {
this.acptArea = acptArea;
}
public String getAcptStreet() {
return acptStreet;
}
public void setAcptStreet(String acptStreet) {
this.acptStreet = acptStreet;
}
public String getAcptAddress() {
return acptAddress;
}
public void setAcptAddress(String acptAddress) {
this.acptAddress = acptAddress;
}
public Short getAcptType() {
return acptType;
}
public void setAcptType(Short acptType) {
this.acptType = acptType;
}
public Long getDiseTypeF() {
return diseTypeF;
}
public void setDiseTypeF(Long diseTypeF) {
this.diseTypeF = diseTypeF;
}
public Long getDiseTypeS() {
return diseTypeS;
}
public void setDiseTypeS(Long diseTypeS) {
this.diseTypeS = diseTypeS;
}
public Long getCfgModeId() {
return cfgModeId;
}
public void setCfgModeId(Long cfgModeId) {
this.cfgModeId = cfgModeId;
}
public String getReasonsReview() {
return reasonsReview;
}
public void setReasonsReview(String reasonsReview) {
this.reasonsReview = reasonsReview;
}
public String getReasonsRemark() {
return reasonsRemark;
}
public void setReasonsRemark(String reasonsRemark) {
this.reasonsRemark = reasonsRemark;
}
public Short getApplyMethod() {
return applyMethod;
}
public void setApplyMethod(Short applyMethod) {
this.applyMethod = applyMethod;
}
public Long getFirstApplyId() {
return firstApplyId;
}
public void setFirstApplyId(Long firstApplyId) {
this.firstApplyId = firstApplyId;
}
public String getAddressLongitude() {
return addressLongitude;
}
public void setAddressLongitude(String addressLongitude) {
this.addressLongitude = addressLongitude;
}
public String getAddressLatitude() {
return addressLatitude;
}
public void setAddressLatitude(String addressLatitude) {
this.addressLatitude = addressLatitude;
}
public String getAcptLongitude() {
return acptLongitude;
}
public void setAcptLongitude(String acptLongitude) {
this.acptLongitude = acptLongitude;
}
public String getAcptLatitude() {
return acptLatitude;
}
public void setAcptLatitude(String acptLatitude) {
this.acptLatitude = acptLatitude;
}
public String getOperStreet() {
return operStreet;
}
public void setOperStreet(String operStreet) {
this.operStreet = operStreet;
}
public String getAgentLongitude() {
return agentLongitude;
}
public void setAgentLongitude(String agentLongitude) {
this.agentLongitude = agentLongitude;
}
public String getAgentLatitude() {
return agentLatitude;
}
public void setAgentLatitude(String agentLatitude) {
this.agentLatitude = agentLatitude;
}
public String getAddressRoadDetail() {
return addressRoadDetail;
}
public void setAddressRoadDetail(String addressRoadDetail) {
this.addressRoadDetail = addressRoadDetail;
}
public Short getAddressRoadType() {
return addressRoadType;
}
public void setAddressRoadType(Short addressRoadType) {
this.addressRoadType = addressRoadType;
}
public String getAddressNumberDetail() {
return addressNumberDetail;
}
public void setAddressNumberDetail(String addressNumberDetail) {
this.addressNumberDetail = addressNumberDetail;
}
public Short getAddressNumberType() {
return addressNumberType;
}
public void setAddressNumberType(Short addressNumberType) {
this.addressNumberType = addressNumberType;
}
public String getAcptRoadDetail() {
return acptRoadDetail;
}
public void setAcptRoadDetail(String acptRoadDetail) {
this.acptRoadDetail = acptRoadDetail;
}
public Short getAcptRoadType() {
return acptRoadType;
}
public void setAcptRoadType(Short acptRoadType) {
this.acptRoadType = acptRoadType;
}
public String getAcptNumberDetail() {
return acptNumberDetail;
}
public void setAcptNumberDetail(String acptNumberDetail) {
this.acptNumberDetail = acptNumberDetail;
}
public Short getAcptNumberType() {
return acptNumberType;
}
public void setAcptNumberType(Short acptNumberType) {
this.acptNumberType = acptNumberType;
}
public String getOperRoadDetail() {
return operRoadDetail;
}
public void setOperRoadDetail(String operRoadDetail) {
this.operRoadDetail = operRoadDetail;
}
public Short getOperRoadType() {
return operRoadType;
}
public void setOperRoadType(Short operRoadType) {
this.operRoadType = operRoadType;
}
public String getOperNumberDetail() {
return operNumberDetail;
}
public void setOperNumberDetail(String operNumberDetail) {
this.operNumberDetail = operNumberDetail;
}
public Short getOperNumberType() {
return operNumberType;
}
public void setOperNumberType(Short operNumberType) {
this.operNumberType = operNumberType;
}
public String getAcptSrvProvincial() {
return acptSrvProvincial;
}
public void setAcptSrvProvincial(String acptSrvProvincial) {
this.acptSrvProvincial = acptSrvProvincial;
}
public String getAcptSrvCity() {
return acptSrvCity;
}
public void setAcptSrvCity(String acptSrvCity) {
this.acptSrvCity = acptSrvCity;
}
public String getAcptSrvArea() {
return acptSrvArea;
}
public void setAcptSrvArea(String acptSrvArea) {
this.acptSrvArea = acptSrvArea;
}
public String getAcptSrvStreet() {
return acptSrvStreet;
}
public void setAcptSrvStreet(String acptSrvStreet) {
this.acptSrvStreet = acptSrvStreet;
}
public String getAcptSrvRoadDetail() {
return acptSrvRoadDetail;
}
public void setAcptSrvRoadDetail(String acptSrvRoadDetail) {
this.acptSrvRoadDetail = acptSrvRoadDetail;
}
public Short getAcptSrvRoadType() {
return acptSrvRoadType;
}
public void setAcptSrvRoadType(Short acptSrvRoadType) {
this.acptSrvRoadType = acptSrvRoadType;
}
public String getAcptSrvNumberDetail() {
return acptSrvNumberDetail;
}
public void setAcptSrvNumberDetail(String acptSrvNumberDetail) {
this.acptSrvNumberDetail = acptSrvNumberDetail;
}
public Short getAcptSrvNumberType() {
return acptSrvNumberType;
}
public void setAcptSrvNumberType(Short acptSrvNumberType) {
this.acptSrvNumberType = acptSrvNumberType;
}
public String getAcptSrvAddress() {
return acptSrvAddress;
}
public void setAcptSrvAddress(String acptSrvAddress) {
this.acptSrvAddress = acptSrvAddress;
}
public Short getAcptSrvType() {
return acptSrvType;
}
public void setAcptSrvType(Short acptSrvType) {
this.acptSrvType = acptSrvType;
}
public String getAcptSrvLongitude() {
return acptSrvLongitude;
}
public void setAcptSrvLongitude(String acptSrvLongitude) {
this.acptSrvLongitude = acptSrvLongitude;
}
public String getAcptSrvLatitude() {
return acptSrvLatitude;
}
public void setAcptSrvLatitude(String acptSrvLatitude) {
this.acptSrvLatitude = acptSrvLatitude;
}
public String getFixedTel() {
return fixedTel;
}
public void setFixedTel(String fixedTel) {
this.fixedTel = fixedTel;
}
public String getRegistProvincial() {
return registProvincial;
}
public void setRegistProvincial(String registProvincial) {
this.registProvincial = registProvincial;
}
public String getRegistCity() {
return registCity;
}
public void setRegistCity(String registCity) {
this.registCity = registCity;
}
public String getRegistArea() {
return registArea;
}
public void setRegistArea(String registArea) {
this.registArea = registArea;
}
public String getRegistStreet() {
return registStreet;
}
public void setRegistStreet(String registStreet) {
this.registStreet = registStreet;
}
public String getRegistAddress() {
return registAddress;
}
public void setRegistAddress(String registAddress) {
this.registAddress = registAddress;
}
public String getRegistLongitude() {
return registLongitude;
}
public void setRegistLongitude(String registLongitude) {
this.registLongitude = registLongitude;
}
public String getRegistLatitude() {
return registLatitude;
}
public void setRegistLatitude(String registLatitude) {
this.registLatitude = registLatitude;
}
public String getMedicalHistory1() {
return medicalHistory1;
}
public void setMedicalHistory1(String medicalHistory1) {
this.medicalHistory1 = medicalHistory1;
}
public String getMedicalHistory2() {
return medicalHistory2;
}
public void setMedicalHistory2(String medicalHistory2) {
this.medicalHistory2 = medicalHistory2;
}
public String getMedicalHistory3() {
return medicalHistory3;
}
public void setMedicalHistory3(String medicalHistory3) {
this.medicalHistory3 = medicalHistory3;
}
public BigDecimal getHeight() {
return height;
}
public void setHeight(BigDecimal height) {
this.height = height;
}
public BigDecimal getWeight() {
return weight;
}
public void setWeight(BigDecimal weight) {
this.weight = weight;
}
public BigDecimal getLeftHandGrip() {
return leftHandGrip;
}
public void setLeftHandGrip(BigDecimal leftHandGrip) {
this.leftHandGrip = leftHandGrip;
}
public BigDecimal getRightHandGrip() {
return rightHandGrip;
}
public void setRightHandGrip(BigDecimal rightHandGrip) {
this.rightHandGrip = rightHandGrip;
}
public Short getBodyIncomplete() {
return bodyIncomplete;
}
public void setBodyIncomplete(Short bodyIncomplete) {
this.bodyIncomplete = bodyIncomplete;
}
public Short getVisionObstacle() {
return visionObstacle;
}
public void setVisionObstacle(Short visionObstacle) {
this.visionObstacle = visionObstacle;
}
public Short getHearingObstacle() {
return hearingObstacle;
}
public void setHearingObstacle(Short hearingObstacle) {
this.hearingObstacle = hearingObstacle;
}
public String getMedicalHistory() {
return medicalHistory;
}
public void setMedicalHistory(String medicalHistory) {
this.medicalHistory = medicalHistory;
}
public Date getHisTime() {
return hisTime;
}
public void setHisTime(Date hisTime) {
this.hisTime = hisTime;
}
public Long getHisEmp() {
return hisEmp;
}
public void setHisEmp(Long hisEmp) {
this.hisEmp = hisEmp;
}
public String getOperFixedTel() {
return operFixedTel;
}
public void setOperFixedTel(String operFixedTel) {
this.operFixedTel = operFixedTel;
}
public Short getTreatmentType() {
return treatmentType;
}
public void setTreatmentType(Short treatmentType) {
this.treatmentType = treatmentType;
}
public static long getSerialVersionUID() {
return serialVersionUID;
}
} }
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