From 1a057dd0b2fea02792504a6f52eaa0aaed07cf5c Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期二, 29 十一月 2022 15:43:37 +0800
Subject: [PATCH] fix: 上传处置问题

---
 ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java |   24 ++++++++++--------------
 1 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java
index 059a182..898ba0e 100644
--- a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java
@@ -73,15 +73,13 @@
     @Transactional(rollbackFor = Exception.class)
     public Boolean saveOrUpdateUpload(UploadDisposingResultParam uploadDisposingResultParam) {
         AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
-        ArrivalSituation arrivalSituationed = iArrivalSituationService.getOne(new LambdaQueryWrapper<ArrivalSituation>().eq(ArrivalSituation::getBaseCaseId, uploadDisposingResultParam.getCaseId()));
-        if (arrivalSituationed != null || arrivalSituationed.getId() != null) {
+        List<ArrivalSituation> list = iArrivalSituationService.list(new LambdaQueryWrapper<ArrivalSituation>().eq(ArrivalSituation::getBaseCaseId, uploadDisposingResultParam.getCaseId()));
+        if (!list.isEmpty()) {
             //褰撲簨浜�
             PartyInfo partyInfo = new PartyInfo();
-            if (StringUtils.isNotEmpty(uploadDisposingResultParam.getName())) {
-                BeanUtils.copyProperties(uploadDisposingResultParam, partyInfo);
-                partyInfo.setId(uploadDisposingResultParam.getPartyInfoId());
-                iPartyInfoService.updateById(partyInfo);
-            }
+            BeanUtils.copyProperties(uploadDisposingResultParam, partyInfo);
+            partyInfo.setId(uploadDisposingResultParam.getPartyInfoId());
+            iPartyInfoService.updateById(partyInfo);
             //璋冩煡鍙栬瘉
             Investigation investigation = new Investigation();
             BeanUtils.copyProperties(uploadDisposingResultParam, investigation);
@@ -123,16 +121,14 @@
                                 , uploadDisposingResultParam.getWritPic()));
                 iImageResourcesService.updateById(imageResources);
             }
-            return baseCaseService.update(new LambdaUpdateWrapper<BaseCase>().eq(BaseCase::getId, uploadDisposingResultParam.getCaseId()).set(BaseCase::getState, BaseCaseStatus.CHECK));
+            return baseCaseService.update(new LambdaUpdateWrapper<BaseCase>().eq(BaseCase::getId, uploadDisposingResultParam.getCaseId()).set(BaseCase::getState, BaseCaseStatus.DISPOSE));
         } else {
             //褰撲簨浜�
             PartyInfo partyInfo = new PartyInfo();
-            if (StringUtils.isNotEmpty(uploadDisposingResultParam.getName())) {
-                BeanUtils.copyProperties(uploadDisposingResultParam, partyInfo);
-                partyInfo.setCreateUser(user.getUserId().intValue());
-                partyInfo.setCreateTime(LocalDateTime.now());
-                iPartyInfoService.save(partyInfo);
-            }
+            BeanUtils.copyProperties(uploadDisposingResultParam, partyInfo);
+            partyInfo.setCreateUser(user.getUserId().intValue());
+            partyInfo.setCreateTime(LocalDateTime.now());
+            iPartyInfoService.save(partyInfo);
             //璋冩煡鍙栬瘉
             Investigation investigation = new Investigation();
             BeanUtils.copyProperties(uploadDisposingResultParam, investigation);

--
Gitblit v1.8.0