From 170c89b9b8e6d5c3117d53e7b38f782651ebfcde Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期五, 22 十二月 2023 14:04:04 +0800
Subject: [PATCH] 物品统计表中总数量改为在库数量+报废数量
---
consum-base/src/main/java/com/consum/base/controller/FinSysServerController.java | 34 ++++++++++++++++++++--------------
1 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/controller/FinSysServerController.java b/consum-base/src/main/java/com/consum/base/controller/FinSysServerController.java
index 50b6caa..3f5f2d6 100644
--- a/consum-base/src/main/java/com/consum/base/controller/FinSysServerController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/FinSysServerController.java
@@ -1,16 +1,7 @@
package com.consum.base.controller;
-import com.consum.base.BaseController;
-import com.consum.base.core.utils.CommonUtil;
-import com.consum.base.pojo.FinSysServerSearchParam;
-import com.consum.base.pojo.FinSysServerVo;
-import com.consum.base.service.FinSysServerService;
-import com.consum.model.po.FinSysServer;
-import com.walker.db.page.GenericPager;
-import com.walker.infrastructure.utils.DateUtils;
-import com.walker.infrastructure.utils.NumberGenerator;
-import com.walker.web.ResponseValue;
import java.util.List;
+
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@@ -18,6 +9,21 @@
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
+import com.consum.base.BaseController;
+import com.consum.base.core.utils.CommonUtil;
+import com.consum.base.pojo.FinSysServerSearchParam;
+import com.consum.base.pojo.FinSysServerVo;
+import com.consum.base.service.FinSysServerService;
+import com.consum.model.po.FinSysServer;
+import com.iplatform.model.po.S_role;
+import com.walker.db.page.GenericPager;
+import com.walker.infrastructure.utils.DateUtils;
+import com.walker.infrastructure.utils.NumberGenerator;
+import com.walker.web.ResponseValue;
+
+import io.swagger.annotations.Api;
+
+@Api(value = "绯荤粺鏈嶅姟淇℃伅", tags = "绯荤粺鏈嶅姟淇℃伅")
@RestController
@RequestMapping("/pc/fin/sys/server")
public class FinSysServerController extends BaseController {
@@ -36,7 +42,10 @@
*/
@GetMapping("/selectByDataScope")
public ResponseValue selectByDataScope(Integer dataScope) {
- return ResponseValue.success(finSysServerServiceImpl.getByDataScope(dataScope));
+ List<S_role> roleList = finSysServerServiceImpl.getByDataScope(dataScope);
+ // 杩囨护浠撳簱绠＄悊鍛樼殑鏄剧ず
+ roleList.removeIf(role -> role.getRole_name().equals("浠撳簱绠＄悊鍛�"));
+ return ResponseValue.success(roleList);
}
/**
@@ -119,9 +128,6 @@
if (param == null) {
return ResponseValue.error("鍙傛暟涓虹┖");
}
-// if(finSysServer.getLvType()!=null) {
-// finSysServer.setLv(Long.valueOf(finSysServer.getLvType()));
-// }
int num = this.finSysServerServiceImpl.save(param);
return num > 0 ? ResponseValue.success(1) : ResponseValue.error("缂栬緫澶辫触锛�");
}
--
Gitblit v1.9.1