单井日报、分层注水评价

vseaf4.4-cyyzs/src/main/java/cn/com/victorysoft/business/cyyzs/entity/WellDaily.java

@@ -83,7 +83,10 @@ public class WellDaily implements Serializable {
      */
     private Integer rn;
 
-
+    /**
+     * 注水层位
+     */
+    private String zscw;
 
     private static final long serialVersionUID = 1L;
 }

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

@@ -32,7 +32,7 @@
         ROUND(sum(DAILY_WATER), 2) ljzsl,
         ROUND(sum(OPEN_TIME), 2) ljzssj,
         case when sum(OPEN_TIME) = '0' then 0 when sum(OPEN_TIME) = null then 0 else
-        ROUND(sum(DAILY_WATER)/sum(OPEN_TIME), 2) end rznl,
+        ROUND(sum(DAILY_WATER)/(sum(OPEN_TIME)/24), 2) end rznl,
         case when sum(PLAN_DAILY_WATER) = '0' then 0 when sum(PLAN_DAILY_WATER) = null then 0 else
         ROUND((sum(DAILY_WATER)/sum(PLAN_DAILY_WATER)), 2) end cz,
         case

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

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="cn.com.victorysoft.business.cyyzs.dao.WellDailyDao">
     <sql id="Base_Column_List">
-        RQ, JH, SCSJ, GXYL, YY, TY, RZSL, RPZSL, BZ
+        RQ, JH, SCSJ, GXYL, YY, TY, RZSL, RPZSL, BZ, ZSCW
     </sql>
     <select id="selectList" parameterType="cn.com.victorysoft.business.cyyzs.param.WellDailyParam"
             resultType="cn.com.victorysoft.business.cyyzs.entity.WellDaily">
@@ -14,7 +14,7 @@
         <if test="wellname != null and wellname != ''">
             and JH = #{wellname,jdbcType=VARCHAR}
         </if>
-        order by jh
+        order by RQ desc
     </select>
 
 </mapper>