From 240a430cd12066a13e35e3da554b3b6afecdf512 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 03 十一月 2022 17:56:06 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server

---
 ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 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 5c2ef5e..ac64166 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
@@ -24,6 +24,7 @@
 
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.List;
 
 /**
@@ -71,10 +72,12 @@
         AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
         //褰撲簨浜�
         PartyInfo partyInfo = new PartyInfo();
-        BeanUtils.copyProperties(uploadDisposingResultParam, partyInfo);
-        partyInfo.setCreateUser(user.getUserId().intValue());
-        partyInfo.setCreateTime(LocalDateTime.now());
-        iPartyInfoService.save(partyInfo);
+        if (StringUtils.isNotEmpty(uploadDisposingResultParam.getName())) {
+            BeanUtils.copyProperties(uploadDisposingResultParam, partyInfo);
+            partyInfo.setCreateUser(user.getUserId().intValue());
+            partyInfo.setCreateTime(LocalDateTime.now());
+            iPartyInfoService.save(partyInfo);
+        }
         //璋冩煡鍙栬瘉
         Investigation investigation = new Investigation();
         BeanUtils.copyProperties(uploadDisposingResultParam, investigation);
@@ -82,6 +85,7 @@
         investigation.setCreateTime(LocalDateTime.now());
         investigation.setCreateUser(user.getUserId());
         investigation.setPartyId(partyInfo.getId());
+        investigation.setInvestigationTime(LocalDateTime.parse(uploadDisposingResultParam.getInvestigationTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
         iInvestigationService.save(investigation);
         //鍒拌揪
         ArrivalSituation arrivalSituation = new ArrivalSituation();
@@ -89,6 +93,7 @@
         arrivalSituation.setBaseCaseId(caseId);
         arrivalSituation.setCreateTime(LocalDateTime.now());
         arrivalSituation.setCreateUser(user.getUserId());
+        arrivalSituation.setArrivalTime(LocalDateTime.parse(uploadDisposingResultParam.getArrivalTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
         iArrivalSituationService.save(arrivalSituation);
         //鏂囦功
         Integer illegalBuildingType = 2;
@@ -110,6 +115,9 @@
             writ.setIllegalBuildingId(caseId);
             writ.setCreateTime(LocalDateTime.now());
             writ.setCreateUser(user.getUserId());
+            writ.setLimitTime(LocalDateTime.parse(uploadDisposingResultParam.getLimitTime(), DateTimeFormatter.ofPattern("YYYY-MM-dd HH:mm:ss")));
+            writ.setRectifyTime(LocalDateTime.parse(uploadDisposingResultParam.getRectifyTime(), DateTimeFormatter.ofPattern("YYYY-MM-dd HH:mm:ss")));
+            writ.setSendTime(LocalDateTime.parse(uploadDisposingResultParam.getSendTime(), DateTimeFormatter.ofPattern("YYYY-MM-dd HH:mm:ss")));
             iWritService.save(writ);
             imageResources.setUrl(StringUtils
                     .joinWith(",", uploadDisposingResultParam.getPic()
@@ -142,6 +150,7 @@
         updateRecord.setState(1);
         updateRecord.setEndTime(LocalDateTime.now());
         updateRecord.setHandlerId(disposeRecord.getCreateUser());
+        updateRecord.setResult(uploadDisposingResultParam.getDescription());
         baseMapper.update(updateRecord, updateWrapper);
 
         QueryWrapper<WorkflowConfigStep> stepQurey = new QueryWrapper<>();

--
Gitblit v1.8.0