From 93439681edf7d2e746986aee19938e0027a8b7df Mon Sep 17 00:00:00 2001
From: zhouxiantao <1026371446@qq.com>
Date: Sun, 08 Sep 2024 18:06:16 +0800
Subject: [PATCH] 小程序优化
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/wechat/CaseInfoWechatController.java | 19 +---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/wechat/CasePersonWechatController.java | 56 ++++++++++++++
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseInfoMapper.xml | 8 +-
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/wechat/CaseAgentWechatController.java | 56 ++++++++++++++
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java | 61 +--------------
5 files changed, 125 insertions(+), 75 deletions(-)
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/wechat/CaseAgentWechatController.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/wechat/CaseAgentWechatController.java
new file mode 100644
index 0000000..477b576
--- /dev/null
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/wechat/CaseAgentWechatController.java
@@ -0,0 +1,56 @@
+package cn.huge.module.cases.controller.wechat;
+
+import cn.huge.base.common.utils.ReturnFailUtils;
+import cn.huge.base.common.utils.ReturnSucUtils;
+import cn.huge.module.cases.domain.po.CaseAgent;
+import cn.huge.module.cases.service.CaseAgentService;
+import com.google.common.collect.Maps;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Sort;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
+/**
+ * @title: 纠纷代理人信息表接口api-web端
+ * @description: 纠纷代理人信息表接口api-web端
+ * @company: hugeinfo
+ * @author: wangwh
+ * @time: 2024-08-27 10:48:17
+ * @version: 1.0.0
+ */
+@Slf4j
+@RestController
+@RequestMapping("/api/wechat/caseAgent")
+public class CaseAgentWechatController {
+
+ @Autowired(required = false)
+ private HttpServletRequest request;
+
+ @Autowired
+ private CaseAgentService service;
+
+
+ /**
+ * 根据编号查询单个
+ * @url {ctx}/api/wechat/caseAgent/getById
+ * @param id 主键编号
+ * @return Object
+ */
+ @GetMapping("/getById")
+ public Object getById(@RequestParam(value = "id") String id) {
+ try {
+ return ReturnSucUtils.getRepInfo(service.getById(id));
+ } catch (Exception e) {
+ return ReturnFailUtils.getRepInfo();
+ }
+ }
+
+
+
+}
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/wechat/CaseInfoWechatController.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/wechat/CaseInfoWechatController.java
index 982288a..1c8d429 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/wechat/CaseInfoWechatController.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/wechat/CaseInfoWechatController.java
@@ -19,6 +19,7 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
@@ -64,19 +65,7 @@
// 办理进度，1：待受理，2：办理中，3：已结案，4：不予受理
String processStatus = request.getParameter("processStatus");
if (StringUtils.isNotBlank(processStatus)){
- if("1".equals(processStatus)){
- List<Integer> processList = Arrays.asList(1,2);
- terms.put("processList", processList);
- }else if("2".equals(processStatus)){
- List<Integer> processList = Arrays.asList(3,4);
- terms.put("processList", processList);
- }else if("3".equals(processStatus)){
- List<Integer> processList = Arrays.asList(5,6);
- terms.put("processList", processList);
- }else{
- List<Integer> processList = Arrays.asList(7);
- terms.put("processList", processList);
- }
+ terms.put("infoProcess", processStatus);
}
return terms;
@@ -91,7 +80,7 @@
* @CurrentUser String userId,
*/
@GetMapping("/pageCard")
- public Object pageCard(@CurrentUser String userId,@RequestParam(value = "page") int page, @RequestParam(value = "size") int size) {
+ public Object pageCard( @CurrentUser String userId,@RequestParam(value = "page") int page, @RequestParam(value = "size") int size) {
try {
// String userId = "2408301111391000";
Map<String, Object> terms = getParameter();
@@ -134,7 +123,7 @@
/**
* 小程序端-查看案件详情
- * @url {ctx}/api/v1/caseInfo/getCaseInfo
+ * @url {ctx}/api/wechat/caseInfo/getCaseInfo
*/
@GetMapping("/getCaseInfo")
public Object getCaseInfo(@RequestParam(value = "id") String id) {
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/wechat/CasePersonWechatController.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/wechat/CasePersonWechatController.java
new file mode 100644
index 0000000..3f87da7
--- /dev/null
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/wechat/CasePersonWechatController.java
@@ -0,0 +1,56 @@
+package cn.huge.module.cases.controller.wechat;
+
+import cn.huge.base.common.utils.ReturnFailUtils;
+import cn.huge.base.common.utils.ReturnSucUtils;
+import cn.huge.module.cases.domain.po.CasePerson;
+import cn.huge.module.cases.service.CasePersonService;
+import com.google.common.collect.Maps;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Sort;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
+/**
+ * @title: 纠纷当事人信息表接口api-web端
+ * @description: 纠纷当事人信息表接口api-web端
+ * @company: hugeinfo
+ * @author: wangwh
+ * @time: 2024-08-27 10:48:18
+ * @version: 1.0.0
+ */
+@Slf4j
+@RestController
+@RequestMapping("/api/wechat/casePerson")
+public class CasePersonWechatController {
+
+ @Autowired(required = false)
+ private HttpServletRequest request;
+
+ @Autowired
+ private CasePersonService service;
+
+
+ /**
+ * 根据编号查询单个
+ * @url {ctx}/api/wechat/casePerson/getById
+ * @param id 主键编号
+ * @return Object
+ */
+ @GetMapping("/getById")
+ public Object getById(@RequestParam(value = "id") String id) {
+ try {
+ return ReturnSucUtils.getRepInfo(service.getById(id));
+ } catch (Exception e) {
+ return ReturnFailUtils.getRepInfo();
+ }
+ }
+
+
+
+}
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseInfoMapper.xml b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseInfoMapper.xml
index c168b50..c222a72 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseInfoMapper.xml
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseInfoMapper.xml
@@ -282,8 +282,8 @@
<where>
<if test="terms.ids != null and terms.ids.size > 0">
and id in
- <foreach collection="terms.id" item="terms.ids" index="index" open="(" separator="," close=")">
- #{terms.id}
+ <foreach collection="terms.ids" item="id" index="index" open="(" separator="," close=")">
+ #{id}
</foreach>
</if>
<if test="terms.id != null and terms.id !=''">
@@ -459,8 +459,8 @@
</if>
<if test="terms.processList != null and terms.processList.size > 0">
and process in
- <foreach collection="terms.process" item="terms.processList" index="index" open="(" separator="," close=")">
- #{terms.process}
+ <foreach collection="terms.processList" item="process" index="index" open="(" separator="," close=")">
+ #{process}
</foreach>
</if>
<if test="terms.process != null and terms.process !=''">
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 4fd77c6..a05f846 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
@@ -585,25 +585,17 @@
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);
//添加申请方和被申请方人名组合
@@ -627,18 +619,13 @@
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())) {
@@ -648,33 +635,6 @@
}
//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;
@@ -724,26 +684,15 @@
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();
BeanUtils.copyProperties(caseInfo, caseInfoWeChatDTO);
- if(ObjectUtils.isNotEmpty(caseInfo) && caseInfo.getProcess().equals(1) || caseInfo.getProcess().equals(2)){
- caseInfoWeChatDTO.setProcessStatus(1);
- caseInfoWeChatDTO.setProcessStatusName("待受理");
- }else if(ObjectUtils.isNotEmpty(caseInfo) && caseInfo.getProcess().equals(3) || caseInfo.getProcess().equals(4)){
- caseInfoWeChatDTO.setProcessStatus(2);
- caseInfoWeChatDTO.setProcessStatusName("办理中");
- }else if(ObjectUtils.isNotEmpty(caseInfo) && 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());
QueryWrapper<CasePerson> personWrapper1 = new QueryWrapper<>();
personWrapper1.eq("case_id", caseInfo.getId());
List<CasePerson> casePersonList1 = personService.list(personWrapper1);
--
Gitblit v1.8.0