From c16a867c943e25a25d64f02fb95e755ef1a7c9f9 Mon Sep 17 00:00:00 2001
From: liyj <15602261488@163.com>
Date: Mon, 30 Sep 2024 18:03:25 +0800
Subject: [PATCH] 1、审核过程中申请记录的申请时间和申请人无法查看 2、审核联合处置申请在申请部门已办结后会报错，且无法继续审核 3、案件不予受理后在已办中无记录 4、上报的案件上级部门回退后下级部门接收不到 5、广州市综治中心纠纷依然可以选择上报，且点击上报后报错
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/client/api/impl/SysClientImpl.java | 48 +++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 43 insertions(+), 5 deletions(-)
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 d4abeca..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,17 +90,35 @@
/**
* 获取时限
- * @param limitTable 表名
* @param limitType 时限类型
* @return List
*/
- public Integer getTimeLimit(String limitTable, String limitType){
+ public Integer getTimeLimitHour(String limitType){
int timeTerm = 0;
try{
- ReturnBO returnBo = sysClient.getTimeLimit(limitTable, limitType);
+ ReturnBO returnBo = sysClient.getExpireTime(limitType);
if (ReturnConsts.OK == returnBo.getCode()){
if (ObjectUtils.isNotEmpty(returnBo.getData())){
- timeTerm = (int)returnBo.getData();
+ SyTimeLimitDTO syTimeLimitDTO = objectMapper.convertValue(returnBo.getData(), SyTimeLimitDTO.class);
+ if (ObjectUtils.isNotEmpty(syTimeLimitDTO)){
+ if (ObjectUtils.isNotEmpty(syTimeLimitDTO)){
+ if (TimeUnitConsts.TIME_UNIT_1.equals(syTimeLimitDTO.getTermUnit())){
+ timeTerm = syTimeLimitDTO.getTimeTerm()*24*365;
+ }
+ if (TimeUnitConsts.TIME_UNIT_2.equals(syTimeLimitDTO.getTermUnit())){
+ timeTerm = syTimeLimitDTO.getTimeTerm()*24*30;
+ }
+ if (TimeUnitConsts.TIME_UNIT_3.equals(syTimeLimitDTO.getTermUnit())){
+ timeTerm = syTimeLimitDTO.getTimeTerm()*24;
+ }
+ if (TimeUnitConsts.TIME_UNIT_4.equals(syTimeLimitDTO.getTermUnit())){
+ timeTerm = syTimeLimitDTO.getTimeTerm();
+ }
+ if (TimeUnitConsts.TIME_UNIT_5.equals(syTimeLimitDTO.getTermUnit())){
+ timeTerm = syTimeLimitDTO.getTimeTerm()/60;
+ }
+ }
+ }
}
}
}catch (Exception e){
@@ -119,7 +137,7 @@
public Date getExpireTime(Date computeTime, String limitType){
Date expireTime = null;
try{
- ReturnBO returnBo = sysClient.getExpireTime(computeTime, limitType);
+ ReturnBO returnBo = sysClient.getExpireTime(limitType);
if (ReturnConsts.OK == returnBo.getCode()){
if (ObjectUtils.isNotEmpty(returnBo.getData())){
SyTimeLimitDTO syTimeLimitDTO = objectMapper.convertValue(returnBo.getData(), SyTimeLimitDTO.class);
@@ -227,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;
+ }
+
}
--
Gitblit v1.8.0