springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationDTO.java
@@ -214,4 +214,12 @@ @ApiModelProperty("关键词") private String keyWord; @ApiModelProperty("等级是否查询全部（1.是 2.否）") private Integer levelIsAll; public interface levelIsAll{ int yes = 1; int no = 2; } } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationHouseAdminDTO.java
@@ -123,4 +123,12 @@ @ApiModelProperty(value = "房屋地址") private Long address; @ApiModelProperty("等级是否查询全部（1.是 2.否）") private Integer levelIsAll; public interface levelIsAll{ int yes = 1; int no = 2; } } springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActReserveApi.java
@@ -27,6 +27,7 @@ import com.panzhihua.common.utlis.SFTPUtil; import com.panzhihua.common.utlis.StringUtils; import com.panzhihua.community_backstage.config.SFTPConfig; import com.panzhihua.community_backstage.excel.Custemhandler; import com.panzhihua.community_backstage.excel.CustomSheetWriteHandler; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -515,11 +516,9 @@ contentWriteCellStyle.setWrapped(true); HorizontalCellStyleStrategy horizontalCellStyleStrategy = new HorizontalCellStyleStrategy(headWriteCellStyle, contentWriteCellStyle); LongestMatchColumnWidthStyleStrategy longestMatchColumnWidthStyleStrategy = new LongestMatchColumnWidthStyleStrategy(); excelWriter = EasyExcel.write(fileName, ComMngPopulationExcelVo.class) .registerWriteHandler(horizontalCellStyleStrategy) .registerWriteHandler(longestMatchColumnWidthStyleStrategy) .registerWriteHandler(horizontalCellStyleStrategy).registerWriteHandler(new Custemhandler()) .registerWriteHandler(new CustomSheetWriteHandler()).build(); WriteSheet writeSheet = EasyExcel.writerSheet("登记明细导出数据").head(headList).build(); excelWriter.write(datalist, writeSheet); springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/excel/Custemhandler.java
New file @@ -0,0 +1,36 @@ package com.panzhihua.community_backstage.excel; import com.alibaba.excel.metadata.CellData; import com.alibaba.excel.metadata.Head; import com.alibaba.excel.write.metadata.holder.WriteSheetHolder; import com.alibaba.excel.write.style.column.AbstractColumnWidthStyleStrategy; import org.apache.poi.ss.usermodel.Cell; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.util.List; public class Custemhandler extends AbstractColumnWidthStyleStrategy { private static final int MAX_COLUMN_WIDTH = 100; //the maximum column width in Excel is 255 characters public Custemhandler() { } @Override protected void setColumnWidth(WriteSheetHolder writeSheetHolder, List<CellData> cellDataList, Cell cell, Head head, Integer relativeRowIndex, Boolean isHead) { if (isHead && cell.getRowIndex() != 0) { int columnWidth = cell.getStringCellValue().getBytes().length; if (columnWidth > MAX_COLUMN_WIDTH) { columnWidth = MAX_COLUMN_WIDTH; } else { columnWidth = columnWidth + 3; } writeSheetHolder.getSheet().setColumnWidth(cell.getColumnIndex(), columnWidth * 256); } } private final static Logger logger = LoggerFactory.getLogger(Custemhandler.class); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComElderAuthRecordsDO.java
@@ -29,7 +29,7 @@ /** * 主键id */ @TableId(type = IdType.INPUT) @TableId(type = IdType.AUTO) private Long id; /** springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComElderAuthRecordsServiceImpl.java
@@ -38,7 +38,6 @@ import com.panzhihua.common.model.vos.community.ComElderAuthRecordVO; import com.panzhihua.common.utlis.AgeUtils; import com.panzhihua.common.utlis.DateUtils; import com.panzhihua.common.utlis.Snowflake; import com.panzhihua.common.utlis.StringUtils; import com.panzhihua.common.utlis.WxUtil; import com.panzhihua.common.utlis.WxXCXTempSend; @@ -393,7 +392,6 @@ , ComElderAuthElderliesDO comElderAuthElderliesDO, String authPeriod, Long userId, Long communityId,Date date) { ComElderAuthRecordsDO comElderAuthRecordsDO = new ComElderAuthRecordsDO(); BeanUtils.copyProperties(vo, comElderAuthRecordsDO); comElderAuthRecordsDO.setId(Snowflake.getId()); comElderAuthRecordsDO.setElderliesId(comElderAuthElderliesDO.getId()); comElderAuthRecordsDO.setAuthPeriod(authPeriod); comElderAuthRecordsDO.setSubmitUserId(userId); springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationHouseServiceImpl.java
@@ -195,25 +195,27 @@ break; case 2: populationHouseAdminDTO.setRoad(houseDO.getAlley()); populationHouseAdminDTO.setDoorNo(houseDO.getHouseNum()); // populationHouseAdminDTO.setDoorNo(houseDO.getHouseNum()); break; case 3: populationHouseAdminDTO.setRoad(houseDO.getAlley()); populationHouseAdminDTO.setDoorNo(houseDO.getHouseNum()); populationHouseAdminDTO.setFloor(houseDO.getFloor()); // populationHouseAdminDTO.setFloor(houseDO.getFloor()); break; case 4: populationHouseAdminDTO.setRoad(houseDO.getAlley()); populationHouseAdminDTO.setDoorNo(houseDO.getHouseNum()); populationHouseAdminDTO.setFloor(houseDO.getFloor()); populationHouseAdminDTO.setUnitNo(houseDO.getUnitNo()); // populationHouseAdminDTO.setUnitNo(houseDO.getUnitNo()); break; case 5: populationHouseAdminDTO.setRoad(houseDO.getAlley()); populationHouseAdminDTO.setDoorNo(houseDO.getHouseNum()); populationHouseAdminDTO.setFloor(houseDO.getFloor()); populationHouseAdminDTO.setUnitNo(houseDO.getUnitNo()); populationHouseAdminDTO.setHouseNo(houseDO.getHouseNo()); if(populationHouseAdminDTO.getLevelIsAll() == null){ populationHouseAdminDTO.setHouseNo(houseDO.getHouseNo()); } break; default: break; springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
@@ -472,25 +472,27 @@ break; case 2: comMngPopulationVO.setRoad(houseDO.getAlley()); comMngPopulationVO.setDoorNo(houseDO.getHouseNum()); // comMngPopulationVO.setDoorNo(houseDO.getHouseNum()); break; case 3: comMngPopulationVO.setRoad(houseDO.getAlley()); comMngPopulationVO.setDoorNo(houseDO.getHouseNum()); comMngPopulationVO.setFloor(houseDO.getFloor()); // comMngPopulationVO.setFloor(houseDO.getFloor()); break; case 4: comMngPopulationVO.setRoad(houseDO.getAlley()); comMngPopulationVO.setDoorNo(houseDO.getHouseNum()); comMngPopulationVO.setFloor(houseDO.getFloor()); comMngPopulationVO.setUnitNo(houseDO.getUnitNo()); // comMngPopulationVO.setUnitNo(houseDO.getUnitNo()); break; case 5: comMngPopulationVO.setRoad(houseDO.getAlley()); comMngPopulationVO.setDoorNo(houseDO.getHouseNum()); comMngPopulationVO.setFloor(houseDO.getFloor()); comMngPopulationVO.setUnitNo(houseDO.getUnitNo()); comMngPopulationVO.setHouseNo(houseDO.getHouseNo()); if(comMngPopulationVO.getLevelIsAll() == null){ comMngPopulationVO.setHouseNo(houseDO.getHouseNo()); } break; default: break; springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComPensionAuthRecordServiceImpl.java
@@ -15,10 +15,6 @@ import javax.annotation.Resource; import cn.hutool.core.util.IdcardUtil; import com.panzhihua.common.utlis.WxUtil; import com.panzhihua.common.utlis.WxXCXTempSend; import com.panzhihua.service_community.dao.ComActActSignDAO; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -30,7 +26,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.panzhihua.common.enums.PopulHouseUseEnum; import com.panzhihua.common.exceptions.ServiceException; import com.panzhihua.common.model.dtos.community.AddIdentityAuthDTO; import com.panzhihua.common.model.dtos.community.EldersAuthTypeQueryDTO; @@ -46,8 +41,10 @@ import com.panzhihua.common.model.vos.community.SysConfVO; import com.panzhihua.common.utlis.AgeUtils; import com.panzhihua.common.utlis.DateUtils; import com.panzhihua.common.utlis.Snowflake; import com.panzhihua.common.utlis.StringUtils; import com.panzhihua.common.utlis.WxUtil; import com.panzhihua.common.utlis.WxXCXTempSend; import com.panzhihua.service_community.dao.ComActActSignDAO; import com.panzhihua.service_community.dao.ComActDAO; import com.panzhihua.service_community.dao.ComMngPopulationDAO; import com.panzhihua.service_community.dao.ComPensionAuthPensionerDAO; @@ -62,6 +59,7 @@ import com.panzhihua.service_community.model.dos.SysConfDO; import com.panzhihua.service_community.service.ComPensionAuthRecordService; import cn.hutool.core.util.IdcardUtil; import lombok.extern.slf4j.Slf4j; /** @@ -406,7 +404,6 @@ , ComPensionAuthPensionerDO comPensionAuthPensionerDO, String authPeriod, Long userId, Long communityId,Date date) { ComPensionAuthRecordDO comPensionAuthRecordDO = new ComPensionAuthRecordDO(); BeanUtils.copyProperties(vo, comPensionAuthRecordDO); comPensionAuthRecordDO.setId(Snowflake.getId()); comPensionAuthRecordDO.setPensionerId(comPensionAuthPensionerDO.getId()); comPensionAuthRecordDO.setAuthPeriod(authPeriod); comPensionAuthRecordDO.setSubmitUserId(userId); springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComElderAuthRecordsMapper.xml
@@ -194,9 +194,6 @@ <foreach collection="comElderAuthRecordsDOS" item="item" index="index" separator=";"> update com_elder_auth_records <set> <if test="item.id != null"> `id` = #{item.id}, </if> <if test="item.elderliesId != null"> `elderlies_id` = #{item.elderliesId}, </if> springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComPensionAuthRecordMapper.xml
@@ -187,9 +187,6 @@ <foreach collection="comPensionAuthRecordDOS" item="item" index="index" separator=";"> update com_pension_auth_records <set> <if test="item.id != null"> `id` = #{item.id}, </if> <if test="item.pensionerId != null"> `pensioner_id` = #{item.pensionerId}, </if>
