修改出库可视化页面数据不准确的问题

src/main/java/com/dreamchaser/depository_manage/controller/DepositoryController.java

@@ -427,7 +427,8 @@ public class DepositoryController {
                 show_data.putAll((Map<?, ?>) result);
             }
             depository_data.put("data", show_data);
-        } else {
+        }
+        else {
             // 每天各仓库入库数目
             while (it.hasNext()) {
                 Object next = it.next();
@@ -598,7 +599,8 @@ public class DepositoryController {
             }
 
 
-        } else {
+        }
+        else {
 
             // 获取本周至今仓库的入/出库数量
             Future<Object> futureForBarChartData = completionService.submit(new distributeTasks(depositoryAllNameAndId, type, 1, userByPort, depositoryName));
@@ -666,10 +668,13 @@ public class DepositoryController {
             Long format = DateUtil.DateTimeByDayToTimeStamp(formatter.format(instance.getTime()));
             days.add(format);
         }
+        // 反转日期
+        Collections.reverse(days);
         // 定义线程
         int threadSize = depositoryAllNameAndId.size();
         ExecutorService exs = new ThreadPoolExecutor(threadSize, threadSize, 100, TimeUnit.SECONDS, new LinkedBlockingQueue<>(threadSize));
 
+
         // 结果集
         List<Future<Object>> futureList = new ArrayList<Future<Object>>();
         // 1.定义CompletionService
@@ -1341,7 +1346,8 @@ public class DepositoryController {
                 map.put("data", doubleList);
                 show_data.put(val, map);
             }
-        } else {
+        }
+        else {
             // 获取日期
             SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
             int now = instance.get(Calendar.DAY_OF_WEEK) - 1 == 0 ? 7 : instance.get(Calendar.DAY_OF_WEEK) - 1;

src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml

@@ -1710,7 +1710,7 @@
                 and aorstate = #{state}
             </if>
         </if>
-        and depositoryManagerTime between #{start} and #{end}
+        and applicantTime between #{start} and #{end}
     </select>
 
 

src/test/java/com/dreamchaser/depository_manage/SomeTest.java

@@ -10,6 +10,7 @@ import com.dreamchaser.depository_manage.pojo.callBackXml.approvalCallBackXml.*;
 import com.dreamchaser.depository_manage.security.pool.HandlesOtherFunctionalThreadPool;
 import com.dreamchaser.depository_manage.security.pool.RedisPool;
 import com.dreamchaser.depository_manage.service.DepositoryRecordService;
+import com.dreamchaser.depository_manage.utils.DateUtil;
 import com.dreamchaser.depository_manage.utils.Md5;
 import com.dreamchaser.depository_manage.utils.ObjectFormatUtil;
 import com.dreamchaser.depository_manage.utils.QyWxXMLUtils;
@@ -19,7 +20,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.List;
 import java.util.Map;
 
@@ -318,4 +321,28 @@ public class SomeTest {
         callback(approvalInfo);
 
     }
+
+
+    @Test
+    public void otherTest(){
+        //获取获取系统的当前日历对象
+        Calendar instance = Calendar.getInstance();
+        int weekDay = instance.get(Calendar.DAY_OF_WEEK);
+        weekDay = weekDay - 1;
+        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
+        int now = instance.get(Calendar.DAY_OF_WEEK) - 1 == 0 ? 7 : instance.get(Calendar.DAY_OF_WEEK) - 1;
+        List<Long> days = new ArrayList<>(); // 周一至今的每天
+        instance.add(Calendar.DATE, 1);
+        days.add(DateUtil.DateTimeByDayToTimeStamp(formatter.format(instance.getTime())));
+        instance.add(Calendar.DATE, -1);
+        days.add(DateUtil.DateTimeByDayToTimeStamp(formatter.format(instance.getTime())));
+        while (now - 1 > 0) {
+            now--;
+            instance.add(Calendar.DATE, -1);
+            Long format = DateUtil.DateTimeByDayToTimeStamp(formatter.format(instance.getTime()));
+            days.add(format);
+        }
+        System.out.println(days);
+        System.out.println(DateUtil.getLastTimeInterval());
+    }
 }

target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml

@@ -1710,7 +1710,7 @@
                 and aorstate = #{state}
             </if>
         </if>
-        and depositoryManagerTime between #{start} and #{end}
+        and applicantTime between #{start} and #{end}
     </select>