Commit 130e50d4 authored by maqing's avatar maqing

Merge remote-tracking branch 'origin/master'

parents 4898a47e 075d702f
...@@ -78,6 +78,33 @@ ...@@ -78,6 +78,33 @@
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId> <artifactId>spring-boot-starter-web</artifactId>
</dependency> </dependency>
<!--Excel导入导出-->
<dependency>
<groupId>cn.afterturn</groupId>
<artifactId>easypoi-base</artifactId>
<version>4.1.0</version>
</dependency>
<dependency>
<groupId>cn.afterturn</groupId>
<artifactId>easypoi-web</artifactId>
<version>4.1.0</version>
</dependency>
<dependency>
<groupId>cn.afterturn</groupId>
<artifactId>easypoi-annotation</artifactId>
<version>4.1.0</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
<version>6.1.3.Final</version>
</dependency>
</dependencies> </dependencies>
<build> <build>
......
...@@ -10,9 +10,12 @@ import com.hungraim.ltc.util.Result; ...@@ -10,9 +10,12 @@ import com.hungraim.ltc.util.Result;
import com.hungraim.ltc.util.ResultCode; import com.hungraim.ltc.util.ResultCode;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.net.URLEncoder;
import java.util.List; import java.util.List;
/** /**
...@@ -208,6 +211,43 @@ public class DisableController { ...@@ -208,6 +211,43 @@ public class DisableController {
return Result.success(page); return Result.success(page);
} }
/**
*@author zwl
*@desc 失能人员导出
*@date 2023/1/7
*@param * @param organId
* @param districtProvincial
* @param districtCity
* @param districtArea
* @param realName
* @param certiCode
* @param dataFrom
* @param response
*@return void
**/
@RequestMapping("/download")
public void download(String organId, String districtProvincial,
String districtCity, String districtArea,
String realName, String certiCode, String dataFrom,HttpServletResponse response){
Workbook workbook = disableService.disableDownload(organId, districtProvincial,
districtCity, districtArea, realName, certiCode, dataFrom,1);
// 命名表格
String fileName = "disable.xlsx";
try{
response.setCharacterEncoding("UTF-8");
response.setHeader("content-Type", "application/vnd.ms-excel");
response.setHeader("Content-Disposition","attachment;filename=" + URLEncoder.encode(fileName,"UTF-8"));
// 输出流
workbook.write(response.getOutputStream());
// 清除response
response.flushBuffer();
}catch (Exception e){
log.error(e.getMessage());
}
}
/** /**
* 失能审核信息详情 * 失能审核信息详情
* *
...@@ -262,21 +302,19 @@ public class DisableController { ...@@ -262,21 +302,19 @@ public class DisableController {
if (StringUtils.isBlank(chDisableApply.getTel())) { if (StringUtils.isBlank(chDisableApply.getTel())) {
return Result.failed("手机号不能为空!"); return Result.failed("手机号不能为空!");
} }
if (chDisableApply.getRegist() == null) { // if (chDisableApply.getRegist() == null) {
return Result.failed("所在户籍不能为空!"); // return Result.failed("所在户籍不能为空!");
} // }
if (StringUtils.isBlank(chDisableApply.getAcptProvincial()) || StringUtils.isBlank(chDisableApply.getAcptCity()) || StringUtils.isBlank(chDisableApply.getAcptArea()) || StringUtils.isBlank(chDisableApply.getAcptStreet()) || StringUtils.isBlank(chDisableApply.getAcptAddress())) { if (StringUtils.isBlank(chDisableApply.getAcptProvincial()) || StringUtils.isBlank(chDisableApply.getAcptCity()) || StringUtils.isBlank(chDisableApply.getAcptArea()) || StringUtils.isBlank(chDisableApply.getAcptStreet()) || StringUtils.isBlank(chDisableApply.getAcptAddress())) {
return Result.failed("接受评定地址不能为空!"); return Result.failed("接受评定地址不能为空!");
} }
if (StringUtils.isBlank(chDisableApply.getAcptSrvProvincial()) || StringUtils.isBlank(chDisableApply.getAcptSrvCity()) || StringUtils.isBlank(chDisableApply.getAcptSrvArea()) || StringUtils.isBlank(chDisableApply.getAcptSrvStreet()) || StringUtils.isBlank(chDisableApply.getAcptSrvAddress())) { if (StringUtils.isBlank(chDisableApply.getAcptSrvProvincial()) || StringUtils.isBlank(chDisableApply.getAcptSrvCity()) || StringUtils.isBlank(chDisableApply.getAcptSrvArea()) || StringUtils.isBlank(chDisableApply.getAcptSrvAddress())) {
return Result.failed("接受服务地址不能为空!"); return Result.failed("接受服务地址不能为空!");
} }
if (StringUtils.isBlank(chDisableApply.getAdressDistrictProvincial()) || StringUtils.isBlank(chDisableApply.getAdressDistrictCity()) || StringUtils.isBlank(chDisableApply.getAdressDistrictCode()) || StringUtils.isBlank(chDisableApply.getStreet()) || StringUtils.isBlank(chDisableApply.getAdressDetail())) { if (StringUtils.isBlank(chDisableApply.getAdressDistrictProvincial()) || StringUtils.isBlank(chDisableApply.getAdressDistrictCity()) || StringUtils.isBlank(chDisableApply.getAdressDistrictCode()) || StringUtils.isBlank(chDisableApply.getAdressDetail())) {
return Result.failed("现住址不能为空!"); return Result.failed("现住址不能为空!");
} }
if (chDisableApply.getDiseTypeF() == null || chDisableApply.getDiseTypeS() == null) {
return Result.failed("诊断疾病不能为空!");
}
if (chDisableApply.getSrvModeId() == null) { if (chDisableApply.getSrvModeId() == null) {
return Result.failed("申请服务方式不能为空!"); return Result.failed("申请服务方式不能为空!");
} }
...@@ -315,21 +353,19 @@ public class DisableController { ...@@ -315,21 +353,19 @@ public class DisableController {
if (StringUtils.isBlank(chDisableApply.getTel())) { if (StringUtils.isBlank(chDisableApply.getTel())) {
return Result.failed("手机号不能为空!"); return Result.failed("手机号不能为空!");
} }
if (chDisableApply.getRegist() == null) { // if (chDisableApply.getRegist() == null) {
return Result.failed("所在户籍不能为空!"); // return Result.failed("所在户籍不能为空!");
} // }
if (StringUtils.isBlank(chDisableApply.getAcptProvincial()) || StringUtils.isBlank(chDisableApply.getAcptCity()) || StringUtils.isBlank(chDisableApply.getAcptArea()) || StringUtils.isBlank(chDisableApply.getAcptStreet()) || StringUtils.isBlank(chDisableApply.getAcptAddress())) { if (StringUtils.isBlank(chDisableApply.getAcptProvincial()) || StringUtils.isBlank(chDisableApply.getAcptCity()) || StringUtils.isBlank(chDisableApply.getAcptArea()) || StringUtils.isBlank(chDisableApply.getAcptAddress())) {
return Result.failed("接受评定地址不能为空!"); return Result.failed("接受评定地址不能为空!");
} }
if (StringUtils.isBlank(chDisableApply.getAcptSrvProvincial()) || StringUtils.isBlank(chDisableApply.getAcptSrvCity()) || StringUtils.isBlank(chDisableApply.getAcptSrvArea()) || StringUtils.isBlank(chDisableApply.getAcptSrvStreet()) || StringUtils.isBlank(chDisableApply.getAcptSrvAddress())) { if (StringUtils.isBlank(chDisableApply.getAcptSrvProvincial()) || StringUtils.isBlank(chDisableApply.getAcptSrvCity()) || StringUtils.isBlank(chDisableApply.getAcptSrvArea()) || StringUtils.isBlank(chDisableApply.getAcptSrvAddress())) {
return Result.failed("接受服务地址不能为空!"); return Result.failed("接受服务地址不能为空!");
} }
if (StringUtils.isBlank(chDisableApply.getAdressDistrictProvincial()) || StringUtils.isBlank(chDisableApply.getAdressDistrictCity()) || StringUtils.isBlank(chDisableApply.getAdressDistrictCode()) || StringUtils.isBlank(chDisableApply.getStreet()) || StringUtils.isBlank(chDisableApply.getAdressDetail())) { if (StringUtils.isBlank(chDisableApply.getAdressDistrictProvincial()) || StringUtils.isBlank(chDisableApply.getAdressDistrictCity()) || StringUtils.isBlank(chDisableApply.getAdressDistrictCode()) || StringUtils.isBlank(chDisableApply.getAdressDetail())) {
return Result.failed("现住址不能为空!"); return Result.failed("现住址不能为空!");
} }
if (chDisableApply.getDiseTypeF() == null || chDisableApply.getDiseTypeS() == null) {
return Result.failed("诊断疾病不能为空!");
}
if (chDisableApply.getSrvModeId() == null) { if (chDisableApply.getSrvModeId() == null) {
return Result.failed("申请服务方式不能为空!"); return Result.failed("申请服务方式不能为空!");
} }
...@@ -362,7 +398,7 @@ public class DisableController { ...@@ -362,7 +398,7 @@ public class DisableController {
*/ */
@PostMapping("/addOrUpdateDisInfoChange") @PostMapping("/addOrUpdateDisInfoChange")
public Result addOrUpdateDisInfoChange(DisableUpdateDetailVO disableUpdateDetailVO) { public Result addOrUpdateDisInfoChange(DisableUpdateDetailVO disableUpdateDetailVO) {
if (null == disableUpdateDetailVO.getDisabInfoId() || StrUtil.isBlank(disableUpdateDetailVO.getOrganId()) || StrUtil.isBlank(disableUpdateDetailVO.getDistrictProvince()) || StrUtil.isBlank(disableUpdateDetailVO.getDistrictCity()) || StrUtil.isBlank(disableUpdateDetailVO.getDistrictArea()) || StrUtil.isBlank(disableUpdateDetailVO.getRealName()) || StrUtil.isBlank(disableUpdateDetailVO.getCertifNum()) || null == disableUpdateDetailVO.getBirthday() || StrUtil.isBlank(disableUpdateDetailVO.getGender()) || StrUtil.isBlank(disableUpdateDetailVO.getTel()) || null == disableUpdateDetailVO.getRegist() || StrUtil.isBlank(disableUpdateDetailVO.getAcptProvincial()) || StrUtil.isBlank(disableUpdateDetailVO.getAcptCity()) || StrUtil.isBlank(disableUpdateDetailVO.getAcptArea()) || StrUtil.isBlank(disableUpdateDetailVO.getAcptStreet()) || StrUtil.isBlank(disableUpdateDetailVO.getAcptDetail()) || StrUtil.isBlank(disableUpdateDetailVO.getAcptSrvProvincial()) || StrUtil.isBlank(disableUpdateDetailVO.getAcptSrvCity()) || StrUtil.isBlank(disableUpdateDetailVO.getAcptSrvArea()) || StrUtil.isBlank(disableUpdateDetailVO.getAcptSrvStreet()) || StrUtil.isBlank(disableUpdateDetailVO.getAcptSrvAddress()) || null == disableUpdateDetailVO.getAcptSrvType() || StrUtil.isBlank(disableUpdateDetailVO.getAddressProvincial()) || StrUtil.isBlank(disableUpdateDetailVO.getAddressCity()) || StrUtil.isBlank(disableUpdateDetailVO.getAddressArea()) || StrUtil.isBlank(disableUpdateDetailVO.getAddressStreet()) || StrUtil.isBlank(disableUpdateDetailVO.getAddressDetail()) || null == disableUpdateDetailVO.getAddressType() || StrUtil.isBlank(disableUpdateDetailVO.getChangeReason())) { if (null == disableUpdateDetailVO.getDisabInfoId() || StrUtil.isBlank(disableUpdateDetailVO.getOrganId()) || StrUtil.isBlank(disableUpdateDetailVO.getDistrictProvince()) || StrUtil.isBlank(disableUpdateDetailVO.getDistrictCity()) || StrUtil.isBlank(disableUpdateDetailVO.getDistrictArea()) || StrUtil.isBlank(disableUpdateDetailVO.getRealName()) || StrUtil.isBlank(disableUpdateDetailVO.getCertifNum()) || null == disableUpdateDetailVO.getBirthday() || StrUtil.isBlank(disableUpdateDetailVO.getGender()) || StrUtil.isBlank(disableUpdateDetailVO.getTel()) || null == disableUpdateDetailVO.getRegist() || StrUtil.isBlank(disableUpdateDetailVO.getAcptProvincial()) || StrUtil.isBlank(disableUpdateDetailVO.getAcptCity()) || StrUtil.isBlank(disableUpdateDetailVO.getAcptArea()) || StrUtil.isBlank(disableUpdateDetailVO.getAcptStreet()) || StrUtil.isBlank(disableUpdateDetailVO.getAcptDetail()) || StrUtil.isBlank(disableUpdateDetailVO.getAcptSrvProvincial()) || StrUtil.isBlank(disableUpdateDetailVO.getAcptSrvCity()) || StrUtil.isBlank(disableUpdateDetailVO.getAcptSrvArea()) || StrUtil.isBlank(disableUpdateDetailVO.getAcptSrvAddress()) || null == disableUpdateDetailVO.getAcptSrvType() || StrUtil.isBlank(disableUpdateDetailVO.getAddressProvincial()) || StrUtil.isBlank(disableUpdateDetailVO.getAddressCity()) || StrUtil.isBlank(disableUpdateDetailVO.getAddressArea()) || StrUtil.isBlank(disableUpdateDetailVO.getAddressStreet()) || StrUtil.isBlank(disableUpdateDetailVO.getAddressDetail()) || null == disableUpdateDetailVO.getAddressType() || StrUtil.isBlank(disableUpdateDetailVO.getChangeReason())) {
return Result.failed(ResultCode.REQUEST_PARAM_ERROR); return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
} }
return disableService.addOrUpdateDisInfoChange(disableUpdateDetailVO); return disableService.addOrUpdateDisInfoChange(disableUpdateDetailVO);
......
...@@ -8,7 +8,9 @@ import com.hungraim.ltc.pojo.vo.disable.DisableInfoVO; ...@@ -8,7 +8,9 @@ import com.hungraim.ltc.pojo.vo.disable.DisableInfoVO;
import com.hungraim.ltc.pojo.vo.disable.DisableVO; import com.hungraim.ltc.pojo.vo.disable.DisableVO;
import com.hungraim.ltc.pojo.vo.disable.ExamineRecord; import com.hungraim.ltc.pojo.vo.disable.ExamineRecord;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import org.springframework.web.bind.annotation.PathVariable;
import java.util.List; import java.util.List;
...@@ -32,9 +34,9 @@ public interface DisableApplyMapper extends BaseMapper<ChDisableApply> { ...@@ -32,9 +34,9 @@ public interface DisableApplyMapper extends BaseMapper<ChDisableApply> {
* @param srvOrganName 护理机构 * @param srvOrganName 护理机构
* @param applyMethod 申请方式(1首次申请、2复评申请、3动态评估) * @param applyMethod 申请方式(1首次申请、2复评申请、3动态评估)
*/ */
Page<DisableVO> disableList(Page<DisableVO> page, List<String> organIds, String provincial, Page<DisableVO> disableList(Page<DisableVO> page, @Param("organIds") List<String> organIds, @Param("provincial")String provincial,
String city, String area, String name, String certiCode, @Param("city")String city, @Param("area")String area, @Param("name")String name, @Param("certiCode")String certiCode,
String dataFrom, String srvOrganName, Integer applyMethod); @Param("dataFrom")String dataFrom, @Param("srvOrganName")String srvOrganName, @Param("applyMethod")Integer applyMethod);
DisableExamineInfoVO selectDisableExamineInfoByApplyId(String applyId); DisableExamineInfoVO selectDisableExamineInfoByApplyId(String applyId);
...@@ -42,4 +44,8 @@ public interface DisableApplyMapper extends BaseMapper<ChDisableApply> { ...@@ -42,4 +44,8 @@ public interface DisableApplyMapper extends BaseMapper<ChDisableApply> {
List<ExamineRecord> listExamineRecordByApplyId(String applyId); List<ExamineRecord> listExamineRecordByApplyId(String applyId);
DisableInfoVO getDisableInfo(String disableInfoId); DisableInfoVO getDisableInfo(String disableInfoId);
List<DisableVO> disableExportList(@Param(value = "organIds") List<String> organIds, @Param("provincial")String provincial,
@Param("city")String city, @Param("area")String area,@Param("name") String name, @Param("certiCode")String certiCode,
@Param("dataFrom")String dataFrom, @Param("applyMethod")Integer applyMethod);
} }
...@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; ...@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.hungraim.ltc.pojo.entity.disable.*; import com.hungraim.ltc.pojo.entity.disable.*;
import com.hungraim.ltc.pojo.vo.disable.*; import com.hungraim.ltc.pojo.vo.disable.*;
import com.hungraim.ltc.util.Result; import com.hungraim.ltc.util.Result;
import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List; import java.util.List;
...@@ -143,4 +144,20 @@ public interface DisableService { ...@@ -143,4 +144,20 @@ public interface DisableService {
* @return 失能人员变更信息详情 * @return 失能人员变更信息详情
*/ */
DisableUpdateDetailVO changeDisableDetail(Integer changeId); DisableUpdateDetailVO changeDisableDetail(Integer changeId);
/**
*@author zwl
* @param organId
* @param districtProvincial
* @param districtCity
* @param districtArea
* @param realName
* @param certiCode
* @param dataFrom
* @param applyMethod
*@return org.apache.poi.ss.usermodel.Workbook
**/
Workbook disableDownload(String organId, String districtProvincial, String districtCity,
String districtArea, String realName, String certiCode, String dataFrom,
Integer applyMethod);
} }
package com.hungraim.ltc.service.impl; package com.hungraim.ltc.service.impl;
import cn.afterturn.easypoi.excel.ExcelExportUtil;
import cn.afterturn.easypoi.excel.entity.ExportParams;
import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
...@@ -25,11 +28,13 @@ import com.hungraim.ltc.util.ResultCode; ...@@ -25,11 +28,13 @@ import com.hungraim.ltc.util.ResultCode;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.awt.print.Book;
import java.util.*; import java.util.*;
@Service @Service
...@@ -507,4 +512,33 @@ public class DisableServiceImpl implements DisableService { ...@@ -507,4 +512,33 @@ public class DisableServiceImpl implements DisableService {
return disableUpdateDetailVO; return disableUpdateDetailVO;
} }
@Override
public Workbook disableDownload(String organId, String districtProvincial, String districtCity,
String districtArea, String realName, String certiCode, String dataFrom,
Integer applyMethod) {
// 没有organId参数的时候,这个集合就为null
List<String> organIds = null;
if (StrUtil.isNotBlank(organId)) {
organIds = Arrays.asList(organId.split(","));
}
List<DisableVO> records = disableApplyMapper.disableExportList(organIds, districtProvincial,
districtCity, districtArea, realName, certiCode, dataFrom, applyMethod);
List<DisableExportVO> disableExportVOList = new ArrayList<>();
for (DisableVO record : records) {
DisableExportVO disableExportVO = new DisableExportVO();
BeanUtil.copyProperties(record,disableExportVO);
StringBuilder stringBuilder = new StringBuilder();
stringBuilder.append(record.getProvincial()).append(record.getCity()).append(record.getArea());
disableExportVO.setProvinCialcityArea(stringBuilder.toString());
disableExportVOList.add(disableExportVO);
}
ExportParams exportParams = new ExportParams();
exportParams.setType(ExcelType.XSSF); // 对应xlsx
Workbook workbook = ExcelExportUtil.exportExcel(exportParams, DisableExportVO.class, disableExportVOList);
return workbook;
}
} }
...@@ -174,4 +174,65 @@ ...@@ -174,4 +174,65 @@
where disable.disab_info_id = #{disableInfoId} where disable.disab_info_id = #{disableInfoId}
</select> </select>
<select id="disableExportList" resultType="com.hungraim.ltc.pojo.vo.disable.DisableVO">
select a.APPLY_ID applyId,
o.ORGAN_NAME organName,
a.organ_id organId,
a.DISTRICT_PROVINCIAL provincial,
a.DISTRICT_CITY city,
a.DISTRICT_AREA area,
a.REAL_NAME name,
a.birthday birthday,
a.CERTI_CODE certiCode,
a.TREATMENT_TYPE treatmentTyte,
a.OPER_NAME operName,
a.gender gender,
a.OPER_CERTI_CODE operCertiCode,
a.tel tel,
a.fixed_tel fixedTel,
m.MODE_NAME srvModeName,
a.DISE_TYPE_S diseTypeS,
a.eff_time effTime,
a.data_from dataFrom,
a.APPLY_STATUS applyStatus,
a.APPLY_METHOD applyMethod
from CH_DISABLE_APPLY a
LEFT JOIN CH_FND_ORGAN o ON a.organ_id = o.ORGAN_ID
LEFT JOIN CH_CFG_SRV_MODE m ON a.srv_mode_id = m.MODE_ID
LEFT JOIN CH_SRV_ORGAN s ON a.SRV_ORGAN_ID = s.SRV_ORGAN_ID
<where>
<if test="organIds != null">
and a.organ_id in
<foreach collection="organIds" item="organId" open="(" close=")" separator=",">
#{organId}
</foreach>
</if>
<if test="applyMethod != null and applyMethod != ''">
and a.APPLY_METHOD = #{applyMethod}
</if>
<if test="provincial != null and provincial != ''">
and a.DISTRICT_PROVINCIAL = #{provincial}
</if>
<if test="city != null and city != ''">
and a.DISTRICT_CITY = #{city}
</if>
<if test="area != null and area != ''">
and a.DISTRICT_AREA = #{area}
</if>
<if test="name != null and name != ''">
and a.REAL_NAME like CONCAT(CONCAT('%',#{name}) ,'%')
</if>
<if test="certiCode != null and certiCode != ''">
and a.CERTI_CODE = #{certiCode}
</if>
<if test="dataFrom != null and dataFrom != ''">
and a.DATA_FROM = #{dataFrom}
</if>
</where>
</select>
</mapper> </mapper>
\ No newline at end of file
...@@ -56,6 +56,12 @@ ...@@ -56,6 +56,12 @@
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId> <artifactId>httpclient</artifactId>
</dependency> </dependency>
<dependency>
<groupId>cn.afterturn</groupId>
<artifactId>easypoi-annotation</artifactId>
<version>RELEASE</version>
<scope>compile</scope>
</dependency>
</dependencies> </dependencies>
......
...@@ -597,6 +597,16 @@ public class ChDisableApply extends PageInfo implements Serializable { ...@@ -597,6 +597,16 @@ public class ChDisableApply extends PageInfo implements Serializable {
*/ */
private Short treatmentType; private Short treatmentType;
/**
*银行卡号
*/
private String bankCardNo;
/**
*医保统筹区
*/
private String medicalArea;
@TableField(exist = false) @TableField(exist = false)
private List<ChFndAttach> fileDataList; private List<ChFndAttach> fileDataList;
......
package com.hungraim.ltc.pojo.vo.disable;
import cn.afterturn.easypoi.excel.annotation.Excel;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* @author zwl
* @ClassName DisableExportVO
* @description
* @date 2023/1/7 16:12
**/
@Data
public class DisableExportVO implements Serializable {
//失能人员姓名
@Excel(name = "失能人员姓名")
private String name;
//失能人员身份证号码
@Excel(name = "身份证号码")
private String certiCode;
//性别
@Excel(name = "性别")
private String gender;
//联系人姓名
@Excel(name = "联系人姓名")
private String opername;
//失能人员手机号
@Excel(name = "手机号码")
private String tel;
//失能人员固话
@Excel(name = "座机号码")
private String fixedtel;
@Excel(name = "地址")
private String provinCialcityArea;
//申请来源 网厅:0,核心:1,手机端:2,待遇申请:3
@Excel(name = "来源")
private String dataFrom;
// 申请类别
@Excel(name = "申请类别")
private Integer applyMethod;
//申请服务方式
@Excel(name = "申请服务方式")
private String srvModeName;
}
...@@ -21,7 +21,7 @@ public interface SystemAdminFeignService { ...@@ -21,7 +21,7 @@ public interface SystemAdminFeignService {
* @return 用户信息 * @return 用户信息
*/ */
@GetMapping("/api.system/user/loadUserInfoByAccount/{account}") @GetMapping("/api.system/user/loadUserInfoByAccount/{account}")
Result<SystemUser> loadUserInfoByAccount(@PathVariable String account); Result<SystemUser> loadUserInfoByAccount(@PathVariable("account") String account);
/** /**
* feign api 根据用户id获取用户权限列表 * feign api 根据用户id获取用户权限列表
...@@ -30,7 +30,7 @@ public interface SystemAdminFeignService { ...@@ -30,7 +30,7 @@ public interface SystemAdminFeignService {
* @return 权限列表 * @return 权限列表
*/ */
@GetMapping("/api.system/user/loadUserRolesByUserId/{id}") @GetMapping("/api.system/user/loadUserRolesByUserId/{id}")
Result<List<Long>> loadUserRolesByUserId(@PathVariable Long id); Result<List<Long>> loadUserRolesByUserId(@PathVariable("id") Long id);
/** /**
......
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