java/zhihuishenqu.git

			@@ -4,6 +4,7 @@
			import com.fasterxml.jackson.annotation.JsonFormat;
			import io.swagger.annotations.ApiModelProperty;
			import lombok.Data;
			import org.springframework.format.annotation.DateTimeFormat;

			import java.net.URL;
			import java.util.Date;
			@@ -42,6 +43,7 @@
			*/
			@ExcelProperty(value = "出发日期")
			@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
			@DateTimeFormat(pattern = "yyyy-MM-dd")
			private Date departureDate;

			/**
			@@ -67,6 +69,7 @@
			*/
			@ExcelProperty(value = "到达日期")
			@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
			@DateTimeFormat(pattern = "yyyy-MM-dd")
			private Date arriveDate;

			/**

			@@ -1,5 +1,8 @@
			package com.panzhihua.service_community.service.impl;

			import com.alibaba.fastjson.JSON;
			import com.alibaba.fastjson.JSONArray;
			import com.alibaba.fastjson.JSONObject;
			import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
			import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
			import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
			@@ -7,10 +10,7 @@
			import com.panzhihua.common.model.dtos.community.acid.ComActAcidRecordDTO;
			import com.panzhihua.common.model.dtos.property.CommonPage;
			import com.panzhihua.common.model.vos.R;
			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.ComActAcidDangerMemberVO;
			import com.panzhihua.common.model.vos.community.acid.ComActAcidRecordVO;
			import com.panzhihua.common.model.vos.community.acid.*;
			import com.panzhihua.common.utlis.DateUtils;
			import com.panzhihua.common.utlis.StringUtils;
			import com.panzhihua.service_community.dao.ComActAcidDangerMemberDao;
			@@ -55,7 +55,24 @@

			@Override
			public R export(ComActAcidRecordDTO comActAcidRecordDTO) {
			return R.ok(this.baseMapper.export(comActAcidRecordDTO));
			List<ComActAcidRecordExcelVO> comActAcidRecordExcelVOS=this.baseMapper.export(comActAcidRecordDTO);
			comActAcidRecordExcelVOS.forEach(comActAcidRecordExcelVO -> {
			if(StringUtils.isNotEmpty(comActAcidRecordExcelVO.getTouristCity())){
			JSONArray jsonArray = JSON.parseArray(comActAcidRecordExcelVO.getTouristCity());
			if(jsonArray.isEmpty()){
			comActAcidRecordExcelVO.setTouristCity("");
			}
			else {
			StringBuilder touristCity= new StringBuilder();
			for(int i=0;i<jsonArray.size();i++){
			JSONObject jsonObject=jsonArray.getJSONObject(i);
			touristCity.append(jsonObject.get(i)).append(",");
			}
			comActAcidRecordExcelVO.setTouristCity(touristCity.toString());
			}
			}
			});
			return R.ok();
			}

			@Override

	springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidRecordExcelVO.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActAcidMemberApi.java	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActAcidRecordServiceImpl.java	27 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -43,6 +43,7 @@
			@ApiOperation(value = "分页查询列表",response = ComActAcidMemberVO.class)
			@PostMapping("queryAll")
			public R selectAll(@RequestBody ComActAcidMemberDTO commonPage) {
			commonPage.setRelationName(this.getLoginUserInfo().getName());
			return this.communityService.selectAllComActAcidMember(commonPage);
			}