From 4722c9d44d1cb941920776016567daf077d87e13 Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期一, 24 十月 2022 16:33:00 +0800
Subject: [PATCH] 修改消息分页查询

---
 ycl-platform/src/main/java/com/ycl/controller/caseHandler/DispatchHandleController.java |   28 +++++++++++++++++++++++++---
 1 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/DispatchHandleController.java b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/DispatchHandleController.java
index a19f04b..8bdbd0f 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/DispatchHandleController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/DispatchHandleController.java
@@ -13,6 +13,7 @@
 import com.ycl.service.caseHandler.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.context.SecurityContextHolder;
@@ -49,11 +50,13 @@
     IBaseCaseService baseCaseService;
     @Autowired
     IDisposeRecordService iDisposeRecordService;
+    @Autowired
+    IImageResourcesService iImageResourcesService;
 
     @ApiOperation(value = "璋冨害")
     @RequestMapping(value = "/dispatch", method = RequestMethod.POST)
     @ResponseBody
-    @LogSave(operationType = "浜嬮」澶勭疆绠$悊",contain = "妗堜欢璋冨害")
+    @LogSave(operationType = "浜嬮」澶勭疆绠$悊", contain = "妗堜欢璋冨害")
     public CommonResult<DispatchInfo> dispatch(@Validated @RequestBody DispatchInfoParam dispatchInfoParam) {
         AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
         dispatchInfoParam.setCreateUser(user.getUserId());
@@ -62,7 +65,7 @@
 
     @ApiOperation(value = "涓婁紶杩濊/杩濆缓澶勭疆缁撴灉")
     @PostMapping("/addition_dispose_result")
-    @LogSave(operationType = "浜嬮」澶勭疆绠$悊",contain = "妗堜欢涓婁紶澶勭疆缁撴灉")
+    @LogSave(operationType = "浜嬮」澶勭疆绠$悊", contain = "妗堜欢涓婁紶澶勭疆缁撴灉")
     public CommonResult searchDisposeList(@RequestParam Long caseId,
                                           @RequestParam Integer type,
                                           @RequestBody UploadDisposingResultParam uploadDisposingResultParam) {
@@ -90,7 +93,18 @@
         iArrivalSituationService.save(arrivalSituation);
         //鏂囦功
         Integer illegalBuildingType = 2;
-        if (type.equals(illegalBuildingType)) {
+        Integer violation = 1;
+        String handType = "02";
+        ImageResources imageResources = new ImageResources();
+        imageResources.setType(handType);
+        imageResources.setBelongToId(caseId);
+        imageResources.setCreateTime(LocalDateTime.now());
+        imageResources.setCreateUser(user.getUserId());
+        if (type == violation) {
+            imageResources.setUrl(StringUtils.joinWith(",", uploadDisposingResultParam.getPic(), uploadDisposingResultParam.getSituationPic()));
+            iImageResourcesService.save(imageResources);
+        }
+        if (type==illegalBuildingType) {
             Writ writ = new Writ();
             BeanUtils.copyProperties(uploadDisposingResultParam, writ);
             writ.setBaseCaseId(caseId);
@@ -98,6 +112,14 @@
             writ.setCreateTime(LocalDateTime.now());
             writ.setCreateUser(user.getUserId());
             iWritService.save(writ);
+            imageResources.setUrl(StringUtils
+                    .joinWith(",", uploadDisposingResultParam.getPic()
+                            , uploadDisposingResultParam.getSituationPic()
+                            , uploadDisposingResultParam.getOriginalPic()
+                            , uploadDisposingResultParam.getOtherPic()
+                            , uploadDisposingResultParam.getRectifiedPic()
+                            , uploadDisposingResultParam.getWritPic()));
+            iImageResourcesService.save(imageResources);
         }
         baseCaseService.update(new LambdaUpdateWrapper<BaseCase>().eq(BaseCase::getId, caseId).set(BaseCase::getState, BaseCaseStatus.DISPOSE));
         String stepName = StepName.CHECK.getName();

--
Gitblit v1.8.0