Browse Source

Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

chenw 7 years ago
parent
commit
47fed81e14

+ 2 - 2
applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/impl/BankinformationServiceImpl.java

@@ -55,11 +55,11 @@ public class BankinformationServiceImpl extends CommonBaseServiceImpl<Bankinform
         String dateString = date2String(date, "yyyyMMdd");
         int ym = Integer.parseInt(dateString);
 
-        String date1 = date2String(date, "yyyymm");
+        String date1 = date2String(date, "yyyyMM");
         date1 = date1 + "01 00:00:00";
         Date d = null;
         try {
-            d = string2Date(date1, "yyyy-mm-dd hh:mm:ss");
+            d = string2Date(date1, "yyyy-MM-dd hh:mm:ss");
         } catch (Exception e) {
             e.printStackTrace();
         }

+ 2 - 2
applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/impl/CustomerServiceImpl.java

@@ -253,11 +253,11 @@ public class CustomerServiceImpl extends CommonBaseServiceImpl<CustomerMapper, C
             subledger.setSl_vendid(0);
             subledger.setSl_custid(Math.toIntExact(customer.getId()));
             subledger.setCompanyId(BaseContextHolder.getCompanyId());
-            String dates = date2String(customer.getCu_begindate(), "yyyy-mm");
+            String dates = date2String(customer.getCu_begindate(), "yyyy-MM");
             dates = dates + "-01";
             Date date = null;
             try {
-                date = string2Date(dates, "yyyy-mm-dd");
+                date = string2Date(dates, "yyyy-MM-dd");
             } catch (Exception e) {
                 e.printStackTrace();
             }

+ 2 - 2
applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/impl/VendorServiceImpl.java

@@ -223,11 +223,11 @@ public class VendorServiceImpl extends CommonBaseServiceImpl<VendorMapper, Vendo
             subledger.setSl_vendid(Math.toIntExact(main.getId()));
             subledger.setSl_custid(0);
             subledger.setCompanyId(BaseContextHolder.getCompanyId());
-            String dates = date2String(main.getVe_begindate(), "yyyy-mm");
+            String dates = date2String(main.getVe_begindate(), "yyyy-MM");
             dates = dates + "-01";
             Date date = null;
             try {
-                date = string2Date(dates, "yyyy-mm-dd");
+                date = string2Date(dates, "yyyy-MM-dd");
             } catch (Exception e) {
                 e.printStackTrace();
             }