浏览代码

华统大屏接口修改12

wwh 2 年之前
父节点
当前提交
2d14021ec7

+ 8 - 2
huimv-admin/src/main/java/com/huimv/admin/service/impl/ProdProductionServiceImpl.java

@@ -50,8 +50,14 @@ public class ProdProductionServiceImpl extends ServiceImpl<ProdProductionMapper,
             String firstDay = format.format(cal_1.getTime());
             queryWrapper.ge("creat_time", firstDay);
         } else {
-            startTime = startTime + " 00:00:00";
-            endTime = endTime + " 23:59:59";
+            startTime = startTime +"-01-" + " 00:00:00";
+            String[] split = endTime.split("-");
+            if (split[1].equals("01") || split[1].equals("03") || split[1].equals("05")
+                    || split[1].equals("07") || split[1].equals("08") || split[1].equals("10") || split[1].equals("12")) {
+                endTime = endTime + "-31-"+" 23:59:59";
+            } else {
+                endTime = endTime + "-30-"+" 23:59:59";
+            }
             queryWrapper.between("creat_time", startTime, endTime);
         }