From e20796da87dea0327435b5d32aee3fd274f73a44 Mon Sep 17 00:00:00 2001 From: xueqingkun Date: Wed, 7 Aug 2024 15:44:49 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E6=B7=BB=E5=8A=A0=E6=A1=88=E4=BB=B6?= =?UTF-8?q?=E6=98=AF=E6=B7=BB=E5=8A=A0=E6=A1=88=E4=BB=B6=E8=A1=8C=E4=B8=BA?= =?UTF-8?q?=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supervision/police/dto/ModelCaseBase.java | 6 +++ .../police/service/CasePersonService.java | 17 ++++++++ .../service/impl/CasePersonServiceImpl.java | 41 +++++++++++++++++++ .../service/impl/ModelCaseServiceImpl.java | 27 +++++------- 4 files changed, 75 insertions(+), 16 deletions(-) create mode 100644 src/main/java/com/supervision/police/service/CasePersonService.java create mode 100644 src/main/java/com/supervision/police/service/impl/CasePersonServiceImpl.java diff --git a/src/main/java/com/supervision/police/dto/ModelCaseBase.java b/src/main/java/com/supervision/police/dto/ModelCaseBase.java index 369d66a..5d19ed5 100644 --- a/src/main/java/com/supervision/police/dto/ModelCaseBase.java +++ b/src/main/java/com/supervision/police/dto/ModelCaseBase.java @@ -41,6 +41,12 @@ public class ModelCaseBase { @Schema(description = "案件编号") private String caseNo; + @Schema(description = "案件行为人名称") + private String caseActorName; + + @Schema(description = "案件行为身份证id") + private String caseActorIdCard; + public ModelCase toModelCase() { ModelCase modelCase = new ModelCase(); modelCase.setId(this.id); diff --git a/src/main/java/com/supervision/police/service/CasePersonService.java b/src/main/java/com/supervision/police/service/CasePersonService.java new file mode 100644 index 0000000..f6cbc19 --- /dev/null +++ b/src/main/java/com/supervision/police/service/CasePersonService.java @@ -0,0 +1,17 @@ +package com.supervision.police.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.supervision.police.domain.CasePerson; + +public interface CasePersonService extends IService { + + + /** + * 新增案件行为人 + * @param caseId 案件id + * @param caseActorName 案件行为人姓名 + * @param caseActorIdCard 案件行为人身份证号 + * @return 插入结果 true 成功 false 失败 + */ + boolean saveCaseActor(String caseId,String caseActorName,String caseActorIdCard); +} diff --git a/src/main/java/com/supervision/police/service/impl/CasePersonServiceImpl.java b/src/main/java/com/supervision/police/service/impl/CasePersonServiceImpl.java new file mode 100644 index 0000000..a7dd4cb --- /dev/null +++ b/src/main/java/com/supervision/police/service/impl/CasePersonServiceImpl.java @@ -0,0 +1,41 @@ +package com.supervision.police.service.impl; + +import cn.hutool.core.lang.Assert; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.supervision.police.domain.CasePerson; +import com.supervision.police.mapper.CasePersonMapper; +import com.supervision.police.service.CasePersonService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +@Slf4j +@Service +@RequiredArgsConstructor +public class CasePersonServiceImpl extends ServiceImpl implements CasePersonService { + @Override + public boolean saveCaseActor(String caseId, String caseActorName, String caseActorIdCard) { + + if (StrUtil.isEmpty(caseId) || StrUtil.isEmpty(caseActorName) || StrUtil.isEmpty(caseActorIdCard)){ + log.info("案件行为人信息不能为空"); + return false; + } + + Long count = super.lambdaQuery().eq(CasePerson::getCaseId, caseId).eq(CasePerson::getIdCard, caseActorIdCard).count(); + if (count > 0){ + log.info("案件行为人:{},已经存在于案件:{}之中", caseActorIdCard, caseId); + return false; + } + + CasePerson casePerson = new CasePerson(); + casePerson.setCaseId(caseId); + casePerson.setName(caseActorName); + casePerson.setIdCard(caseActorIdCard); + casePerson.setCaseActorFlag(1); + // 角色设置为行为人 + casePerson.setRoleCode("1"); + return super.save(casePerson); + + } +} diff --git a/src/main/java/com/supervision/police/service/impl/ModelCaseServiceImpl.java b/src/main/java/com/supervision/police/service/impl/ModelCaseServiceImpl.java index e21ac48..d91e0b3 100644 --- a/src/main/java/com/supervision/police/service/impl/ModelCaseServiceImpl.java +++ b/src/main/java/com/supervision/police/service/impl/ModelCaseServiceImpl.java @@ -27,13 +27,13 @@ import com.supervision.police.dto.*; import com.supervision.police.mapper.CasePersonMapper; import com.supervision.police.mapper.ModelCaseMapper; import com.supervision.police.domain.ModelCase; +import com.supervision.police.service.CasePersonService; import com.supervision.police.service.CaseStatusManageService; import com.supervision.police.service.ComDictionaryService; import com.supervision.police.service.ModelCaseService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; @@ -56,7 +56,7 @@ public class ModelCaseServiceImpl extends ServiceImpl caseIdList = modelCaseIPage.getRecords().stream().map(ModelCase::getId).toList(); - List casePersonList = casePersonMapper.selectList( + List casePersonList = casePersonService.list( Wrappers.lambdaQuery(CasePerson.class).in(CasePerson::getCaseId, caseIdList)); // 多级分组 Map>> persionMap = casePersonList.stream().collect(Collectors.groupingBy(CasePerson::getCaseId, @@ -114,15 +114,6 @@ public class ModelCaseServiceImpl extends ServiceImpl checkCaseNo(String caseNo, String caseId) { Long count = modelCaseMapper.selectCount(new LambdaQueryWrapper() @@ -156,6 +147,10 @@ public class ModelCaseServiceImpl extends ServiceImpl wrapper = Wrappers.lambdaQuery(); wrapper.eq(CasePerson::getCaseId, caseId) .like(StrUtil.isNotEmpty(name), CasePerson::getName, name); - List casePeople = casePersonMapper.selectList(wrapper); + List casePeople = casePersonService.list(wrapper); List dicts = comDictionaryService.list(); for (CasePerson cp : casePeople) { cp.setRoleName(comDictionaryService.getName(dicts, "case_role", cp.getRoleCode())); @@ -207,11 +202,11 @@ public class ModelCaseServiceImpl extends ServiceImpl() + long count = casePersonService.count(new LambdaQueryWrapper() .eq(CasePerson::getCaseId, person.getCaseId()).eq(CasePerson::getIdCard, person.getIdCard())); Assert.isTrue(count == 0, "该身份证号已存在"); - int i = casePersonMapper.insert(person); - if (i > 0) { + boolean success = casePersonService.save(person); + if (success) { caseStatusManageService.whenSaveCasePeople(person.getCaseId(), person); return R.okMsg("新增成功"); } else {