Merge branch 'master' of http://gitea.yxtsoft.com/yxt_group/supervise

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobacco/PurchaseRequisitionTobaccoService.java

@@ -27,6 +27,8 @@ package com.yxt.supervise.portal.biz.purchaserequisitiontobacco;
 
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.poi.excel.ExcelUtil;
 import cn.hutool.poi.excel.sax.handler.RowHandler;
 import com.alibaba.fastjson.JSONObject;
@@ -361,7 +363,14 @@ public class PurchaseRequisitionTobaccoService extends MybatisBaseService<Purcha
                     String replace = s.replace("]", "");
                     orderMap.put("tdrCode", replace);//填单人
                     orderMap.put("tdrName", split[0]);//填单人
-                    orderMap.put("purchaseDate", r.get(6));//填单时间
+                    String r6 = "" + r.get(6);
+                    try {
+                        DateTime parse = DateUtil.parse(r6);
+                        r6 = DateUtil.format(parse, "yyyy.MM.dd");
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    orderMap.put("purchaseDate", r6);//填单时间
                     orderMap.put("supplierName", r.get(6));//
                     orderMap.put("supplierCode", r.get(6));//
                 }
@@ -378,7 +387,14 @@ public class PurchaseRequisitionTobaccoService extends MybatisBaseService<Purcha
                     // String s2 = split1[0];
                     // String replace1 = s2.replace("[", "");
                     orderMap.put("warehousePositionCode", o.substring(0, 3));
-                    orderMap.put("arrivalDate", r.get(6));
+                    String r6 = "" + r.get(6);
+                    try {
+                        DateTime parse = DateUtil.parse(r6);
+                        r6 = DateUtil.format(parse, "yyyy.MM.dd");
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    orderMap.put("arrivalDate", r6);
                 }
                 if (rowNum == 3) {
                     String s = r.get(2).toString();

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/application.yml

@@ -2,8 +2,8 @@ spring:
   application:
     name: supervise-portal
   profiles:
-    active: devv
-#    active: test
+#    active: devv
+    active: test
   messages:
     # 国际化资源文件路径
     basename: i18n/messages

yxt_supervise/supervise-portal/supervise-portal-biz/src/test/java/com/yxt/supervise/portal/test/LiuTest.java

@@ -0,0 +1,14 @@
+package com.yxt.supervise.portal.test;
+
+import cn.hutool.core.date.DateUtil;
+
+import java.util.Date;
+
+public class LiuTest {
+
+    public static void main(String[] args) {
+        Date date = DateUtil.parse("2023.01.28");
+        String yyyyMMdd = DateUtil.format(date, "yyyyMMdd");
+        System.out.println(yyyyMMdd);
+    }
+}