From f1fd3d984043951702d64b8e1a1a4412ef3a76fb Mon Sep 17 00:00:00 2001
From: xusd <hugeinfo123>
Date: Sun, 08 Sep 2024 16:57:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 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..4fd77c6 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
@@ -545,7 +545,10 @@
caseInfo.setInputWay(CaseBaseConsts.INPUT_WAY_1);
caseInfo.setCreateTime(nowDate);
caseInfo.setUpdateTime(nowDate);
+ caseInfo.setVisitTime(nowDate);
caseInfo.setDeleteStatus(BaseConsts.DELETE_STATUS_0);
+ caseInfo.setProcess(1);
+ caseInfo.setProcessName("来访登记");
//todo case_ref生成、case_title生成
caseInfoUnfold.setId(utilsClient.getNewTimeId());
@@ -702,8 +705,8 @@
* @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){
+ List<CaseInfoWeChatDTO> list = new ArrayList<>();
String personType = terms.get("personType")+"";
if(ObjectUtils.isEmpty(personType)){
throw new RuntimeException("请选择人员类型");
@@ -718,7 +721,7 @@
}
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);
@@ -726,15 +729,15 @@
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)){
+ if(ObjectUtils.isNotEmpty(caseInfo) && 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)){
+ }else if(ObjectUtils.isNotEmpty(caseInfo) && 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)){
+ }else if(ObjectUtils.isNotEmpty(caseInfo) && caseInfo.getProcess().equals(5) || caseInfo.getProcess().equals(6)){
caseInfoWeChatDTO.setProcessStatus(3);
caseInfoWeChatDTO.setProcessStatusName("已结案");
}else{
@@ -762,7 +765,7 @@
list.add(caseInfoWeChatDTO);
}
}
- return new PageImpl<CaseInfoWechatDTO>(list, page, total);
+ return new PageImpl<CaseInfoWeChatDTO>(list, page, total);
}
/**
--
Gitblit v1.8.0