From 6c56f35bef519265b4e7ae98fda6ca87855daf9f Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 15 十二月 2022 11:29:08 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server

---
 ycl-platform/src/main/java/com/ycl/controller/caseHandler/DispatchHandleController.java |   37 +++++++++++++++++++++++++++++++++----
 1 files changed, 33 insertions(+), 4 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 38d9fd1..74db768 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
@@ -1,13 +1,18 @@
 package com.ycl.controller.caseHandler;
 
 
+import com.ycl.annotation.LogSave;
 import com.ycl.api.CommonResult;
+import com.ycl.bo.AdminUserDetails;
 import com.ycl.dto.caseHandler.DispatchInfoParam;
+import com.ycl.dto.dispatch.UploadDisposingResultParam;
 import com.ycl.entity.caseHandler.DispatchInfo;
-import com.ycl.service.caseHandler.IDispatchHandleService;
+import com.ycl.service.caseHandler.*;
+import com.ycl.service.resources.IImageResourcesService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -20,19 +25,43 @@
  * @since 2022-09-28
  */
 @RestController
-@RequestMapping("/dispatch-handle")
-@Api(tags = "璋冨害澶勭悊")
+@RequestMapping("/dispatch_handle")
+@Api(tags = "璋冨害")
 public class DispatchHandleController {
 
 
     @Autowired
     IDispatchHandleService iDispatchHandleService;
-
+    @Autowired
+    IInvestigationService iInvestigationService;
+    @Autowired
+    IArrivalSituationService iArrivalSituationService;
+    @Autowired
+    IPartyInfoService iPartyInfoService;
+    @Autowired
+    IWritService iWritService;
+    @Autowired
+    IBaseCaseService baseCaseService;
+    @Autowired
+    IDisposeRecordService iDisposeRecordService;
+    @Autowired
+    IImageResourcesService iImageResourcesService;
 
     @ApiOperation(value = "璋冨害")
     @RequestMapping(value = "/dispatch", method = RequestMethod.POST)
     @ResponseBody
+    @LogSave(operationType = "浜嬮」澶勭疆绠$悊", contain = "妗堜欢璋冨害")
     public CommonResult<DispatchInfo> dispatch(@Validated @RequestBody DispatchInfoParam dispatchInfoParam) {
+        AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+        dispatchInfoParam.setCreateUser(user.getUserId());
         return CommonResult.success(iDispatchHandleService.dispatch(dispatchInfoParam));
     }
+
+    @ApiOperation(value = "涓婁紶杩濊/杩濆缓澶勭疆缁撴灉")
+    @PostMapping("/addition_dispose_result")
+    @LogSave(operationType = "浜嬮」澶勭疆绠$悊", contain = "妗堜欢涓婁紶澶勭疆缁撴灉")
+    public CommonResult searchDisposeList(@RequestBody UploadDisposingResultParam uploadDisposingResultParam) {
+        iDisposeRecordService.saveOrUpdateUpload(uploadDisposingResultParam);
+        return CommonResult.success("add success");
+    }
 }

--
Gitblit v1.8.0