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 | 83 +++++++++++++++++++++++++++++++++--------
1 files changed, 67 insertions(+), 16 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 b58fdce..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
@@ -1,8 +1,13 @@
package org.jeecg.modules.dry.controller;
import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
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;
import org.jeecg.common.system.query.QueryGenerator;
@@ -17,6 +22,9 @@
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.*;
import org.springframework.web.servlet.ModelAndView;
@@ -26,18 +34,21 @@
import org.apache.shiro.authz.annotation.RequiresPermissions;
/**
- * @Description: 骞茬嚗鎵规
+ * @Description: 骞茬嚗宸ュ崟
* @Author: jeecg-boot
* @Date: 2023-03-08
* @Version: V1.0
*/
-@Api(tags="骞茬嚗鎵规")
+@Api(tags="骞茬嚗宸ュ崟")
@RestController
@RequestMapping("/dry/dryOrder")
@Slf4j
public class DryOrderController extends JeecgController<DryOrder, IDryOrderService> {
@Autowired
private IDryOrderService dryOrderService;
+
+ @Autowired
+ private IDryOrderTrendService dryOrderTrendService;
/**
* 鍒嗛〉鍒楄〃鏌ヨ
@@ -48,8 +59,8 @@
* @param req
* @return
*/
- //@AutoLog(value = "骞茬嚗鎵规-鍒嗛〉鍒楄〃鏌ヨ")
- @ApiOperation(value="骞茬嚗鎵规-鍒嗛〉鍒楄〃鏌ヨ", notes="骞茬嚗鎵规-鍒嗛〉鍒楄〃鏌ヨ")
+ //@AutoLog(value = "骞茬嚗宸ュ崟-鍒嗛〉鍒楄〃鏌ヨ")
+ @ApiOperation(value="骞茬嚗宸ュ崟-鍒嗛〉鍒楄〃鏌ヨ", notes="骞茬嚗宸ュ崟-鍒嗛〉鍒楄〃鏌ヨ")
@GetMapping(value = "/list")
public Result<IPage<DryOrder>> queryPageList(DryOrder dryOrder,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@@ -67,14 +78,24 @@
return Result.OK(pageList);
}
+
+ @ApiOperation(value="鏈堢敓浜ф儏鍐垫瑙�", notes="")
+ @GetMapping(value = "/monthOverview")
+ public Result<?> queryMonthOverview(@RequestParam(name="month") String month) {
+ int tenantId = oConvertUtils.getInt(TenantContext.getTenant(),0);
+ List<String> list = dryOrderService.queryMonthOverview(month, tenantId);
+ return Result.ok(list);
+ }
+
+
/**
* 娣诲姞
*
* @param dryOrder
* @return
*/
- @AutoLog(value = "骞茬嚗鎵规-娣诲姞")
- @ApiOperation(value="骞茬嚗鎵规-娣诲姞", notes="骞茬嚗鎵规-娣诲姞")
+ @AutoLog(value = "骞茬嚗宸ュ崟-娣诲姞")
+ @ApiOperation(value="骞茬嚗宸ュ崟-娣诲姞", notes="骞茬嚗宸ュ崟-娣诲姞")
@RequiresPermissions("dry:dry_order:add")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody DryOrder dryOrder) {
@@ -88,8 +109,8 @@
* @param dryOrder
* @return
*/
- @AutoLog(value = "骞茬嚗鎵规-缂栬緫")
- @ApiOperation(value="骞茬嚗鎵规-缂栬緫", notes="骞茬嚗鎵规-缂栬緫")
+ @AutoLog(value = "骞茬嚗宸ュ崟-缂栬緫")
+ @ApiOperation(value="骞茬嚗宸ュ崟-缂栬緫", notes="骞茬嚗宸ュ崟-缂栬緫")
@RequiresPermissions("dry:dry_order:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
public Result<String> edit(@RequestBody DryOrder dryOrder) {
@@ -103,8 +124,8 @@
* @param id
* @return
*/
- @AutoLog(value = "骞茬嚗鎵规-閫氳繃id鍒犻櫎")
- @ApiOperation(value="骞茬嚗鎵规-閫氳繃id鍒犻櫎", notes="骞茬嚗鎵规-閫氳繃id鍒犻櫎")
+ @AutoLog(value = "骞茬嚗宸ュ崟-閫氳繃id鍒犻櫎")
+ @ApiOperation(value="骞茬嚗宸ュ崟-閫氳繃id鍒犻櫎", notes="骞茬嚗宸ュ崟-閫氳繃id鍒犻櫎")
@RequiresPermissions("dry:dry_order:delete")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name="id",required=true) String id) {
@@ -118,8 +139,8 @@
* @param ids
* @return
*/
- @AutoLog(value = "骞茬嚗鎵规-鎵归噺鍒犻櫎")
- @ApiOperation(value="骞茬嚗鎵规-鎵归噺鍒犻櫎", notes="骞茬嚗鎵规-鎵归噺鍒犻櫎")
+ @AutoLog(value = "骞茬嚗宸ュ崟-鎵归噺鍒犻櫎")
+ @ApiOperation(value="骞茬嚗宸ュ崟-鎵归噺鍒犻櫎", notes="骞茬嚗宸ュ崟-鎵归噺鍒犻櫎")
@RequiresPermissions("dry:dry_order:deleteBatch")
@DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
@@ -127,14 +148,29 @@
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
* @return
*/
- //@AutoLog(value = "骞茬嚗鎵规-閫氳繃id鏌ヨ")
- @ApiOperation(value="骞茬嚗鎵规-閫氳繃id鏌ヨ", notes="骞茬嚗鎵规-閫氳繃id鏌ヨ")
+ //@AutoLog(value = "骞茬嚗宸ュ崟-閫氳繃id鏌ヨ")
+ @ApiOperation(value="骞茬嚗宸ュ崟-閫氳繃id鏌ヨ", notes="骞茬嚗宸ュ崟-閫氳繃id鏌ヨ")
@GetMapping(value = "/queryById")
public Result<DryOrder> queryById(@RequestParam(name="id",required=true) String id) {
DryOrder dryOrder = dryOrderService.getById(id);
@@ -143,6 +179,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
@@ -153,7 +203,7 @@
@RequiresPermissions("dry:dry_order:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, DryOrder dryOrder) {
- return super.exportXls(request, dryOrder, DryOrder.class, "骞茬嚗鎵规");
+ return super.exportXls(request, dryOrder, DryOrder.class, "骞茬嚗宸ュ崟");
}
/**
@@ -169,4 +219,5 @@
return super.importExcel(request, response, DryOrder.class);
}
+
}
--
Gitblit v1.9.3