修改提取数据

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

@@ -47,12 +47,12 @@
                     ZSJDDS = T2.SKYCDS1,
                     ZSJDDIS = T2.SKYCDS2,
                     YCZS = (T2.SKYCDS2 + T2.SKYCDS1)/2,
-                    TGGG = T2.TGMC || '/' || T2.WJ,
+                    TGGG = T2.TGGJ || '/' || T2.WJ,
                     JX = T2.ZDJXJ,
-                    STHD = ''
+                    STHD = T2.YXHD
         WHEN NOT MATCHED THEN
             INSERT(JH, QKDM, DWDM, DWMC, YTDM, BGRQ, YCLX, SCCW, CS, YSDCYL, YSDCWD, YSBHYL, ZSJDDS, ZSJDDIS, YCZS, TGGG, JX, STHD)
-            VALUES(T2.JH, T2.DYDM, T2.EJDWDM, T2.DWMC, T2.YQTDM, SYSDATE, '', T2.CW, T2.CS, T2.YSDCYL, T2.YSDCWD, T2.YSBHYL, T2.SKYCDS1, T2.SKYCDS2, (T2.SKYCDS2 + T2.SKYCDS1)/2, T2.TGMC || '/' || T2.WJ, T2.ZDJXJ, '')
+            VALUES(T2.JH, T2.DYDM, T2.EJDWDM, T2.DWMC, T2.YQTDM, SYSDATE, '', T2.CW, T2.CS, T2.YSDCYL, T2.YSDCWD, T2.YSBHYL, T2.SKYCDS1, T2.SKYCDS2, (T2.SKYCDS2 + T2.SKYCDS1)/2, T2.TGGJ || '/' || T2.WJ, T2.ZDJXJ, T2.YXHD)
     </update>
 
 </mapper>