springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidCheckRecordVO.java
@@ -59,7 +59,7 @@ private String username; @ApiModelProperty("记录时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") private Date checkTime; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidDangerMemberVO.java
@@ -32,6 +32,7 @@ * 创建时间 */ @ApiModelProperty(value = "创建时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createTime; /** springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidRecordExcelReturn.java
New file @@ -0,0 +1,121 @@ package com.panzhihua.common.model.vos.community.acid; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.format.DateTimeFormat; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.net.URL; import java.util.Date; /** * @author zzj */ @Data public class ComActAcidRecordExcelReturn { /** * 姓名 */ @ExcelProperty(value = "姓名") private String name; /** * 身份证 */ @ExcelProperty(value = "身份证") private String idCard; /** * 手机号 */ @ExcelProperty(value = "手机号") private String phone; /** * 出发城市 */ @ExcelProperty(value = "出发城市") private String departureCity; /** * 出发日期 */ @ExcelProperty(value = "出发日期") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @DateTimeFormat("yyyy-MM-dd") private Date departureDate; /** * 旅居城市 */ @ExcelProperty(value = "中途旅居城市") private String touristCity; /** * 在攀居住地 */ @ExcelProperty(value = "在攀居住地") private String localCity; /** * 在攀地址 */ @ExcelProperty(value = "详细地址") private String localAddress; /** * 到达日期 */ @ExcelProperty(value = "到达日期") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @DateTimeFormat("yyyy-MM-dd") private Date arriveDate; /** * 健康码颜色 */ @ExcelProperty(value = "健康码状态") private String colorMark; /** * 行程码 */ @ExcelProperty(value = "行程码是否带*") private String travelCard; /** * 危险区 */ @ExcelProperty(value = "14天内是否到过中高风险地区") private String dangerArea; /** * 境外城市 */ @ExcelProperty(value = "28天内是否到过境外或边境口岸城市") private String outsideCity; /** * 疫苗接种 */ @ExcelProperty(value = "新冠疫苗接种情况") private String vaccination; /** * 核酸检测 */ @ExcelProperty(value = "48小时内核酸检测") private String acidTest; @ExcelProperty("健康码截图") private String colorImage; @ExcelProperty("行程码截图") private String travelImage; @ExcelProperty("48小时核酸截图") private String acidImage; @ExcelProperty("疫苗接种截图") private String vaccinationImage; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/SysUserVO.java
@@ -56,6 +56,8 @@ @ApiModelProperty("是否是党员（0.否 1.是）") private Integer isPartymember; private String imgUrl; /** * 用户类型（用户类型 1 小程序 2 运营平台 3 社区平台 5 商家后台 6 网格综治APP 7 网格综治后台 8大屏 9城管后台 10一键报警app） */ springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActAcidRecordApi.java
@@ -11,6 +11,7 @@ import com.panzhihua.common.model.dtos.property.CommonPage; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.acid.ComAcidStaticVO; import com.panzhihua.common.model.vos.community.acid.ComActAcidRecordExcelReturn; import com.panzhihua.common.model.vos.community.acid.ComActAcidRecordExcelVO; import com.panzhihua.common.model.vos.community.acid.ComActAcidRecordVO; import com.panzhihua.common.model.vos.community.reserve.FiveCount; @@ -24,12 +25,17 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.io.File; import java.io.FileInputStream; import java.io.InputStream; import java.net.MalformedURLException; import java.net.URL; import java.util.ArrayList; import java.util.List; /** * (ComActAcidRecord)表控制层 @@ -137,6 +143,25 @@ } R r = communityService.exportComActAcidRecord(comActAcidRecordDTO); if (R.isOk(r)) { List<ComActAcidRecordExcelVO> excelVOS=new ArrayList<>(); List<ComActAcidRecordExcelReturn> list= JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ComActAcidRecordExcelReturn.class); if(!CollectionUtils.isEmpty(list)){ list.forEach(li->{ ComActAcidRecordExcelVO comActAcidRecordExcelVO=new ComActAcidRecordExcelVO(); BeanUtils.copyProperties(li,comActAcidRecordExcelVO); if(StringUtils.isNotEmpty(li.getAcidImage())){ try { comActAcidRecordExcelVO.setAcidImage(new URL(li.getAcidImage())); comActAcidRecordExcelVO.setColorImage(new URL(li.getColorImage())); comActAcidRecordExcelVO.setTravelImage(new URL(li.getTravelImage())); comActAcidRecordExcelVO.setVaccinationImage(new URL(li.getVaccinationImage())); } catch (MalformedURLException e) { e.printStackTrace(); } } excelVOS.add(comActAcidRecordExcelVO); }); } try { SFTPUtil sftp = new SFTPUtil(userName, password, host, port); sftp.login(); @@ -152,7 +177,7 @@ .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()) .registerWriteHandler(new CustomSheetWriteHandler()).build(); WriteSheet writeSheet = EasyExcel.writerSheet( "导出").build(); excelWriter.write(JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ComActAcidRecordExcelVO.class), writeSheet); excelWriter.write(excelVOS, writeSheet); excelWriter.finish(); springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActAcidRecordDao.java
@@ -5,10 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.panzhihua.common.model.dtos.community.acid.ComActAcidRecordDTO; import com.panzhihua.common.model.dtos.property.CommonPage; import com.panzhihua.common.model.vos.community.acid.ComAcidAreaVO; import com.panzhihua.common.model.vos.community.acid.ComAcidStaticVO; import com.panzhihua.common.model.vos.community.acid.ComActAcidRecordExcelVO; import com.panzhihua.common.model.vos.community.acid.ComActAcidRecordVO; import com.panzhihua.common.model.vos.community.acid.*; import com.panzhihua.common.model.vos.community.reserve.FiveCount; import org.apache.ibatis.annotations.Mapper; import com.panzhihua.service_community.entity.ComActAcidRecord; @@ -39,7 +36,7 @@ * @param comActAcidRecordDTO * @return */ List<ComActAcidRecordExcelVO> export(@Param("commonPage")ComActAcidRecordDTO comActAcidRecordDTO); List<ComActAcidRecordExcelReturn> export(@Param("commonPage")ComActAcidRecordDTO comActAcidRecordDTO); /** * 5项统计 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActAcidRecordServiceImpl.java
@@ -56,7 +56,7 @@ @Override public R export(ComActAcidRecordDTO comActAcidRecordDTO) { List<ComActAcidRecordExcelVO> comActAcidRecordExcelVOS=this.baseMapper.export(comActAcidRecordDTO); List<ComActAcidRecordExcelReturn> comActAcidRecordExcelVOS=this.baseMapper.export(comActAcidRecordDTO); comActAcidRecordExcelVOS.forEach(comActAcidRecordExcelVO -> { if(StringUtils.isNotEmpty(comActAcidRecordExcelVO.getTouristCity())&&comActAcidRecordExcelVO.getTouristCity().contains("[")){ JSONArray jsonArray = JSON.parseArray(comActAcidRecordExcelVO.getTouristCity()); springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActAcidDangerMemberMapper.xml
@@ -44,13 +44,13 @@ and checkTime >= #{commonPage.startTime} </if> <if test="commonPage.stopTime!=null"> and #{commonPage.stopTime} >= checkTime and concat(#{commonPage.stopTime},' 23:59:59') >= checkTime </if> order by checkTime desc </select> <select id="pageDangerMember" resultType="com.panzhihua.common.model.vos.community.acid.ComActAcidDangerMemberVO"> SELECT t1.id, t1.`name`, t1.`status`, t1.record_id, t1.phone, t2.color_mark, t2.acid_test, MAX(t3.create_time) AS checkTime SELECT t1.id, t1.`name`, t1.`status`, t1.record_id, t1.phone, t2.color_mark, t2.acid_test, MAX(t3.create_time) AS checkTime,t.create_time FROM com_act_acid_danger_member t1 LEFT JOIN com_act_acid_record t2 ON t1.record_id = t2.id LEFT JOIN com_act_acid_check_record t3 ON t1.id = t3.member_id springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActAcidRecordMapper.xml
@@ -58,7 +58,7 @@ order by create_time desc </select> <select id="export" resultType="com.panzhihua.common.model.vos.community.acid.ComActAcidRecordExcelVO"> <select id="export" resultType="com.panzhihua.common.model.vos.community.acid.ComActAcidRecordExcelReturn"> select * from com_act_acid_record <where> <if test="commonPage.userId !=null"> springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActIntegralUserDOMapper.xml
@@ -91,7 +91,7 @@ com_act_integral_user AS caiu LEFT JOIN sys_user AS su ON su.user_id = caiu.user_id WHERE caiu.community_id = ${communityRankDTO.communityId} caiu.community_id = ${communityRankDTO.communityId} and su.nick_name is not null <if test="communityRankDTO.type == 3"> and su.is_volunteer = 1 </if> springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java
@@ -89,13 +89,18 @@ */ @Override public R addPartyBuildingMember(PartyBuildingMemberVO partyBuildingMemberVO) { String idCard = partyBuildingMemberVO.getIdCard(); List<ComPbMemberDO> comPbMemberDOs = comPbMemberDAO.selectList(new QueryWrapper<ComPbMemberDO>().lambda() .eq(ComPbMemberDO::getIdCard, idCard).eq(ComPbMemberDO::getAuditResult, 1)); .eq(ComPbMemberDO::getPhone, partyBuildingMemberVO.getPhone()).eq(ComPbMemberDO::getAuditResult, 1)); if (!ObjectUtils.isEmpty(comPbMemberDOs) && comPbMemberDOs.size() > 0) { comPbMemberDOs.forEach(comPbMemberDO -> { comPbMemberDAO.deleteById(comPbMemberDO.getId()); }); } //添加党员同步用户小程序头像 R r=userService.getSysUserVOByPhone(partyBuildingMemberVO.getPhone()); if(R.isOk(r)&&r.getData()!=null){ SysUserVO sysUserVO= (SysUserVO) r.getData(); partyBuildingMemberVO.setPhotoPath(sysUserVO.getImgUrl()); } ComPbMemberDO comPbMemberDO1 = new ComPbMemberDO(); BeanUtils.copyProperties(partyBuildingMemberVO, comPbMemberDO1); @@ -162,6 +167,12 @@ if (!comPbMemberDOList.isEmpty()) { comPbMemberDOList.forEach(comPbMember -> { BeanUtils.copyProperties(partyBuildingMemberExcelVO, comPbMember); //添加党员同步用户小程序头像 R r=userService.getSysUserVOByPhone(comPbMember.getPhone()); if(R.isOk(r)&&r.getData()!=null){ SysUserVO sysUserVO= (SysUserVO) r.getData(); comPbMember.setPhotoPath(sysUserVO.getImgUrl()); } this.baseMapper.updateById(comPbMember); }); continue;
