From 835bd18ad7f74192f96e83d85c358a7d9aa6b559 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期二, 05 九月 2023 14:14:12 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 62 +++++++++++++++++++++---------
1 files changed, 43 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index b6e98e6..4f095f5 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -37,6 +37,7 @@
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
+import java.text.SimpleDateFormat;
import java.util.*;
/**
@@ -816,7 +817,17 @@
@Override
@Transactional
public List<LocMast> packTestBasicInformation() {
- return locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_type1", 1).and().ne("loc_sts","O"));
+ List<LocMast> locMasts=locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_type1", 1).and().ne("loc_sts","O")
+ .and().ne("loc_sts","X"));
+ for (LocMast locMast:locMasts) {
+ LocDetl locDetl=locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no",locMast.getLocNo()));
+ if(Cools.isEmpty(locDetl)){
+ locMast.setMk("鏃犱俊鎭�");
+ }else{
+ locMast.setMk(locDetl.getMatnr());
+ }
+ }
+ return locMasts;
}
/*
* 娴嬭瘯搴撲娇鐢ㄦ儏鍐�
@@ -854,23 +865,21 @@
@Transactional
public List<PackUsageRate2> packQualified() {
Date now = new Date();
- Date date7 = Utils.timeYesterday(now);
- Date date14 = Utils.timeYesterday(date7);
ArrayList<PackUsageRate2> packUsageRates = new ArrayList<>();
-
- PackUsageRate2 packUsageRate = new PackUsageRate2();
- packUsageRate.setTotal(packQualifiedService.selectTotal(date7,now));
- packUsageRate.setQualified(packQualifiedService.selectCurrentQuantity(true,date7,now));
- packUsageRate.setUnqualified(packQualifiedService.selectCurrentQuantity(false,date7,now));
- packUsageRate.setWeek("鏈懆");
- packUsageRates.add(packUsageRate);
-
- PackUsageRate2 packUsageRate2 = new PackUsageRate2();
- packUsageRate2.setTotal(packQualifiedService.selectTotal(date14,date7));
- packUsageRate2.setQualified(packQualifiedService.selectCurrentQuantity(true,date14,date7));
- packUsageRate2.setUnqualified(packQualifiedService.selectCurrentQuantity(false,date14,date7));
- packUsageRate2.setWeek("涓婂懆");
- packUsageRates.add(packUsageRate2);
+ SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
+ for(int i=1;i<8;i++){
+ Date date7 = Utils.timeYesterday(now,i);
+ PackUsageRate2 packUsageRate7 = new PackUsageRate2();
+ packUsageRate7.setTotal(packQualifiedService.selectTotal(date7,now));
+ packUsageRate7.setQualified(packQualifiedService.selectCurrentQuantity(true,date7,now));
+ packUsageRate7.setUnqualified(packQualifiedService.selectCurrentQuantity(false,date7,now));
+ String formattedDate = sdf.format(date7);
+ int month = Integer.parseInt(formattedDate.substring(5, 7));
+ int day = Integer.parseInt(formattedDate.substring(8, 10));
+ packUsageRate7.setWeek(month+"-"+day);
+ packUsageRates.add(packUsageRate7);
+ now=date7;
+ }
return packUsageRates;
}
@@ -880,8 +889,23 @@
* */
@Override
@Transactional
- public List<WorkChartAxis> chartAxisEvening() {
- return reportQueryMapper.getChartAxisEvening();
+ public List<PackUsageRate2> chartAxisEvening() {
+ Date now = new Date();
+ ArrayList<PackUsageRate2> packUsageRates = new ArrayList<>();
+ SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
+ for(int i=1;i<13;i++){
+ Date date7 = Utils.timeYesterday1(now,i);
+ PackUsageRate2 packUsageRate7 = new PackUsageRate2();
+ packUsageRate7.setTotal(packQualifiedService.selectTotal1(date7,now));
+ packUsageRate7.setQualified(packQualifiedService.selectCurrentQuantity1(true,date7,now));
+ packUsageRate7.setUnqualified(packQualifiedService.selectCurrentQuantity1(false,date7,now));
+ String formattedDate = sdf.format(date7);
+ int hour= date7.getHours();
+ packUsageRate7.setWeek(hour+"");
+ packUsageRates.add(packUsageRate7);
+ now=date7;
+ }
+ return packUsageRates;
}
/*
--
Gitblit v1.9.1