From b41bcab1dfceb7d452cb0ffd1158f299ba736cd3 Mon Sep 17 00:00:00 2001
From: houjie <714924425@qq.com>
Date: 星期三, 23 八月 2023 17:31:09 +0800
Subject: [PATCH] 计量单位：重构/备件模块 调整
---
lxzn-module-eam/src/main/java/org/jeecg/modules/spare/service/impl/SparePartReceiveDeatilServiceImpl.java | 14 +-
lxzn-module-eam/src/main/java/org/jeecg/modules/spare/service/impl/SparePartOutboundDetailServiceImpl.java | 14 +-
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/controller/UnitController.java | 199 ++++++++++++++++++++++++---------------
lxzn-module-eam/src/main/java/org/jeecg/modules/spare/service/impl/SparesScrapDetailServiceImpl.java | 10 +-
lxzn-module-eam/src/main/java/org/jeecg/modules/spare/service/impl/SparePartPurchaseStorageDetailServiceImpl.java | 4
lxzn-module-eam/src/main/java/org/jeecg/modules/spare/service/impl/SparePartCancellingStocksServiceImpl.java | 2
lxzn-module-eam/src/main/java/org/jeecg/modules/spare/service/impl/SparePartCancellingStocksDetailServiceImpl.java | 12 +-
7 files changed, 150 insertions(+), 105 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/service/impl/SparePartCancellingStocksDetailServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/service/impl/SparePartCancellingStocksDetailServiceImpl.java
index ae3c2b2..7681900 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/service/impl/SparePartCancellingStocksDetailServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/service/impl/SparePartCancellingStocksDetailServiceImpl.java
@@ -74,29 +74,29 @@
//3.鑾峰彇涓� 杈呭崟浣嶈浆鎹㈡瘮渚�
SparePart sparePart = sparePartService.getById(sparePartId);
- String conversionRatio = sparePart.getConversionRatio();
+ /* String conversionRatio = sparePart.getConversionRatio();
double conversionRatioD = 0;
if (StringUtils.isBlank(conversionRatio)) {
conversionRatioD = Double.parseDouble("0");
} else {
conversionRatioD = Double.parseDouble(conversionRatio);
}
- BigDecimal conversionRatioB = new BigDecimal(conversionRatioD);
+ BigDecimal conversionRatioB = new BigDecimal(conversionRatioD);*/
//4.璁＄畻鍑哄簱鏁伴噺鏇存柊搴撳瓨鏁伴噺(搴撳瓨)
Double mainQuantity = sparesPartInventory.getMainQuantity();
BigDecimal mainQuantityB = new BigDecimal(mainQuantity);
/*浠撳簱杈呮暟閲�*/
Double auxiliaryQuantity = sparesPartInventory.getAuxiliaryQuantity();
- BigDecimal auxiliaryQuantityB = new BigDecimal(auxiliaryQuantity);
+ /* BigDecimal auxiliaryQuantityB = new BigDecimal(auxiliaryQuantity);*/
BigDecimal mainQuantitySubtract = mainQuantityB.add(outboundMainQuantityB);//鍔犲悗鐨勫簱瀛樹富鏁伴噺
- BigDecimal outboundAuxiliaryQuantity = outboundMainQuantityB.multiply(conversionRatioB);//鍑哄簱杈呮暟閲�
+ /* BigDecimal outboundAuxiliaryQuantity = outboundMainQuantityB.multiply();*///鍑哄簱杈呮暟閲�
/*杈呮暟閲�=浠撳簱杈呮暟閲�+鍑哄簱鐨勮緟鏁伴噺锛堝嚭搴撴暟閲�*璁＄畻姣斾緥锛�*/
- BigDecimal auxiliaryQuantitySubtract = auxiliaryQuantityB.add(outboundAuxiliaryQuantity);//鍔犲悗鐨勫簱瀛樿緟鏁伴噺
+ /* BigDecimal auxiliaryQuantitySubtract = auxiliaryQuantityB.add(outboundAuxiliaryQuantity);//鍔犲悗鐨勫簱瀛樿緟鏁伴噺*/
sparesPartInventory.setMainQuantity(mainQuantitySubtract.doubleValue());
- sparesPartInventory.setAuxiliaryQuantity(auxiliaryQuantitySubtract.doubleValue());
+ /* sparesPartInventory.setAuxiliaryQuantity(auxiliaryQuantitySubtract.doubleValue());*/
boolean b = sparesPartInventoryService.updateById(sparesPartInventory);
if (!b) {
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/service/impl/SparePartCancellingStocksServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/service/impl/SparePartCancellingStocksServiceImpl.java
index 859864d..4dbf7f2 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/service/impl/SparePartCancellingStocksServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/service/impl/SparePartCancellingStocksServiceImpl.java
@@ -47,7 +47,7 @@
for (SparePartCancellingStocksDetail entity : sparePartCancellingStocksDetailList) {
entity.setStatus(CommonConstant.STATUS_0);
SparePart sparePart = sparePartService.getById(entity.getSparePartId());
- entity.setAuxiliaryQuantity(entity.getMainQuantity() * Double.parseDouble(sparePart.getConversionRatio()));
+ /* entity.setAuxiliaryQuantity(entity.getMainQuantity() * Double.parseDouble(sparePart.getConversionRatio()));*/
//澶栭敭璁剧疆
entity.setSparePartCancellingId(sparePartCancellingStocks.getId());
sparePartCancellingStocksDetailMapper.insert(entity);
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/service/impl/SparePartOutboundDetailServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/service/impl/SparePartOutboundDetailServiceImpl.java
index 3126659..09c1260 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/service/impl/SparePartOutboundDetailServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/service/impl/SparePartOutboundDetailServiceImpl.java
@@ -69,27 +69,27 @@
//3.鑾峰彇涓� 杈呭崟浣嶈浆鎹㈡瘮渚�
SparePart sparePart = sparePartService.getById(sparePartId);
- String conversionRatio = sparePart.getConversionRatio();
+/* String conversionRatio = sparePart.getConversionRatio();
double conversionRatioD = 0;
if(StringUtils.isBlank(conversionRatio)){
conversionRatioD = Double.parseDouble("0");
}else{
conversionRatioD = Double.parseDouble(conversionRatio);
}
- BigDecimal conversionRatioB = new BigDecimal(conversionRatioD);
+ BigDecimal conversionRatioB = new BigDecimal(conversionRatioD);*/
//4.璁＄畻鍑哄簱鏁伴噺鏇存柊搴撳瓨鏁伴噺(搴撳瓨)
Double mainQuantity = sparesPartInventory.getMainQuantity();
BigDecimal mainQuantityB = new BigDecimal(mainQuantity);
- Double auxiliaryQuantity = sparesPartInventory.getAuxiliaryQuantity();
- BigDecimal auxiliaryQuantityB = new BigDecimal(auxiliaryQuantity);
+ /* Double auxiliaryQuantity = sparesPartInventory.getAuxiliaryQuantity();*/
+ /* BigDecimal auxiliaryQuantityB = new BigDecimal(auxiliaryQuantity);*/
BigDecimal mainQuantitySubtract = mainQuantityB.subtract(outboundMainQuantityB);//鍑忓畬鍚庣殑搴撳瓨涓绘暟閲�
- BigDecimal outboundAuxiliaryQuantity = outboundMainQuantityB.multiply(conversionRatioB);//鍑哄簱杈呮暟閲�
- BigDecimal auxiliaryQuantitySubtract = auxiliaryQuantityB.subtract(outboundAuxiliaryQuantity);//鍑忓畬鍚庣殑搴撳瓨杈呮暟閲�
+ /* BigDecimal outboundAuxiliaryQuantity = outboundMainQuantityB.multiply(conversionRatioB);//鍑哄簱杈呮暟閲�*/
+ /* BigDecimal auxiliaryQuantitySubtract = auxiliaryQuantityB.subtract(outboundAuxiliaryQuantity);//鍑忓畬鍚庣殑搴撳瓨杈呮暟閲�*/
sparesPartInventory.setMainQuantity(mainQuantitySubtract.doubleValue());
- sparesPartInventory.setAuxiliaryQuantity(auxiliaryQuantitySubtract.doubleValue());
+ /* sparesPartInventory.setAuxiliaryQuantity(auxiliaryQuantitySubtract.doubleValue());*/
boolean b = sparesPartInventoryService.updateById(sparesPartInventory);
if(!b){
return b;
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/service/impl/SparePartPurchaseStorageDetailServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/service/impl/SparePartPurchaseStorageDetailServiceImpl.java
index 7bffa57..54844b7 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/service/impl/SparePartPurchaseStorageDetailServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/service/impl/SparePartPurchaseStorageDetailServiceImpl.java
@@ -79,8 +79,8 @@
sparesPartInventory.setConstructorId(sparePartPurchaseStorageDetail.getConstructorId());
sparesPartInventory.setMainUnitId(sparePartPurchaseStorageDetail.getMainUnitId());
sparesPartInventory.setMainQuantity(sparePartPurchaseStorageDetail.getMainQuantity());
- sparesPartInventory.setAuxiliaryUnitId(sparePartPurchaseStorageDetail.getAuxiliaryUnitId());
- sparesPartInventory.setAuxiliaryQuantity(sparePartPurchaseStorageDetail.getAuxiliaryQuantity());
+ /* sparesPartInventory.setAuxiliaryUnitId(sparePartPurchaseStorageDetail.getAuxiliaryUnitId());
+ sparesPartInventory.setAuxiliaryQuantity(sparePartPurchaseStorageDetail.getAuxiliaryQuantity());*/
sparesPartInventory.setManufactureDate(sparePartPurchaseStorageDetail.getManufactureDate());
sparesPartInventory.setSupplierId(sparePartPurchaseStorageDetail.getSupplierId());
sparesPartInventory.setStatus("1");
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/service/impl/SparePartReceiveDeatilServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/service/impl/SparePartReceiveDeatilServiceImpl.java
index ef137fa..89f23ca 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/service/impl/SparePartReceiveDeatilServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/service/impl/SparePartReceiveDeatilServiceImpl.java
@@ -68,14 +68,14 @@
//3.鑾峰彇涓� 杈呭崟浣嶈浆鎹㈡瘮渚�
SparePart sparePart = sparePartService.getById(sparePartId);
- String conversionRatio = sparePart.getConversionRatio();
- double conversionRatioD = 0;
+ /* String conversionRatio = sparePart.getConversionRatio();*/
+ /* double conversionRatioD = 0;
if (StringUtils.isBlank(conversionRatio)) {
conversionRatioD = Double.parseDouble("0");
} else {
conversionRatioD = Double.parseDouble(conversionRatio);
}
- BigDecimal conversionRatioB = new BigDecimal(conversionRatioD);
+ BigDecimal conversionRatioB = new BigDecimal(conversionRatioD);*/
//4.璁＄畻鍑哄簱鏁伴噺鏇存柊搴撳瓨鏁伴噺(搴撳瓨)
/*搴撳瓨涓绘暟閲�*/
@@ -83,16 +83,16 @@
BigDecimal mainQuantityB = new BigDecimal(mainQuantity);
/*搴撳瓨杈呮暟閲�*/
- Double auxiliaryQuantity = sparesPartInventory.getAuxiliaryQuantity();
- BigDecimal auxiliaryQuantityB = new BigDecimal(auxiliaryQuantity);
+ /* Double auxiliaryQuantity = sparesPartInventory.getAuxiliaryQuantity();
+ BigDecimal auxiliaryQuantityB = new BigDecimal(auxiliaryQuantity);*/
BigDecimal mainQuantitySubtract = mainQuantityB.subtract(scrapMainQuantityB);//棰嗗彇鍚庡簱瀛樹富鏁伴噺
- BigDecimal scrapAuxiliaryQuantity = mainQuantitySubtract.multiply(conversionRatioB);//棰嗗彇鍚庡簱瀛樿緟鏁伴噺
+ /* BigDecimal scrapAuxiliaryQuantity = mainQuantitySubtract.multiply(conversionRatioB);//棰嗗彇鍚庡簱瀛樿緟鏁伴噺*/
sparesPartInventory.setMainQuantity(mainQuantitySubtract.doubleValue());
- sparesPartInventory.setAuxiliaryQuantity(scrapAuxiliaryQuantity.doubleValue());
+ /* sparesPartInventory.setAuxiliaryQuantity(scrapAuxiliaryQuantity.doubleValue());*/
boolean b = sparesPartInventoryService.updateById(sparesPartInventory);
if (!b) {
return b;
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/service/impl/SparesScrapDetailServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/service/impl/SparesScrapDetailServiceImpl.java
index f91384b..43307f7 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/service/impl/SparesScrapDetailServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/service/impl/SparesScrapDetailServiceImpl.java
@@ -67,14 +67,14 @@
//3.鑾峰彇涓� 杈呭崟浣嶈浆鎹㈡瘮渚�
SparePart sparePart = sparePartService.getById(sparePartId);
- String conversionRatio = sparePart.getConversionRatio();
+ /* String conversionRatio = sparePart.getConversionRatio();
double conversionRatioD = 0;
if (StringUtils.isBlank(conversionRatio)) {
conversionRatioD = Double.parseDouble("0");
} else {
conversionRatioD = Double.parseDouble(conversionRatio);
}
- BigDecimal conversionRatioB = new BigDecimal(conversionRatioD);
+ BigDecimal conversionRatioB = new BigDecimal(conversionRatioD);*/
//4.璁＄畻鍑哄簱鏁伴噺鏇存柊搴撳瓨鏁伴噺(搴撳瓨)
/*搴撳瓨涓绘暟閲�*/
@@ -83,15 +83,15 @@
/*搴撳瓨杈呮暟閲�*/
Double auxiliaryQuantity = sparesPartInventory.getAuxiliaryQuantity();
- BigDecimal auxiliaryQuantityB = new BigDecimal(auxiliaryQuantity);
+ /*BigDecimal auxiliaryQuantityB = new BigDecimal(auxiliaryQuantity);*/
BigDecimal mainQuantitySubtract = mainQuantityB.subtract(scrapMainQuantityB);//鎶ュ簾鍚庡簱瀛樹富鏁伴噺
- BigDecimal scrapAuxiliaryQuantity = mainQuantitySubtract.multiply(conversionRatioB);//鎶ュ簾鍚庡簱瀛樿緟鏁伴噺
+ /* BigDecimal scrapAuxiliaryQuantity = mainQuantitySubtract.multiply(conversionRatioB);//鎶ュ簾鍚庡簱瀛樿緟鏁伴噺*/
sparesPartInventory.setMainQuantity(mainQuantitySubtract.doubleValue());
- sparesPartInventory.setAuxiliaryQuantity(scrapAuxiliaryQuantity.doubleValue());
+ /* sparesPartInventory.setAuxiliaryQuantity(scrapAuxiliaryQuantity.doubleValue());*/
boolean b = sparesPartInventoryService.updateById(sparesPartInventory);
if (!b) {
return b;
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/controller/UnitController.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/controller/UnitController.java
index 10c4b57..3c13036 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/controller/UnitController.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/base/controller/UnitController.java
@@ -1,17 +1,29 @@
package org.jeecg.modules.base.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.base.entity.Unit;
import org.jeecg.modules.base.entity.UnitConversion;
import org.jeecg.modules.base.service.IUnitConversionService;
import org.jeecg.modules.base.service.IUnitService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
/**
@@ -24,98 +36,131 @@
@RestController
@RequestMapping("/base/unit")
@Slf4j
-public class UnitController {
+public class UnitController extends JeecgController<Unit, IUnitService> {
- @Resource
- private IUnitService momUnitService;
- @Resource
- private IUnitConversionService momUnitConversionService;
+ @Autowired
+ private IUnitService unitService;
+
+
/**
- * 鏌ヨ鏁版嵁 鏍规嵁鍗曚綅鍒嗙被id鏌ヨ璁￠噺鍗曚綅鍒楄〃
- * @author cj
- * @param unitCategoryId
+ * 鍒嗛〉鍒楄〃鏌ヨ
+ *
+ * @param
+ * @param pageNo
+ * @param pageSize
+ * @param req
* @return
*/
- @GetMapping(value="/getListByUnitCategoryId")
- public Result<List<Unit>> getListByUnitCategoryId(String unitCategoryId){
- Result<List<Unit>> resule = new Result<>();
- List<Unit> list = momUnitService.getListByUnitCategoryId(unitCategoryId);
- resule.setResult(list);
- return resule;
- }
- /**
- * 澧炲姞鏁版嵁 娣诲姞鍜岀紪杈戣閲忓崟浣嶄俊鎭�
- * @author cj
- * @param momUnit
- * @return
- */
- @PostMapping(value = "/addMomUnit")
- public Result<Unit> addMomUnit(@RequestBody Unit momUnit){
- Result<Unit> result = new Result<>();
- try{
- momUnit.setDelFlag("0");
- momUnitService.saveOrUpdate(momUnit);
- result.success("鎿嶄綔鎴愬姛");
- }catch (Exception e){
- result.error500("鎿嶄綔澶辫触");
- }
- return result;
+
+ @ApiOperation(value = "璁￠噺鍗曚綅-鍒嗛〉鍒楄〃鏌ヨ", notes = "璁￠噺鍗曚綅-鍒嗛〉鍒楄〃鏌ヨ")
+ @GetMapping(value = "/list")
+ public Result<IPage<Unit>> queryPageList(Unit unit,
+ @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper<Unit> queryWrapper = QueryGenerator.initQueryWrapper(unit, req.getParameterMap());
+ Page<Unit> page = new Page<Unit>(pageNo, pageSize);
+ IPage<Unit> pageList = unitService.page(page, queryWrapper);
+ return Result.OK(pageList);
}
/**
- * 鍒犻櫎鏁版嵁 鍒犻櫎閫変腑鐨勮閲忓崟浣嶄俊鎭�
- * @author cj
+ * 娣诲姞
+ *
+ * @param unit
+ * @return
+ */
+ @AutoLog(value = "璁￠噺鍗曚綅-娣诲姞")
+ @ApiOperation(value = "璁￠噺鍗曚綅-娣诲姞", notes = "璁￠噺鍗曚綅-娣诲姞")
+
+ @PostMapping(value = "/add")
+ public Result<String> add(@RequestBody Unit unit) {
+ unitService.save(unit);
+ return Result.OK("娣诲姞鎴愬姛锛�");
+ }
+
+ /**
+ * 缂栬緫
+ *
+ * @param unit
+ * @return
+ */
+ @AutoLog(value = "璁￠噺鍗曚綅-缂栬緫")
+ @ApiOperation(value = "璁￠噺鍗曚綅-缂栬緫", notes = "璁￠噺鍗曚綅-缂栬緫")
+ @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+ public Result<String> edit(@RequestBody Unit unit) {
+ unitService.updateById(unit);
+ return Result.OK("缂栬緫鎴愬姛!");
+ }
+
+ /**
+ * 閫氳繃id鍒犻櫎
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "璁￠噺鍗曚綅-閫氳繃id鍒犻櫎")
+ @ApiOperation(value = "璁￠噺鍗曚綅-閫氳繃id鍒犻櫎", notes = "璁￠噺鍗曚綅-閫氳繃id鍒犻櫎")
+ @DeleteMapping(value = "/delete")
+ public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
+ unitService.removeById(id);
+ return Result.OK("鍒犻櫎鎴愬姛!");
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎
+ *
* @param ids
* @return
*/
- @DeleteMapping(value = "/deleteMomUnit")
- public Result<Unit> deleteMomUnit(@RequestParam String ids){
- Result<Unit> result = new Result<>();
- if(oConvertUtils.isEmpty(ids)) {
- result.error500("鏈�変腑璁￠噺鍗曚綅锛�");
- }else {
- String[] ls = ids.split(",");
- List<UnitConversion> list = new ArrayList<>();
- List<Long> idList = new ArrayList<>();
- List<String> nameList = new ArrayList<>();
- for (String id : ls) {
- //鏍规嵁id鏌ヨ鏄惁鏈夋崲绠椾俊鎭�
- LambdaQueryWrapper<UnitConversion> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(UnitConversion::getUnitId,id);
- list = momUnitConversionService.list(queryWrapper);
- if(list.size()==0){
- idList.add(Long.parseLong(id) );
- }else{
- LambdaQueryWrapper<Unit> queryWrapper1 = new LambdaQueryWrapper<>();
- queryWrapper1.eq(Unit::getId,id);
- nameList.add(momUnitService.getOne(queryWrapper1).getName());
- }
- }
- if (idList.size() > 0) {
- momUnitService.removeByIds(idList);
- if (ls.length == idList.size()) {
- result.success("鍒犻櫎鎴愬姛锛�");
- } else {
- result.error500("閮ㄥ垎鍒犻櫎鎴愬姛锛�("+nameList+"涓惈鏈夎閲忓崟浣嶆崲绠椾俊鎭棤娉曞垹闄�!)");
- }
- }else {
- result.error500("閫夋嫨鐨勮閲忓崟浣嶉兘鍚湁璁￠噺鍗曚綅鎹㈢畻淇℃伅锛屾棤娉曞垹闄わ紒");
- }
- }
- return result;
+ @AutoLog(value = "璁￠噺鍗曚綅-鎵归噺鍒犻櫎")
+ @ApiOperation(value = "璁￠噺鍗曚綅-鎵归噺鍒犻櫎", notes = "璁￠噺鍗曚綅-鎵归噺鍒犻櫎")
+ @DeleteMapping(value = "/deleteBatch")
+ public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+ List<String> stringList = Arrays.asList(ids.split(","));
+ unitService.removeBatchByIds(stringList);
+ return Result.OK("鎵归噺鍒犻櫎鎴愬姛!");
}
/**
- * 鏌ヨ鐩爣璁￠噺鍗曚綅鏍戠粨鏋�
- * @author cj
+ * 閫氳繃id鏌ヨ
+ *
+ * @param id
* @return
*/
- @GetMapping(value = "/getTreeList")
- public Result<List<Unit>> getTreeList(){
- Result<List<Unit>> result = new Result<>();
- List<Unit> list = momUnitService.getTreeList();
- result.setResult(list);
- return result;
+ //@AutoLog(value = "绮惧害鍙傛暟-閫氳繃id鏌ヨ")
+ @ApiOperation(value = "璁￠噺鍗曚綅-閫氳繃id鏌ヨ", notes = "璁￠噺鍗曚綅-閫氳繃id鏌ヨ")
+ @GetMapping(value = "/queryById")
+ public Result<Unit> queryById(@RequestParam(name = "id", required = true) String id) {
+ Unit unit = unitService.getById(id);
+ if (unit == null) {
+ return Result.error("鏈壘鍒板搴旀暟鎹�");
+ }
+ return Result.OK(unit);
+ }
+
+ /**
+ * 瀵煎嚭excel
+ *
+ * @param request
+ * @param unit
+ */
+
+ @RequestMapping(value = "/exportXls")
+ public ModelAndView exportXls(HttpServletRequest request, Unit unit) {
+ return super.exportXls(request, unit, Unit.class, "璁￠噺鍗曚綅");
+ }
+
+ /**
+ * 閫氳繃excel瀵煎叆鏁版嵁
+ *
+ * @param request
+ * @param response
+ * @return
+ */
+ @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+ public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+ return super.importExcel(request, response, Unit.class);
}
--
Gitblit v1.9.3