xn

src/main/java/com/dsic/gj_erp/controller/jhgk/DmSygdMxLjController.java

@@ -18,7 +18,8 @@ import org.springframework.web.bind.annotation.RestController;
 public class DmSygdMxLjController {
 
     public static void main(String[] agrs) {
-        System.out.println((3.21!=0.0)&&("16,13".indexOf("12")>0));
+//        System.out.println(String.format("%03d",Integer.parseInt("12")));
+//        System.out.println((3.21!=0.0)&&("16,13".indexOf("12")>0));
 //       double ljgs=12.0/8;
 //        System.out.println(ljgs);
 //        int num= (int)ljgs;

src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmZrcjhServiceImpl.java

@@ -1,6 +1,7 @@
 package com.dsic.gj_erp.service.jhgk.impl;
 
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.poi.excel.ExcelReader;
 import com.alibaba.fastjson.JSONObject;
@@ -52,7 +53,7 @@ public class DmZrcjhServiceImpl extends ServiceImpl<DmZrcjhMapper, DmZrcjh> impl
             String time = json.getString("gjks");
             String startTime = time.split("~")[0];
             String endTime = time.split("~")[1];
-            queryWrapper.between("gjks", startTime, endTime);
+            queryWrapper.between("gjks", DateUtil.parse(startTime,"yyyy/MM/dd"), DateUtil.parse(endTime,"yyyy/MM/dd"));
         }
         if (StringUtils.isNotEmpty(json.getString("Zt"))) {
             queryWrapper.eq("zt", json.getString("Zt"));

src/main/java/com/dsic/gj_erp/util/ExcelUtil.java

@@ -94,6 +94,14 @@ public class ExcelUtil {
                             value=date(value);
                         }
                     }
+                    if (key.equals("批量")){
+                        if (StringUtils.isEmpty(value)){
+                            continue;
+                        }
+                        else {
+                            value=String.format("%03d",Integer.parseInt(value));
+                        }
+                    }
 
                     dataMap.put(mapKey,value);
                 }