From 0770e29a0b752fcacb9202a3ea32cbd458de59c7 Mon Sep 17 00:00:00 2001
From: wangwh <2397901735@qq.com>
Date: Sat, 14 Sep 2024 10:41:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java | 357 ++++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 218 insertions(+), 139 deletions(-)
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 29d2ee5..fb00ddf 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
@@ -1,9 +1,7 @@
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.base.common.utils.ObjectUtils;
+import cn.huge.base.common.utils.*;
import cn.huge.module.cases.domain.dto.*;
import cn.huge.module.cases.domain.po.CaseAgent;
@@ -16,12 +14,14 @@
import cn.huge.module.cases.domain.po.CaseInfo;
import cn.huge.module.constant.BaseConsts;
import cn.huge.module.cust.dto.PaUserDTO;
-import cn.huge.module.mediate.constant.CaseBaseConsts;
-import cn.huge.module.mediate.constant.CaseBaseConstsEnum;
+import cn.huge.module.mediate.constant.*;
import cn.huge.module.cust.dto.CtUserDTO;
import cn.huge.module.draft.service.CasedraftInfoService;
+import cn.huge.module.mediate.constant.CaseProcessBaseConstsEnum;
import cn.huge.module.mediate.dto.WechatBindCaseDTO;
import cn.huge.module.sys.dto.FileIdTypeInfoBaseDTO;
+import cn.huge.module.sys.dto.QueAddrBaseDTO;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.collections.CollectionUtils;
@@ -75,6 +75,13 @@
@Autowired
private SysClientImpl sysClient;
+ @Autowired
+ private CaseTaskService caseTaskService;
+
+ @Autowired
+ private CaseEvaluateService caseEvaluateService;
+
+
/**
* 更新对象
* @param entity 对象
@@ -85,6 +92,20 @@
}catch (Exception e){
log.error("[CaseInfoService.updateCaseInfo]调用失败，异常信息："+e, e);
throw new ServiceException("CaseInfoService.updateCaseInfo", e);
+ }
+ }
+
+ /**
+ * 批量更新对象
+ * @param entity 对象
+ * @param caseIdList
+ */
+ public void updateCaseInfoList(CaseInfo entity, List<String> caseIdList){
+ try{
+ mapper.updateCaseInfoList(entity, caseIdList);
+ }catch (Exception e){
+ log.error("[CaseInfoService.updateCaseInfoList]调用失败，异常信息："+e, e);
+ throw new ServiceException("CaseInfoService.updateCaseInfoList", e);
}
}
@@ -194,8 +215,10 @@
caseInfo.setDagents(dagents.toString());
caseInfo.setCaseRef(utilsClient.createCaseRef());
caseInfo.setCanal(CaseBaseConstsEnum.CASE_CANAL_1.getIndex());
- caseInfo.setCaseDes(CaseBaseConstsEnum.CASE_CANAL_1.getDes());
- //todo case_title生成、经纬度转换、来访形式
+ caseInfo.setCanalName(CaseBaseConstsEnum.CASE_CANAL_1.getDes());
+ caseInfo.setVisitWay(CaseBaseConstsEnum.VISIT_WAY_1.getIndex());
+ caseInfo.setVisitWayName(CaseBaseConstsEnum.VISIT_WAY_1.getDes());
+ //todo case_title生成、经纬度转换
if(0 == registerSaveDTO.getOperateType()){
caseInfo.setInputUnitId(loginUser.getUnitId());
caseInfo.setInputUnitName(loginUser.getUnitName());
@@ -204,26 +227,27 @@
caseInfo.setInputWay(CaseBaseConsts.INPUT_WAY_1);
caseInfo.setCreateTime(nowDate);
caseInfo.setDeleteStatus(BaseConsts.DELETE_STATUS_0);
-
- CaseInfoUnfold caseInfoUnfold = new CaseInfoUnfold();
- caseInfoUnfold.setId(utilsClient.getNewTimeId());
- caseInfoUnfold.setCaseId(caseInfo.getId());
- caseInfoUnfold.setCreateTime(nowDate);
- caseInfoUnfold.setUpdateTime(nowDate);
-
// 删除草稿案件
if(1 == registerSaveDTO.getIsDraft() ){
draftInfoService.removeDraftInfo(registerSaveDTO.getId());
}
-
- //判断是否自行受理
- if(1 == registerSaveDTO.getIsSelfAccept()){
- //todo 流程接口修改status、status_name、process、process_name
- caseInfoUnfold.setMediateUnitId(loginUser.getUnitId());
- caseInfoUnfold.setMediateUnitName(loginUser.getUnitName());
- }
+ // 新增纠纷信息
this.save(caseInfo);
+ // 新增纠纷信息扩展表
+ CaseInfoUnfold caseInfoUnfold = new CaseInfoUnfold();
+ caseInfoUnfold.setId(caseInfo.getId());
+ caseInfoUnfold.setCreateTime(nowDate);
+ caseInfoUnfold.setUpdateTime(nowDate);
caseInfoUnfoldService.save(caseInfoUnfold);
+ // 启动工作流
+ // 判断是否自行受理
+ if(1 == registerSaveDTO.getIsSelfAccept()){
+ // 自行受理流程
+ caseTaskService.webStartFlowZXSL(caseInfo, loginUser);
+ }else {
+ // 自动调度流程
+ caseTaskService.webStartFlowLFDJ(caseInfo);
+ }
}else if(1 == registerSaveDTO.getOperateType()){
this.updateById(caseInfo);
}
@@ -268,13 +292,13 @@
//绑定当事人小程序
this.setPartyUserId(casePerson);
//添加申请方和被申请方人名组合
- if(CaseBaseConstsEnum.PERSON_TYPE_1.equals(casePerson.getPerType())){
+ if(CaseBaseConstsEnum.PERSON_TYPE_1.getIndex().equals(casePerson.getPerType())){
//申请方
if (StringUtils.isNotEmpty(plaintiffs.toString())) {
plaintiffs.append(BaseConsts.COMMA);
}
plaintiffs.append(casePerson.getTrueName());
- }else if(CaseBaseConstsEnum.PERSON_TYPE_2.equals(casePerson.getPerType())){
+ }else if(CaseBaseConstsEnum.PERSON_TYPE_2.getIndex().equals(casePerson.getPerType())){
//被申请方
if (StringUtils.isNotEmpty(defendants.toString())) {
defendants.append(BaseConsts.COMMA);
@@ -302,12 +326,12 @@
caseAgent.setUpdateTime(now);
//绑定当事人小程序
this.setPartyUserId(caseAgent);
- if(CaseBaseConstsEnum.PERSON_TYPE_3.equals(caseAgent.getPerType())) {
+ if(CaseBaseConstsEnum.PERSON_TYPE_3.getIndex().equals(caseAgent.getPerType())) {
if (StringUtils.isNotEmpty(pagents.toString())) {
pagents.append(BaseConsts.COMMA);
}
pagents.append(caseAgent.getTrueName());
- }else if(CaseBaseConstsEnum.PERSON_TYPE_4.equals(caseAgent.getPerType())) {
+ }else if(CaseBaseConstsEnum.PERSON_TYPE_4.getIndex().equals(caseAgent.getPerType())) {
if (StringUtils.isNotEmpty(dagents.toString())) {
dagents.append(BaseConsts.COMMA);
}
@@ -517,57 +541,132 @@
* @return String 纠纷编号
*/
public String caseRegisterWechat(RegisterSaveDTO registerSaveDTO, String userId){
- try {
- // 获取当前登录用户
- PaUserDTO loginUser = custClient.paclientGetUser(userId);
- if(ObjectUtils.isEmpty(registerSaveDTO.getCustId())){
- registerSaveDTO.setCustId(loginUser.getCustId());
- }
+ // 获取当前登录用户
+ PaUserDTO loginUser = custClient.paclientGetUser(userId);
+ if(ObjectUtils.isEmpty(registerSaveDTO.getCustId())){
+ registerSaveDTO.setCustId(loginUser.getCustId());
+ }
- Date nowDate = DateUtils.getNowDate();
- registerSaveDTO.setUpdateTime(nowDate);
- StringBuffer plaintiffs = new StringBuffer();
- StringBuffer defendants = new StringBuffer();
- StringBuffer pagents = new StringBuffer();
- StringBuffer dagents = new StringBuffer();
- int peopleNum = 0;
+ Date nowDate = DateUtils.getNowDate();
+ registerSaveDTO.setUpdateTime(nowDate);
- CaseInfo caseInfo = new CaseInfo();
- CaseInfoUnfold caseInfoUnfold = new CaseInfoUnfold();
- BeanUtils.copyProperties(registerSaveDTO, caseInfo);
- if(ObjectUtils.isEmpty(caseInfo.getId())){
- caseInfo.setId(utilsClient.getNewTimeCaseId());
- }
+ CaseInfo caseInfo = new CaseInfo();
+ CaseInfoUnfold caseInfoUnfold = new CaseInfoUnfold();
+ BeanUtils.copyProperties(registerSaveDTO, caseInfo);
+ if(ObjectUtils.isEmpty(caseInfo.getId())){
+ caseInfo.setId(utilsClient.getNewTimeCaseId());
+ }
// caseInfo.setInputUnitId(loginUser.getUnitId());
// caseInfo.setInputUnitName(loginUser.getUnitName());
- caseInfo.setInputUserId(loginUser.getId());
- caseInfo.setInputUserName(loginUser.getTrueName());
- caseInfo.setInputWay(CaseBaseConsts.INPUT_WAY_1);
- caseInfo.setCreateTime(nowDate);
- caseInfo.setUpdateTime(nowDate);
- caseInfo.setDeleteStatus(BaseConsts.DELETE_STATUS_0);
- //todo case_ref生成、case_title生成
-
- caseInfoUnfold.setId(utilsClient.getNewTimeId());
- caseInfoUnfold.setCaseId(caseInfo.getId());
- caseInfoUnfold.setCreateTime(nowDate);
- caseInfoUnfold.setUpdateTime(nowDate);
-
- // 常规登记-保存当事人
- peopleNum += this.saveCasePersonWechat(registerSaveDTO, plaintiffs, pagents, defendants, dagents,loginUser);
- caseInfo.setPeopleNum(peopleNum);
- caseInfo.setPlaintiffs(plaintiffs.toString());
- caseInfo.setPagents(pagents.toString());
- caseInfo.setDefendants(defendants.toString());
- caseInfo.setDagents(dagents.toString());
- //todo 流程接口修改status、status_name、process、process_name
-
- this.saveOrUpdate(caseInfo);
- return registerSaveDTO.getId();
- }catch (Exception e){
- log.error("service方法[CaseInfoService.caseRegisterWechat]调用异常："+e, e);
- throw new ServiceException("CaseInfoService.caseRegisterWechat", e);
+ caseInfo.setInputUserId(loginUser.getId());
+ caseInfo.setInputUserName(loginUser.getTrueName());
+ caseInfo.setInputWay(CaseBaseConsts.INPUT_WAY_1);
+ caseInfo.setCreateTime(nowDate);
+ caseInfo.setUpdateTime(nowDate);
+ caseInfo.setVisitTime(nowDate);
+ caseInfo.setDeleteStatus(BaseConsts.DELETE_STATUS_0);
+ //坐标转换
+ if(ObjectUtils.isNotEmpty(caseInfo.getLat()) && ObjectUtils.isNotEmpty(caseInfo.getLng())){
+ PointXY pointXY = MapUtils.gcj02tobd09(Double.valueOf(caseInfo.getLng()), Double.valueOf(caseInfo.getLat()));
+ caseInfo.setLat(pointXY.getLat()+"");
+ caseInfo.setLng(pointXY.getLon()+"");
}
+ //todo case_title生成
+ caseInfo.setCaseRef(utilsClient.createCaseRef());
+
+ // 为了演示先兼容小程序没属地问题，写死属地
+ if (ObjectUtils.isEmpty(caseInfo.getQueProv())) {
+// caseInfo.setQueProv("19");
+// caseInfo.setQueProvName("广东");
+// caseInfo.setQueCity("1601");
+// caseInfo.setQueCityName("广州市");
+// caseInfo.setQueArea("50258");
+// caseInfo.setQueAreaName("白云区");
+// caseInfo.setQueRoad("62857");
+// caseInfo.setQueRoadName("新市街道");
+
+ // 根据经纬度查询问题属地
+ QueAddrBaseDTO queAddrBaseDTO = sysClient.getQueAddrByBaiduiLngLat(caseInfo.getLng(), caseInfo.getLat());
+ caseInfo.setQueProv(queAddrBaseDTO.getQueProv());
+ caseInfo.setQueProvName(queAddrBaseDTO.getQueProvName());
+ caseInfo.setQueCity(queAddrBaseDTO.getQueCity());
+ caseInfo.setQueCityName(queAddrBaseDTO.getQueCityName());
+ caseInfo.setQueArea(queAddrBaseDTO.getQueArea());
+ caseInfo.setQueAreaName(queAddrBaseDTO.getQueAreaName());
+ caseInfo.setQueRoad(queAddrBaseDTO.getQueRoad());
+ caseInfo.setQueRoadName(queAddrBaseDTO.getQueRoadName());
+ }
+ caseInfoUnfold.setId(caseInfo.getId());
+ caseInfoUnfold.setCreateTime(nowDate);
+ caseInfoUnfold.setUpdateTime(nowDate);
+
+ StringBuffer plaintiffs = new StringBuffer();
+ StringBuffer defendants = new StringBuffer();
+ StringBuffer pagents = new StringBuffer();
+ StringBuffer dagents = new StringBuffer();
+ // 常规登记-保存当事人
+ int peopleNum = this.saveCasePersonWechat(registerSaveDTO, plaintiffs, pagents, defendants, dagents,loginUser);
+ caseInfo.setVisitPeopleNum(peopleNum);
+ caseInfo.setPlaintiffs(plaintiffs.toString());
+ caseInfo.setPagents(pagents.toString());
+ caseInfo.setDefendants(defendants.toString());
+ caseInfo.setDagents(dagents.toString());
+
+ //todo case_title生成
+// caseInfo.setCaseTitle(this.createCaseTitle(plaintiffs.toString(), defendants.toString(), caseInfo.getCaseTypeName()));
+
+ caseInfo.setInfoProcess(CaseInfoProcessBaseConstsEnum.CASE_INFO_PROCESS_1.getIndex());
+ caseInfo.setInfoProcessName(CaseInfoProcessBaseConstsEnum.CASE_INFO_PROCESS_1.getDes());
+ caseInfo.setProcess(CaseProcessBaseConstsEnum.CASE_PROCESS_1.getIndex());
+ caseInfo.setProcessName(CaseProcessBaseConstsEnum.CASE_PROCESS_1.getDes());
+ caseInfo.setStatus(CaseStatusBaseConstsEnum.CASE_STATUS_1.getIndex());
+ caseInfo.setStatusName(CaseStatusBaseConstsEnum.CASE_STATUS_1.getDes());
+ caseInfo.setCaseLevel(3);
+ caseInfo.setCanal(CaseBaseConstsEnum.CASE_CANAL_2.getIndex());
+ caseInfo.setCanalName(CaseBaseConstsEnum.CASE_CANAL_2.getDes());
+
+ caseInfo.setCaseRef(utilsClient.createCaseRef());
+ caseInfo.setVisitWay(CaseBaseConstsEnum.VISIT_WAY_2.getIndex());
+ caseInfo.setVisitWayName(CaseBaseConstsEnum.VISIT_WAY_2.getDes());
+ // 临时加上一级纠纷类型
+ caseInfo.setCaseTypeFirst("24_01-2");
+ caseInfo.setCaseTypeFirstName("劳动社保");
+ this.saveOrUpdate(caseInfo);
+
+ caseInfoUnfoldService.saveOrUpdate(caseInfoUnfold);
+ // 启动工作流-自动调度流程
+ caseTaskService.webStartFlowLFDJ(caseInfo);
+ return registerSaveDTO.getId();
+ }
+
+ /**
+ * 生成调解案件标题
+ * @param plaintiffs 申请人
+ * @param defendants 被申请人
+ * @param caseTypeName 纠纷类型
+ * @return String
+ */
+ public String createCaseTitle(String plaintiffs, String defendants, String caseTypeName){
+ StringBuffer caseTitle = new StringBuffer();
+ if (plaintiffs.indexOf(BaseConsts.COMMA) != -1){
+ caseTitle.append(plaintiffs.split(BaseConsts.COMMA)[0]).append("等");
+ }else {
+ caseTitle.append(plaintiffs.split(BaseConsts.COMMA)[0]);
+ }
+ if (StringUtils.isNotEmpty(defendants)) {
+ caseTitle.append("和");
+ if (defendants.indexOf(BaseConsts.COMMA) != -1) {
+ caseTitle.append(defendants.split(BaseConsts.COMMA)[0]).append("等");
+ } else {
+ caseTitle.append(defendants.split(BaseConsts.COMMA)[0]);
+ }
+ }
+ caseTitle.append("的");
+ if (StringUtils.isNotEmpty(caseTypeName)){
+ caseTitle.append(caseTypeName);
+ }
+ caseTitle.append("案件");
+ return caseTitle.toString();
}
/**
@@ -582,35 +681,27 @@
private int saveCasePersonWechat(RegisterSaveDTO registerSaveDTO, StringBuffer plaintiffs, StringBuffer pagents,
StringBuffer defendants, StringBuffer dagents,PaUserDTO loginUser){
int peopleNum = 0;
- List<String> newPersonIdList = new ArrayList<>();
- List<String> newAgentIdList = new ArrayList<>();
// 保存申请人
List<CasePerson> personList = registerSaveDTO.getPersonList();
if (CollectionUtils.isNotEmpty(personList)) {
for (CasePerson casePerson : personList) {
- if(ObjectUtils.isEmpty(casePerson.getId())){
- casePerson.setId(utilsClient.getNewTimeCaseId());
- }
- newPersonIdList.add(casePerson.getId());
+ casePerson.setId(utilsClient.getNewTimeCaseId());
casePerson.setCaseId(registerSaveDTO.getId());
-// casePerson.setPerType(CaseBaseConstsEnum.PERSON_TYPE_1.getIndex());
-// casePerson.setPerTypeName(CaseBaseConstsEnum.PERSON_TYPE_1.getDes());
casePerson.setPartyUserId(loginUser.getId());
casePerson.setCustId(registerSaveDTO.getCustId());
casePerson.setCreateTime(registerSaveDTO.getUpdateTime());
casePerson.setUpdateTime(registerSaveDTO.getUpdateTime());
//todo 绑定当事人小程序
-
personService.saveOrUpdate(casePerson);
//添加申请方和被申请方人名组合
- if(CaseBaseConstsEnum.PERSON_TYPE_1.equals(casePerson.getPerType())){
+ if(CaseBaseConstsEnum.PERSON_TYPE_1.getIndex().equals(casePerson.getPerType())){
//申请方
if (StringUtils.isNotEmpty(plaintiffs.toString())) {
plaintiffs.append(BaseConsts.COMMA);
}
plaintiffs.append(casePerson.getTrueName());
- }else if(CaseBaseConstsEnum.PERSON_TYPE_2.equals(casePerson.getPerType())){
+ }else if(CaseBaseConstsEnum.PERSON_TYPE_2.getIndex().equals(casePerson.getPerType())){
//被申请方
if (StringUtils.isNotEmpty(defendants.toString())) {
defendants.append(BaseConsts.COMMA);
@@ -624,56 +715,30 @@
List<CaseAgent> agentList = registerSaveDTO.getAgentList();
if (CollectionUtils.isNotEmpty(agentList)) {
for(CaseAgent caseAgent: agentList){
- newAgentIdList.add(caseAgent.getId());
- if(ObjectUtils.isEmpty(caseAgent.getId())){
- caseAgent.setId(utilsClient.getNewTimeCaseId());
- }
+ caseAgent.setId(utilsClient.getNewTimeCaseId());
caseAgent.setPartyUserId(loginUser.getId());
caseAgent.setCaseId(registerSaveDTO.getId());
caseAgent.setAgentTypeName(CaseBaseConstsEnum.getDes(caseAgent.getAgentType()));
-
caseAgent.setCustId(registerSaveDTO.getCustId());
caseAgent.setCreateTime(registerSaveDTO.getUpdateTime());
caseAgent.setUpdateTime(registerSaveDTO.getUpdateTime());
-
agentService.saveOrUpdate(caseAgent);
-
- if (StringUtils.isNotEmpty(pagents.toString())) {
- pagents.append(BaseConsts.COMMA);
+ if(CaseBaseConstsEnum.PERSON_TYPE_3.getIndex().equals(caseAgent.getPerType())){
+ if (StringUtils.isNotEmpty(pagents.toString())) {
+ pagents.append(BaseConsts.COMMA);
+ }
+ pagents.append(caseAgent.getTrueName());
+ }else if(CaseBaseConstsEnum.PERSON_TYPE_4.getIndex().equals(caseAgent.getPerType())){
+ if (StringUtils.isNotEmpty(dagents.toString())) {
+ dagents.append(BaseConsts.COMMA);
+ }
+ dagents.append(caseAgent.getTrueName());
}
- pagents.append(caseAgent.getTrueName());
+
}
//todo 绑定当事人小程序
}
}
-
- // 删除冗余的申请人
- if (CollectionUtils.isNotEmpty(newPersonIdList)) {
- List<String> oldPersonIdList = personService.listIdByCaseId(registerSaveDTO.getId());
- for (String oldPersonId : oldPersonIdList) {
- if (!newPersonIdList.contains(oldPersonId)) {
- personService.removeById(oldPersonId);
- }
- }
- }else{
- QueryWrapper<CasePerson> casePersonQueryWrapper = new QueryWrapper<>();
- casePersonQueryWrapper.eq("case_id", registerSaveDTO.getId());
- personService.remove(casePersonQueryWrapper);
- }
- //删除冗余的代理人
- if(CollectionUtils.isNotEmpty(newAgentIdList)){
- List<String> oldAgentIdList = agentService.listIdByCaseId(registerSaveDTO.getId());
- for(String oldAgentId: oldAgentIdList){
- if(!newAgentIdList.contains(oldAgentId)){
- agentService.removeById(oldAgentId);
- }
- }
- }else{
- QueryWrapper<CaseAgent> caseAgentQueryWrapper = new QueryWrapper<>();
- caseAgentQueryWrapper.eq("case_id", registerSaveDTO.getId());
- agentService.remove(caseAgentQueryWrapper);
- }
-
return peopleNum;
}
@@ -702,15 +767,19 @@
* @param terms 条件
* @return Page
*/
- public Page<CaseInfoWechatDTO> pageQueryWechat(String userId, PageRequest page, Map<String, Object> terms){
- List<CaseInfoWechatDTO> list = new ArrayList<>();
+ public Page<CaseInfoWeChatDTO> pageQueryWechat(String userId, PageRequest page, Map<String, Object> terms){
+ PaUserDTO loginUser = custClient.paclientGetUser(userId);
+ List<CaseInfoWeChatDTO> list = new ArrayList<>();
String personType = terms.get("personType")+"";
if(ObjectUtils.isEmpty(personType)){
throw new RuntimeException("请选择人员类型");
}
+ if(ObjectUtils.isEmpty(loginUser.getIdcard())){
+ return new PageImpl<CaseInfoWeChatDTO>(list, page, 0);
+ }
QueryWrapper<CasePerson> personWrapper = new QueryWrapper<>();
personWrapper.select("case_id");
- personWrapper.eq("party_user_id", userId);
+ personWrapper.eq("certi_no", loginUser.getIdcard());
if("1".equals(personType)){
personWrapper.eq("per_type",CaseBaseConstsEnum.PERSON_TYPE_1.getIndex());
}else {
@@ -718,29 +787,27 @@
}
List<CasePerson> casePersonList = personService.list(personWrapper);
if(ObjectUtils.isEmpty(casePersonList)){
- return new PageImpl<CaseInfoWechatDTO>(list, page, 0);
+ return new PageImpl<CaseInfoWeChatDTO>(list, page, 0);
}
List<String> ids = casePersonList.stream().map(CasePerson::getCaseId).collect(Collectors.toList());
- terms.put("idList",ids);
+ terms.put("ids",ids);
long total = mapper.countTerms(terms);
List<CaseInfo> content = mapper.pageTerms(page, terms);
if(ObjectUtils.isNotEmpty(content)){
for(CaseInfo caseInfo: content){
- CaseInfoWechatDTO caseInfoWeChatDTO = new CaseInfoWechatDTO();
+ CaseInfoWeChatDTO caseInfoWeChatDTO = new CaseInfoWeChatDTO();
BeanUtils.copyProperties(caseInfo, caseInfoWeChatDTO);
- if(ObjectUtils.isNotEmpty(caseInfo.getProcess()) && caseInfo.getProcess().equals(1) || caseInfo.getProcess().equals(2)){
- caseInfoWeChatDTO.setProcessStatus(1);
- caseInfoWeChatDTO.setProcessStatusName("待受理");
- }else if(ObjectUtils.isNotEmpty(caseInfo.getProcess()) && caseInfo.getProcess().equals(3) || caseInfo.getProcess().equals(4)){
- caseInfoWeChatDTO.setProcessStatus(2);
- caseInfoWeChatDTO.setProcessStatusName("办理中");
- }else if(ObjectUtils.isNotEmpty(caseInfo.getProcess()) && caseInfo.getProcess().equals(5) || caseInfo.getProcess().equals(6)){
- caseInfoWeChatDTO.setProcessStatus(3);
- caseInfoWeChatDTO.setProcessStatusName("已结案");
- }else{
- caseInfoWeChatDTO.setProcessStatus(4);
- caseInfoWeChatDTO.setProcessStatusName("不予受理");
+ caseInfoWeChatDTO.setProcessStatus(caseInfo.getInfoProcess());
+ caseInfoWeChatDTO.setProcessStatusName(caseInfo.getInfoProcessName());
+ //扩展信息
+ CaseInfoUnfold caseInfoUnfold = caseInfoUnfoldService.getById(caseInfo.getId());
+ if(ObjectUtils.isNotEmpty(caseInfoUnfold)){
+ caseInfoWeChatDTO.setMediResult(caseInfoUnfold.getMediResult());
+ caseInfoWeChatDTO.setMediResultName(caseInfoUnfold.getMediResultName());
+ caseInfoWeChatDTO.setMediateDeptId(caseInfoUnfold.getMediateDeptId());
+ caseInfoWeChatDTO.setMediateDeptName(caseInfoUnfold.getMediateDeptName());
}
+
QueryWrapper<CasePerson> personWrapper1 = new QueryWrapper<>();
personWrapper1.eq("case_id", caseInfo.getId());
List<CasePerson> casePersonList1 = personService.list(personWrapper1);
@@ -759,10 +826,22 @@
}
caseInfoWeChatDTO.setDefendantList(defendantList);
caseInfoWeChatDTO.setPlaintiffList(plaintiffList);
+ //评价信息
+ Map<String, Object> evaluateTerms = new HashMap<>();
+ evaluateTerms.put("caseId", caseInfo.getId());
+ evaluateTerms.put("deleteStatus", BaseConsts.DELETE_STATUS_0);
+ evaluateTerms.put("evaluateUserId", loginUser.getId());
+ long evaluateCount = caseEvaluateService.countTerms(evaluateTerms);
+ if(evaluateCount > 0){
+ caseInfoWeChatDTO.setIsEvaluate("1");
+ }else{
+ caseInfoWeChatDTO.setIsEvaluate("0");
+ }
+
list.add(caseInfoWeChatDTO);
}
}
- return new PageImpl<CaseInfoWechatDTO>(list, page, total);
+ return new PageImpl<CaseInfoWeChatDTO>(list, page, total);
}
/**
--
Gitblit v1.8.0