修改SQL

vseaf4.4-calc/src/main/resources/mapper/WaterTubularStructureDao.xml

@@ -9,13 +9,11 @@
                 A.JH, A.KGRQ, A.WGRQ, A.CSLB, A.KGRQ - A.LAST_WGRQ ZJSJ, A.LAST_WGRQ
             FROM (
                 SELECT
-                    A.*, B.WGRQ LAST_WGRQ,
-                    CASE WHEN B.WGRQ IS NULL THEN 1 ELSE ROW_NUMBER() OVER(PARTITION BY B.JH ORDER BY B.WGRQ ASC) END XH
+                    A.*, LEAD(KGRQ, 1, NULL) OVER(PARTITION BY JH ORDER BY KGRQ) LAST_WGRQ
                 FROM
                     YS_DDH01 A
-                LEFT JOIN YS_DDH01 B ON A.JH = B.JH AND A.KGRQ > B.WGRQ
             ) A
-            LEFT JOIN YS_DAA01 B ON A.JH = B.JH AND A.XH = '1'
+            LEFT JOIN YS_DAA01 B ON A.JH = B.JH
         ) T2 ON (T1.JH = T2.JH AND T1.WJRQ = T2.WGRQ)
         WHEN MATCHED THEN
             UPDATE SET

vseaf4.4-cyyzs/src/main/resources/mapper/ProductionDataDao.xml

@@ -67,7 +67,7 @@
                                     1 = 1
                                 <if test="ksrq != null and ksrq != ''"> AND A.RECORD_DATE >= TO_DATE(#{ksrq}, 'yyyy-mm-dd')</if>
                                 <if test="jsrq != null and jsrq != ''"> AND A.RECORD_DATE <![CDATA[ <= ]]> TO_DATE(#{jsrq}, 'yyyy-mm-dd')</if>
-                                <if test="dydm != null and dydm != ''"> AND A.QKDM = #{dydm}</if>
+                                <if test="dydm != null and dydm != ''"> AND B.QKDM = #{dydm}</if>
                                 <if test="dwdm != null and dwdm != ''"> AND B.DWDM IN (SELECT UNITCODE FROM SYS_UNITINFO START WITH UNITCODE = #{dwdm} CONNECT BY PRIOR UNITCODE = P_UNITCODE)</if>
                                 <if test="yclx != null and yclx != ''"> AND B.YCLX = #{yclx}</if>
                                 GROUP BY A.WELLNAME, A.SECTION

vseaf4.4-template-starter-dev/pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>cn.com.victorysoft</groupId>
 	<artifactId>vseaf4.4-template-starter-dev</artifactId>
-	<packaging>war</packaging>
+	<packaging>jar</packaging>
 
 	<parent>
 		<groupId>cn.com.victorysoft</groupId>

vseaf4.4-template-starter-dev/src/main/resources/application.properties

@@ -8,13 +8,14 @@ spring.mvc.view.suffix=.jsp
 
 #spring.datasource.username=water
 #spring.datasource.password=life1sShort
-spring.datasource.username=cyyzs
-spring.datasource.password=life1sShort
-#spring.datasource.username=zsyx
-#spring.datasource.password=ZCK#406sr
+#spring.datasource.username=cyyzs
+#spring.datasource.password=life1sShort
+spring.datasource.username=zss_znzs
+spring.datasource.password=zss_znzs221215
 #spring.datasource.url=jdbc:mysql://127.0.0.1:3306/property?serverTimezone=GMT%2B8&useSSL=false&characterEncoding=utf8&allowMutiQueries=true
 #spring.datasource.druid.url=jdbc:oracle:thin:@192.168.2.194:1521:xe
-spring.datasource.druid.url=jdbc:oracle:thin:@49.234.214.200:15116/xe
+#spring.datasource.druid.url=jdbc:oracle:thin:@49.234.214.200:15116/xe
+spring.datasource.druid.url=jdbc:oracle:thin:@10.67.88.221:1521/cyycygc
 #spring.datasource.druid.url=jdbc:oracle:thin:@10.67.112.2:1521/scora
 #spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 spring.datasource.druid.driver-class-name=oracle.jdbc.OracleDriver