From dcd669d0f4fad2e9292ee2ae8b2b55de98b1332c Mon Sep 17 00:00:00 2001
From: liyj <15602261488@163.com>
Date: Tue, 24 Sep 2024 19:03:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/gzdyh_test' into gzdyh_test
---
/dev/null | 137 -------------------
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/CasePageDTO.java | 25 +++
dyh-service/dyh-sys/src/main/java/cn/huge/module/kind/controller/web/SyRegionWebController.java | 18 ++
dyh-service/dyh-mediate/src/main/java/cn/huge/module/client/api/impl/SysClientImpl.java | 21 ++
dyh-service/dyh-sys/src/main/java/cn/huge/module/kind/service/SyRegionService.java | 19 ++
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseInfoWebController.java | 43 ++---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/client/api/SysClient.java | 9 +
dyh-service/dyh-base/src/main/java/cn/huge/module/sys/dto/QueAreaDTO.java | 23 +++
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseInfoMapper.xml | 13 +
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/CaseInfoWeExcelDTO.java | 23 +-
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/CaseStatisticsAreaDTO.java | 1
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java | 70 ++++++---
12 files changed, 204 insertions(+), 198 deletions(-)
diff --git a/dyh-service/dyh-base/src/main/java/cn/huge/module/sys/dto/QueAreaDTO.java b/dyh-service/dyh-base/src/main/java/cn/huge/module/sys/dto/QueAreaDTO.java
new file mode 100644
index 0000000..f92b9c0
--- /dev/null
+++ b/dyh-service/dyh-base/src/main/java/cn/huge/module/sys/dto/QueAreaDTO.java
@@ -0,0 +1,23 @@
+package cn.huge.module.sys.dto;
+
+import lombok.Data;
+
+/**
+ * @author zhouxiantao
+ * @create 2024-09-24 17:59
+ */
+@Data
+public class QueAreaDTO {
+ /**
+ * 区域编码
+ */
+ private String areaCode;
+ /**
+ * 区域名称
+ */
+ private String areaName;
+ /**
+ * 父级区域编码
+ */
+ private String parentId;
+}
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseAreaWebController.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseAreaWebController.java
deleted file mode 100644
index a404147..0000000
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseAreaWebController.java
+++ /dev/null
@@ -1,171 +0,0 @@
-package cn.huge.module.cases.controller.web;
-
-import cn.huge.base.common.utils.ReturnFailUtils;
-import cn.huge.base.common.utils.ReturnSucUtils;
-import cn.huge.module.cases.domain.po.CaseArea;
-import cn.huge.module.cases.service.CaseAreaService;
-import com.google.common.collect.Maps;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Sort;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-/**
- * @title: 地区表接口api-web端
- * @description: 地区表接口api-web端
- * @company: hugeinfo
- * @author: zhouxt
- * @time: 2024-09-23 09:01:17
- * @version: 1.0.0
- */
-@Slf4j
-@RestController
-@RequestMapping("/api/web/caseArea")
-public class CaseAreaWebController {
-
- @Autowired(required = false)
- private HttpServletRequest request;
-
- @Autowired
- private CaseAreaService service;
-
- /**
- * 获取请求URL参数
- * @return Map<String, Object>
- */
- private Map<String, Object> getParameter(){
- Map<String, Object> terms = Maps.newHashMap();
- // 表ID
- String id = request.getParameter("id");
- if (StringUtils.isNotBlank(id)){
- terms.put("id", id);
- }
- // 区域名称
- String areaName = request.getParameter("areaName");
- if (StringUtils.isNotBlank(areaName)){
- terms.put("areaName", areaName);
- }
- // 区域编码
- String areaCode = request.getParameter("areaCode");
- if (StringUtils.isNotBlank(areaCode)){
- terms.put("areaCode", areaCode);
- }
- // 父类编码
- String parentCode = request.getParameter("parentCode");
- if (StringUtils.isNotBlank(parentCode)){
- terms.put("parentCode", parentCode);
- }
- // 区域等级，1-省，2-市，3-区，4-街道
- String areaLevel = request.getParameter("areaLevel");
- if (StringUtils.isNotBlank(areaLevel)){
- terms.put("areaLevel", areaLevel);
- }
- // 创建时间区间
- String createStart = request.getParameter("createStart");
- String createEnd = request.getParameter("createEnd");
- if(StringUtils.isNotBlank(createStart) && StringUtils.isNotBlank(createEnd)) {
- terms.put("createStart", createStart);
- terms.put("createEnd", createEnd);
- }
- // 更新时间区间
- String updateStart = request.getParameter("updateStart");
- String updateEnd = request.getParameter("updateEnd");
- if(StringUtils.isNotBlank(updateStart) && StringUtils.isNotBlank(updateEnd)) {
- terms.put("updateStart", updateStart);
- terms.put("updateEnd", updateEnd);
- }
- return terms;
- }
-
- /**
- * 条件查询多个
- * @url {ctx}/api/web/caseArea/listQuery
- * @return Object
- */
- @GetMapping("/listQuery")
- public Object listQuery() {
- try {
- Map<String, Object> terms = getParameter();
- return ReturnSucUtils.getRepInfo(service.listTerms(terms));
- } catch (Exception e) {
- return ReturnFailUtils.getRepInfo();
- }
- }
-
- /**
- * 条件分页查询
- * @url {ctx}/api/web/caseArea/pageQuery
- * @param page 页码
- * @param size 每页数量
- * @return Object
- */
- @GetMapping("/pageQuery")
- public Object pageQuery(@RequestParam(value = "page") int page, @RequestParam(value = "size") int size) {
- try {
- Map<String, Object> terms = getParameter();
- Sort sort = Sort.by(Sort.Direction.DESC, "create_time");
- PageRequest pageRequest = PageRequest.of(page-1, size, sort);
- Page<CaseArea> caseAreaPage = service.pageQuery(pageRequest, terms);
- return ReturnSucUtils.getRepInfo( "处理成功", caseAreaPage);
- } catch (Exception e) {
- return ReturnFailUtils.getRepInfo();
- }
- }
-
- /**
- * 根据编号查询单个
- * @url {ctx}/api/web/caseArea/getById
- * @param id 主键编号
- * @return Object
- */
- @GetMapping("/getById")
- public Object getById(@RequestParam(value = "id") String id) {
- try {
- return ReturnSucUtils.getRepInfo(service.getById(id));
- } catch (Exception e) {
- return ReturnFailUtils.getRepInfo();
- }
- }
-
- /**
- * 根据主键单个
- * @url {ctx}/api/web/caseArea/deleteById
- * @param id 主键编号
- * @return Object
- */
- @GetMapping("/deleteById")
- public Object deleteById(@RequestParam(value = "id") String id) {
- try {
- service.removeById(id);
- return ReturnSucUtils.getRepInfo();
- } catch (Exception e) {
- return ReturnFailUtils.getRepInfo();
- }
- }
-
- /**
- * 新增或更新对象
- * @url {ctx}/api/web/caseArea/saveCaseArea
- * @param caseArea 实体对象
- * @return Object
- */
- @PostMapping("/saveCaseArea")
- public Object saveCaseArea(@RequestBody CaseArea caseArea) {
- try {
- service.saveCaseArea(caseArea);
- return ReturnSucUtils.getRepInfo();
- } catch (Exception e) {
- return ReturnFailUtils.getRepInfo();
- }
- }
-
-
-}
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseInfoWebController.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseInfoWebController.java
index cd27017..cb97ed5 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseInfoWebController.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseInfoWebController.java
@@ -104,18 +104,27 @@
String peopleNum = request.getParameter("peopleNum");
if (StringUtils.isNotBlank(peopleNum)){
String[] split = peopleNum.split("-");
- terms.put("peopleNumStart", split[0]);
- if(split.length>1){
- terms.put("peopleNumEnd", split[1]);
+ String number = split[0];
+ if(number.equals("0") && split.length==1){
+ terms.put("peopleNumEnd", split[0]);
+ }else{
+ terms.put("peopleNumStart", split[0]);
+ if(split.length>1){
+ terms.put("peopleNumEnd", split[1]);
+ }
}
-
}
String amount = request.getParameter("amount");
if (StringUtils.isNotBlank(amount)){
String[] split = amount.split("-");
- terms.put("amountStart", split[0]);
- if(split.length>1){
- terms.put("amountEnd", split[1]);
+ String number = split[0];
+ if(number.equals("0") && split.length==1){
+ terms.put("amountEnd", split[0]);
+ }else{
+ terms.put("amountStart", split[0]);
+ if(split.length>1){
+ terms.put("amountEnd", split[1]);
+ }
}
}
return terms;
@@ -647,24 +656,8 @@
CaseInfoWeExcelDTO caseInfoWeExcelDTO = new CaseInfoWeExcelDTO();
BeanUtils.copyProperties(casePageDTO,caseInfoWeExcelDTO);
caseInfoWeExcelDTO.setCloseTime(DateUtils.DateToString(casePageDTO.getCloseTime(), DateUtils.YYYY_MM_DD));
- if(ObjectUtils.isNotEmpty(casePageDTO.getPlaintiffList())){
- StringBuffer sb = new StringBuffer();
- for (CasePersonWeDTO casePersonWeDTO : casePageDTO.getPlaintiffList()) {
- sb.append(casePersonWeDTO.getTrueName()).append(",");
- }
- if(ObjectUtils.isNotEmpty(sb)){
- caseInfoWeExcelDTO.setPlaintiffStr(sb.substring(0,sb.length()-1));
- }
- }
- if(ObjectUtils.isNotEmpty(casePageDTO.getDefendantList())){
- StringBuffer sb = new StringBuffer();
- for (CasePersonWeDTO casePersonWeDTO : casePageDTO.getDefendantList()) {
- sb.append(casePersonWeDTO.getTrueName()).append(",");
- }
- if(ObjectUtils.isNotEmpty(sb)){
- caseInfoWeExcelDTO.setDefendantStr(sb.substring(0,sb.length()-1));
- }
- }
+ caseInfoWeExcelDTO.setCreateTime(DateUtils.DateToString(casePageDTO.getCreateTime(), DateUtils.YYYY_MM_DD));
+ caseInfoWeExcelDTO.setCaseTypeName(casePageDTO.getCaseTypeFirstName()+"/"+casePageDTO.getCaseTypeName());
excelList.add(caseInfoWeExcelDTO);
}
}
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/CaseAreaMapper.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/CaseAreaMapper.java
deleted file mode 100644
index 69556fb..0000000
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/CaseAreaMapper.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package cn.huge.module.cases.dao.mapper;
-
-import cn.huge.module.cases.domain.po.CaseArea;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-import java.util.Map;
-
-/**
-* @title: 地区表持久层业务处理
-* @Description 此处仅涉及复杂SQL操作，务必不要在此再次写单表的CRUD操作，因为mybatisPlus已经实现。
-* @company: hugeinfo
-* @author: zhouxt
-* @time: 2024-09-23 09:01:17
-* @version 1.0.0
-*/
-@Repository
-public interface CaseAreaMapper extends BaseMapper<CaseArea>{
-
- /**
- * 更新对象
- * @param entity 对象
- */
- void updateCaseArea(@Param("entity") CaseArea entity);
-
- /**
- * 条件更新对象
- * @param entity 对象
- * @param terms 条件
- */
- void updateCaseAreaTerms(@Param("entity") CaseArea entity, @Param("terms") Map<String, Object> terms);
-
- /**
- * 根据编号物理删除
- * @param id 查询条件集合
- */
- void deleteCaseArea(@Param("id") String id);
-
- /**
- * 按条件查询结果集
- * @param terms 查询条件集合
- * @return List<CaseArea>
- */
- List<CaseArea> listTerms(@Param("terms") Map<String, Object> terms);
-
- /**
- * 按条件查询实体总数
- * @param terms 查询条件集合
- * @return long
- */
- long countTerms(@Param("terms") Map<String, Object> terms);
-
- /**
- * 按条件查询实体分页结果集
- * @param page 分页对象
- * @param terms 查询条件集合
- * @return List<CaseArea>
- */
- List<CaseArea> pageTerms(@Param("page") PageRequest page, @Param("terms") Map<String, Object> terms);
-
-}
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseAreaMapper.xml b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseAreaMapper.xml
deleted file mode 100644
index 196ef62..0000000
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseAreaMapper.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<!--
- * @title: 地区表
- * @description: 自定义sql，请自行实现业务逻辑
- * @company: hugeinfo
- * @author: zhouxt
- * @time:2024-09-23 09:01:17
- * @version 1.0.0
--->
-<mapper namespace="cn.huge.module.cases.dao.mapper.CaseAreaMapper">
- <!-- 结果集 -->
- <resultMap id="dataResult" type="cn.huge.module.cases.domain.po.CaseArea">
- <result property="id" column="id"/>
- <result property="areaName" column="area_name"/>
- <result property="areaCode" column="area_code"/>
- <result property="parentCode" column="parent_code"/>
- <result property="areaLevel" column="area_level"/>
- <result property="updateTime" column="update_time"/>
- <result property="createTime" column="create_time"/>
- </resultMap>
- <!-- 表 -->
- <sql id='table-name'>dyh_case_area</sql>
- <!-- 字段 -->
- <sql id="column-part">
- id,
- area_name,
- area_code,
- parent_code,
- area_level,
- update_time,
- create_time
- </sql>
- <!-- 更新实体字段 -->
- <sql id="set-part">
- <if test="entity.areaName != null">area_name = #{entity.areaName},</if>
- <if test="entity.areaCode != null">area_code = #{entity.areaCode},</if>
- <if test="entity.parentCode != null">parent_code = #{entity.parentCode},</if>
- <if test="entity.areaLevel != null">area_level = #{entity.areaLevel},</if>
- <if test="entity.updateTime != null">update_time = #{entity.updateTime},</if>
- <if test="entity.createTime != null">create_time = #{entity.createTime}</if>
- </sql>
- <!-- 条件 -->
- <sql id="where-part">
- <if test="terms != null">
- <where>
- <if test="terms.id != null and terms.id !=''">
- and id = #{terms.id}
- </if>
- <if test="terms.areaName != null and terms.areaName !=''">
- and area_name = #{terms.areaName}
- </if>
- <if test="terms.areaCode != null and terms.areaCode !=''">
- and area_code = #{terms.areaCode}
- </if>
- <if test="terms.parentCode != null and terms.parentCode !=''">
- and parent_code = #{terms.parentCode}
- </if>
- <if test="terms.areaLevel != null and terms.areaLevel !=''">
- and area_level = #{terms.areaLevel}
- </if>
- <if test="terms.updateTime != null and terms.updateTime !=''">
- and DATE_FORMAT(update_time,'%Y-%m-%d') = #{terms.updateTime}
- </if>
- <if test="terms.updateStart != null and terms.updateStart !='' and terms.updateEnd != null and terms.updateEnd !=''">
- and (DATE_FORMAT(update_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.updateStart}
- and DATE_FORMAT(update_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.updateEnd})
- </if>
- <if test="terms.createTime != null and terms.createTime !=''">
- and DATE_FORMAT(create_time,'%Y-%m-%d') = #{terms.createTime}
- </if>
- <if test="terms.createStart != null and terms.createStart !='' and terms.createEnd != null and terms.createEnd !=''">
- and (DATE_FORMAT(create_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.createStart}
- and DATE_FORMAT(create_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.createEnd})
- </if>
- </where>
- </if>
- </sql>
- <!-- 更新对象 -->
- <update id="updateCaseArea">
- update
- <include refid="table-name"/>
- <set>
- <include refid="set-part"/>
- </set>
- <where>
- id = #{entity.id}
- </where>
- </update>
- <!-- 条件更新对象 -->
- <update id="updateCaseAreaTerms">
- update
- <include refid="table-name"/>
- <set>
- <include refid="set-part"/>
- </set>
- <include refid="where-part"/>
- </update>
- <!-- 根据编号物理删除 -->
- <delete id="deleteCaseArea">
- delete from
- <include refid="table-name" />
- where id = #{id}
- </delete>
- <!-- 根据条件查询 -->
- <select id="listTerms" resultMap="dataResult">
- select
- <include refid="column-part"/>
- from
- <include refid="table-name" />
- <include refid="where-part"/>
- </select>
- <!-- 根据条件统计 -->
- <select id="countTerms" resultType="java.lang.Long">
- select
- COUNT(1)
- from
- <include refid="table-name" />
- <include refid="where-part"/>
- </select>
- <!-- 根据条件分页查询 -->
- <select id="pageTerms" resultMap="dataResult">
- SELECT
- <include refid="column-part"/>
- FROM
- <include refid="table-name" />
- <include refid="where-part"/>
- <if test="page.sort != null">
- <foreach collection="page.sort" item="s" index="index" separator="," open="order by ">
- isnull(${s.property}), ${s.property} ${s.direction}
- </foreach>
- </if>
- <if test="page.sort == null">
- order by isnull(create_time), create_time desc
- </if>
- limit #{page.offset}, #{page.size}
- </select>
-
-</mapper>
\ No newline at end of file
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseInfoMapper.xml b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseInfoMapper.xml
index 9642c1b..d89fc3a 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseInfoMapper.xml
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseInfoMapper.xml
@@ -105,6 +105,11 @@
<result property="createTime" column="create_time"/>
<result property="plaintiffs" column="plaintiffs"/>
<result property="defendants" column="defendants"/>
+ <result property="queCityName" column="que_city_name"/>
+ <result property="queAreaName" column="que_area_name"/>
+ <result property="queRoadName" column="que_road_name"/>
+ <result property="caseTypeFirst" column="case_type_first"/>
+ <result property="caseTypeFirstName" column="case_type_first_name"/>
</resultMap>
<!-- 表 -->
<sql id='table-name'>dyh_case_info</sql>
@@ -122,6 +127,11 @@
a.create_time,
a.plaintiffs,
a.defendants,
+ a.que_city_name,
+ a.que_area_name,
+ a.que_road_name,
+ a.case_type_first,
+ a.case_type_first_name,
b.medi_result,
b.medi_result_name,
b.mediate_unit_id,
@@ -804,7 +814,8 @@
count(1) as caseNum,
sum(case when b.medi_result = '22_00025-1' then 1 else 0 end) as resolveNum,
sum(case when b.medi_result is null and a.info_process <![CDATA[ < ]]> 4 then 1 else 0 end) as resolveingNum,
- sum(case when b.medi_result = '22_00025-2' then 1 else 0 end) as unResolveNum
+ sum(case when b.medi_result = '22_00025-2' then 1 else 0 end) as unResolveNum,
+ sum(case when a.info_process = 4 then 1 else 0 end) as rejectNum
FROM
dyh_case_info a LEFT JOIN dyh_case_info_unfold b on a.id = b.id
<include refid="where-part-all"/>
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/CaseInfoWeExcelDTO.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/CaseInfoWeExcelDTO.java
index 2e3c999..0e1199a 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/CaseInfoWeExcelDTO.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/CaseInfoWeExcelDTO.java
@@ -9,8 +9,12 @@
*/
@Data
public class CaseInfoWeExcelDTO {
- @ExcelProperty(value="事项状态")
- private String statusName;
+ @ExcelProperty(value="登记时间")
+ private String createTime;
+ @ExcelProperty(value="登记机构")
+ private String inputUnitName;
+ @ExcelProperty(value="问题归属地")
+ private String areaName;
@ExcelProperty(value="事项来源")
private String canalName;
@ExcelProperty(value="事项等级")
@@ -19,16 +23,15 @@
private String caseTypeName;
@ExcelProperty(value="承办部门")
private String mediateUnitName;
- @ExcelProperty(value="配合部门")
- private String assistUnitName;
- @ExcelProperty(value="化解结果")
- private String mediResultName;
+ @ExcelProperty(value="事项状态")
+ private String statusName;
@ExcelProperty(value="办结时间")
private String closeTime;
+ @ExcelProperty(value="化解结果")
+ private String mediResultName;
@ExcelProperty(value="申请人")
- private String plaintiffStr;
+ private String plaintiffs;
@ExcelProperty(value="被申请人")
- private String defendantStr;
- @ExcelProperty(value="登记机构")
- private String inputUnitName;
+ private String defendants;
+
}
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/CasePageDTO.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/CasePageDTO.java
index 5454663..0acfb1e 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/CasePageDTO.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/CasePageDTO.java
@@ -48,6 +48,15 @@
* 纠纷类型名称
*/
private String caseTypeName;
+ /**
+ * 纠纷一级类型
+ */
+ private String caseTypeFirst;
+
+ /**
+ * 纠纷一级类型名称
+ */
+ private String caseTypeFirstName;
/**
* 调解结果
@@ -127,4 +136,20 @@
* 被申请方当事人名称
*/
private String defendants;
+ /**
+ * 问题归属地
+ * */
+ private String areaName;
+ /**
+ * 问题属地市名称
+ */
+ private String queCityName;
+ /**
+ * 问题属地区名称
+ */
+ private String queAreaName;
+ /**
+ * 问题属地街道名称
+ */
+ private String queRoadName;
}
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/CaseStatisticsAreaDTO.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/CaseStatisticsAreaDTO.java
index a4051f2..a627892 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/CaseStatisticsAreaDTO.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/CaseStatisticsAreaDTO.java
@@ -14,4 +14,5 @@
private Integer resolveNum=0;//化解成功数量
private Integer resolveingNum=0;//化解中数量
private Integer unResolveNum=0;//化解不成功数量
+ private Integer rejectNum=0;//不予受理数量
}
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseAreaService.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseAreaService.java
deleted file mode 100644
index 0e7fd48..0000000
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseAreaService.java
+++ /dev/null
@@ -1,137 +0,0 @@
-package cn.huge.module.cases.service;
-
-import cn.huge.base.common.exception.ServiceException;
-import cn.huge.base.common.utils.DateUtils;
-import cn.huge.base.common.utils.IdUtils;
-import cn.huge.module.cases.domain.dto.CaseAreaDTO;
-import cn.huge.module.client.api.impl.UtilsClientImpl;
-import cn.huge.module.cases.dao.mapper.CaseAreaMapper;
-import cn.huge.module.cases.domain.po.CaseArea;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageImpl;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.PostConstruct;
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @title: 地区表业务逻辑处理
- * @Description 地区表业务逻辑处理
- * @company hugeinfo
- * @author zhouxt
- * @Time 2024-09-23 09:01:17
- * @version 1.0.0
- */
-@Slf4j
-@Service
-@Transactional(rollbackFor = Exception.class)
-public class CaseAreaService extends ServiceImpl<CaseAreaMapper, CaseArea>{
-
- @Autowired
- private CaseAreaMapper mapper;
-
- @Autowired
- private UtilsClientImpl utilsClient;
-
- /**
- * 更新对象
- * @param entity 对象
- */
- public void updateCaseArea(CaseArea entity){
- try{
- mapper.updateCaseArea(entity);
- }catch (Exception e){
- log.error("[CaseAreaService.updateCaseArea]调用失败，异常信息："+e, e);
- throw new ServiceException("CaseAreaService.updateCaseArea", e);
- }
- }
-
- /**
- * 条件更新对象
- * @param entity 对象
- * @param terms 条件
- */
- public void updateCaseAreaTerms(CaseArea entity, Map<String, Object> terms){
- try{
- mapper.updateCaseAreaTerms(entity, terms);
- }catch (Exception e){
- log.error("[CaseAreaService.updateCaseAreaTerms]调用失败，异常信息："+e, e);
- throw new ServiceException("CaseAreaService.updateCaseAreaTerms", e);
- }
- }
-
- /**
- * 根据编号物理删除
- * @param id 查询条件集合
- */
- public void deleteCaseArea(String id){
- try{
- mapper.deleteCaseArea(id);
- }catch (Exception e){
- log.error("[CaseAreaService.deleteCaseArea]调用失败，异常信息："+e, e);
- throw new ServiceException("CaseAreaService.deleteCaseArea", e);
- }
- }
-
- /**
- * 按条件查询
- * @param terms 条件
- * @return List
- */
- public List<CaseArea> listTerms(Map<String, Object> terms){
- return mapper.listTerms(terms);
- }
-
- /**
- * 按条件统计
- * @param terms 条件
- * @return long
- */
- public long countTerms(Map<String, Object> terms){
- return mapper.countTerms(terms);
- }
-
- /**
- * 按条件分页查询
- * @param page 分页对象
- * @param terms 条件
- * @return Page
- */
- public Page<CaseArea> pageQuery(PageRequest page, Map<String, Object> terms){
- long total = mapper.countTerms(terms);
- List<CaseArea> content = mapper.pageTerms(page, terms);
- return new PageImpl<CaseArea>(content, page, total);
- }
-
- /**
- * 新增或更新对象
- * @param caseArea 实体对象
- */
- public void saveCaseArea(CaseArea caseArea){
- try{
- Date nowDate = DateUtils.getNowDate();
- // 判断是否新增
- if (IdUtils.checkNewId(caseArea.getId())){
- caseArea.setId(utilsClient.getNewTimeId());
- caseArea.setCreateTime(nowDate);
- }
- caseArea.setUpdateTime(nowDate);
- this.saveOrUpdate(caseArea);
- }catch (Exception e){
- log.error("[CaseAreaService.saveCaseArea]调用失败，异常信息："+e, e);
- throw new ServiceException("CaseAreaService.saveCaseArea", e);
- }
- }
-}
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java
index 936d173..3cfb939 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java
@@ -19,6 +19,7 @@
import cn.huge.module.mediate.dto.WechatBindCaseDTO;
import cn.huge.module.sys.dto.FileIdTypeInfoBaseDTO;
import cn.huge.module.sys.dto.QueAddrBaseDTO;
+import cn.huge.module.sys.dto.QueAreaDTO;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -84,9 +85,6 @@
@Autowired
private CaseEvaluateService caseEvaluateService;
-
- @Autowired
- private CaseAreaService caseAreaService;
/**
@@ -911,6 +909,26 @@
List<CasePageDTO> content = mapper.pageTermsAll(page, terms);
if (ObjectUtils.isNotEmpty(content)) {
for (CasePageDTO casePageDTO : content) {
+ if(ObjectUtils.isNotEmpty(casePageDTO.getQueRoadName())){
+ casePageDTO.setAreaName(casePageDTO.getQueRoadName());
+ }else if(ObjectUtils.isNotEmpty(casePageDTO.getAreaName())){
+ casePageDTO.setAreaName(casePageDTO.getAreaName());
+ }else if(ObjectUtils.isNotEmpty(casePageDTO.getQueCityName())){
+ casePageDTO.setAreaName(casePageDTO.getQueCityName());
+ }
+ if(ObjectUtils.isNotEmpty(casePageDTO.getCaseLevel())){
+ switch (casePageDTO.getCaseLevel()){
+ case 1:
+ casePageDTO.setCanalName("一级");
+ break;
+ case 2:
+ casePageDTO.setCanalName("二级");
+ break;
+ case 3:
+ casePageDTO.setCanalName("三级");
+ break;
+ }
+ }
QueryWrapper<CasePerson> personWrapper1 = new QueryWrapper<>();
personWrapper1.eq("case_id", casePageDTO.getId());
List<CasePerson> casePersonList1 = personService.list(personWrapper1);
@@ -963,9 +981,9 @@
areaCodeList.add(caseStatisticsAreaDTO.getAreaCode());
}
caseStatisticsAreaDTOS.add(allArea);
- List<CaseArea> queArea = listAreaByType(terms.get("areaType"), terms.get("queArea"));
+ List<QueAreaDTO> queArea = listAreaByType(terms.get("queArea"));
log.info("listAreaByType {}", JSON.toJSONString(queArea));
- for (CaseArea caseAreaDTO : queArea) {
+ for (QueAreaDTO caseAreaDTO : queArea) {
if (!areaCodeList.contains(caseAreaDTO.getAreaCode())) {
CaseStatisticsAreaDTO areaChild = new CaseStatisticsAreaDTO();
areaChild.setAreaCode(caseAreaDTO.getAreaCode());
@@ -1071,8 +1089,24 @@
}
public List<CaseStatisticsAreaDTO> sortArea(List<CaseStatisticsAreaDTO> caseStatisticsAreaDTOS) {
+ Map<String, String> map = new HashMap<>();
+ map.put("越秀区","2");
+ map.put("海珠区","3");
+ map.put("荔湾区","4");
+ map.put("天河区","5");
+ map.put("白云区","6");
+ map.put("黄埔区","7");
+ map.put("花都区","8");
+ map.put("番禺区","9");
+ map.put("南沙区","10");
+ map.put("从化区","11");
+ map.put("增城区","12");
+ for (CaseStatisticsAreaDTO caseStatisticsAreaDTO : caseStatisticsAreaDTOS) {
+ if(map.containsKey(caseStatisticsAreaDTO.getAreaName())){
+ caseStatisticsAreaDTO.setAreaCode(map.get(caseStatisticsAreaDTO.getAreaName()));
+ }
+ }
caseStatisticsAreaDTOS.sort((o1, o2) -> {
- log.info("xsd:{},{}",o1,o2);
Integer totalScore1 = Integer.valueOf(o1.getAreaCode());
Integer totalScore2 = Integer.valueOf(o2.getAreaCode());
if (totalScore1 > totalScore2) {
@@ -1096,24 +1130,14 @@
/**
* 根据不同的等级获取不同区域子集合
- *
- * @param areaType 1-市级 2-区
*/
- public List<CaseArea> listAreaByType(Object areaType, Object areaCode) throws IOException {
- log.info("listAreaByType {},{}", areaType, areaCode);
- if (ObjectUtils.isEmpty(areaType) || areaType.equals("") || areaType.equals("1")) {
- QueryWrapper<CaseArea> caseAreaWrapper = new QueryWrapper<>();
- caseAreaWrapper.eq("parent_code","1601");
- List<CaseArea> list = caseAreaService.list(caseAreaWrapper);
- return list;
+ public List<QueAreaDTO> listAreaByType(Object areaCode) {
+ log.info("listAreaByType {},{}", areaCode);
+ String parentId = "1601";
+ if (ObjectUtils.isNotEmpty(areaCode)) {
+ parentId = String.valueOf(areaCode);
}
- if (areaType.equals("2")) {
-
- QueryWrapper<CaseArea> caseAreaWrapper = new QueryWrapper<>();
- caseAreaWrapper.eq("parent_code",areaCode);
- List<CaseArea> list = caseAreaService.list(caseAreaWrapper);
- return list;
- }
- return new ArrayList<>();
+ List<QueAreaDTO> queAreaDTOS = sysClient.listByParentId(parentId);
+ return queAreaDTOS;
}
}
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/client/api/SysClient.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/client/api/SysClient.java
index 4828a57..e43b0e8 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/client/api/SysClient.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/client/api/SysClient.java
@@ -83,4 +83,13 @@
*/
@PostMapping("/api/client/fileRelate/saveFileRelateList")
ReturnBO saveFileRelateList(@RequestBody List<FileRelateDTO> fileRelateList);
+
+ /**
+ * 根据父类ID获取区域列表
+ * @url {ctx}/api/web/syRegion/listByParentId
+ * @param parentId 条件
+ * @return Object
+ */
+ @GetMapping("/api/web/syRegion/listByParentId")
+ ReturnBO listByParentId(@RequestParam(value = "parentId") String parentId);
}
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/client/api/impl/SysClientImpl.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/client/api/impl/SysClientImpl.java
index f173cce..dba4bc4 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/client/api/impl/SysClientImpl.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/client/api/impl/SysClientImpl.java
@@ -90,7 +90,6 @@
/**
* 获取时限
- * @param limitTable 表名
* @param limitType 时限类型
* @return List
*/
@@ -246,4 +245,24 @@
log.error("service方法[SysClientImpl.saveFileRelateList]请求异常："+e, e);
}
}
+
+ public List<QueAreaDTO> listByParentId(String parentId){
+ List<QueAreaDTO> queAreaDTOList = new ArrayList<>();
+ try{
+ ReturnBO returnBo = sysClient.listByParentId(parentId);
+ if (ReturnConsts.OK == returnBo.getCode()){
+ if (ObjectUtils.isNotEmpty(returnBo.getData())){
+ List<LinkedHashMap> list = (List<LinkedHashMap>) returnBo.getData();
+ for (LinkedHashMap map : list) {
+ QueAreaDTO queAreaDTO = JSON.parseObject(JSON.toJSONString(map), QueAreaDTO.class);
+ queAreaDTOList.add(queAreaDTO);
+ }
+ }
+ }
+ }catch (Exception e){
+ log.error("service方法[SysClientImpl.listFileRelateByOwnerId]调用异常："+e, e);
+ }
+ return queAreaDTOList;
+ }
+
}
diff --git a/dyh-service/dyh-sys/src/main/java/cn/huge/module/kind/controller/web/SyRegionWebController.java b/dyh-service/dyh-sys/src/main/java/cn/huge/module/kind/controller/web/SyRegionWebController.java
index 820372a..197924d 100644
--- a/dyh-service/dyh-sys/src/main/java/cn/huge/module/kind/controller/web/SyRegionWebController.java
+++ b/dyh-service/dyh-sys/src/main/java/cn/huge/module/kind/controller/web/SyRegionWebController.java
@@ -8,6 +8,7 @@
import cn.huge.module.kind.domain.po.SyRegion;
import cn.huge.module.kind.service.SyRegionService;
import cn.huge.module.sys.dto.QueAddrBaseDTO;
+import cn.huge.module.sys.dto.QueAreaDTO;
import cn.huge.module.utils.BaiduMapAddrDTO;
import cn.huge.module.utils.BaiduMapUtils;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -21,6 +22,7 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@@ -207,4 +209,20 @@
}
}
+
+ /**
+ * 根据父类ID获取列表
+ * @url {ctx}/api/web/syRegion/listByParentId
+ * @return
+ */
+ @GetMapping("/listByParentId")
+ public Object listByParentId(@RequestParam(value = "parentId") String parentId) {
+ try {
+ List<QueAreaDTO> list = service.listByParentId(parentId);
+ return ReturnSucUtils.getRepInfo(list);
+ } catch (Exception e) {
+ return ReturnFailUtils.getRepInfo();
+ }
+ }
+
}
diff --git a/dyh-service/dyh-sys/src/main/java/cn/huge/module/kind/service/SyRegionService.java b/dyh-service/dyh-sys/src/main/java/cn/huge/module/kind/service/SyRegionService.java
index f440a41..fefe1c0 100644
--- a/dyh-service/dyh-sys/src/main/java/cn/huge/module/kind/service/SyRegionService.java
+++ b/dyh-service/dyh-sys/src/main/java/cn/huge/module/kind/service/SyRegionService.java
@@ -9,6 +9,7 @@
import cn.huge.module.kind.domain.dto.RegionSelectJSDTO;
import cn.huge.module.kind.domain.po.SyRegion;
import cn.huge.module.sys.dto.QueAddrBaseDTO;
+import cn.huge.module.sys.dto.QueAreaDTO;
import cn.huge.module.utils.BaiduMapAddrDTO;
import cn.huge.module.utils.BaiduMapUtils;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -25,6 +26,7 @@
import javax.annotation.PostConstruct;
import javax.swing.plaf.synth.Region;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -209,6 +211,21 @@
}
-
+ public List<QueAreaDTO> listByParentId(String parentId){
+ List<QueAreaDTO> list = new ArrayList<>();
+ QueryWrapper<SyRegion> queryWrapper = new QueryWrapper();
+ queryWrapper.eq("parent_id", parentId);
+ List<SyRegion> syRegions = mapper.selectList(queryWrapper);
+ if(ObjectUtils.isNotEmpty(syRegions)){
+ for (SyRegion syRegion : syRegions) {
+ QueAreaDTO queAreaDTO = new QueAreaDTO();
+ queAreaDTO.setAreaCode(syRegion.getId());
+ queAreaDTO.setAreaName(syRegion.getName());
+ queAreaDTO.setParentId(syRegion.getParentId());
+ list.add(queAreaDTO);
+ }
+ }
+ return list;
+ }
}
--
Gitblit v1.8.0