修改

src/main/resources/mybatis/zt/DjdcInfoMapper.xml

@@ -670,7 +670,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 				#{item}
 			</foreach>
 		</if>
-		order by WJRQ desc) where ROWNUM &lt;= 100
+		order by WJRQ desc NULLS LAST) where ROWNUM &lt;= 100
 	</select>
 <!--	select ss.kc,ss.ztxh,ss.cc,-->
 <!--	count( *) as ztsl,-->
@@ -998,32 +998,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		-- 根据井斜变化率进行分类
 		CASE
 		WHEN LEAD(dc) OVER (PARTITION BY a.jh ORDER BY a.xh) IS NULL THEN NULL
-		-- 自然增：大于0且小于0.1
+		-- 小幅增：大于0且小于0.1
 		WHEN (LEAD(jx) OVER (PARTITION BY a.jh ORDER BY a.xh) - jx)
 		/ LEAD(dc) OVER (PARTITION BY a.jh ORDER BY a.xh) * 30 > 0
 		AND (LEAD(jx) OVER (PARTITION BY a.jh ORDER BY a.xh) - jx)
 		/ LEAD(dc) OVER (PARTITION BY a.jh ORDER BY a.xh) * 30
 		&lt;
 		0.1
-		THEN '自然增'
-		-- 自然降：小于0且大于-0.1
+		THEN '小幅增'
+		-- 小幅降：小于0且大于-0.1
 		WHEN (LEAD(jx) OVER (PARTITION BY a.jh ORDER BY a.xh) - jx)
 		/ LEAD(dc) OVER (PARTITION BY a.jh ORDER BY a.xh) * 30
 		&lt;
 		0
 		AND (LEAD(jx) OVER (PARTITION BY a.jh ORDER BY a.xh) - jx)
 		/ LEAD(dc) OVER (PARTITION BY a.jh ORDER BY a.xh) * 30 > -0.1
-		THEN '自然降'
-		-- 人工增：大于1
+		THEN '小幅降'
+		-- 大幅增：大于1
 		WHEN (LEAD(jx) OVER (PARTITION BY a.jh ORDER BY a.xh) - jx)
 		/ LEAD(dc) OVER (PARTITION BY a.jh ORDER BY a.xh) * 30 > 1
-		THEN '人工增'
-		-- 人工降：小于-1
+		THEN '大幅增'
+		-- 大幅降：小于-1
 		WHEN (LEAD(jx) OVER (PARTITION BY a.jh ORDER BY a.xh) - jx)
 		/ LEAD(dc) OVER (PARTITION BY a.jh ORDER BY a.xh) * 30
 		&lt;
 		-1
-		THEN '人工降'
+		THEN '大幅降'
 		-- 其他情况（如0.1~1之间或-1~-0.1之间）
 		ELSE null
 		END AS zrzjx,d.gynr glzxd
@@ -1047,8 +1047,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		ORDER BY a.jh, a.xh
 	</select>
 	<select id="getJskdList2" resultType="com.zjsgfa.project.zt.domain.Jskd">
-		select gldc,sum( case zrzjx when '自然降' then 1 ELSE 0 end ) as zrj,sum( case zrzjx when '自然增' then 1  ELSE 0 end) as zrz,
-		sum( case zrzjx when '人工增' then 1  ELSE 0 end) as rgz,sum( case zrzjx when '人工降' then 1  ELSE 0 end) as rgj	from (
+		select gldc,sum( case zrzjx when '小幅降' then 1 ELSE 0 end ) as zrj,sum( case zrzjx when '小幅增' then 1  ELSE 0 end) as zrz,
+		sum( case zrzjx when '大幅增' then 1  ELSE 0 end) as rgz,sum( case zrzjx when '大幅降' then 1  ELSE 0 end) as rgj	from (
 		SELECT
 		a.*,
 		c.cw gldc,
@@ -1071,7 +1071,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		/ LEAD(dc) OVER (PARTITION BY a.jh ORDER BY a.xh) * 30
 		&lt;
 		0.1
-		THEN '自然增'
+		THEN '小幅增'
 
 		WHEN (LEAD(jx) OVER (PARTITION BY a.jh ORDER BY a.xh) - jx)
 		/ LEAD(dc) OVER (PARTITION BY a.jh ORDER BY a.xh) * 30
@@ -1079,17 +1079,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		0
 		AND (LEAD(jx) OVER (PARTITION BY a.jh ORDER BY a.xh) - jx)
 		/ LEAD(dc) OVER (PARTITION BY a.jh ORDER BY a.xh) * 30 > -0.1
-		THEN '自然降'
+		THEN '小幅降'
 
 		WHEN (LEAD(jx) OVER (PARTITION BY a.jh ORDER BY a.xh) - jx)
 		/ LEAD(dc) OVER (PARTITION BY a.jh ORDER BY a.xh) * 30 > 1
-		THEN '人工增'
+		THEN '大幅增'
 
 		WHEN (LEAD(jx) OVER (PARTITION BY a.jh ORDER BY a.xh) - jx)
 		/ LEAD(dc) OVER (PARTITION BY a.jh ORDER BY a.xh) * 30
 		&lt;
 		-1
-		THEN '人工降'
+		THEN '大幅降'
 
 		ELSE null
 		END AS zrzjx,d.gynr glzxd