bug fix

src/main/java/org/springblade/modules/business/controller/ReportController.java

@@ -107,20 +107,22 @@ public class ReportController extends BladeController {
 	public R getAppealByMon(Integer timeFrame, String startTime, String endTime) {
 		LocalDateTime start = null;
 		LocalDateTime end = null;
+		LocalDateTime now = LocalDateTimeUtils.now();
 		if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) {
 			DateTimeFormatter fmt = DateTimeFormatter.ofPattern(DateUtil.PATTERN_DATETIME);
 			start = LocalDateTime.parse(startTime, fmt);
 			end = LocalDateTime.parse(endTime, fmt);
 		} else if (timeFrame == 1) {
-			start = LocalDateTimeUtils.monthStartTime();
+			start = LocalDateTimeUtils.last6MonStartTime();
-			end = LocalDateTimeUtils.monthEndTime();
+			end = now;
 		} else if (timeFrame == 2) {
-			start = LocalDateTimeUtils.quarterStartTime();
+			start = LocalDateTimeUtils.last6MonStartTime();
-			end = LocalDateTimeUtils.quarterEndTime();
+			end = now;
 		} else {
-			start = LocalDateTimeUtils.yearStartTime();
+			start = LocalDateTimeUtils.halfYearStartTime();
-			end = LocalDateTimeUtils.yearEndTime();
+			end = now;
 		}
+
 		return R.data(largeScreenService.getAppealByMon(start, end));
 	}
 
