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/CustClientImpl.java | 111 ++++++++++++++++++++++++++++++-------------------------
1 files changed, 60 insertions(+), 51 deletions(-)
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/client/api/impl/CustClientImpl.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/client/api/impl/CustClientImpl.java
index cf056ca..80592ee 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/client/api/impl/CustClientImpl.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/client/api/impl/CustClientImpl.java
@@ -6,13 +6,16 @@
import cn.huge.base.common.exception.ClientException;
import cn.huge.base.common.exception.ServiceException;
import cn.huge.module.client.api.CustClient;
+import cn.huge.module.cust.dto.CtUnitDTO;
import cn.huge.module.cust.dto.CtUserDTO;
import cn.huge.module.cust.dto.PaUserDTO;
+import cn.huge.module.mediate.dto.WechatBindCaseDTO;
import com.alibaba.fastjson.JSON;
import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestParam;
import java.util.ArrayList;
@@ -65,7 +68,7 @@
}
/**
- * 内部用户-获取登录用户
+ * 内部用户-获取登录用户-所有信息
* @param userId
* @return
*/
@@ -86,7 +89,7 @@
}
/**
- * 当事人-获取登录用户
+ * 当事人-获取登录用户-所有信息
* @param userId 用户编号
* @return
*/
@@ -107,82 +110,88 @@
}
/**
- * 根据组织和角色查询
- * @return unitId 组织编号
- * @return roleCode 角色代码
- * @return Object
+ * pc端提交案件后-获取相关当事人用户编号
+ * @param wechatBindCaseDTO 实体对象
+ * @return ReturnBO
*/
- public List<CtUserDTO> listUserByUnitRole(@RequestParam(value = "unitId") String unitId, @RequestParam(value = "roleCode") String roleCode) {
- List<CtUserDTO> ctUserDTOList = new ArrayList<>();
+ public String bindGetUserId(WechatBindCaseDTO wechatBindCaseDTO){
+ String userId = null;
try{
- ReturnBO returnBo = custClient.listUserByUnitRole(unitId, roleCode);
+ ReturnBO returnBo = custClient.bindGetUserId(wechatBindCaseDTO);
if (ReturnConsts.OK == returnBo.getCode()){
- List<LinkedHashMap> list = (List<LinkedHashMap>) returnBo.getData();
- for (LinkedHashMap map : list) {
- CtUserDTO ctUserDTO = JSON.parseObject(JSON.toJSONString(map), CtUserDTO.class);
- ctUserDTOList.add(ctUserDTO);
- }
- return ctUserDTOList;
+ userId = (String) returnBo.getData();
}else{
- log.error("Client外服务接口[CustClientImpl.listUserByUnitRole]请求异常：" + returnBo.getMsg(), returnBo.getMsg());
- throw new ClientException("CustClientImpl.listUserByUnitRole", returnBo.getMsg());
+ log.error("Client外服务接口[CustClientImpl.bindGetUserId]请求异常：" + returnBo.getMsg(), returnBo.getMsg());
}
}catch (Exception e){
- log.error("service方法[CustClientImpl.listUserByUnitRole]调用异常："+e, e);
- throw new ServiceException("CustClientImpl.listUserByUnitRole", e);
+ log.error("service方法[CustClientImpl.bindGetUserId]调用异常："+e, e);
+ }
+ return userId;
+ }
+
+ /**
+ * 根据id查询组织信息
+ * @url {ctx}/api/client/ctUnit/getUnitById
+ * @param unitId 组织编号
+ * @return Object
+ */
+ public CtUnitDTO getUnitById(String unitId){
+ try{
+ ReturnBO returnBo = custClient.getUnitById(unitId);
+ if (ReturnConsts.OK == returnBo.getCode()){
+ CtUnitDTO ctUnitDTO = objectMapper.convertValue(returnBo.getData(), CtUnitDTO.class);
+ return ctUnitDTO;
+ }else{
+ log.error("Client外服务接口[CustClientImpl.getUnitById]请求异常：" + returnBo.getMsg(), returnBo.getMsg());
+ throw new ClientException("CustClientImpl.getUnitById", returnBo.getMsg());
+ }
+ }catch (Exception e){
+ log.error("service方法[CustClientImpl.getUnitById]调用异常："+e, e);
+ throw new ServiceException("CustClientImpl.getUnitById", e);
}
}
/**
- * 根据部门和角色查询
- * @return deptId 部门编号
- * @return roleCode 角色代码
+ * 获取上级综治中心
+ * @url {ctx}/api/client/ctUnit/getParentZzzxUnit
+ * @param unitId 组织编号
* @return Object
*/
- public List<CtUserDTO> listUserByDeptRole(@RequestParam(value = "deptId") String deptId, @RequestParam(value = "roleCode") String roleCode) {
- List<CtUserDTO> ctUserDTOList = new ArrayList<>();
+ public CtUnitDTO getParentZzzxUnit(String unitId){
try{
- ReturnBO returnBo = custClient.listUserByDeptRole(deptId, roleCode);
+ ReturnBO returnBo = custClient.getParentZzzxUnit(unitId);
if (ReturnConsts.OK == returnBo.getCode()){
- List<LinkedHashMap> list = (List<LinkedHashMap>) returnBo.getData();
- for (LinkedHashMap map : list) {
- CtUserDTO ctUserDTO = JSON.parseObject(JSON.toJSONString(map), CtUserDTO.class);
- ctUserDTOList.add(ctUserDTO);
- }
- return ctUserDTOList;
+ CtUnitDTO ctUnitDTO = objectMapper.convertValue(returnBo.getData(), CtUnitDTO.class);
+ return ctUnitDTO;
}else{
- log.error("Client外服务接口[CustClientImpl.listUserByDeptRole]请求异常：" + returnBo.getMsg(), returnBo.getMsg());
- throw new ClientException("CustClientImpl.listUserByDeptRole", returnBo.getMsg());
+ log.error("Client外服务接口[CustClientImpl.getParentZzzxUnit]请求异常：" + returnBo.getMsg(), returnBo.getMsg());
+ throw new ClientException("CustClientImpl.getParentZzzxUnit", returnBo.getMsg());
}
}catch (Exception e){
- log.error("service方法[CustClientImpl.listUserByDeptRole]调用异常："+e, e);
- throw new ServiceException("CustClientImpl.listUserByDeptRole", e);
+ log.error("service方法[CustClientImpl.getParentZzzxUnit]请求成功，处理异常："+e, e);
+ throw new ServiceException("CustClientImpl.getParentZzzxUnit", e);
}
}
/**
- * 查询客户下的法院
- * @param userId
- * @return
+ * 查询用户所在的单位信息
+ * @url {ctx}/api/client/ctUnit/getUnitByUserId
+ * @param userId 用户编号
+ * @return Object
*/
- public List<SelectTermDTO> listCourt1(String userId){
- List<SelectTermDTO> selectTermDTOList = new ArrayList<>();
+ public CtUnitDTO getUnitByUserId(String userId){
try{
- ReturnBO returnBo = custClient.listCourt1(userId);
+ ReturnBO returnBo = custClient.getUnitByUserId(userId);
if (ReturnConsts.OK == returnBo.getCode()){
- List<LinkedHashMap> list = (List<LinkedHashMap>) returnBo.getData();
- for (LinkedHashMap map : list) {
- SelectTermDTO selectTermDTO = JSON.parseObject(JSON.toJSONString(map), SelectTermDTO.class);
- selectTermDTOList.add(selectTermDTO);
- }
- return selectTermDTOList;
+ CtUnitDTO ctUnitDTO = objectMapper.convertValue(returnBo.getData(), CtUnitDTO.class);
+ return ctUnitDTO;
}else{
- log.error("Client外服务接口[CustClientImpl.listCourt1]请求异常：" + returnBo.getMsg(), returnBo.getMsg());
- throw new ClientException("CustClientImpl.listCourt1", returnBo.getMsg());
+ log.error("Client外服务接口[CustClientImpl.getUnitByUserId]请求异常：" + returnBo.getMsg(), returnBo.getMsg());
+ throw new ClientException("CustClientImpl.getUnitByUserId", returnBo.getMsg());
}
}catch (Exception e){
- log.error("service方法[CustClientImpl.listCourt1]调用异常："+e, e);
- throw new ServiceException("CustClientImpl.listCourt1", e);
+ log.error("service方法[CustClientImpl.getUnitByUserId]调用异常："+e, e);
+ throw new ServiceException("CustClientImpl.getUnitByUserId", e);
}
}
}
--
Gitblit v1.8.0