diff --git a/src/main/java/com/JN/demo/jnzmquatation/mapper/JnRegionMapper.java b/src/main/java/com/JN/demo/jnzmquatation/mapper/JnRegionMapper.java index 7164ad1..83c5344 100644 --- a/src/main/java/com/JN/demo/jnzmquatation/mapper/JnRegionMapper.java +++ b/src/main/java/com/JN/demo/jnzmquatation/mapper/JnRegionMapper.java @@ -15,11 +15,6 @@ import java.util.List; */ @Mapper public interface JnRegionMapper { - @Select("with temp as(\n" + - "select pz_place_uid_0,price_0t_5t,price_5t_10t,price_10t_25t,price_25t_100t,price_100t from c_pz_price where date_0=(select max(date_0) from c_pz_price) \n" + - ") select distinct a.sheng_0 as province,a.shi_0 as city,a.qu_0 as district,a.km_0 as kilometers,\n" + - "b.price_0t_5t as price_01,b.price_5t_10t as price_02,b.price_10t_25t as price_03,b.price_25t_100t as price_04,b.price_100t as price_05\n" + - "from c_pz_place2019 a left join temp b on a.id_0 = b.pz_place_uid_0 where a.qu_0 not in \n" + - "('江阴市','金坛区','溧阳市','宜兴市') and (sheng_0 like '%${regionName}%' or shi_0 like '%${regionName}%' or qu_0 like '%${regionName}%')") + @Select("select * from c_place a where 1=1 and a.province like '%${regionName}%' or a.city like '%${regionName}%' or a.district like '%${regionName}%' ") List queryRegionListByName(String regionName); } diff --git a/src/main/resources/application-JN.yml b/src/main/resources/application-JN.yml index 9bdbd98..14b6c9a 100644 --- a/src/main/resources/application-JN.yml +++ b/src/main/resources/application-JN.yml @@ -11,7 +11,7 @@ spring: datasource: master: driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver - url: jdbc:sqlserver://192.168.9.230:1433;databaseName=ERP;Encrypt=false;TrustServerCertificate=true; + url: jdbc:sqlserver://192.168.9.99:1433;databaseName=jn_quot;Encrypt=false;TrustServerCertificate=true; username: sa password: Itcenter110- slave_1: diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index b37579b..a55ed7b 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -2,4 +2,4 @@ spring: thymeleaf: mode: HTML profiles: - active: ZM + active: JN diff --git a/src/main/resources/static/jnquotation/js/index.js b/src/main/resources/static/jnquotation/js/index.js index 340ca0a..958ffd0 100644 --- a/src/main/resources/static/jnquotation/js/index.js +++ b/src/main/resources/static/jnquotation/js/index.js @@ -1,6 +1,6 @@ const queryRegionListByName = (params) => { return $axios({ - url: '/zmquotation/regionList', + url: '/jnquotation/regionList', method: 'post', params }) @@ -19,4 +19,4 @@ const queryInventoryList = () => { url: '/zmquotation/inventoryList', method: 'post', }) -} \ No newline at end of file +} diff --git a/src/main/resources/templates/jnquotation/index.html b/src/main/resources/templates/jnquotation/index.html index 378ff9f..1783496 100644 --- a/src/main/resources/templates/jnquotation/index.html +++ b/src/main/resources/templates/jnquotation/index.html @@ -591,6 +591,7 @@ } console.log(params) queryRegionListByName(params).then(res => { + console.log('queryRegionListByName') this.regionTableData = res.data || [] this.regionCurrentPage = 1; }).catch(err => { diff --git a/target/JNDemo-1.0-SNAPSHOT.jar b/target/JNDemo-1.0-SNAPSHOT.jar new file mode 100644 index 0000000..30282fb Binary files /dev/null and b/target/JNDemo-1.0-SNAPSHOT.jar differ diff --git a/target/JNDemo-1.0-SNAPSHOT.jar.original b/target/JNDemo-1.0-SNAPSHOT.jar.original new file mode 100644 index 0000000..15cd25e Binary files /dev/null and b/target/JNDemo-1.0-SNAPSHOT.jar.original differ diff --git a/target/classes/META-INF/JNDemo.kotlin_module b/target/classes/META-INF/JNDemo.kotlin_module deleted file mode 100644 index a49347a..0000000 Binary files a/target/classes/META-INF/JNDemo.kotlin_module and /dev/null differ diff --git a/target/classes/application-JN.yml b/target/classes/application-JN.yml index 9bdbd98..14b6c9a 100644 --- a/target/classes/application-JN.yml +++ b/target/classes/application-JN.yml @@ -11,7 +11,7 @@ spring: datasource: master: driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver - url: jdbc:sqlserver://192.168.9.230:1433;databaseName=ERP;Encrypt=false;TrustServerCertificate=true; + url: jdbc:sqlserver://192.168.9.99:1433;databaseName=jn_quot;Encrypt=false;TrustServerCertificate=true; username: sa password: Itcenter110- slave_1: diff --git a/target/classes/application.yml b/target/classes/application.yml index b37579b..a55ed7b 100644 --- a/target/classes/application.yml +++ b/target/classes/application.yml @@ -2,4 +2,4 @@ spring: thymeleaf: mode: HTML profiles: - active: ZM + active: JN diff --git a/target/classes/com/JN/demo/jnzmquatation/mapper/JnRegionMapper.class b/target/classes/com/JN/demo/jnzmquatation/mapper/JnRegionMapper.class index bb72422..0449dac 100644 Binary files a/target/classes/com/JN/demo/jnzmquatation/mapper/JnRegionMapper.class and b/target/classes/com/JN/demo/jnzmquatation/mapper/JnRegionMapper.class differ diff --git a/target/classes/static/jnquotation/js/index.js b/target/classes/static/jnquotation/js/index.js index 340ca0a..958ffd0 100644 --- a/target/classes/static/jnquotation/js/index.js +++ b/target/classes/static/jnquotation/js/index.js @@ -1,6 +1,6 @@ const queryRegionListByName = (params) => { return $axios({ - url: '/zmquotation/regionList', + url: '/jnquotation/regionList', method: 'post', params }) @@ -19,4 +19,4 @@ const queryInventoryList = () => { url: '/zmquotation/inventoryList', method: 'post', }) -} \ No newline at end of file +} diff --git a/target/classes/templates/jnquotation/index.html b/target/classes/templates/jnquotation/index.html index 378ff9f..1783496 100644 --- a/target/classes/templates/jnquotation/index.html +++ b/target/classes/templates/jnquotation/index.html @@ -591,6 +591,7 @@ } console.log(params) queryRegionListByName(params).then(res => { + console.log('queryRegionListByName') this.regionTableData = res.data || [] this.regionCurrentPage = 1; }).catch(err => { diff --git a/target/maven-archiver/pom.properties b/target/maven-archiver/pom.properties new file mode 100644 index 0000000..87dde2d --- /dev/null +++ b/target/maven-archiver/pom.properties @@ -0,0 +1,3 @@ +artifactId=JNDemo +groupId=com.JN +version=1.0-SNAPSHOT