@@ -153,8 +155,8 @@ public class ReportController extends BladeController {
 	 */
 	@GetMapping("/getAppealSubmitCountByLoc")
 	public R getAppealSubmitCountByLoc(Integer timeFrame, String startTime, String endTime) throws ParseException {
-		Map<String, Object> dataList = largeScreenService.getAppealSubmitCountByLoc(timeFrame, startTime, endTime);
+		Map<String, Object> dataMap = largeScreenService.getAppealSubmitCountByLoc(timeFrame, startTime, endTime);
-		return R.data(getSortAndData(dataList));
+		return R.data(getSortAndData(dataMap));
 	}
 
 	/**
@@ -171,8 +173,8 @@ public class ReportController extends BladeController {
 	 */
 	@GetMapping("/getImmediateCountByLoc")
 	public R getImmediateCountByLoc(Integer timeFrame, String startTime, String endTime) throws ParseException {
-		Map<String, Object> dataList = largeScreenService.getImmediateCountByLoc(timeFrame, startTime, endTime);
+		Map<String, Object> dataMap = largeScreenService.getImmediateCountByLoc(timeFrame, startTime, endTime);
-		return R.data(getSortAndData(dataList));
+		return R.data(getSortAndData(dataMap));
 	}
 
 	/**
@@ -223,6 +225,14 @@ public class ReportController extends BladeController {
 		return R.data(largeScreenService.getAppealHot(start, end));
 	}
 
+	/**
+	 * 矛盾上报排行
+	 *
+	 * @param timeFrame
+	 * @param startTime
+	 * @param endTime
+	 * @return
+	 */
 	@GetMapping("getReportSort")
 	public R getReportSort(Integer timeFrame, String startTime, String endTime) {
 		LocalDateTime start = null;
@@ -258,10 +268,11 @@ public class ReportController extends BladeController {
 
 		for (int idx = 0; idx < list.size(); idx++) {
 			String streetName = list.get(idx).getName();
-			Object streetValue = list.get(idx).getValue();
+			if (idx == 0) {
-			if (idx < 4) {
+				levelMap.put(streetName, 4);
+			} else if (idx == 1) {
 				levelMap.put(streetName, 3);
-			} else if (idx < 8) {
+			} else if (idx < 6) {
 				levelMap.put(streetName, 2);
 			} else {
 				levelMap.put(streetName, 1);
@@ -277,7 +288,7 @@ public class ReportController extends BladeController {
 				DataEntity entity = new DataEntity();
 				entity.setName(streetName);
 				entity.setValue(0);
-				entity.setResolveRate("0");
+				entity.setResolveRate("0%");
 				dataList.add(entity);
 			}
 		});
@@ -303,9 +314,11 @@ public class ReportController extends BladeController {
 		for (int idx = 0; idx < list.size(); idx++) {
 			String streetName = list.get(idx).getKey();
 			Object streetValue = list.get(idx).getValue();
-			if (idx < 4) {
+			if (idx == 0) {
+				levelMap.put(streetName, 4);
+			} else if (idx == 1) {
 				levelMap.put(streetName, 3);
-			} else if (idx < 8) {
+			} else if (idx < 6) {
 				levelMap.put(streetName, 2);
 			} else {
 				levelMap.put(streetName, 1);

src/main/java/org/springblade/modules/business/mapper/AppealMapper.java

@@ -17,10 +17,12 @@
 package org.springblade.modules.business.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 import org.springblade.modules.business.entity.Appeal;
 import org.springblade.modules.business.excel.AppealExcel;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * Mapper 接口
@@ -31,4 +33,6 @@ public interface AppealMapper extends BaseMapper<Appeal> {
 
 
 	List<AppealExcel> exportAppeal(String appealStatus, String startTime, String endTime, String appealType, String windowId, String username);
+
+	List<Map<String, Object>> getAppealByMon(@Param("start") String start, @Param("end") String end);
 }

src/main/java/org/springblade/modules/business/mapper/AppealMapper.xml

@@ -37,4 +37,16 @@
         </if>
         ORDER BY a.first_reg_time DESC
     </select>
+
+    <select id="getAppealByMon" resultType="map">
+        SELECT mon, COUNT(1) submit, SUM(if(`status` IN (2, 3), 1, 0)) mediation
+        FROM (
+            SELECT DATE_FORMAT(ma.first_reg_time, '%Y-%m') mon, ma.`status`
+            FROM mp_appeal ma
+            WHERE ma.is_deleted = FALSE AND IFNULL(ma.first_reg_time, 0) &lt;&gt; 0
+                and ma.first_reg_time between #{start} and #{end}
+        ) t
+        GROUP BY mon
+        ORDER BY mon
+    </select>
 </mapper>

src/main/java/org/springblade/modules/business/service/IAppealService.java

@@ -16,14 +16,18 @@
  */
 package org.springblade.modules.business.service;
 
+import org.apache.ibatis.annotations.Param;
 import org.springblade.modules.business.entity.Appeal;
 import org.springblade.core.mp.base.BaseService;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 服务类
  *
  * @author BladeX
  */
 public interface IAppealService extends BaseService<Appeal> {
-
+	List<Map<String, Object>> getAppealByMon(String start, String end);
 }

src/main/java/org/springblade/modules/business/service/impl/AppealMediationServiceImpl.java

@@ -18,7 +18,9 @@ package org.springblade.modules.business.service.impl;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
+import org.springblade.common.cache.DictBizCache;
 import org.springblade.common.constant.BusinessConstant;
+import org.springblade.common.enums.DictEnum;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
@@ -29,11 +31,16 @@ import org.springblade.modules.business.mapper.AppealVisitorMapper;
 import org.springblade.modules.business.service.*;
 import org.springblade.modules.business.vo.AppealMediationDetailListVO;
 import org.springblade.modules.business.vo.AppealMediationVO;
+import org.springblade.modules.system.entity.DictBiz;
+import org.springblade.modules.system.entity.User;
+import org.springblade.modules.system.service.IUserService;
 import org.springframework.stereotype.Service;
 
 import java.sql.Wrapper;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 服务实现类
@@ -47,6 +54,7 @@ public class AppealMediationServiceImpl extends BaseServiceImpl<AppealMediationM
 	private final IAppealRegService appealRegService;
 	private final AppealVisitorMapper visitorMapper;
 	private final IAppealMediationFileService fileService;
+	private final IUserService userService;
 
 	@Override
 	public AppealMediationVO getNewestReg(String appealId) {
@@ -70,9 +78,9 @@ public class AppealMediationServiceImpl extends BaseServiceImpl<AppealMediationM
 		if (Func.isNotEmpty(mediationList) && mediationList.size() > 0) {
 			Long mediateId = mediationList.get(mediationList.size() - 1).getId();
 			return getMediationDetail(appealId, mediateId.toString());
+		} else {
+			return getMediationDetail(appealId, null);
 		}
-
-		return null;
 	}
 
 	@Override
@@ -145,8 +153,13 @@ public class AppealMediationServiceImpl extends BaseServiceImpl<AppealMediationM
 		// 若指定调解记录, 获取该记录对应的登记, 否则取最后一次登记记录
 		AppealReg appealReg = Func.isEmpty(mediation) ? appealRegService.getLastReg(appealId) : appealRegService.getById(mediation.getAppealRegId());
 		// 获取登记的来访人员
-		List<AppealVisitor> visitorList = visitorMapper.selectList(
+		List<AppealVisitor> visitorList = new ArrayList<>();
+		if (Func.isNotEmpty(appealReg)) {
+			visitorMapper.selectList(
 				Wrappers.<AppealVisitor>lambdaQuery().eq(AppealVisitor::getAppealRegId, appealReg.getId()));
+		} else {
+			appealReg = new AppealReg();
+		}
 
 		// 4. 组织返回对象数据
 		vo.setAppealId(Long.valueOf(appealId));
@@ -156,8 +169,30 @@ public class AppealMediationServiceImpl extends BaseServiceImpl<AppealMediationM
 		vo.setSkipGrant(appeal.getSkipGrant());
 		vo.setPersonNum(visitorList.size());
 		vo.setStreetId(appeal.getStreetId());
+		DictBiz street = DictBizCache.getById(appeal.getStreetId());
+		vo.setStreetName(Func.isEmpty(street) ? "" : street.getDictValue());
 		vo.setDisputeId(appeal.getDisputeId());
 		vo.setDisputeName(appeal.getDisputeName());
+		vo.setDisputeLevel(appeal.getDisputeLevel());
+		if (Func.isNotEmpty(appeal.getDisputeLevel())) {
+			// 纠纷等级(事件等级), 0:简单, 1:一般, 2:重大, 3:疑难
+			switch (appeal.getDisputeLevel()) {
+				case 0:
+					vo.setDisputeLevelName("简单");
+					break;
+				case 1:
+					vo.setDisputeLevelName("一般");
+					break;
+				case 2:
+					vo.setDisputeLevelName("重大");
+					break;
+				case 3:
+					vo.setDisputeLevelName("疑难");
+					break;
+			}
+		} else {
+			vo.setDisputeLevelName("");
+		}
 		vo.setDisposeDept(appealReg.getDisposeDept());
 		vo.setDisposeDeptName(appealReg.getDisposeDeptName());
 		vo.setProtocol(appealReg.getProtocol());
@@ -168,6 +203,21 @@ public class AppealMediationServiceImpl extends BaseServiceImpl<AppealMediationM
 		vo.setRegTime(appealReg.getRegTime());
 		vo.setProblemDesc(appeal.getProblemDesc());
 		vo.setAppealStatus(appeal.getStatus());
+		// 诉求状态,诉求状态(办理状态)0:待处理, 1:正在处理, 2:达成协议, 3:调解成功
+		switch (appeal.getStatus()) {
+			case 0:
+				vo.setAppealStatusName("待处理");
+				break;
+			case 1:
+				vo.setAppealStatusName("正在处理");
+				break;
+			case 2:
+				vo.setAppealStatusName("达成协议");
+				break;
+			case 3:
+				vo.setAppealStatusName("调解成功");
+				break;
+		}
 		vo.setTalkingHisList(detailList);
 
 		if (Func.isNotEmpty(mediation)) {
@@ -176,7 +226,23 @@ public class AppealMediationServiceImpl extends BaseServiceImpl<AppealMediationM
 			vo.setAttitude(mediation.getAttitude());
 			vo.setTalkingAdvice(mediation.getTalkingAdvice());
 			vo.setDutyDeptIds(mediation.getDutyDeptIds());
+			if (Func.isNotBlank(mediation.getDutyDeptIds())) {
+				List<User> deptNames = userService.list(Wrappers.<User>lambdaQuery()
+					.select(User::getName).in(User::getId, mediation.getDutyDeptIds().split(",")));
+				if (Func.isNotEmpty(deptNames)) {
+					String names = deptNames.stream().map(User::getName).collect(Collectors.joining(","));
+					vo.setDutyDeptNames(names);
+				}
+			}
 			vo.setCopyDeptIds(mediation.getCopyDeptIds());
+			if (Func.isNotBlank(mediation.getCopyDeptIds())) {
+				List<User> deptNames = userService.list(Wrappers.<User>lambdaQuery()
+					.select(User::getName).in(User::getId, mediation.getCopyDeptIds().split(",")));
+				if (Func.isNotEmpty(deptNames)) {
+					String names = deptNames.stream().map(User::getName).collect(Collectors.joining(","));
+					vo.setCopyDeptNames(names);
+				}
+			}
 			vo.setDisputeLevel(appeal.getDisputeLevel());
 			vo.setFeedbackDeadline(mediation.getFeedbackDeadline());
 			vo.setFinishDeadline(mediation.getFinishDeadline());

src/main/java/org/springblade/modules/business/service/impl/AppealServiceImpl.java

@@ -16,18 +16,27 @@
  */
 package org.springblade.modules.business.service.impl;
 
+import lombok.RequiredArgsConstructor;
 import org.springblade.modules.business.entity.Appeal;
 import org.springblade.modules.business.mapper.AppealMapper;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.modules.business.service.IAppealService;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 服务实现类
  *
  * @author BladeX
  */
 @Service
+@RequiredArgsConstructor
 public class AppealServiceImpl extends BaseServiceImpl<AppealMapper, Appeal> implements IAppealService {
 
+	@Override
+	public List<Map<String, Object>> getAppealByMon(String start, String end) {
+		return baseMapper.getAppealByMon(start, end);
+	}
 }

src/main/java/org/springblade/modules/business/service/impl/LargeScreenServiceImpl.java

@@ -25,6 +25,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springblade.common.cache.DictBizCache;
 import org.springblade.common.cache.UserCache;
 import org.springblade.common.constant.BusinessConstant;
+import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.modules.business.entity.Appeal;
 import org.springblade.modules.business.entity.AppealVisitor;
@@ -38,8 +39,10 @@ import org.springblade.modules.system.entity.User;
 import org.springblade.modules.system.service.IDictBizService;
 import org.springblade.modules.system.service.IUserService;
 import org.springframework.stereotype.Service;
+import software.amazon.ion.Decimal;
 
 import javax.swing.text.html.parser.Entity;
+import java.math.BigDecimal;
 import java.text.DecimalFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -70,9 +73,7 @@ public class LargeScreenServiceImpl implements ILargeScreenService {
 		Map<String, Object> map = new HashMap<>();
 
 		// 化解成功状态数组
-		List<Integer> state = new ArrayList<>();
+		List<Integer> state = Arrays.asList(BusinessConstant.APPEAL_STATUS_AGREEMENT, BusinessConstant.APPEAL_STATUS_FINISH);
-		state.add(2);
-		state.add(3);
 
 		LambdaQueryWrapper<Appeal> wrapper = new LambdaQueryWrapper<>();
 		// 总化解数
@@ -131,9 +132,7 @@ public class LargeScreenServiceImpl implements ILargeScreenService {
 	@Override
 	public List<Appeal> getAppealList(LocalDateTime start, LocalDateTime end) {
 		// 化解成功状态数组
-		List<Integer> state = new ArrayList<>();
+		List<Integer> state = Arrays.asList(BusinessConstant.APPEAL_STATUS_WAITING, BusinessConstant.APPEAL_STATUS_HANDING);
-		state.add(0);
-		state.add(1);
 
 		LambdaQueryWrapper<Appeal> wrapper = new LambdaQueryWrapper<>();
 		// 待处理、正在处理
@@ -162,35 +161,14 @@ public class LargeScreenServiceImpl implements ILargeScreenService {
 
 	@Override
 	public Map<String, List<Object>> getAppealByMon(LocalDateTime start, LocalDateTime end) {
-		Map<String, List<Object>> map = new HashMap<>();
+		DateTimeFormatter fmt = DateTimeFormatter.ofPattern(DateUtil.PATTERN_DATETIME);
-		List<Object> dateList = new ArrayList<>();
+		List<Map<String, Object>> result = appealService.getAppealByMon(start.format(fmt), end.format(fmt));
-		List<Object> handlerCountList = new ArrayList<>();
-		List<Object> finishContList = new ArrayList<>();
-		map.put("dateList", dateList);
-		map.put("handlerCountList", handlerCountList);
-		map.put("finishContList", finishContList);
-
-		List<Integer> state = new ArrayList<>();
-		state.add(2);
-		state.add(3);
-
-		// 当月
-		Map<String, List<Object>> map0 = getStartAndEndTime(map, state, 0);
-
-		// 前1个月
-		Map<String, List<Object>> map1 = getStartAndEndTime(map0, state, 1);
-
-		// 前2个月
-		Map<String, List<Object>> map2 = getStartAndEndTime(map1, state, 2);
-
-		// 前3个月
-		Map<String, List<Object>> map3 = getStartAndEndTime(map2, state, 3);
 
-		// 前4个月
+		Map<String, List<Object>> map = new HashMap<>();
-		Map<String, List<Object>> map4 = getStartAndEndTime(map3, state, 4);
+		map.put("dateList", result.stream().map(e -> e.get("mon")).collect(Collectors.toList()));
-
+		map.put("handlerCountList", result.stream().map(e -> e.get("submit")).collect(Collectors.toList()));
-		// 前5个月
+		map.put("finishContList", result.stream().map(e -> e.get("mediation")).collect(Collectors.toList()));
-		return getStartAndEndTime(map4, state, 5);
+		return map;
 	}
 
 	@Override
@@ -301,9 +279,7 @@ public class LargeScreenServiceImpl implements ILargeScreenService {
 		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
 		// 化解成功状态数组
-		List<Integer> state = new ArrayList<>();
+		List<Integer> state = Arrays.asList(BusinessConstant.APPEAL_STATUS_AGREEMENT, BusinessConstant.APPEAL_STATUS_FINISH);
-		state.add(2);
-		state.add(3);
 
 		LambdaQueryWrapper<Appeal> wrapper = new LambdaQueryWrapper<>();
 		if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) {
@@ -335,9 +311,11 @@ public class LargeScreenServiceImpl implements ILargeScreenService {
 			entity.setName(name);
 			entity.setValue(collect.get(name).size());
 
-			String resolveRate = "0";
+			String resolveRate = "0%";
 			if (entity.getValue() > 0) {
-				double rate = (entity.getValue() / reportList.get(name).size()) * 100;
+				double mediation = entity.getValue().doubleValue();
+				double reportNum = new Double(reportList.get(name).size());
+				double rate = (mediation / reportNum) * 100;
 				resolveRate = calRate(rate);
 			}
 			entity.setResolveRate(resolveRate);
@@ -380,7 +358,7 @@ public class LargeScreenServiceImpl implements ILargeScreenService {
 	@Override
 	public IPage<Appeal> getImmediateList(String streetId, LocalDateTime start, LocalDateTime end, IPage<Appeal> page) {
 		LambdaQueryWrapper<Appeal> wrapper = new LambdaQueryWrapper<>();
-		wrapper.select(Appeal::getId, Appeal::getFirstRegTime, Appeal::getDisputeId, Appeal::getDisputeName);
+		wrapper.select(Appeal::getId, Appeal::getFirstRegTime, Appeal::getDisputeId, Appeal::getDisputeName, Appeal::getSkipGrantLevel);
 		wrapper.eq(Appeal::getStreetId, streetId);
 		wrapper.eq(Appeal::getSkipGrant, BusinessConstant.CODE_TRUE);
 		wrapper.between(Appeal::getFirstRegTime, start, end);
@@ -438,9 +416,11 @@ public class LargeScreenServiceImpl implements ILargeScreenService {
 			DataEntity entity = new DataEntity();
 			entity.setName(dictBiz.getDictValue());
 			entity.setValue(street.containsKey(dictBizId) ? street.get(dictBizId).size() : 0);
-			String resolveRate = "0";
+			String resolveRate = "0%";
 			if (entity.getValue() > 0) {
-				double rate = (entity.getValue() / reportStreetList.get(dictBizId).size()) * 100;
+				double mediation = entity.getValue().doubleValue();
+				double reportNum = new Double(reportStreetList.get(dictBizId).size());
+				double rate = (mediation / reportNum) * 100;
 				resolveRate = calRate(rate);
 			}
 			entity.setResolveRate(resolveRate);
@@ -464,10 +444,12 @@ public class LargeScreenServiceImpl implements ILargeScreenService {
 			DataEntity entity = new DataEntity();
 			entity.setName(user.getName());
 			entity.setValue(town.containsKey(id) ? town.get(id).size() : 0);
-			String resolveRate = "0";
+			String resolveRate = "0%";
 			if (entity.getValue() > 0) {
 				if (reportTownList.containsKey(id)) {
-					double rate = (entity.getValue() / reportTownList.get(id).size()) * 100;
+					double mediation = entity.getValue().doubleValue();
+					double reportNum = new Double(reportTownList.get(id).size());
+					double rate = (mediation / reportNum) * 100;
 					resolveRate = calRate(rate);
 				} else {
 					resolveRate = "100%";
@@ -520,42 +502,10 @@ public class LargeScreenServiceImpl implements ILargeScreenService {
 		return map;
 	}
 
-	private Map<String, List<Object>> getStartAndEndTime(Map<String, List<Object>> map, List<Integer> state, Integer month) {
-		List<Object> dateList = map.get("dateList");
-		List<Object> handlerCountList = map.get("handlerCountList");
-		List<Object> finishContList = map.get("finishContList");
-
-		// 当月开始时间
-		LocalDateTime start = LocalDateTime.of(LocalDate.now().withDayOfMonth(1).minusMonths(month), LocalTime.MIDNIGHT);
-
-		// 当月结束时间
-		LocalDateTime end = start.plusMonths(1).minusSeconds(1);
-		DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("yyyy-MM");
-
-		// 月份：2023-06
-		dateList.add(start.format(dateFormatter));
-
-		// 登记数
-		LambdaQueryWrapper<Appeal> wrapper = new LambdaQueryWrapper<>();
-		wrapper.between(Appeal::getFirstRegTime, start, end);
-		handlerCountList.add(appealService.count(wrapper));
-
-		// 调解成功数
-		wrapper.clear();
-		wrapper.in(Appeal::getStatus, state);
-		wrapper.between(Appeal::getFirstRegTime, start, end);
-		finishContList.add(appealService.count(wrapper));
-
-		map.put("dateList", dateList);
-		map.put("handlerCountList", handlerCountList);
-		map.put("finishContList", finishContList);
-		return map;
-	}
-
 	private String calRate(double rate) {
 		String resolveRate = String.format("%.2f", rate);
 
-		if ("100.00".equalsIgnoreCase(resolveRate)) {
+		if ("100.00".equalsIgnoreCase(resolveRate) || "100.0".equalsIgnoreCase(resolveRate)) {
 			resolveRate = "100";
 		}
 		if ("0.00".equalsIgnoreCase(resolveRate)) {

src/main/java/org/springblade/modules/business/utils/LocalDateTimeUtils.java

@@ -7,7 +7,6 @@ import java.util.Date;
 
 /**
  * LocalDateTime工具类
- *
  */
 
 public class LocalDateTimeUtils {
@@ -110,6 +109,25 @@ public class LocalDateTimeUtils {
 		return LocalDateTime.of(LocalDate.now(), LocalTime.MAX);
 	}
 
+	/**
+	 * 最近6月开始时间
+	 *
+	 * @return
+	 */
+	public static LocalDateTime last6MonStartTime() {
+		return LocalDateTime.of(LocalDate.now().minus(5L, ChronoUnit.MONTHS), LocalTime.MIN);
+	}
+
+	/**
+	 * 最近6月结束时间
+	 *
+	 * @return
+	 */
+	public static LocalDateTime last6MonEndTime() {
+		return LocalDateTime.of(LocalDate.now(), LocalTime.MAX);
+	}
+
+
 	/**
 	 * 最近一年开始时间
 	 *

src/main/java/org/springblade/modules/business/vo/AppealMediationVO.java

@@ -54,6 +54,11 @@ public class AppealMediationVO implements Serializable {
 	 */
 	private Long streetId;
 
+	/**
+	 * 所属街道字典id
+	 */
+	private String streetName;
+
 	/**
 	 * 纠纷字典id
 	 */
@@ -64,11 +69,26 @@ public class AppealMediationVO implements Serializable {
 	 */
 	private String disputeName;
 
+	/**
+	 * 纠纷等级(事件等级), 0:简单, 1:一般, 2:重大, 3:疑难
+	 */
+	private Integer disputeLevel;
+
+	/**
+	 * 纠纷等级(事件等级), 0:简单, 1:一般, 2:重大, 3:疑难
+	 */
+	private String disputeLevelName;
+
 	/**
 	 * 诉求状态
 	 */
 	private Integer appealStatus;
 
+	/**
+	 * 诉求状态
+	 */
+	private String appealStatusName;
+
 	/**
 	 * 何单位处理过-单位id
 	 */
@@ -113,6 +133,7 @@ public class AppealMediationVO implements Serializable {
 	 * 是否越级上报, 0:否, 1:是
 	 */
 	private Integer skipGrant;
+
 	/**
 	 * 越级等级, 0:中央, 1:省级, 2:市级, 3:区县
 	 */
@@ -140,15 +161,19 @@ public class AppealMediationVO implements Serializable {
 	 */
 	private String dutyDeptIds;
 
+	/**
+	 * 责任单位id列表, 以逗号分割
+	 */
+	private String dutyDeptNames;
+
 	/**
 	 * 抄送单位id列表, 以逗号分割
 	 */
 	private String copyDeptIds;
-
 	/**
-	 * 纠纷等级(事件等级), 0:简单, 1:一般, 2:重大, 3:疑难
+	 * 抄送单位id列表, 以逗号分割
 	 */
-	private Integer disputeLevel;
+	private String copyDeptNames;
 
 	/**
 	 * 反馈时限