From 2ea74568de5adefc41718d0736e7d173b22335fc Mon Sep 17 00:00:00 2001
From: xusd <330628789@qq.com>
Date: Wed, 11 Jun 2025 11:22:04 +0800
Subject: [PATCH] feature：市平台项目
---
dyh-service/dyh-disp/src/main/java/cn/huge/module/casedisp/dao/mapper/xml/DispNormCauseMapper.xml | 3 +++
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtAccountService.java | 7 ++-----
dyh-service/dyh-disp/src/main/java/cn/huge/module/casedisp/service/SysDispService.java | 1 +
dyh-service/dyh-mediate/src/main/resources/static/editor-app/editor/i18n/translation_signavio_de.js | 2 +-
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java | 26 ++++++++++++++------------
dyh-service/dyh-sys/src/main/java/cn/huge/module/timer/GridCityCaseTimer.java | 2 +-
6 files changed, 22 insertions(+), 19 deletions(-)
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtAccountService.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtAccountService.java
index 0d94bde..da0c79b 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtAccountService.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtAccountService.java
@@ -1,6 +1,5 @@
package cn.huge.module.ctuser.service;
-import cn.huge.base.common.bo.R;
import cn.huge.base.common.bo.ReturnBO;
import cn.huge.base.common.exception.ServiceException;
import cn.huge.base.common.utils.*;
@@ -10,23 +9,21 @@
import cn.huge.module.ctuser.domain.po.*;
import cn.huge.module.ctuser.dto.*;
import cn.huge.module.cust.constant.UserBaseConsts;
-import cn.huge.module.rsoper.domain.po.RsRole;
import cn.huge.module.sys.dto.GridTokenBaseDTO;
import cn.huge.module.sys.dto.GridUserBaseDTO;
import cn.huge.module.sys.dto.GridUserRoleDTO;
-import cn.huge.module.sys.vo.GridRoleMenuVo;
import cn.huge.module.sys.vo.GridUserRoleVo;
import cn.huge.module.utils.JwtUtils;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import lombok.extern.slf4j.Slf4j;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageImpl;
import org.springframework.data.domain.PageRequest;
+import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.DigestUtils;
diff --git a/dyh-service/dyh-disp/src/main/java/cn/huge/module/casedisp/dao/mapper/xml/DispNormCauseMapper.xml b/dyh-service/dyh-disp/src/main/java/cn/huge/module/casedisp/dao/mapper/xml/DispNormCauseMapper.xml
index 6eb885e..e6239a5 100644
--- a/dyh-service/dyh-disp/src/main/java/cn/huge/module/casedisp/dao/mapper/xml/DispNormCauseMapper.xml
+++ b/dyh-service/dyh-disp/src/main/java/cn/huge/module/casedisp/dao/mapper/xml/DispNormCauseMapper.xml
@@ -182,6 +182,9 @@
<if test="terms.city != null and terms.city !=''">
and city = #{terms.city}
</if>
+ <if test="terms.unitGrade != null and terms.unitGrade !=''">
+ and unit_grade = #{terms.unitGrade}
+ </if>
</if>
</sql>
diff --git a/dyh-service/dyh-disp/src/main/java/cn/huge/module/casedisp/service/SysDispService.java b/dyh-service/dyh-disp/src/main/java/cn/huge/module/casedisp/service/SysDispService.java
index 4c8b108..3da81b7 100644
--- a/dyh-service/dyh-disp/src/main/java/cn/huge/module/casedisp/service/SysDispService.java
+++ b/dyh-service/dyh-disp/src/main/java/cn/huge/module/casedisp/service/SysDispService.java
@@ -188,6 +188,7 @@
caseDisp.setDispStatus(DispBaseConsts.DISP_STATUS_2);
// 默认流转到对应综治中心处理
Map<String, Object> terms = Maps.newHashMap();
+ terms.put("unitGrade",highTargetLevel);
// 镇街综治中心
if (UserBaseConsts.UNIT_GRADE_3 == highTargetLevel) {
terms.put("road", dispCaseBaseDTO.getQueRoad());
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 0ede542..6f47029 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
@@ -2203,16 +2203,16 @@
// 重新获取纠纷类型统计（基于完整的选择类型条件）
List<CaseStatisticsTypeDTO> caseStatisticsTypeDTOS = mapper.statisticsTypeFirst(terms);
- // // 如果基于选择类型的查询结果为空，则使用全量数据进行纠纷类型统计
- // if (ObjectUtils.isEmpty(caseStatisticsTypeDTOS)) {
- // // 临时移除所有类型筛选条件，获取全量纠纷类型统计
- // terms.remove("canal");
- // terms.remove("canalSecond");
- // terms.remove("canalList");
- // terms.remove("canalSecondNot");
- // terms.remove("canalSecondAll");
- // caseStatisticsTypeDTOS = mapper.statisticsTypeFirst(terms);
- // }
+ // 如果基于选择类型的查询结果为空，则使用全量数据进行纠纷类型统计
+ if (ObjectUtils.isEmpty(caseStatisticsTypeDTOS)) {
+ // 临时移除所有类型筛选条件，获取全量纠纷类型统计
+ terms.remove("canal");
+ terms.remove("canalSecond");
+ terms.remove("canalList");
+ terms.remove("canalSecondNot");
+ terms.remove("canalSecondAll");
+ caseStatisticsTypeDTOS = mapper.statisticsTypeFirst(terms);
+ }
if (ObjectUtils.isNotEmpty(caseStatisticsTypeDTOS)) {
sortType(caseStatisticsTypeDTOS);
@@ -2526,7 +2526,9 @@
} else {
terms.put("queryType", 3);
}
+ log.info("xsd:{}",terms);
CtUnitDTO ctUnitDTO = mapper.getUnitByGridCode(terms);
+ log.info("xsd:ctUnitDTO{}",ctUnitDTO);
if (ObjectUtils.isNotEmpty(ctUnitDTO)) {
if (StringUtils.isNotBlank(ctUnitDTO.getCity()) && StringUtils.isNotBlank(ctUnitDTO.getCityName())) {
registerSaveDTO.setQueCity(ctUnitDTO.getCity());
@@ -2540,8 +2542,8 @@
registerSaveDTO.setQueRoad(ctUnitDTO.getRoad());
registerSaveDTO.setQueRoadName(ctUnitDTO.getRoadName());
}
- registerSaveDTO.setWantUnitId(ctUnitDTO.getId());
- registerSaveDTO.setWantUnitName(ctUnitDTO.getUnitName());
+// registerSaveDTO.setWantUnitId(ctUnitDTO.getId());
+// registerSaveDTO.setWantUnitName(ctUnitDTO.getUnitName());
//网格上报的事件时间一般在凌晨，导致北京时间是昨天，所以+8小时还原为北京时间，确保在同一天内
Date nowDate1 = DateUtils.getNowDate();
diff --git a/dyh-service/dyh-mediate/src/main/resources/static/editor-app/editor/i18n/translation_signavio_de.js b/dyh-service/dyh-mediate/src/main/resources/static/editor-app/editor/i18n/translation_signavio_de.js
index 192834f..ad5c00b 100644
--- a/dyh-service/dyh-mediate/src/main/resources/static/editor-app/editor/i18n/translation_signavio_de.js
+++ b/dyh-service/dyh-mediate/src/main/resources/static/editor-app/editor/i18n/translation_signavio_de.js
@@ -28,7 +28,7 @@
*
**/
-Ext.PagingToolbar.prototype.firstText = "Erste Seite";
+Ext.PagingToolbar.prototype.firstText = "Erste Seite";
Ext.PagingToolbar.prototype.prevText = "Vorherige Seite";
Ext.PagingToolbar.prototype.nextText = "Nächste Seite";
Ext.PagingToolbar.prototype.lastText = "Letzte Seite";
diff --git a/dyh-service/dyh-sys/src/main/java/cn/huge/module/timer/GridCityCaseTimer.java b/dyh-service/dyh-sys/src/main/java/cn/huge/module/timer/GridCityCaseTimer.java
index 9cf13a9..bdbb8ca 100644
--- a/dyh-service/dyh-sys/src/main/java/cn/huge/module/timer/GridCityCaseTimer.java
+++ b/dyh-service/dyh-sys/src/main/java/cn/huge/module/timer/GridCityCaseTimer.java
@@ -350,7 +350,7 @@
if (parts.length == 3) {
return parts[0] + parts[1] + parts[2];
} else if (parts.length >= 4) {
- return parts[0] + parts[1] + parts[2]+"-"+parts[4];
+ return parts[0] + parts[1] + parts[2]+"-"+parts[3];
} else {
return input; // 或抛出异常
}
--
Gitblit v1.8.0