From 23855599412c4d61b38d78f0f3abd3430a48b5b1 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期三, 25 六月 2025 11:51:38 +0800
Subject: [PATCH] Merge branch 'mdc_hyjs_master'
---
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/OutboundOrderController.java | 418 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 418 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/OutboundOrderController.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/OutboundOrderController.java
new file mode 100644
index 0000000..9d82e25
--- /dev/null
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/OutboundOrderController.java
@@ -0,0 +1,418 @@
+package org.jeecg.modules.tms.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.parser.Feature;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.jeecg.common.system.query.QueryGenerator;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.util.TranslateDictTextUtils;
+import org.jeecg.modules.tms.entity.dto.OutBoundAddDto;
+import org.jeecg.modules.tms.entity.dto.OutBoundOrderFlowDto;
+import org.jeecg.modules.tms.entity.dto.OutBoundRequestDto;
+import org.jeecg.modules.tms.entity.dto.OutboundOrderAndDetailDto;
+import org.jeecg.modules.tms.entity.vo.OutboundDetailVo;
+import org.jeecg.modules.tms.entity.vo.SelectOutboundToolVo;
+import org.jeecg.modules.tms.enums.OutBillStatus;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.web.servlet.ModelAndView;
+import java.util.Arrays;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.tms.entity.OutboundDetail;
+import org.jeecg.modules.tms.entity.OutboundOrder;
+import org.jeecg.modules.tms.service.IOutboundOrderService;
+import org.jeecg.modules.tms.service.IOutboundDetailService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+ /**
+ * @Description: tms_outbound_order
+ * @Author: jeecg-boot
+ * @Date: 2025-05-16
+ * @Version: V1.0
+ */
+@Api(tags="tms_outbound_order")
+@RestController
+@RequestMapping("/tms/outboundOrder")
+@Slf4j
+public class OutboundOrderController extends JeecgController<OutboundOrder, IOutboundOrderService> {
+
+ @Autowired
+ private IOutboundOrderService outboundOrderService;
+
+ @Autowired
+ private IOutboundDetailService outboundDetailService;
+
+ @Autowired
+ private ObjectMapper objectMapper;
+
+ @Autowired
+ private TranslateDictTextUtils translateDictTextUtils;
+
+
+
+ /*---------------------------------涓昏〃澶勭悊-begin-------------------------------------*/
+
+ /**
+ * 鍒嗛〉鍒楄〃鏌ヨ
+ * @param outboundOrder
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ //@AutoLog(value = "tms_outbound_order-鍒嗛〉鍒楄〃鏌ヨ")
+ @ApiOperation(value="tms_outbound_order-鍒嗛〉鍒楄〃鏌ヨ", notes="tms_outbound_order-鍒嗛〉鍒楄〃鏌ヨ")
+ @GetMapping(value = "/list")
+ public Result<IPage<OutboundOrder>> queryPageList(OutboundOrder outboundOrder,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+ Map<String, String[]> parameterMap = req.getParameterMap();
+ QueryWrapper<OutboundOrder> queryWrapper = QueryGenerator.initQueryWrapper(outboundOrder, parameterMap);
+ Page<OutboundOrder> page = new Page<OutboundOrder>(pageNo, pageSize);
+ IPage<OutboundOrder> pageList = outboundOrderService.queryPageList(page, parameterMap);
+ return Result.OK(pageList);
+ }
+
+ @ApiOperation(value="鍑哄簱鐢宠-鏌ヨ鍊熺敤鍑哄簱宸ュ叿鍒楄〃", notes="鍑哄簱鐢宠-鏌ヨ鍊熺敤鍑哄簱宸ュ叿鍒楄〃")
+ @GetMapping(value = "/selectBorrowOutboundToolPageList")
+ public Result<IPage<SelectOutboundToolVo>> queryBorrowOutboundToolPageList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+ Map<String, String[]> parameterMap = req.getParameterMap();
+ Page<SelectOutboundToolVo> page = new Page<>(pageNo, pageSize);
+ IPage<SelectOutboundToolVo> pageList = outboundOrderService.queryBorrowOutboundToolPageList(page, parameterMap);
+ return Result.OK(pageList);
+ }
+
+ @ApiOperation(value="鍑哄簱鐢宠-鏌ヨ鍒冪（鍑哄簱宸ュ叿鍒楄〃", notes="鍑哄簱鐢宠-鏌ヨ鍒冪（鍑哄簱宸ュ叿鍒楄〃")
+ @GetMapping(value = "/selectSharpenOutboundToolPageList")
+ public Result<IPage<SelectOutboundToolVo>> querySharpenOutboundToolPageList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+ Map<String, String[]> parameterMap = req.getParameterMap();
+ Page<SelectOutboundToolVo> page = new Page<>(pageNo, pageSize);
+ IPage<SelectOutboundToolVo> pageList = outboundOrderService.querySharpenOutboundToolPageList(page, parameterMap);
+ return Result.OK(pageList);
+ }
+
+ @ApiOperation(value="tms_outbound_order-閫氳繃id鏌ヨ", notes="tms_outbound_order-閫氳繃id鏌ヨ")
+ @GetMapping(value = "/queryById")
+ public Result<?> queryById(@RequestParam("id") String id) {
+ OutboundOrder outboundOrder = outboundOrderService.getById(id);
+ if (outboundOrder == null) {
+ return Result.error("鏈壘鍒板搴旀暟鎹�");
+ }
+ try {
+ String jsonStr = objectMapper.writeValueAsString(outboundOrder);
+ JSONObject item = JSONObject.parseObject(jsonStr, Feature.OrderedField);
+ translateDictTextUtils.translateField("outStorehouseType", outboundOrder.getOutStorehouseType(), item, "out_storehouse_type");
+ translateDictTextUtils.translateField("handler", outboundOrder.getHandler(), item, "sys_user,realname,id");
+ translateDictTextUtils.translateField("orderStatus", outboundOrder.getOrderStatus(), item, "out_bill_status");
+ translateDictTextUtils.translateField("outStatus", outboundOrder.getOutStatus(), item, "out_storehouse_status");
+ translateDictTextUtils.translateField("createBy", outboundOrder.getCreateBy(), item, "sys_user,realname,username");
+ translateDictTextUtils.translateField("updateBy", outboundOrder.getUpdateBy(), item, "sys_user,realname,username");
+ return Result.OK(item);
+ } catch (JsonProcessingException e) {
+ return Result.error("鏁版嵁杞瘧澶辫触锛�");
+ }
+ }
+
+ /**
+ * 娣诲姞
+ * @param outboundOrder
+ * @return
+ */
+ @AutoLog(value = "tms_outbound_order-娣诲姞")
+ @ApiOperation(value="tms_outbound_order-娣诲姞", notes="tms_outbound_order-娣诲姞")
+ //@RequiresPermissions("org.jeecg.modules:tms_outbound_order:add")
+ @PostMapping(value = "/add")
+ public Result<String> add(@RequestBody OutboundOrder outboundOrder) {
+ outboundOrderService.save(outboundOrder);
+ return Result.OK("娣诲姞鎴愬姛锛�");
+ }
+
+ @AutoLog(value = "tms_outbound_order-娣诲姞鍑哄簱鐢宠鍗曚富琛ㄥ強鏄庣粏淇℃伅")
+ @ApiOperation(value="tms_outbound_order-娣诲姞鍑哄簱鐢宠鍗曚富琛ㄥ強鏄庣粏淇℃伅", notes="tms_outbound_order-娣诲姞鍑哄簱鐢宠鍗曚富琛ㄥ強鏄庣粏淇℃伅")
+ @PostMapping(value = "/addTotal")
+ public Result<String> addTotal(@RequestBody OutboundOrderAndDetailDto outboundOrder) {
+ outboundOrderService.addTotal(outboundOrder);
+ return Result.OK("娣诲姞鎴愬姛锛�");
+ }
+
+ @AutoLog(value = "tms_outbound_order-缂栬緫鍑哄簱鐢宠鍗曚富琛ㄥ強鏄庣粏淇℃伅")
+ @ApiOperation(value="tms_outbound_order-缂栬緫鍑哄簱鐢宠鍗曚富琛ㄥ強鏄庣粏淇℃伅", notes="tms_outbound_order-缂栬緫鍑哄簱鐢宠鍗曚富琛ㄥ強鏄庣粏淇℃伅")
+ //@RequiresPermissions("org.jeecg.modules:tms_outbound_order:edit")
+ @RequestMapping(value = "/editTotal", method = {RequestMethod.PUT,RequestMethod.POST})
+ public Result<String> editTotal(@RequestBody OutboundOrderAndDetailDto outboundOrder) {
+ outboundOrderService.editTotal(outboundOrder);
+ return Result.OK("缂栬緫鎴愬姛锛�");
+ }
+
+ /**
+ * 缂栬緫
+ * @param outboundOrder
+ * @return
+ */
+ @AutoLog(value = "tms_outbound_order-缂栬緫")
+ @ApiOperation(value="tms_outbound_order-缂栬緫", notes="tms_outbound_order-缂栬緫")
+ //@RequiresPermissions("org.jeecg.modules:tms_outbound_order:edit")
+ @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+ public Result<String> edit(@RequestBody OutboundOrder outboundOrder) {
+ outboundOrderService.updateById(outboundOrder);
+ return Result.OK("缂栬緫鎴愬姛!");
+ }
+
+ @AutoLog(value = "tms_outbound_order-鎻愪氦鍑哄簱鐢宠鍗�")
+ @ApiOperation(value="tms_outbound_order-鎻愪氦鍑哄簱鐢宠鍗�", notes="tms_outbound_order-鎻愪氦鍑哄簱鐢宠鍗�")
+ @GetMapping(value = "/submit")
+ public Result<String> submit(@RequestParam(name="id") String id) {
+ outboundOrderService.submit(id);
+ return Result.OK("鎻愪氦鎴愬姛!");
+ }
+
+ @AutoLog(value = "瀹℃壒娴佺▼")
+ @ApiOperation(value = "鍑哄簱鐢宠鍗�-瀹℃壒娴佺▼", notes = "鍑哄簱鐢宠鍗�-瀹℃壒娴佺▼")
+ @PostMapping("/approval")
+ public Result<?> approval(@RequestBody OutBoundOrderFlowDto outBoundOrderFlowDto) {
+ outboundOrderService.approvalProcess(outBoundOrderFlowDto);
+ return Result.OK("鎿嶄綔鎴愬姛");
+ }
+
+ @AutoLog(value = "鐢宠鍗曟柟寮忓嚭搴�")
+ @ApiOperation(value = "鐢宠鍗曟柟寮忓嚭搴�", notes = "鐢宠鍗曟柟寮忓嚭搴�")
+ @PostMapping(value = "/outBoundByApply")
+ public Result<?> outBoundByApply(@RequestBody List<OutBoundRequestDto> outBoundRequestList) {
+ outboundOrderService.outBoundByApply(outBoundRequestList);
+ return Result.OK("鍑哄簱鎴愬姛");
+ }
+
+ @AutoLog(value = "鏂板鏂瑰紡鍑哄簱")
+ @ApiOperation(value = "鏂板鏂瑰紡鍑哄簱", notes = "鏂板鏂瑰紡鍑哄簱")
+ @PostMapping(value = "/outBoundByAdd")
+ public Result<?> outBoundByAdd(@RequestBody List<OutBoundAddDto> boundAddList) {
+ outboundOrderService.outBoundByAdd(boundAddList);
+ return Result.OK("鍑哄簱鎴愬姛");
+ }
+
+ /**
+ * 閫氳繃id鍒犻櫎
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "tms_outbound_order-閫氳繃id鍒犻櫎")
+ @ApiOperation(value="tms_outbound_order-閫氳繃id鍒犻櫎", notes="tms_outbound_order-閫氳繃id鍒犻櫎")
+ //@RequiresPermissions("org.jeecg.modules:tms_outbound_order:delete")
+ @DeleteMapping(value = "/delete")
+ public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+ outboundOrderService.delMain(id);
+ return Result.OK("鍒犻櫎鎴愬姛!");
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎
+ * @param ids
+ * @return
+ */
+ @AutoLog(value = "tms_outbound_order-鎵归噺鍒犻櫎")
+ @ApiOperation(value="tms_outbound_order-鎵归噺鍒犻櫎", notes="tms_outbound_order-鎵归噺鍒犻櫎")
+ //@RequiresPermissions("org.jeecg.modules:tms_outbound_order:deleteBatch")
+ @DeleteMapping(value = "/deleteBatch")
+ public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+ this.outboundOrderService.delBatchMain(Arrays.asList(ids.split(",")));
+ return Result.OK("鎵归噺鍒犻櫎鎴愬姛!");
+ }
+
+ /**
+ * 瀵煎嚭
+ * @return
+ */
+ //@RequiresPermissions("org.jeecg.modules:tms_outbound_order:exportXls")
+ @RequestMapping(value = "/exportXls")
+ public ModelAndView exportXls(HttpServletRequest request, OutboundOrder outboundOrder) {
+ return super.exportXls(request, outboundOrder, OutboundOrder.class, "tms_outbound_order");
+ }
+
+ /**
+ * 瀵煎叆
+ * @return
+ */
+ //@RequiresPermissions("org.jeecg.modules:tms_outbound_order:importExcel")
+ @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+ public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+ return super.importExcel(request, response, OutboundOrder.class);
+ }
+ /*---------------------------------涓昏〃澶勭悊-end-------------------------------------*/
+
+
+ /*--------------------------------瀛愯〃澶勭悊-鍑哄簱鐢宠鍗曟槑缁�-begin----------------------------------------------*/
+ /**
+ * 閫氳繃涓昏〃ID鏌ヨ
+ * @return
+ */
+ //@AutoLog(value = "鍑哄簱鐢宠鍗曟槑缁�-閫氳繃涓昏〃ID鏌ヨ")
+ @ApiOperation(value="鍑哄簱鐢宠鍗曟槑缁�-閫氳繃涓昏〃ID鏌ヨ", notes="鍑哄簱鐢宠鍗曟槑缁�-閫氳繃涓昏〃ID鏌ヨ")
+ @GetMapping(value = "/listOutboundDetailByMainId")
+ public Result<IPage<OutboundDetailVo>> listOutboundDetailByMainId(OutboundDetail outboundDetail,
+ @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+ HttpServletRequest req) {
+ Map<String, String[]> parameterMap = req.getParameterMap();
+ QueryWrapper<OutboundDetail> queryWrapper = QueryGenerator.initQueryWrapper(outboundDetail, parameterMap);
+ Page<OutboundDetail> page = new Page<OutboundDetail>(pageNo, pageSize);
+ IPage<OutboundDetailVo> pageList = outboundDetailService.queryPageList(page, parameterMap);
+ return Result.OK(pageList);
+ }
+
+ /**
+ * 娣诲姞
+ * @param outboundDetail
+ * @return
+ */
+ @AutoLog(value = "鍑哄簱鐢宠鍗曟槑缁�-娣诲姞")
+ @ApiOperation(value="鍑哄簱鐢宠鍗曟槑缁�-娣诲姞", notes="鍑哄簱鐢宠鍗曟槑缁�-娣诲姞")
+ @PostMapping(value = "/addOutboundDetail")
+ public Result<String> addOutboundDetail(@RequestBody OutboundDetail outboundDetail) {
+ outboundDetailService.save(outboundDetail);
+ return Result.OK("娣诲姞鎴愬姛锛�");
+ }
+
+ /**
+ * 缂栬緫
+ * @param outboundDetail
+ * @return
+ */
+ @AutoLog(value = "鍑哄簱鐢宠鍗曟槑缁�-缂栬緫")
+ @ApiOperation(value="鍑哄簱鐢宠鍗曟槑缁�-缂栬緫", notes="鍑哄簱鐢宠鍗曟槑缁�-缂栬緫")
+ @RequestMapping(value = "/editOutboundDetail", method = {RequestMethod.PUT,RequestMethod.POST})
+ public Result<String> editOutboundDetail(@RequestBody OutboundDetail outboundDetail) {
+ outboundDetailService.updateById(outboundDetail);
+ return Result.OK("缂栬緫鎴愬姛!");
+ }
+
+ /**
+ * 閫氳繃id鍒犻櫎
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "鍑哄簱鐢宠鍗曟槑缁�-閫氳繃id鍒犻櫎")
+ @ApiOperation(value="鍑哄簱鐢宠鍗曟槑缁�-閫氳繃id鍒犻櫎", notes="鍑哄簱鐢宠鍗曟槑缁�-閫氳繃id鍒犻櫎")
+ @DeleteMapping(value = "/deleteOutboundDetail")
+ public Result<String> deleteOutboundDetail(@RequestParam(name="id",required=true) String id) {
+ outboundDetailService.removeById(id);
+ return Result.OK("鍒犻櫎鎴愬姛!");
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎
+ * @param ids
+ * @return
+ */
+ @AutoLog(value = "鍑哄簱鐢宠鍗曟槑缁�-鎵归噺鍒犻櫎")
+ @ApiOperation(value="鍑哄簱鐢宠鍗曟槑缁�-鎵归噺鍒犻櫎", notes="鍑哄簱鐢宠鍗曟槑缁�-鎵归噺鍒犻櫎")
+ @DeleteMapping(value = "/deleteBatchOutboundDetail")
+ public Result<String> deleteBatchOutboundDetail(@RequestParam(name="ids",required=true) String ids) {
+ this.outboundDetailService.removeByIds(Arrays.asList(ids.split(",")));
+ return Result.OK("鎵归噺鍒犻櫎鎴愬姛!");
+ }
+
+ /**
+ * 瀵煎嚭
+ * @return
+ */
+ @RequestMapping(value = "/exportOutboundDetail")
+ public ModelAndView exportOutboundDetail(HttpServletRequest request, OutboundDetail outboundDetail) {
+ // Step.1 缁勮鏌ヨ鏉′欢
+ QueryWrapper<OutboundDetail> queryWrapper = QueryGenerator.initQueryWrapper(outboundDetail, request.getParameterMap());
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+
+ // Step.2 鑾峰彇瀵煎嚭鏁版嵁
+ List<OutboundDetail> pageList = outboundDetailService.list(queryWrapper);
+ List<OutboundDetail> exportList = null;
+
+ // 杩囨护閫変腑鏁版嵁
+ String selections = request.getParameter("selections");
+ if (oConvertUtils.isNotEmpty(selections)) {
+ List<String> selectionList = Arrays.asList(selections.split(","));
+ exportList = pageList.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList());
+ } else {
+ exportList = pageList;
+ }
+
+ // Step.3 AutoPoi 瀵煎嚭Excel
+ ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+ //姝ゅ璁剧疆鐨刦ilename鏃犳晥,鍓嶇浼氶噸鏇存柊璁剧疆涓�涓�
+ mv.addObject(NormalExcelConstants.FILE_NAME, "鍑哄簱鐢宠鍗曟槑缁�");
+ mv.addObject(NormalExcelConstants.CLASS, OutboundDetail.class);
+ mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("鍑哄簱鐢宠鍗曟槑缁嗘姤琛�", "瀵煎嚭浜�:" + sysUser.getRealname(), "鍑哄簱鐢宠鍗曟槑缁�"));
+ mv.addObject(NormalExcelConstants.DATA_LIST, exportList);
+ return mv;
+ }
+
+ /**
+ * 瀵煎叆
+ * @return
+ */
+ @RequestMapping(value = "/importOutboundDetail/{mainId}")
+ public Result<?> importOutboundDetail(HttpServletRequest request, HttpServletResponse response, @PathVariable("mainId") String mainId) {
+ MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+ Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+ for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
+ // 鑾峰彇涓婁紶鏂囦欢瀵硅薄
+ MultipartFile file = entity.getValue();
+ ImportParams params = new ImportParams();
+ params.setTitleRows(2);
+ params.setHeadRows(1);
+ params.setNeedSave(true);
+ try {
+ List<OutboundDetail> list = ExcelImportUtil.importExcel(file.getInputStream(), OutboundDetail.class, params);
+ for (OutboundDetail temp : list) {
+ temp.setOutStorehouseId(mainId);
+ }
+ long start = System.currentTimeMillis();
+ outboundDetailService.saveBatch(list);
+ log.info("娑堣�楁椂闂�" + (System.currentTimeMillis() - start) + "姣");
+ return Result.OK("鏂囦欢瀵煎叆鎴愬姛锛佹暟鎹鏁帮細" + list.size());
+ } catch (Exception e) {
+ log.error(e.getMessage(), e);
+ return Result.error("鏂囦欢瀵煎叆澶辫触:" + e.getMessage());
+ } finally {
+ try {
+ file.getInputStream().close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+ return Result.error("鏂囦欢瀵煎叆澶辫触锛�");
+ }
+
+ /*--------------------------------瀛愯〃澶勭悊-鍑哄簱鐢宠鍗曟槑缁�-end----------------------------------------------*/
+
+
+
+
+}
--
Gitblit v1.9.3