From 339515558253d776769dc2e2560bbb4a0450c989 Mon Sep 17 00:00:00 2001
From: zhuguifei <zhuguifei@zhuguifeideiMac.local>
Date: 星期五, 29 十一月 2024 09:44:44 +0800
Subject: [PATCH] 将码云版本提交至gitlab -- 20241129
---
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryOrderController.java | 37 ++++++++++++++++++++++++++++++++++++-
1 files changed, 36 insertions(+), 1 deletions(-)
diff --git a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryOrderController.java b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryOrderController.java
old mode 100644
new mode 100755
index 8d4de43..c88e53a
--- a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryOrderController.java
+++ b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryOrderController.java
@@ -6,6 +6,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson.JSONObject;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.config.TenantContext;
@@ -21,6 +22,8 @@
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.modules.dry.service.IDryOrderTrendService;
+import org.jeecg.modules.dry.vo.DryOrderTrendVo;
import org.jeecg.modules.dry.vo.DryOrderVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -43,6 +46,9 @@
public class DryOrderController extends JeecgController<DryOrder, IDryOrderService> {
@Autowired
private IDryOrderService dryOrderService;
+
+ @Autowired
+ private IDryOrderTrendService dryOrderTrendService;
/**
* 鍒嗛〉鍒楄〃鏌ヨ
@@ -142,7 +148,22 @@
return Result.OK("鎵归噺鍒犻櫎鎴愬姛!");
}
- /**
+ /**
+ * 鎵归噺涓嬪彂宸ュ崟
+ * @param ids
+ * @return
+ */
+ @AutoLog(value = "骞茬嚗宸ュ崟-鎵归噺涓嬪彂")
+ @ApiOperation(value="骞茬嚗宸ュ崟-鎵归噺涓嬪彂", notes="骞茬嚗宸ュ崟-鎵归噺涓嬪彂")
+ @RequiresPermissions("dry:dry_order:edit")
+ @PostMapping(value = "/sendBatch")
+ public Result<String> sendBatch(@RequestParam(name="ids",required=true) String ids) {
+ this.dryOrderService.sendByIds(Arrays.asList(ids.split(",")));
+ return Result.OK("鎵归噺涓嬪彂鎴愬姛!");
+ }
+
+
+ /**
* 閫氳繃id鏌ヨ
*
* @param id
@@ -159,6 +180,20 @@
return Result.OK(dryOrder);
}
+ @ApiOperation(value="骞茬嚗宸ュ崟-鏌ヨ杩囩▼瓒嬪娍鏁版嵁", notes="鏌ヨ杩囩▼瓒嬪娍鏁版嵁")
+ @GetMapping(value = "/queryOrderTrendById")
+ public Result<DryOrderVo> queryOrderTrendById(@RequestParam(name="id",required=true) String id) {
+ DryOrder dryOrder = dryOrderService.getById(id);
+ DryOrderVo orderVo;
+ if(dryOrder ==null) {
+ return Result.error("鏈壘鍒板搴旀暟鎹�");
+ }
+ orderVo = BeanUtil.toBean(dryOrder, DryOrderVo.class);
+ List<DryOrderTrendVo> trendVos = dryOrderTrendService.listByOrderId(orderVo.getId());
+ orderVo.setDetailList(trendVos);
+ return Result.OK(orderVo);
+ }
+
/**
* 瀵煎嚭excel
*
--
Gitblit v1.9.3