From dcd669d0f4fad2e9292ee2ae8b2b55de98b1332c Mon Sep 17 00:00:00 2001
From: liyj <15602261488@163.com>
Date: Tue, 24 Sep 2024 19:03:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/gzdyh_test' into gzdyh_test
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/draft/service/CasedraftInfoService.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/draft/service/CasedraftInfoService.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/draft/service/CasedraftInfoService.java
index 646aad9..7d4e76b 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/draft/service/CasedraftInfoService.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/draft/service/CasedraftInfoService.java
@@ -135,7 +135,9 @@
* @param terms 条件
* @return Page
*/
- public Page<CasedraftInfo> pageQuery(PageRequest page, Map<String, Object> terms){
+ public Page<CasedraftInfo> pageQuery(PageRequest page, Map<String, Object> terms,String userId){
+ CtUserDTO loginUser = custClient.clientGetUserAll(userId);
+ terms.put("inputUnitId", loginUser.getUnitId());
long total = mapper.countTerms(terms);
List<CasedraftInfo> content = mapper.pageTerms(page, terms);
return new PageImpl<CasedraftInfo>(content, page, total);
@@ -180,6 +182,11 @@
CasedraftInfo casedraftInfo = new CasedraftInfo();
BeanUtils.copyProperties(draftRegisterSaveDTO, casedraftInfo);
+ //默认添加省市
+ casedraftInfo.setQueProv("19");
+ casedraftInfo.setQueProvName("广东省");
+ casedraftInfo.setQueCity("1601");
+ casedraftInfo.setQueCityName("广州市");
casedraftInfo.setCustId(loginUser.getCustId());
casedraftInfo.setUpdateTime(nowDate);
// 常规登记-保存当事人
@@ -232,13 +239,13 @@
casedraftPerson.setUpdateTime(now);
//添加申请方和被申请方人名组合
- if(CaseBaseConstsEnum.PERSON_TYPE_1.equals(casedraftPerson.getPerType())){
+ if(CaseBaseConstsEnum.PERSON_TYPE_1.getIndex().equals(casedraftPerson.getPerType())){
//申请方
if (StringUtils.isNotEmpty(plaintiffs.toString())) {
plaintiffs.append(BaseConsts.COMMA);
}
plaintiffs.append(casedraftPerson.getTrueName());
- }else if(CaseBaseConstsEnum.PERSON_TYPE_2.equals(casedraftPerson.getPerType())){
+ }else if(CaseBaseConstsEnum.PERSON_TYPE_2.getIndex().equals(casedraftPerson.getPerType())){
//被申请方
if (StringUtils.isNotEmpty(defendants.toString())) {
defendants.append(BaseConsts.COMMA);
@@ -265,12 +272,12 @@
casedraftAgent.setCustId(draftRegisterSaveDTO.getCustId());
casedraftAgent.setUpdateTime(now);
- if(CaseBaseConstsEnum.PERSON_TYPE_3.equals(casedraftAgent.getPerType())) {
+ if(CaseBaseConstsEnum.PERSON_TYPE_3.getIndex().equals(casedraftAgent.getPerType())) {
if (StringUtils.isNotEmpty(pagents.toString())) {
pagents.append(BaseConsts.COMMA);
}
pagents.append(casedraftAgent.getTrueName());
- }else if(CaseBaseConstsEnum.PERSON_TYPE_4.equals(casedraftAgent.getPerType())) {
+ }else if(CaseBaseConstsEnum.PERSON_TYPE_4.getIndex().equals(casedraftAgent.getPerType())) {
if (StringUtils.isNotEmpty(dagents.toString())) {
dagents.append(BaseConsts.COMMA);
}
--
Gitblit v1.8.0