From 2c65c31aceb16c1d06c692266e3fb555ecafdfb5 Mon Sep 17 00:00:00 2001
From: wujian <14790700720@163.com>
Date: 星期三, 23 十月 2024 09:10:47 +0800
Subject: [PATCH] change-4
---
jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/controller/DaPassingStationCollectionController.java | 31 +++++++++++++++++++++++++++++++
1 files changed, 31 insertions(+), 0 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/controller/DaPassingStationCollectionController.java b/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/controller/DaPassingStationCollectionController.java
index 9b4f3fc..c5d5a36 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/controller/DaPassingStationCollectionController.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/controller/DaPassingStationCollectionController.java
@@ -1,5 +1,6 @@
package com.jcdm.main.da.passingStationCollection.controller;
+import cn.hutool.core.util.ObjectUtil;
import com.jcdm.common.annotation.Log;
import com.jcdm.common.core.controller.BaseController;
import com.jcdm.common.core.domain.AjaxResult;
@@ -9,6 +10,7 @@
import com.jcdm.common.utils.DateUtils;
import com.jcdm.common.utils.poi.ExcelUtil;
import com.jcdm.main.da.passingStationCollection.domain.DaPassingStationCollection;
+import com.jcdm.main.da.passingStationCollection.domain.ProductNumVO;
import com.jcdm.main.da.passingStationCollection.service.IDaPassingStationCollectionService;
import com.jcdm.main.da.passingStationCollection.service.impl.DaPassingStationCollectionServiceImpl;
import com.jcdm.main.da.passingStationCollection.vo.DaPassingStationVO;
@@ -18,6 +20,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
+import java.time.LocalDate;
import java.util.List;
/**
@@ -47,6 +50,15 @@
List<DaPassingStationCollection> list = daPassingStationCollectionService.selectDaPassingStationCollectionList(daPassingStationCollection);
return getDataTable(list);
}
+
+ @GetMapping("/selectDaPassingStationCollectionForSearch")
+ public TableDataInfo selectDaPassingStationCollectionForSearch(DaPassingStationCollection daPassingStationCollection)
+ {
+ startPage();
+ List<DaPassingStationCollection> list = daPassingStationCollectionService.selectDaPassingStationCollectionForSearch(daPassingStationCollection);
+ return getDataTable(list);
+ }
+
@GetMapping("/getTopProcess")
public TableDataInfo getTopProcess()
@@ -152,4 +164,23 @@
// }
// return passingStationCollectionServiceImpl.sendMessage(message);
// }
+
+
+ @GetMapping("/getProductNum")
+ public R getProductNum(DaPassingStationCollection daPassingStationCollection){
+ LocalDate queryDate = daPassingStationCollection.getQueryDate();
+ String queryMonth = daPassingStationCollection.getQueryMonth();
+ if (ObjectUtil.isNull(queryDate) && ObjectUtil.isNull(queryMonth)){
+ return R.fail("璇烽�夋嫨鏈堜唤鎴栬�呮棩鏈�");
+ }
+ if (ObjectUtil.isNotEmpty(queryMonth) && ObjectUtil.isNotEmpty(queryDate)){
+ String queryDateString = queryDate.toString();
+ String queryMonthString = queryMonth.toString();
+ if (!queryDateString.contains(queryMonthString)){
+ return R.fail("璇风‘璁ら�夋嫨鐨勬湀浠藉拰鏃ユ湡鏈堜唤鏄惁鍖归厤");
+ }
+ }
+ List<ProductNumVO> productNum = daPassingStationCollectionService.getProductNum(daPassingStationCollection);
+ return R.ok(productNum);
+ }
}
--
Gitblit v1.9.3