SH-Arbitrate/Arbitrate-Backend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'wq' of SH-Arbitrate/Arbitrate-Backend into dev

Browse Source
This commit was merged in pull request #51.
This commit is contained in:
wangqiong123
2023-10-10 19:38:32 +08:00
committed by Gitea
parent b0d77ea3e4 373486d54a
commit e382c59b6b
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java
+10 -9
View File
@@ -256,6 +256,10 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
if(caseApplicationList!=null&&caseApplicationList.size()>0){ if(caseApplicationList!=null&&caseApplicationList.size()>0){
// 1，查询所有的组织机构，组装成map // 1，查询所有的组织机构，组装成map
List<SysDept> deptList = sysDeptMapper.selectDeptList(new SysDept()); List<SysDept> deptList = sysDeptMapper.selectDeptList(new SysDept());
Map<String, Long> deptMap =new HashMap<>();
if(CollectionUtil.isNotEmpty(deptList)) {
deptMap = deptList.stream().collect(Collectors.toMap(SysDept::getDeptName, SysDept::getDeptId));
}
List<CaseApplication> caseApplicationListinsert = new ArrayList<>(); List<CaseApplication> caseApplicationListinsert = new ArrayList<>();
for (int i = 0; i < caseApplicationList.size(); i++){ for (int i = 0; i < caseApplicationList.size(); i++){
CaseApplication caseApplication = caseApplicationList.get(i); CaseApplication caseApplication = caseApplicationList.get(i);
@@ -268,7 +272,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
//赋值CaseApplication的案件关联人信息 //赋值CaseApplication的案件关联人信息
List<CaseAffiliate> caseAffiliatesnew = new ArrayList<>(); List<CaseAffiliate> caseAffiliatesnew = new ArrayList<>();
// 组装案件关联人信息 // 组装案件关联人信息
assignmentCaseAffiliates(caseApplication,caseAffiliatesnew,deptList); assignmentCaseAffiliates(caseApplication,caseAffiliatesnew,deptMap);
// int caseApplicationCount = selectCaseApplicationCount(caseApplication); // int caseApplicationCount = selectCaseApplicationCount(caseApplication);
// if(caseApplicationCount>0){ // if(caseApplicationCount>0){
@@ -579,7 +583,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
private void assignmentCaseAffiliates(CaseApplication caseApplication, List<CaseAffiliate> caseAffiliatesnew,List<SysDept> deptList) { private void assignmentCaseAffiliates(CaseApplication caseApplication, List<CaseAffiliate> caseAffiliatesnew, Map<String, Long> deptMap) {
// 申请人信息 // 申请人信息
CaseAffiliate caseAffiliate = new CaseAffiliate(); CaseAffiliate caseAffiliate = new CaseAffiliate();
@@ -588,7 +592,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
caseAffiliate.setIdentityType(1); caseAffiliate.setIdentityType(1);
// 申请人（机构），需要判断部门中是否存在，不存在则新增，当身份类型为1的时候，查询时需要根据名称查询组织机构 // 申请人（机构），需要判断部门中是否存在，不存在则新增，当身份类型为1的时候，查询时需要根据名称查询组织机构
if(StrUtil.isNotEmpty(caseApplication.getName())){ if(StrUtil.isNotEmpty(caseApplication.getName())){
setApplicantOrganization(caseAffiliate, caseApplication, deptList); setApplicantOrganization(caseAffiliate, caseApplication, deptMap);
} }
caseAffiliatesnew.add(caseAffiliate); caseAffiliatesnew.add(caseAffiliate);
@@ -603,10 +607,10 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
* @param caseApplication * @param caseApplication
*/ */
@DataScope(deptAlias = "d") @DataScope(deptAlias = "d")
private void setApplicantOrganization(CaseAffiliate caseAffiliate, CaseApplication caseApplication, List<SysDept> deptList ) { private void setApplicantOrganization(CaseAffiliate caseAffiliate, CaseApplication caseApplication, Map<String, Long> deptMap ) {
if(CollectionUtil.isNotEmpty(deptList)){
Map<String, Long> deptMap = deptList.stream().collect(Collectors.toMap(SysDept::getDeptName, SysDept::getDeptId));
// 将组织机构id设为申请人名称 // 将组织机构id设为申请人名称
if(deptMap.containsKey(caseApplication.getName())){ if(deptMap.containsKey(caseApplication.getName())){
caseAffiliate.setName(String.valueOf(deptMap.get(caseApplication.getName()))); caseAffiliate.setName(String.valueOf(deptMap.get(caseApplication.getName())));
@@ -626,9 +630,6 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
caseAffiliate.setName(String.valueOf(dept.getDeptId())); caseAffiliate.setName(String.valueOf(dept.getDeptId()));
} }
}
} }