diff --git a/2017/.gitignore b/2017/.gitignore index 0a11984..1c1af51 100644 --- a/2017/.gitignore +++ b/2017/.gitignore @@ -1,4 +1,6 @@ .idea +*.trace.db +/logs .gradle build/ diff --git a/2017/build.gradle.kts b/2017/build.gradle.kts index 8253511..a8c7845 100644 --- a/2017/build.gradle.kts +++ b/2017/build.gradle.kts @@ -10,9 +10,18 @@ repositories { } dependencies { + annotationProcessor("org.projectlombok:lombok:1.18.30") + compileOnly("org.projectlombok:lombok:1.18.30") + implementation("com.h2database:h2:2.2.224") + implementation("org.apache.logging.log4j:log4j-core:2.21.1") + implementation("org.apache.logging.log4j:log4j-slf4j2-impl:2.21.1") implementation("org.apache.poi:poi:5.2.4") implementation("org.apache.poi:poi-ooxml:5.2.4") + implementation("org.hibernate.orm:hibernate-core:6.3.1.Final") + implementation("org.slf4j:slf4j-api:2.0.9") + testAnnotationProcessor("org.projectlombok:lombok:1.18.30") + testCompileOnly("org.projectlombok:lombok:1.18.30") testImplementation(platform("org.junit:junit-bom:5.9.1")) testImplementation("org.junit.jupiter:junit-jupiter") } diff --git a/2017/src/main/java/dev/miti99/Main.java b/2017/src/main/java/dev/miti99/Main.java deleted file mode 100644 index b509b3d..0000000 --- a/2017/src/main/java/dev/miti99/Main.java +++ /dev/null @@ -1,20 +0,0 @@ -package dev.miti99; - -// Press Shift twice to open the Search Everywhere dialog and type `show whitespaces`, -// then press Enter. You can now see whitespace characters in your code. -public class Main { - - public static void main(String[] args) { - // Press Alt+Enter with your caret at the highlighted text to see how - // IntelliJ IDEA suggests fixing it. - System.out.printf("Hello and welcome!"); - - // Press Shift+F10 or click the green arrow button in the gutter to run the code. - for (int i = 1; i <= 5; i++) { - - // Press Shift+F9 to start debugging your code. We have set one breakpoint - // for you, but you can always add more by pressing Ctrl+F8. - System.out.println("i = " + i); - } - } -} diff --git a/2017/src/main/java/dev/miti99/thptqg2017/Converter.java b/2017/src/main/java/dev/miti99/thptqg2017/Converter.java new file mode 100644 index 0000000..424184b --- /dev/null +++ b/2017/src/main/java/dev/miti99/thptqg2017/Converter.java @@ -0,0 +1,32 @@ +package dev.miti99.thptqg2017; + +import dev.miti99.thptqg2017.entity.Student; +import java.text.SimpleDateFormat; +import lombok.extern.slf4j.Slf4j; +import org.hibernate.cfg.Configuration; + +@Slf4j +public class Converter { + private static final SimpleDateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy"); + + public static void main(String[] args) { + var configuration = new Configuration(); + configuration.configure("hibernate.cfg.xml"); + + try (var sessionFactory = configuration.buildSessionFactory(); + var session = sessionFactory.openSession()) { + var transaction = session.beginTransaction(); + + var newStudent = new Student(); + newStudent.setSoBaoDanh(12345); + newStudent.setHoTen("John Doe"); + newStudent.setNgaySinh(dateFormat.parse("01/01/1999")); + + session.merge(newStudent); + + transaction.commit(); + } catch (Exception e) { + log.error("Exception occurred", e); + } + } +} diff --git a/2017/src/main/java/dev/miti99/thptqg2017/entity/Student.java b/2017/src/main/java/dev/miti99/thptqg2017/entity/Student.java new file mode 100644 index 0000000..d0b1d31 --- /dev/null +++ b/2017/src/main/java/dev/miti99/thptqg2017/entity/Student.java @@ -0,0 +1,59 @@ +package dev.miti99.thptqg2017.entity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; +import java.util.Date; +import lombok.Data; + +@Entity +@Table(name = "Student") +@Data +public class Student { + @Id + @Column(name = "SOBAODANH") + private int soBaoDanh; + + @Column(name = "HO_TEN") + private String hoTen; + + @Column(name = "NGAY_SINH") + @Temporal(TemporalType.TIMESTAMP) + private Date ngaySinh; + + @Column(name = "TOAN") + private double toan; + + @Column(name = "NGU_VAN") + private double nguVan; + + @Column(name = "VAT_LY") + private double vatLy; + + @Column(name = "HOA_HOC") + private double hoaHoc; + + @Column(name = "SINH_HOC") + private double sinhHoc; + + @Column(name = "KHTN") + private double khtn; + + @Column(name = "LICH_SU") + private double lichSu; + + @Column(name = "DIA_LY") + private double diaLy; + + @Column(name = "GDCD") + private double gdcd; + + @Column(name = "KHXH") + private double khxh; + + @Column(name = "TIENG_ANH") + private double tiengAnh; +} diff --git a/2017/src/main/resources/hibernate.cfg.xml b/2017/src/main/resources/hibernate.cfg.xml new file mode 100644 index 0000000..25c132c --- /dev/null +++ b/2017/src/main/resources/hibernate.cfg.xml @@ -0,0 +1,18 @@ + + + + + + org.h2.Driver + jdbc:h2:./database + username + password + + create + false + + + + diff --git a/2017/src/main/resources/log4j2.xml b/2017/src/main/resources/log4j2.xml new file mode 100644 index 0000000..d471b71 --- /dev/null +++ b/2017/src/main/resources/log4j2.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + diff --git a/2017/src/main/resources/(update)/1.BaRia-VungTau_PGZT.xlsx b/2017/src/main/resources/raw/(update)/1.BaRia-VungTau_PGZT.xlsx similarity index 100% rename from 2017/src/main/resources/(update)/1.BaRia-VungTau_PGZT.xlsx rename to 2017/src/main/resources/raw/(update)/1.BaRia-VungTau_PGZT.xlsx diff --git a/2017/src/main/resources/(update)/1.Da Nang_ABWU.xlsx b/2017/src/main/resources/raw/(update)/1.Da Nang_ABWU.xlsx similarity index 100% rename from 2017/src/main/resources/(update)/1.Da Nang_ABWU.xlsx rename to 2017/src/main/resources/raw/(update)/1.Da Nang_ABWU.xlsx diff --git a/2017/src/main/resources/(update)/1.Son La_XLFN.xlsx b/2017/src/main/resources/raw/(update)/1.Son La_XLFN.xlsx similarity index 100% rename from 2017/src/main/resources/(update)/1.Son La_XLFN.xlsx rename to 2017/src/main/resources/raw/(update)/1.Son La_XLFN.xlsx diff --git a/2017/src/main/resources/(update)/1.TuyenQuang_PTMR.xlsx b/2017/src/main/resources/raw/(update)/1.TuyenQuang_PTMR.xlsx similarity index 100% rename from 2017/src/main/resources/(update)/1.TuyenQuang_PTMR.xlsx rename to 2017/src/main/resources/raw/(update)/1.TuyenQuang_PTMR.xlsx diff --git a/2017/src/main/resources/(update)/10.BinhThuan_MVVG.xlsx b/2017/src/main/resources/raw/(update)/10.BinhThuan_MVVG.xlsx similarity index 100% rename from 2017/src/main/resources/(update)/10.BinhThuan_MVVG.xlsx rename to 2017/src/main/resources/raw/(update)/10.BinhThuan_MVVG.xlsx diff --git a/2017/src/main/resources/(update)/10.LamDong_YUQA.xlsx b/2017/src/main/resources/raw/(update)/10.LamDong_YUQA.xlsx similarity index 100% rename from 2017/src/main/resources/(update)/10.LamDong_YUQA.xlsx rename to 2017/src/main/resources/raw/(update)/10.LamDong_YUQA.xlsx diff --git a/2017/src/main/resources/(update)/10.Soc Trang_LQWU.xlsx b/2017/src/main/resources/raw/(update)/10.Soc Trang_LQWU.xlsx similarity index 100% rename from 2017/src/main/resources/(update)/10.Soc Trang_LQWU.xlsx rename to 2017/src/main/resources/raw/(update)/10.Soc Trang_LQWU.xlsx diff --git a/2017/src/main/resources/(update)/11.BinhDuong_HVAH.xlsx b/2017/src/main/resources/raw/(update)/11.BinhDuong_HVAH.xlsx similarity index 100% rename from 2017/src/main/resources/(update)/11.BinhDuong_HVAH.xlsx rename to 2017/src/main/resources/raw/(update)/11.BinhDuong_HVAH.xlsx diff --git a/2017/src/main/resources/(update)/11.LaoCai_ZTBP.xlsx b/2017/src/main/resources/raw/(update)/11.LaoCai_ZTBP.xlsx similarity index 100% rename from 2017/src/main/resources/(update)/11.LaoCai_ZTBP.xlsx rename to 2017/src/main/resources/raw/(update)/11.LaoCai_ZTBP.xlsx diff --git a/2017/src/main/resources/(update)/12.BenTre_NQTU.xlsx b/2017/src/main/resources/raw/(update)/12.BenTre_NQTU.xlsx similarity index 100% rename from 2017/src/main/resources/(update)/12.BenTre_NQTU.xlsx rename to 2017/src/main/resources/raw/(update)/12.BenTre_NQTU.xlsx diff --git a/2017/src/main/resources/(update)/12.LongAn_PDRH.xlsx b/2017/src/main/resources/raw/(update)/12.LongAn_PDRH.xlsx similarity index 100% rename from 2017/src/main/resources/(update)/12.LongAn_PDRH.xlsx rename to 2017/src/main/resources/raw/(update)/12.LongAn_PDRH.xlsx diff --git a/2017/src/main/resources/(update)/13.NamDinh_NAYR.xlsx b/2017/src/main/resources/raw/(update)/13.NamDinh_NAYR.xlsx similarity index 100% rename from 2017/src/main/resources/(update)/13.NamDinh_NAYR.xlsx rename to 2017/src/main/resources/raw/(update)/13.NamDinh_NAYR.xlsx diff --git a/2017/src/main/resources/(update)/13.TraVinh_FODZ.xlsx b/2017/src/main/resources/raw/(update)/13.TraVinh_FODZ.xlsx similarity index 100% rename from 2017/src/main/resources/(update)/13.TraVinh_FODZ.xlsx rename to 2017/src/main/resources/raw/(update)/13.TraVinh_FODZ.xlsx diff --git a/2017/src/main/resources/(update)/14.NgheAn_HTKD.xlsx b/2017/src/main/resources/raw/(update)/14.NgheAn_HTKD.xlsx similarity index 100% rename from 2017/src/main/resources/(update)/14.NgheAn_HTKD.xlsx rename to 2017/src/main/resources/raw/(update)/14.NgheAn_HTKD.xlsx diff --git a/2017/src/main/resources/(update)/15.PhuTho_IJZW.xlsx b/2017/src/main/resources/raw/(update)/15.PhuTho_IJZW.xlsx similarity index 100% rename from 2017/src/main/resources/(update)/15.PhuTho_IJZW.xlsx rename to 2017/src/main/resources/raw/(update)/15.PhuTho_IJZW.xlsx diff --git a/2017/src/main/resources/(update)/17.QuangNam_NQMG.xlsx b/2017/src/main/resources/raw/(update)/17.QuangNam_NQMG.xlsx similarity index 100% rename from 2017/src/main/resources/(update)/17.QuangNam_NQMG.xlsx rename to 2017/src/main/resources/raw/(update)/17.QuangNam_NQMG.xlsx diff --git a/2017/src/main/resources/(update)/18.QuangNgai_IUPY.xlsx b/2017/src/main/resources/raw/(update)/18.QuangNgai_IUPY.xlsx similarity index 100% rename from 2017/src/main/resources/(update)/18.QuangNgai_IUPY.xlsx rename to 2017/src/main/resources/raw/(update)/18.QuangNgai_IUPY.xlsx diff --git a/2017/src/main/resources/(update)/19.QuangTri_MKNN.xlsx b/2017/src/main/resources/raw/(update)/19.QuangTri_MKNN.xlsx similarity index 100% rename from 2017/src/main/resources/(update)/19.QuangTri_MKNN.xlsx rename to 2017/src/main/resources/raw/(update)/19.QuangTri_MKNN.xlsx diff --git a/2017/src/main/resources/(update)/2.BacKan_YQNX(1).xlsx b/2017/src/main/resources/raw/(update)/2.BacKan_YQNX(1).xlsx similarity index 100% rename from 2017/src/main/resources/(update)/2.BacKan_YQNX(1).xlsx rename to 2017/src/main/resources/raw/(update)/2.BacKan_YQNX(1).xlsx diff --git a/2017/src/main/resources/(update)/2.BacKan_YQNX.xlsx b/2017/src/main/resources/raw/(update)/2.BacKan_YQNX.xlsx similarity index 100% rename from 2017/src/main/resources/(update)/2.BacKan_YQNX.xlsx rename to 2017/src/main/resources/raw/(update)/2.BacKan_YQNX.xlsx diff --git a/2017/src/main/resources/(update)/2.Ha Giang_PIYK.xlsx b/2017/src/main/resources/raw/(update)/2.Ha Giang_PIYK.xlsx similarity index 100% rename from 2017/src/main/resources/(update)/2.Ha Giang_PIYK.xlsx rename to 2017/src/main/resources/raw/(update)/2.Ha Giang_PIYK.xlsx diff --git a/2017/src/main/resources/(update)/2.Ninh Thuan_BAGG.xlsx b/2017/src/main/resources/raw/(update)/2.Ninh Thuan_BAGG.xlsx similarity index 100% rename from 2017/src/main/resources/(update)/2.Ninh Thuan_BAGG.xlsx rename to 2017/src/main/resources/raw/(update)/2.Ninh Thuan_BAGG.xlsx diff --git a/2017/src/main/resources/(update)/2.Thanh Hoa_UOPE.xlsx b/2017/src/main/resources/raw/(update)/2.Thanh Hoa_UOPE.xlsx similarity index 100% rename from 2017/src/main/resources/(update)/2.Thanh Hoa_UOPE.xlsx rename to 2017/src/main/resources/raw/(update)/2.Thanh Hoa_UOPE.xlsx diff --git a/2017/src/main/resources/(update)/2.VinhPhuc_QZJK.xlsx b/2017/src/main/resources/raw/(update)/2.VinhPhuc_QZJK.xlsx similarity index 100% rename from 2017/src/main/resources/(update)/2.VinhPhuc_QZJK.xlsx rename to 2017/src/main/resources/raw/(update)/2.VinhPhuc_QZJK.xlsx diff --git a/2017/src/main/resources/(update)/20.TayNinh_KJAQ.xlsx b/2017/src/main/resources/raw/(update)/20.TayNinh_KJAQ.xlsx similarity index 100% rename from 2017/src/main/resources/(update)/20.TayNinh_KJAQ.xlsx rename to 2017/src/main/resources/raw/(update)/20.TayNinh_KJAQ.xlsx diff --git a/2017/src/main/resources/(update)/21.ThaiBinh_KTQN.xlsx b/2017/src/main/resources/raw/(update)/21.ThaiBinh_KTQN.xlsx similarity index 100% rename from 2017/src/main/resources/(update)/21.ThaiBinh_KTQN.xlsx rename to 2017/src/main/resources/raw/(update)/21.ThaiBinh_KTQN.xlsx diff --git a/2017/src/main/resources/(update)/22.ThaiNguyen_BKIF.xlsx b/2017/src/main/resources/raw/(update)/22.ThaiNguyen_BKIF.xlsx similarity index 100% rename from 2017/src/main/resources/(update)/22.ThaiNguyen_BKIF.xlsx rename to 2017/src/main/resources/raw/(update)/22.ThaiNguyen_BKIF.xlsx diff --git a/2017/src/main/resources/(update)/24.HCM_UTLQ.xlsx b/2017/src/main/resources/raw/(update)/24.HCM_UTLQ.xlsx similarity index 100% rename from 2017/src/main/resources/(update)/24.HCM_UTLQ.xlsx rename to 2017/src/main/resources/raw/(update)/24.HCM_UTLQ.xlsx diff --git a/2017/src/main/resources/(update)/3.BacGiang_SAVS.xlsx b/2017/src/main/resources/raw/(update)/3.BacGiang_SAVS.xlsx similarity index 100% rename from 2017/src/main/resources/(update)/3.BacGiang_SAVS.xlsx rename to 2017/src/main/resources/raw/(update)/3.BacGiang_SAVS.xlsx diff --git a/2017/src/main/resources/(update)/3.BinhPhuoc_IPHL.xlsx b/2017/src/main/resources/raw/(update)/3.BinhPhuoc_IPHL.xlsx similarity index 100% rename from 2017/src/main/resources/(update)/3.BinhPhuoc_IPHL.xlsx rename to 2017/src/main/resources/raw/(update)/3.BinhPhuoc_IPHL.xlsx diff --git a/2017/src/main/resources/(update)/3.Cao Bang_WMUU.xlsx b/2017/src/main/resources/raw/(update)/3.Cao Bang_WMUU.xlsx similarity index 100% rename from 2017/src/main/resources/(update)/3.Cao Bang_WMUU.xlsx rename to 2017/src/main/resources/raw/(update)/3.Cao Bang_WMUU.xlsx diff --git a/2017/src/main/resources/(update)/3.Dong Thap_HKJX.xlsx b/2017/src/main/resources/raw/(update)/3.Dong Thap_HKJX.xlsx similarity index 100% rename from 2017/src/main/resources/(update)/3.Dong Thap_HKJX.xlsx rename to 2017/src/main/resources/raw/(update)/3.Dong Thap_HKJX.xlsx diff --git a/2017/src/main/resources/(update)/3.Thua Thien -Hue_MAET.xlsx b/2017/src/main/resources/raw/(update)/3.Thua Thien -Hue_MAET.xlsx similarity index 100% rename from 2017/src/main/resources/(update)/3.Thua Thien -Hue_MAET.xlsx rename to 2017/src/main/resources/raw/(update)/3.Thua Thien -Hue_MAET.xlsx diff --git a/2017/src/main/resources/(update)/4.An Giang_PMJD.xlsx b/2017/src/main/resources/raw/(update)/4.An Giang_PMJD.xlsx similarity index 100% rename from 2017/src/main/resources/(update)/4.An Giang_PMJD.xlsx rename to 2017/src/main/resources/raw/(update)/4.An Giang_PMJD.xlsx diff --git a/2017/src/main/resources/(update)/4.BacNinh_NNIS.xlsx b/2017/src/main/resources/raw/(update)/4.BacNinh_NNIS.xlsx similarity index 100% rename from 2017/src/main/resources/(update)/4.BacNinh_NNIS.xlsx rename to 2017/src/main/resources/raw/(update)/4.BacNinh_NNIS.xlsx diff --git a/2017/src/main/resources/(update)/4.Binh Dinh_VOMJ.xlsx b/2017/src/main/resources/raw/(update)/4.Binh Dinh_VOMJ.xlsx similarity index 100% rename from 2017/src/main/resources/(update)/4.Binh Dinh_VOMJ.xlsx rename to 2017/src/main/resources/raw/(update)/4.Binh Dinh_VOMJ.xlsx diff --git a/2017/src/main/resources/(update)/4.DienBien_FYGN.xlsx b/2017/src/main/resources/raw/(update)/4.DienBien_FYGN.xlsx similarity index 100% rename from 2017/src/main/resources/(update)/4.DienBien_FYGN.xlsx rename to 2017/src/main/resources/raw/(update)/4.DienBien_FYGN.xlsx diff --git a/2017/src/main/resources/(update)/4.Lang Son_QWOG.xlsx b/2017/src/main/resources/raw/(update)/4.Lang Son_QWOG.xlsx similarity index 100% rename from 2017/src/main/resources/(update)/4.Lang Son_QWOG.xlsx rename to 2017/src/main/resources/raw/(update)/4.Lang Son_QWOG.xlsx diff --git a/2017/src/main/resources/(update)/5.Bac Lieu_VIVY.xlsx b/2017/src/main/resources/raw/(update)/5.Bac Lieu_VIVY.xlsx similarity index 100% rename from 2017/src/main/resources/(update)/5.Bac Lieu_VIVY.xlsx rename to 2017/src/main/resources/raw/(update)/5.Bac Lieu_VIVY.xlsx diff --git a/2017/src/main/resources/(update)/5.Gia Lai_TAAS.xlsx b/2017/src/main/resources/raw/(update)/5.Gia Lai_TAAS.xlsx similarity index 100% rename from 2017/src/main/resources/(update)/5.Gia Lai_TAAS.xlsx rename to 2017/src/main/resources/raw/(update)/5.Gia Lai_TAAS.xlsx diff --git a/2017/src/main/resources/(update)/5.HaiDuong_WNHD.xlsx b/2017/src/main/resources/raw/(update)/5.HaiDuong_WNHD.xlsx similarity index 100% rename from 2017/src/main/resources/(update)/5.HaiDuong_WNHD.xlsx rename to 2017/src/main/resources/raw/(update)/5.HaiDuong_WNHD.xlsx diff --git a/2017/src/main/resources/(update)/5.Hanam_SDKN.xlsx b/2017/src/main/resources/raw/(update)/5.Hanam_SDKN.xlsx similarity index 100% rename from 2017/src/main/resources/(update)/5.Hanam_SDKN.xlsx rename to 2017/src/main/resources/raw/(update)/5.Hanam_SDKN.xlsx diff --git a/2017/src/main/resources/(update)/5.Yen Bai_BSLV.xlsx b/2017/src/main/resources/raw/(update)/5.Yen Bai_BSLV.xlsx similarity index 100% rename from 2017/src/main/resources/(update)/5.Yen Bai_BSLV.xlsx rename to 2017/src/main/resources/raw/(update)/5.Yen Bai_BSLV.xlsx diff --git a/2017/src/main/resources/(update)/6.Hau Giang_SIAJ.xlsx b/2017/src/main/resources/raw/(update)/6.Hau Giang_SIAJ.xlsx similarity index 100% rename from 2017/src/main/resources/(update)/6.Hau Giang_SIAJ.xlsx rename to 2017/src/main/resources/raw/(update)/6.Hau Giang_SIAJ.xlsx diff --git a/2017/src/main/resources/(update)/6.HoaBinh_HLYQ.xlsx b/2017/src/main/resources/raw/(update)/6.HoaBinh_HLYQ.xlsx similarity index 100% rename from 2017/src/main/resources/(update)/6.HoaBinh_HLYQ.xlsx rename to 2017/src/main/resources/raw/(update)/6.HoaBinh_HLYQ.xlsx diff --git a/2017/src/main/resources/(update)/6.NinhBinh_PKMQ.xlsx b/2017/src/main/resources/raw/(update)/6.NinhBinh_PKMQ.xlsx similarity index 100% rename from 2017/src/main/resources/(update)/6.NinhBinh_PKMQ.xlsx rename to 2017/src/main/resources/raw/(update)/6.NinhBinh_PKMQ.xlsx diff --git a/2017/src/main/resources/(update)/6.Quang Ninh_YAKJ.xlsx b/2017/src/main/resources/raw/(update)/6.Quang Ninh_YAKJ.xlsx similarity index 100% rename from 2017/src/main/resources/(update)/6.Quang Ninh_YAKJ.xlsx rename to 2017/src/main/resources/raw/(update)/6.Quang Ninh_YAKJ.xlsx diff --git a/2017/src/main/resources/(update)/7.HaTinh_XMFQ.xlsx b/2017/src/main/resources/raw/(update)/7.HaTinh_XMFQ.xlsx similarity index 100% rename from 2017/src/main/resources/(update)/7.HaTinh_XMFQ.xlsx rename to 2017/src/main/resources/raw/(update)/7.HaTinh_XMFQ.xlsx diff --git a/2017/src/main/resources/(update)/7.HungYen_TCBE.xlsx b/2017/src/main/resources/raw/(update)/7.HungYen_TCBE.xlsx similarity index 100% rename from 2017/src/main/resources/(update)/7.HungYen_TCBE.xlsx rename to 2017/src/main/resources/raw/(update)/7.HungYen_TCBE.xlsx diff --git a/2017/src/main/resources/(update)/7.Kon Tum_CAQU.xlsx b/2017/src/main/resources/raw/(update)/7.Kon Tum_CAQU.xlsx similarity index 100% rename from 2017/src/main/resources/(update)/7.Kon Tum_CAQU.xlsx rename to 2017/src/main/resources/raw/(update)/7.Kon Tum_CAQU.xlsx diff --git a/2017/src/main/resources/(update)/7.Tien Giang_AOWZ.xlsx b/2017/src/main/resources/raw/(update)/7.Tien Giang_AOWZ.xlsx similarity index 100% rename from 2017/src/main/resources/(update)/7.Tien Giang_AOWZ.xlsx rename to 2017/src/main/resources/raw/(update)/7.Tien Giang_AOWZ.xlsx diff --git a/2017/src/main/resources/(update)/8.PhuYen_MLTQ.xlsx b/2017/src/main/resources/raw/(update)/8.PhuYen_MLTQ.xlsx similarity index 100% rename from 2017/src/main/resources/(update)/8.PhuYen_MLTQ.xlsx rename to 2017/src/main/resources/raw/(update)/8.PhuYen_MLTQ.xlsx diff --git a/2017/src/main/resources/(update)/9.DakNong_ZWJT.xlsx b/2017/src/main/resources/raw/(update)/9.DakNong_ZWJT.xlsx similarity index 100% rename from 2017/src/main/resources/(update)/9.DakNong_ZWJT.xlsx rename to 2017/src/main/resources/raw/(update)/9.DakNong_ZWJT.xlsx diff --git a/2017/src/main/resources/(update)/9.Khanh Hoa_IBTX.xlsx b/2017/src/main/resources/raw/(update)/9.Khanh Hoa_IBTX.xlsx similarity index 100% rename from 2017/src/main/resources/(update)/9.Khanh Hoa_IBTX.xlsx rename to 2017/src/main/resources/raw/(update)/9.Khanh Hoa_IBTX.xlsx diff --git a/2017/src/main/resources/(update)/9.Vinh Long_WVKI.xlsx b/2017/src/main/resources/raw/(update)/9.Vinh Long_WVKI.xlsx similarity index 100% rename from 2017/src/main/resources/(update)/9.Vinh Long_WVKI.xlsx rename to 2017/src/main/resources/raw/(update)/9.Vinh Long_WVKI.xlsx diff --git a/2017/src/main/resources/10_BinhThuan_RIIW.xls.xlsx b/2017/src/main/resources/raw/10_BinhThuan_RIIW.xls.xlsx similarity index 100% rename from 2017/src/main/resources/10_BinhThuan_RIIW.xls.xlsx rename to 2017/src/main/resources/raw/10_BinhThuan_RIIW.xls.xlsx diff --git a/2017/src/main/resources/10_Ca_Mau_BKXT.xls.xlsx b/2017/src/main/resources/raw/10_Ca_Mau_BKXT.xls.xlsx similarity index 100% rename from 2017/src/main/resources/10_Ca_Mau_BKXT.xls.xlsx rename to 2017/src/main/resources/raw/10_Ca_Mau_BKXT.xls.xlsx diff --git a/2017/src/main/resources/10_LamDong_GNFT (1).xls.xlsx b/2017/src/main/resources/raw/10_LamDong_GNFT (1).xls.xlsx similarity index 100% rename from 2017/src/main/resources/10_LamDong_GNFT (1).xls.xlsx rename to 2017/src/main/resources/raw/10_LamDong_GNFT (1).xls.xlsx diff --git a/2017/src/main/resources/10_LamDong_GNFT.xls.xlsx b/2017/src/main/resources/raw/10_LamDong_GNFT.xls.xlsx similarity index 100% rename from 2017/src/main/resources/10_LamDong_GNFT.xls.xlsx rename to 2017/src/main/resources/raw/10_LamDong_GNFT.xls.xlsx diff --git a/2017/src/main/resources/10_Soc_Trang_XCGJ.xls.xlsx b/2017/src/main/resources/raw/10_Soc_Trang_XCGJ.xls.xlsx similarity index 100% rename from 2017/src/main/resources/10_Soc_Trang_XCGJ.xls.xlsx rename to 2017/src/main/resources/raw/10_Soc_Trang_XCGJ.xls.xlsx diff --git a/2017/src/main/resources/11_BinhDuong_RYQL.xls.xlsx b/2017/src/main/resources/raw/11_BinhDuong_RYQL.xls.xlsx similarity index 100% rename from 2017/src/main/resources/11_BinhDuong_RYQL.xls.xlsx rename to 2017/src/main/resources/raw/11_BinhDuong_RYQL.xls.xlsx diff --git a/2017/src/main/resources/11_LaoCai_GMSU.xls.xlsx b/2017/src/main/resources/raw/11_LaoCai_GMSU.xls.xlsx similarity index 100% rename from 2017/src/main/resources/11_LaoCai_GMSU.xls.xlsx rename to 2017/src/main/resources/raw/11_LaoCai_GMSU.xls.xlsx diff --git a/2017/src/main/resources/12_BenTre_DKWF.xls.xlsx b/2017/src/main/resources/raw/12_BenTre_DKWF.xls.xlsx similarity index 100% rename from 2017/src/main/resources/12_BenTre_DKWF.xls.xlsx rename to 2017/src/main/resources/raw/12_BenTre_DKWF.xls.xlsx diff --git a/2017/src/main/resources/12_LongAn_ZZUK.xls.xlsx b/2017/src/main/resources/raw/12_LongAn_ZZUK.xls.xlsx similarity index 100% rename from 2017/src/main/resources/12_LongAn_ZZUK.xls.xlsx rename to 2017/src/main/resources/raw/12_LongAn_ZZUK.xls.xlsx diff --git a/2017/src/main/resources/13_NamDinh_ESEL.xls.xlsx b/2017/src/main/resources/raw/13_NamDinh_ESEL.xls.xlsx similarity index 100% rename from 2017/src/main/resources/13_NamDinh_ESEL.xls.xlsx rename to 2017/src/main/resources/raw/13_NamDinh_ESEL.xls.xlsx diff --git a/2017/src/main/resources/13_TraVinh_LKUJ.xls.xlsx b/2017/src/main/resources/raw/13_TraVinh_LKUJ.xls.xlsx similarity index 100% rename from 2017/src/main/resources/13_TraVinh_LKUJ.xls.xlsx rename to 2017/src/main/resources/raw/13_TraVinh_LKUJ.xls.xlsx diff --git a/2017/src/main/resources/14_NgheAn_BSLY.xls.xlsx b/2017/src/main/resources/raw/14_NgheAn_BSLY.xls.xlsx similarity index 100% rename from 2017/src/main/resources/14_NgheAn_BSLY.xls.xlsx rename to 2017/src/main/resources/raw/14_NgheAn_BSLY.xls.xlsx diff --git a/2017/src/main/resources/15_PhuTho_ABWQ.xls.xlsx b/2017/src/main/resources/raw/15_PhuTho_ABWQ.xls.xlsx similarity index 100% rename from 2017/src/main/resources/15_PhuTho_ABWQ.xls.xlsx rename to 2017/src/main/resources/raw/15_PhuTho_ABWQ.xls.xlsx diff --git a/2017/src/main/resources/16_QuangBinh_KGEU.xls.xlsx b/2017/src/main/resources/raw/16_QuangBinh_KGEU.xls.xlsx similarity index 100% rename from 2017/src/main/resources/16_QuangBinh_KGEU.xls.xlsx rename to 2017/src/main/resources/raw/16_QuangBinh_KGEU.xls.xlsx diff --git a/2017/src/main/resources/17_QuangNam_AMTK.xls.xlsx b/2017/src/main/resources/raw/17_QuangNam_AMTK.xls.xlsx similarity index 100% rename from 2017/src/main/resources/17_QuangNam_AMTK.xls.xlsx rename to 2017/src/main/resources/raw/17_QuangNam_AMTK.xls.xlsx diff --git a/2017/src/main/resources/18_QuangNgai_KOFP.xls.xlsx b/2017/src/main/resources/raw/18_QuangNgai_KOFP.xls.xlsx similarity index 100% rename from 2017/src/main/resources/18_QuangNgai_KOFP.xls.xlsx rename to 2017/src/main/resources/raw/18_QuangNgai_KOFP.xls.xlsx diff --git a/2017/src/main/resources/19_QuangTri_OMZF.xls.xlsx b/2017/src/main/resources/raw/19_QuangTri_OMZF.xls.xlsx similarity index 100% rename from 2017/src/main/resources/19_QuangTri_OMZF.xls.xlsx rename to 2017/src/main/resources/raw/19_QuangTri_OMZF.xls.xlsx diff --git a/2017/src/main/resources/1_BaRia_VungTau_HJKG.xls.xlsx b/2017/src/main/resources/raw/1_BaRia_VungTau_HJKG.xls.xlsx similarity index 100% rename from 2017/src/main/resources/1_BaRia_VungTau_HJKG.xls.xlsx rename to 2017/src/main/resources/raw/1_BaRia_VungTau_HJKG.xls.xlsx diff --git a/2017/src/main/resources/1_Da_Nang_AHWJ.xls.xlsx b/2017/src/main/resources/raw/1_Da_Nang_AHWJ.xls.xlsx similarity index 100% rename from 2017/src/main/resources/1_Da_Nang_AHWJ.xls.xlsx rename to 2017/src/main/resources/raw/1_Da_Nang_AHWJ.xls.xlsx diff --git a/2017/src/main/resources/1_Ha_Noi_CVXG.xls.xlsx b/2017/src/main/resources/raw/1_Ha_Noi_CVXG.xls.xlsx similarity index 100% rename from 2017/src/main/resources/1_Ha_Noi_CVXG.xls.xlsx rename to 2017/src/main/resources/raw/1_Ha_Noi_CVXG.xls.xlsx diff --git a/2017/src/main/resources/1_Son_La_JIDP.xls.xlsx b/2017/src/main/resources/raw/1_Son_La_JIDP.xls.xlsx similarity index 100% rename from 2017/src/main/resources/1_Son_La_JIDP.xls.xlsx rename to 2017/src/main/resources/raw/1_Son_La_JIDP.xls.xlsx diff --git a/2017/src/main/resources/1_TuyenQuang_JBYF.xls.xlsx b/2017/src/main/resources/raw/1_TuyenQuang_JBYF.xls.xlsx similarity index 100% rename from 2017/src/main/resources/1_TuyenQuang_JBYF.xls.xlsx rename to 2017/src/main/resources/raw/1_TuyenQuang_JBYF.xls.xlsx diff --git a/2017/src/main/resources/20_TayNinh_ILFA.xls.xlsx b/2017/src/main/resources/raw/20_TayNinh_ILFA.xls.xlsx similarity index 100% rename from 2017/src/main/resources/20_TayNinh_ILFA.xls.xlsx rename to 2017/src/main/resources/raw/20_TayNinh_ILFA.xls.xlsx diff --git a/2017/src/main/resources/21_ThaiBinh_FTVG.xls.xlsx b/2017/src/main/resources/raw/21_ThaiBinh_FTVG.xls.xlsx similarity index 100% rename from 2017/src/main/resources/21_ThaiBinh_FTVG.xls.xlsx rename to 2017/src/main/resources/raw/21_ThaiBinh_FTVG.xls.xlsx diff --git a/2017/src/main/resources/22_ThaiNguyen_TLTW.xls.xlsx b/2017/src/main/resources/raw/22_ThaiNguyen_TLTW.xls.xlsx similarity index 100% rename from 2017/src/main/resources/22_ThaiNguyen_TLTW.xls.xlsx rename to 2017/src/main/resources/raw/22_ThaiNguyen_TLTW.xls.xlsx diff --git a/2017/src/main/resources/23_HaiPhong_HXBV.xls.xlsx b/2017/src/main/resources/raw/23_HaiPhong_HXBV.xls.xlsx similarity index 100% rename from 2017/src/main/resources/23_HaiPhong_HXBV.xls.xlsx rename to 2017/src/main/resources/raw/23_HaiPhong_HXBV.xls.xlsx diff --git a/2017/src/main/resources/24_HCM_XULN.xls.xlsx b/2017/src/main/resources/raw/24_HCM_XULN.xls.xlsx similarity index 100% rename from 2017/src/main/resources/24_HCM_XULN.xls.xlsx rename to 2017/src/main/resources/raw/24_HCM_XULN.xls.xlsx diff --git a/2017/src/main/resources/2_BacKan_GFVQ.xls.xlsx b/2017/src/main/resources/raw/2_BacKan_GFVQ.xls.xlsx similarity index 100% rename from 2017/src/main/resources/2_BacKan_GFVQ.xls.xlsx rename to 2017/src/main/resources/raw/2_BacKan_GFVQ.xls.xlsx diff --git a/2017/src/main/resources/2_Ha_Giang_QNCM.xls.xlsx b/2017/src/main/resources/raw/2_Ha_Giang_QNCM.xls.xlsx similarity index 100% rename from 2017/src/main/resources/2_Ha_Giang_QNCM.xls.xlsx rename to 2017/src/main/resources/raw/2_Ha_Giang_QNCM.xls.xlsx diff --git a/2017/src/main/resources/2_Ninh_Thuan_VHLY.xls.xlsx b/2017/src/main/resources/raw/2_Ninh_Thuan_VHLY.xls.xlsx similarity index 100% rename from 2017/src/main/resources/2_Ninh_Thuan_VHLY.xls.xlsx rename to 2017/src/main/resources/raw/2_Ninh_Thuan_VHLY.xls.xlsx diff --git a/2017/src/main/resources/2_Thanh_Hoa_AUFV.xls.xlsx b/2017/src/main/resources/raw/2_Thanh_Hoa_AUFV.xls.xlsx similarity index 100% rename from 2017/src/main/resources/2_Thanh_Hoa_AUFV.xls.xlsx rename to 2017/src/main/resources/raw/2_Thanh_Hoa_AUFV.xls.xlsx diff --git a/2017/src/main/resources/2_VinhPhuc_GUDK.xls.xlsx b/2017/src/main/resources/raw/2_VinhPhuc_GUDK.xls.xlsx similarity index 100% rename from 2017/src/main/resources/2_VinhPhuc_GUDK.xls.xlsx rename to 2017/src/main/resources/raw/2_VinhPhuc_GUDK.xls.xlsx diff --git a/2017/src/main/resources/3_BacGiang_TOIF.xls.xlsx b/2017/src/main/resources/raw/3_BacGiang_TOIF.xls.xlsx similarity index 100% rename from 2017/src/main/resources/3_BacGiang_TOIF.xls.xlsx rename to 2017/src/main/resources/raw/3_BacGiang_TOIF.xls.xlsx diff --git a/2017/src/main/resources/3_BinhPhuoc_YFMU.xls.xlsx b/2017/src/main/resources/raw/3_BinhPhuoc_YFMU.xls.xlsx similarity index 100% rename from 2017/src/main/resources/3_BinhPhuoc_YFMU.xls.xlsx rename to 2017/src/main/resources/raw/3_BinhPhuoc_YFMU.xls.xlsx diff --git a/2017/src/main/resources/3_Cao_Bang_CIEY.xls.xlsx b/2017/src/main/resources/raw/3_Cao_Bang_CIEY.xls.xlsx similarity index 100% rename from 2017/src/main/resources/3_Cao_Bang_CIEY.xls.xlsx rename to 2017/src/main/resources/raw/3_Cao_Bang_CIEY.xls.xlsx diff --git a/2017/src/main/resources/3_Dong_Thap_GSXQ.xls.xlsx b/2017/src/main/resources/raw/3_Dong_Thap_GSXQ.xls.xlsx similarity index 100% rename from 2017/src/main/resources/3_Dong_Thap_GSXQ.xls.xlsx rename to 2017/src/main/resources/raw/3_Dong_Thap_GSXQ.xls.xlsx diff --git a/2017/src/main/resources/3_Thua_Thien_Hue_HMDB.xls.xlsx b/2017/src/main/resources/raw/3_Thua_Thien_Hue_HMDB.xls.xlsx similarity index 100% rename from 2017/src/main/resources/3_Thua_Thien_Hue_HMDB.xls.xlsx rename to 2017/src/main/resources/raw/3_Thua_Thien_Hue_HMDB.xls.xlsx diff --git a/2017/src/main/resources/4_An_Giang_JNOS.xls.xlsx b/2017/src/main/resources/raw/4_An_Giang_JNOS.xls.xlsx similarity index 100% rename from 2017/src/main/resources/4_An_Giang_JNOS.xls.xlsx rename to 2017/src/main/resources/raw/4_An_Giang_JNOS.xls.xlsx diff --git a/2017/src/main/resources/4_BacNinh_STLR.xls.xlsx b/2017/src/main/resources/raw/4_BacNinh_STLR.xls.xlsx similarity index 100% rename from 2017/src/main/resources/4_BacNinh_STLR.xls.xlsx rename to 2017/src/main/resources/raw/4_BacNinh_STLR.xls.xlsx diff --git a/2017/src/main/resources/4_Binh_Dinh_WWZW.xls.xlsx b/2017/src/main/resources/raw/4_Binh_Dinh_WWZW.xls.xlsx similarity index 100% rename from 2017/src/main/resources/4_Binh_Dinh_WWZW.xls.xlsx rename to 2017/src/main/resources/raw/4_Binh_Dinh_WWZW.xls.xlsx diff --git a/2017/src/main/resources/4_DienBien_SOJG.xls.xlsx b/2017/src/main/resources/raw/4_DienBien_SOJG.xls.xlsx similarity index 100% rename from 2017/src/main/resources/4_DienBien_SOJG.xls.xlsx rename to 2017/src/main/resources/raw/4_DienBien_SOJG.xls.xlsx diff --git a/2017/src/main/resources/4_Lang_Son_NYQL.xls.xlsx b/2017/src/main/resources/raw/4_Lang_Son_NYQL.xls.xlsx similarity index 100% rename from 2017/src/main/resources/4_Lang_Son_NYQL.xls.xlsx rename to 2017/src/main/resources/raw/4_Lang_Son_NYQL.xls.xlsx diff --git a/2017/src/main/resources/5_Bac_Lieu_XEKH.xls.xlsx b/2017/src/main/resources/raw/5_Bac_Lieu_XEKH.xls.xlsx similarity index 100% rename from 2017/src/main/resources/5_Bac_Lieu_XEKH.xls.xlsx rename to 2017/src/main/resources/raw/5_Bac_Lieu_XEKH.xls.xlsx diff --git a/2017/src/main/resources/5_Gia_Lai_ABZI.xls.xlsx b/2017/src/main/resources/raw/5_Gia_Lai_ABZI.xls.xlsx similarity index 100% rename from 2017/src/main/resources/5_Gia_Lai_ABZI.xls.xlsx rename to 2017/src/main/resources/raw/5_Gia_Lai_ABZI.xls.xlsx diff --git a/2017/src/main/resources/5_HaiDuong_WWWG.xls.xlsx b/2017/src/main/resources/raw/5_HaiDuong_WWWG.xls.xlsx similarity index 100% rename from 2017/src/main/resources/5_HaiDuong_WWWG.xls.xlsx rename to 2017/src/main/resources/raw/5_HaiDuong_WWWG.xls.xlsx diff --git a/2017/src/main/resources/5_Hanam_QGJS.xls.xlsx b/2017/src/main/resources/raw/5_Hanam_QGJS.xls.xlsx similarity index 100% rename from 2017/src/main/resources/5_Hanam_QGJS.xls.xlsx rename to 2017/src/main/resources/raw/5_Hanam_QGJS.xls.xlsx diff --git a/2017/src/main/resources/5_Yen_Bai_FAQR.xls.xlsx b/2017/src/main/resources/raw/5_Yen_Bai_FAQR.xls.xlsx similarity index 100% rename from 2017/src/main/resources/5_Yen_Bai_FAQR.xls.xlsx rename to 2017/src/main/resources/raw/5_Yen_Bai_FAQR.xls.xlsx diff --git a/2017/src/main/resources/6_Dong_Nai_WOTM.xls.xlsx b/2017/src/main/resources/raw/6_Dong_Nai_WOTM.xls.xlsx similarity index 100% rename from 2017/src/main/resources/6_Dong_Nai_WOTM.xls.xlsx rename to 2017/src/main/resources/raw/6_Dong_Nai_WOTM.xls.xlsx diff --git a/2017/src/main/resources/6_Hau_Giang_KWDM.xls.xlsx b/2017/src/main/resources/raw/6_Hau_Giang_KWDM.xls.xlsx similarity index 100% rename from 2017/src/main/resources/6_Hau_Giang_KWDM.xls.xlsx rename to 2017/src/main/resources/raw/6_Hau_Giang_KWDM.xls.xlsx diff --git a/2017/src/main/resources/6_HoaBinh_TPZY.xls.xlsx b/2017/src/main/resources/raw/6_HoaBinh_TPZY.xls.xlsx similarity index 100% rename from 2017/src/main/resources/6_HoaBinh_TPZY.xls.xlsx rename to 2017/src/main/resources/raw/6_HoaBinh_TPZY.xls.xlsx diff --git a/2017/src/main/resources/6_NinhBinh_IGFT.xls.xlsx b/2017/src/main/resources/raw/6_NinhBinh_IGFT.xls.xlsx similarity index 100% rename from 2017/src/main/resources/6_NinhBinh_IGFT.xls.xlsx rename to 2017/src/main/resources/raw/6_NinhBinh_IGFT.xls.xlsx diff --git a/2017/src/main/resources/6_Quang_Ninh_DQCJ.xls.xlsx b/2017/src/main/resources/raw/6_Quang_Ninh_DQCJ.xls.xlsx similarity index 100% rename from 2017/src/main/resources/6_Quang_Ninh_DQCJ.xls.xlsx rename to 2017/src/main/resources/raw/6_Quang_Ninh_DQCJ.xls.xlsx diff --git a/2017/src/main/resources/7_HaTinh_DDHD.xls.xlsx b/2017/src/main/resources/raw/7_HaTinh_DDHD.xls.xlsx similarity index 100% rename from 2017/src/main/resources/7_HaTinh_DDHD.xls.xlsx rename to 2017/src/main/resources/raw/7_HaTinh_DDHD.xls.xlsx diff --git a/2017/src/main/resources/7_HungYen_LTIK.xls.xlsx b/2017/src/main/resources/raw/7_HungYen_LTIK.xls.xlsx similarity index 100% rename from 2017/src/main/resources/7_HungYen_LTIK.xls.xlsx rename to 2017/src/main/resources/raw/7_HungYen_LTIK.xls.xlsx diff --git a/2017/src/main/resources/7_Kon_Tum_RSLR.xls.xlsx b/2017/src/main/resources/raw/7_Kon_Tum_RSLR.xls.xlsx similarity index 100% rename from 2017/src/main/resources/7_Kon_Tum_RSLR.xls.xlsx rename to 2017/src/main/resources/raw/7_Kon_Tum_RSLR.xls.xlsx diff --git a/2017/src/main/resources/7_Tien_Giang_EFHX.xls.xlsx b/2017/src/main/resources/raw/7_Tien_Giang_EFHX.xls.xlsx similarity index 100% rename from 2017/src/main/resources/7_Tien_Giang_EFHX.xls.xlsx rename to 2017/src/main/resources/raw/7_Tien_Giang_EFHX.xls.xlsx diff --git a/2017/src/main/resources/8_Can_Tho_RQZM.xls.xlsx b/2017/src/main/resources/raw/8_Can_Tho_RQZM.xls.xlsx similarity index 100% rename from 2017/src/main/resources/8_Can_Tho_RQZM.xls.xlsx rename to 2017/src/main/resources/raw/8_Can_Tho_RQZM.xls.xlsx diff --git a/2017/src/main/resources/8_Dak_Lak_YKPR.xls.xlsx b/2017/src/main/resources/raw/8_Dak_Lak_YKPR.xls.xlsx similarity index 100% rename from 2017/src/main/resources/8_Dak_Lak_YKPR.xls.xlsx rename to 2017/src/main/resources/raw/8_Dak_Lak_YKPR.xls.xlsx diff --git a/2017/src/main/resources/8_KienGiang_OTOB.xls.xlsx b/2017/src/main/resources/raw/8_KienGiang_OTOB.xls.xlsx similarity index 100% rename from 2017/src/main/resources/8_KienGiang_OTOB.xls.xlsx rename to 2017/src/main/resources/raw/8_KienGiang_OTOB.xls.xlsx diff --git a/2017/src/main/resources/8_PhuYen_OGIM.xls.xlsx b/2017/src/main/resources/raw/8_PhuYen_OGIM.xls.xlsx similarity index 100% rename from 2017/src/main/resources/8_PhuYen_OGIM.xls.xlsx rename to 2017/src/main/resources/raw/8_PhuYen_OGIM.xls.xlsx diff --git a/2017/src/main/resources/9_DakNong_FBOP.xls.xlsx b/2017/src/main/resources/raw/9_DakNong_FBOP.xls.xlsx similarity index 100% rename from 2017/src/main/resources/9_DakNong_FBOP.xls.xlsx rename to 2017/src/main/resources/raw/9_DakNong_FBOP.xls.xlsx diff --git a/2017/src/main/resources/9_Khanh_Hoa_KPKQ.xls.xlsx b/2017/src/main/resources/raw/9_Khanh_Hoa_KPKQ.xls.xlsx similarity index 100% rename from 2017/src/main/resources/9_Khanh_Hoa_KPKQ.xls.xlsx rename to 2017/src/main/resources/raw/9_Khanh_Hoa_KPKQ.xls.xlsx diff --git a/2017/src/main/resources/9_LaiChau_ALKN.xls.xlsx b/2017/src/main/resources/raw/9_LaiChau_ALKN.xls.xlsx similarity index 100% rename from 2017/src/main/resources/9_LaiChau_ALKN.xls.xlsx rename to 2017/src/main/resources/raw/9_LaiChau_ALKN.xls.xlsx diff --git a/2017/src/main/resources/9_Vinh_Long_OLWA.xls.xlsx b/2017/src/main/resources/raw/9_Vinh_Long_OLWA.xls.xlsx similarity index 100% rename from 2017/src/main/resources/9_Vinh_Long_OLWA.xls.xlsx rename to 2017/src/main/resources/raw/9_Vinh_Long_OLWA.xls.xlsx