井史简介

src/main/resources/mapping/cquery/WellInfoCQuery.xml

@@ -58,9 +58,9 @@
         ) maxdaily on daily.well_id=maxdaily.well_id and daily.prod_time=maxdaily.prod_time
         )fact_daily on well.well_id= fact_daily.well_id
         left join (
-        select mon.* from public.fact_dwr_pc_pro_well_vol_monthly mon
+        select mon.* from public.fact_dwr_pc_pro_well_vol_m mon
         inner join(
-        select well_id, max(prod_time) prod_time from public.fact_dwr_pc_pro_well_vol_monthly group by well_id
+        select well_id, max(prod_time) prod_time from public.fact_dwr_pc_pro_well_vol_m group by well_id
         ) maxmon on mon.well_id=maxmon.well_id and mon.prod_time=maxmon.prod_time
         )fact_mon on well.well_id= fact_mon.well_id
         where 1=1

target/classes/META-INF/MANIFEST.MF

@@ -1,38 +1,44 @@
 Manifest-Version: 1.0
 Main-Class: com.bowintek.practice.PracticeApplication
-Class-Path: HikariCP-4.0.3.jar jackson-annotations-2.13.3.jar jul-to-slf
- 4j-1.7.36.jar netty-codec-4.1.79.Final.jar aspectjweaver-1.9.7.jar tomc
- at-embed-el-9.0.65.jar tomcat-embed-core-9.0.65.jar commons-beanutils-1
- .9.4.jar logback-core-1.2.11.jar commons-collections-3.2.2.jar poi-scra
- tchpad-4.0.0.jar spring-data-keyvalue-2.7.2.jar spring-oxm-5.3.22.jar s
- pring-boot-devtools-2.7.2.jar poi-4.0.0.jar commons-compress-1.18.jar h
- ttpcore-4.4.15.jar reactor-core-3.4.21.jar spring-boot-autoconfigure-2.
- 7.2.jar pagehelper-spring-boot-autoconfigure-1.4.3.jar mybatis-3.5.9.ja
- r lombok-1.18.20.jar commons-collections4-4.2.jar checker-qual-3.5.0.ja
- r spring-boot-starter-2.7.2.jar jackson-datatype-jdk8-2.13.3.jar mybati
- s-spring-boot-autoconfigure-2.2.2.jar spring-tx-5.3.22.jar lettuce-core
- -6.1.9.RELEASE.jar spring-jcl-5.3.22.jar jsqlparser-4.2.jar jackson-mod
- ule-parameter-names-2.13.3.jar spring-boot-2.7.2.jar mybatis-spring-boo
- t-starter-2.2.2.jar commons-net-3.6.jar spring-context-5.3.22.jar netty
- -common-4.1.79.Final.jar fastjson-1.2.47.jar json-20190722.jar spring-w
- ebmvc-5.3.22.jar spring-data-commons-2.7.2.jar jackson-core-2.13.3.jar 
- netty-handler-4.1.79.Final.jar mybatis-spring-2.0.7.jar xmlbeans-3.0.1.
- jar jackson-datatype-jsr310-2.13.3.jar commons-pool2-2.11.1.jar java-jw
- t-3.9.0.jar httpclient-4.5.9.jar spring-boot-starter-json-2.7.2.jar spr
- ing-context-support-5.3.22.jar netty-buffer-4.1.79.Final.jar jakarta.an
- notation-api-1.3.5.jar spring-beans-5.3.22.jar netty-transport-4.1.79.F
- inal.jar druid-spring-boot-starter-1.2.11.jar commons-codec-1.15.jar sp
- ring-boot-starter-data-redis-2.7.2.jar poi-ooxml-schemas-4.0.0.jar mysq
- l-connector-java-8.0.29.jar tomcat-embed-websocket-9.0.65.jar druid-1.2
- .11.jar spring-web-5.3.22.jar commons-lang3-3.5.jar spring-data-redis-2
- .7.2.jar aspectjrt-1.9.7.jar poi-ooxml-4.0.0.jar spring-boot-starter-lo
- gging-2.7.2.jar jackson-databind-2.13.3.jar postgresql-42.3.6.jar netty
- -transport-native-unix-common-4.1.79.Final.jar spring-jdbc-5.3.22.jar s
- pring-boot-starter-web-2.7.2.jar spring-core-5.3.22.jar commons-logging
- -1.2.jar spring-expression-5.3.22.jar aspose-words-15.8.0-jdk16.jar spr
- ing-aop-5.3.22.jar pagehelper-5.3.1.jar spring-boot-starter-tomcat-2.7.
- 2.jar logback-classic-1.2.11.jar spring-boot-starter-jdbc-2.7.2.jar net
- ty-resolver-4.1.79.Final.jar log4j-api-2.17.2.jar reactive-streams-1.0.
- 4.jar log4j-to-slf4j-2.17.2.jar pagehelper-spring-boot-starter-1.4.3.ja
- r slf4j-api-1.7.36.jar snakeyaml-1.30.jar curvesapi-1.04.jar
+Class-Path: mybatis-spring-2.0.7.jar reactor-core-3.4.21.jar lettuce-cor
+ e-6.1.9.RELEASE.jar spring-data-keyvalue-2.7.2.jar jackson-databind-2.1
+ 3.3.jar jackson-datatype-jdk8-2.13.3.jar spring-boot-starter-data-redis
+ -2.7.2.jar spring-boot-starter-jdbc-2.7.2.jar lucene-queries-4.7.2.jar 
+ snakeyaml-1.30.jar netty-handler-4.1.79.Final.jar jackson-module-parame
+ ter-names-2.13.3.jar jackson-core-2.13.3.jar poi-4.0.0.jar spring-webmv
+ c-5.3.22.jar commons-collections4-4.2.jar fastjson-1.2.47.jar spring-be
+ ans-5.3.22.jar commons-lang3-3.5.jar httpasyncclient-4.1.5.jar netty-re
+ solver-4.1.79.Final.jar spring-boot-starter-json-2.7.2.jar lombok-1.18.
+ 20.jar spring-boot-autoconfigure-2.7.2.jar reactive-streams-1.0.4.jar a
+ spectjrt-1.9.7.jar spring-expression-5.3.22.jar jul-to-slf4j-1.7.36.jar
+  checker-qual-3.5.0.jar netty-codec-4.1.79.Final.jar parsson-1.0.0.jar 
+ slf4j-api-1.7.36.jar xmlbeans-3.0.1.jar lucene-queryparser-4.7.2.jar to
+ mcat-embed-core-9.0.65.jar opentelemetry-api-1.29.0.jar spring-jdbc-5.3
+ .22.jar mysql-connector-java-8.0.29.jar spring-core-5.3.22.jar poi-ooxm
+ l-4.0.0.jar pagehelper-spring-boot-starter-1.4.3.jar elasticsearch-java
+ -8.11.1.jar mybatis-3.5.9.jar elasticsearch-rest-client-7.17.4.jar jsql
+ parser-4.2.jar netty-common-4.1.79.Final.jar jakarta.annotation-api-1.3
+ .5.jar spring-tx-5.3.22.jar netty-transport-4.1.79.Final.jar ikanalyzer
+ -2012_u6.jar httpcore-4.4.15.jar mybatis-spring-boot-autoconfigure-2.2.
+ 2.jar jakarta.json-api-2.0.1.jar log4j-to-slf4j-2.17.2.jar spring-boot-
+ 2.7.2.jar druid-spring-boot-starter-1.2.11.jar pagehelper-spring-boot-a
+ utoconfigure-1.4.3.jar spring-data-redis-2.7.2.jar commons-beanutils-1.
+ 9.4.jar log4j-api-2.17.2.jar lucene-sandbox-4.7.2.jar httpclient-4.5.9.
+ jar jsr305-3.0.2.jar HikariCP-4.0.3.jar tomcat-embed-websocket-9.0.65.j
+ ar spring-boot-starter-web-2.7.2.jar postgresql-42.3.6.jar commons-coll
+ ections-3.2.2.jar logback-classic-1.2.11.jar logback-core-1.2.11.jar po
+ i-ooxml-schemas-4.0.0.jar spring-boot-devtools-2.7.2.jar netty-buffer-4
+ .1.79.Final.jar pagehelper-5.3.1.jar commons-pool2-2.11.1.jar spring-bo
+ ot-starter-2.7.2.jar spring-data-commons-2.7.2.jar commons-codec-1.15.j
+ ar spring-aop-5.3.22.jar curvesapi-1.04.jar spring-boot-starter-tomcat-
+ 2.7.2.jar opentelemetry-context-1.29.0.jar aspectjweaver-1.9.7.jar spri
+ ng-web-5.3.22.jar commons-logging-1.2.jar aspose-words-15.8.0-jdk16.jar
+  postgresql-42.3.4.jar java-jwt-3.9.0.jar jackson-annotations-2.13.3.ja
+ r lucene-analyzers-common-4.7.2.jar tomcat-embed-el-9.0.65.jar json-201
+ 90722.jar druid-1.2.11.jar jackson-datatype-jsr310-2.13.3.jar mybatis-s
+ pring-boot-starter-2.2.2.jar commons-compress-1.18.jar spring-oxm-5.3.2
+ 2.jar httpcore-nio-4.4.15.jar spring-context-support-5.3.22.jar spring-
+ context-5.3.22.jar netty-transport-native-unix-common-4.1.79.Final.jar 
+ commons-net-3.6.jar poi-scratchpad-4.0.0.jar spring-jcl-5.3.22.jar spri
+ ng-boot-starter-logging-2.7.2.jar lucene-core-4.7.2.jar
 

vue/src/components/basic/query/select-column.vue

@@ -15,7 +15,7 @@
             全选
           </a-checkbox>
         </div>
-        <a-checkbox-group style="display: flex;flex-flow: column;overflow-y: scroll" v-model:value="checkedList">
+        <a-checkbox-group style="display: flex;flex-flow: column;overflow-y: scroll;max-height: 600px;" v-model:value="checkedList">
           <template v-for="it in fieldList">
             <a-checkbox :value="it.fieldId" v-show="it.isFixed!=1">
               <a-dropdown v-if="it.settingTypeId==2">
@@ -98,7 +98,7 @@ export default defineComponent({
       () => basesListChange(), {deep: true}
     );
     watch(
-      () => props.options.basesList,
+      () => props.options.measuresList,
       () => measuresListChange(), {deep: true}
     );
     const setFixedColumn = () => {