Browse Source

数据修改

yumeng 2 years ago
parent
commit
5d1df0e840

+ 14 - 2
ruixuan-live/src/main/java/com/ruixuan/isc/controller/SupplyChainController.java

@@ -1674,8 +1674,20 @@ public class SupplyChainController extends BaseController {
         if (!Check.isNull(requestJson.getLong("collectSampleId"))) {
             requestMap.put("collectSampleId", requestJson.getLong("collectSampleId"));
         }
-
-        List<JSONObject> list = supplyChainService.bdReportListV2(requestMap);
+        if (!Check.isNull(requestJson.getString("bindStartDate"))) {
+            Integer start = DateUtils.getIntegerTime(requestJson.getString("bindStartDate"));
+            requestMap.put("bindStartDate", start);
+        }
+        if (!Check.isNull(requestJson.getString("bindEndDate"))) {
+            Integer end = DateUtils.getIntegerTime(requestJson.getString("bindEndDate"));
+            requestMap.put("bindEndDate", end);
+        }
+        List<JSONObject> list = new ArrayList<>();
+        if (!Check.isNull(requestJson.getString("orderStartDate")) && !Check.isNull(requestJson.getString("orderEndDate"))) {
+            list = supplyChainService.bdReportListV2(requestMap);
+        } else if (!Check.isNull(requestJson.getString("bindStartDate")) && !Check.isNull(requestJson.getString("bindEndDate"))) {
+            list = supplyChainService.bdReportListV2ByBind(requestMap);
+        }
         List<List<Object>> exportList = new ArrayList<>();
         if (!Check.isNull(list)) {
             for (int i = 0; i < list.size(); i++) {