采購服務站

purchase-admin/src/main/java/com/ozs/web/controller/plan/PlanYearsController.java

@@ -33,11 +33,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.util.ObjectUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-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 org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
@@ -287,13 +283,11 @@ public class PlanYearsController extends BaseController {
 
     @ApiOperation(value = "获取采购服务站")
     @GetMapping("/getProcurementService")
-    // @PreAuthorize("@ss.hasPermi('plan:planYears:getProcurementService')")
     @Log(title = ModularConstans.planYear, businessType = BusinessType.QUERY)
-    public AjaxResult getProcurementService(@RequestBody PlanYears p) {
+    public AjaxResult getProcurementService(@RequestParam("projectType") String projectType,
+                                            @RequestParam("evaluation") BigDecimal evaluation) {
         //获取当前登录人的部门ID
         LoginUser loginUser = getLoginUser();
-        String projectType = p.getProjectType();
-        BigDecimal evaluation = p.getEvaluation();
         List<String> list = new ArrayList<>();
         list.add("网空采购站");
         if (StringUtils.isNull(loginUser) || StringUtils.isNull(loginUser.getDeptId())) {
@@ -307,11 +301,7 @@ public class PlanYearsController extends BaseController {
         }
 
         String str = sysDept.getPurchaseServices();
-
-        if (!ObjectUtils.isEmpty(p)) {
-            if (ObjectUtils.isEmpty(p.getEvaluation()) || ObjectUtils.isEmpty(p.getProjectType())) {
-                return error("概算金额与项目类型必须先选");
-            }
+        if (!ObjectUtils.isEmpty(evaluation) && !ObjectUtils.isEmpty(projectType)) {
             String[] ancestors = sysDept.getAncestors().split(",");
             //当前用户的部门，是否允许提交（不在规定等级范围不可提交）
             //查询当前用户的部门是否有上级，是否需要上级及祖级进行审核
@@ -413,6 +403,7 @@ public class PlanYearsController extends BaseController {
 
             }
         }
+
         if (!org.apache.commons.lang3.StringUtils.isBlank(str)) {
             list.add(str);
         }