新增上传接口

ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BmProjectReferralController.java

@@ -4,7 +4,9 @@ import java.util.List;
 
 import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.system.domain.project.BmProjectReferral;
+import com.ruoyi.system.domain.project.BmProjectReport;
 import com.ruoyi.system.service.project.IBmProjectReferralService;
+import com.ruoyi.system.service.project.IBmProjectReportService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -35,6 +37,9 @@ public class BmProjectReferralController extends BaseController
     @Autowired
     private IBmProjectReferralService bmProjectReferralService;
 
+    @Autowired
+    private IBmProjectReportService bmProjectReportService;
+
     /**
      * 查询项目引荐列表
      */
@@ -103,4 +108,15 @@ public class BmProjectReferralController extends BaseController
     {
         return toAjax(bmProjectReferralService.deleteBmProjectReferralByIds(ids));
     }
+
+    /**
+     * 项目上报的修改项目上报(放在项目上报类上鉴权有问题)
+     */
+    //@PreAuthorize("@ss.hasPermi('BmProjectReport:report:edit')")
+    @Log(title = "项目上报", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    public AjaxResult edit(@RequestBody BmProjectReport bmProjectReport)
+    {
+        return toAjax(bmProjectReportService.updateBmProjectReport(bmProjectReport));
+    }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BmProjectReportController.java

@@ -9,14 +9,7 @@ import com.ruoyi.system.domain.project.BmProjectReport;
 import com.ruoyi.system.service.project.IBmProjectReportService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -46,7 +39,7 @@ public class BmProjectReportController extends BaseController
     {
         startPage();
         LoginUser loginUser = SecurityUtils.getLoginUser();
-        if (ObjectUtil.isNotNull(loginUser)){
+        if (ObjectUtil.isNotNull(loginUser) && loginUser.getUser().getUserId() != 1){
             Long deptId = loginUser.getUser().getDeptId();
             bmProjectReport.setSysDeptId(Integer.valueOf(deptId.toString()));
         }
@@ -82,7 +75,7 @@ public class BmProjectReportController extends BaseController
      */
     //@PreAuthorize("@ss.hasPermi('BmProjectReport:report:add')")
     @Log(title = "项目上报", businessType = BusinessType.INSERT)
-    @PostMapping
+    @PutMapping
     public AjaxResult add(@RequestBody BmProjectReport bmProjectReport)
     {
         return toAjax(bmProjectReportService.insertBmProjectReport(bmProjectReport));

ruoyi-ui/src/api/projectReport/index.js

@@ -29,8 +29,8 @@ export function addReport(data) {
 // 修改项目上报
 export function updateReport(data) {
   return request({
-    url: '/bmProjectReport/report',
-    method: 'put',
+    url: '/projectReferral/referral/edit',
+    method: 'post',
     data: data
   })
 }