pom.xml

@@ -99,12 +99,8 @@
 
 	<modules>
 		<module>vseaf4.4-sys</module>
-		<module>vseaf4.4-indicator</module>
-		<module>vseaf4.4-condition</module>
 		<module>vseaf4.4-cyyzs</module>
-		<module>vseaf4.4-technology</module>
 		<module>vseaf4.4-calc</module>
-		<module>vseaf4.4-analyze</module>
 		<module>vseaf4.4-template-starter</module>
 		<module>vseaf4.4-template-starter-dev</module>
 	</modules>

vseaf4.4-calc/pom.xml

@@ -28,19 +28,9 @@
 		</dependency>
 		<dependency>
 			<groupId>cn.com.victorysoft</groupId>
-			<artifactId>vseaf4.4-indicator</artifactId>
-			<version>1.0.0-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>cn.com.victorysoft</groupId>
-			<artifactId>vseaf4.4-condition</artifactId>
-			<version>1.0.0-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>cn.com.victorysoft</groupId>
-			<artifactId>vseaf4.4-technology</artifactId>
+			<artifactId>vseaf4.4-cyyzs</artifactId>
 			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 
-</project>
+</project>

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

@@ -7,7 +7,7 @@ import java.math.BigDecimal;
 import java.util.Date;
 
 /**
- * @author 
+ * @author
  * 分层注水评价
  */
 @Data
@@ -16,7 +16,7 @@ public class LayeredWater implements Serializable {
     /**
      * 日期
      */
-    private String recordDate;
+    private Date recordDate;
 
     /**
      * 单位代码
@@ -120,4 +120,4 @@ public class LayeredWater implements Serializable {
 
 
     private static final long serialVersionUID = 1L;
-}
+}

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

@@ -11,7 +11,7 @@
     <select id="selectList" parameterType="cn.com.victorysoft.business.cyyzs.param.LayeredWaterParam"
             resultType="cn.com.victorysoft.business.cyyzs.entity.LayeredWater">
         select * from (
-        SELECT RECORD_DATE, DWDM, su.UNITNAME DWMC, QKDM, sb.BLOCKNAME QKMC, YCLX,
+        SELECT RECORD_DATE, DWDM, replace(su.FULLNAME,'胜利油田分公司/','') DWMC, QKDM, sb.BLOCKNAME QKMC, YCLX,
         (SELECT flag_name FROM sys_flag WHERE category_code = 'YCLX' AND flag_code = yclx) YCLXMC,
         GYLX,
         (SELECT flag_name FROM sys_flag WHERE category_code = 'GYLX' AND flag_code = gylx) GYLXMC,
@@ -64,4 +64,4 @@
         order by a.WELLNAME
     </select>
 
-</mapper>
+</mapper>

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

@@ -6,7 +6,8 @@
     <select id="selectList" resultType="cn.com.victorysoft.business.cyyzs.entity.ProductionData"
             parameterType="cn.com.victorysoft.business.cyyzs.param.ProductionParam">
         SELECT
-            B.GYLX, COUNT(1) ZJS,
+            (select flag_name from sys_flag where category_code = 'GYLX' and flag_code = B.GYLX) gylx,
+            COUNT(1) ZJS,
             SUM(CASE WHEN KCS >= 1 THEN 1 ELSE 0 END) KJS,
             SUM(ZCS) ZCS, SUM(KCS) KCS,
             SUM(CASE WHEN IS_JCJ >= 1 THEN 1 ELSE 0 END) JCJS,
@@ -80,4 +81,4 @@
         LEFT JOIN WELL_PROCESS_TYPE B ON A.WELLNAME = B.JH
         GROUP BY B.GYLX
     </select>
-</mapper>
+</mapper>

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

@@ -12,7 +12,10 @@
         <include refid="Base_Column_List"/>
         from WATER_WELL_BASIC web
         left join sys_blockinfo sb on web.qkdm = sb.blockcode
-        where BGRQ = #{testdate,jdbcType=TIMESTAMP}
+        where 1 = 1
+        <if test="testdate != null">
+            and BGRQ = #{testdate,jdbcType=TIMESTAMP}
+        </if>
         <if test="unitcode != null and unitcode != ''">
             and DWDM in (select unitcode
             from SYS_UNITINFO
@@ -42,4 +45,4 @@
         </set>
         where JH = #{jh,jdbcType=VARCHAR}
     </update>
-</mapper>
+</mapper>

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

@@ -62,36 +62,16 @@
 			<artifactId>vseaf4.4-sys</artifactId>
 			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
-		<dependency>
-			<groupId>cn.com.victorysoft</groupId>
-			<artifactId>vseaf4.4-indicator</artifactId>
-			<version>1.0.0-SNAPSHOT</version>
-		</dependency>
 		<dependency>
 			<groupId>cn.com.victorysoft</groupId>
 			<artifactId>vseaf4.4-cyyzs</artifactId>
 			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
-		<dependency>
-			<groupId>cn.com.victorysoft</groupId>
-			<artifactId>vseaf4.4-condition</artifactId>
-			<version>1.0.0-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>cn.com.victorysoft</groupId>
-			<artifactId>vseaf4.4-technology</artifactId>
-			<version>1.0.0-SNAPSHOT</version>
-		</dependency>
 		<dependency>
 			<groupId>cn.com.victorysoft</groupId>
 			<artifactId>vseaf4.4-calc</artifactId>
 			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
-		<dependency>
-			<groupId>cn.com.victorysoft</groupId>
-			<artifactId>vseaf4.4-analyze</artifactId>
-			<version>1.0.0-SNAPSHOT</version>
-		</dependency>
 
 		<dependency>
 			<groupId>com.github.xiaoymin</groupId>

vseaf4.4-template-starter/pom.xml

@@ -69,36 +69,16 @@
 			<artifactId>vseaf4.4-sys</artifactId>
 			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
-		<dependency>
-			<groupId>cn.com.victorysoft</groupId>
-			<artifactId>vseaf4.4-indicator</artifactId>
-			<version>1.0.0-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>cn.com.victorysoft</groupId>
-			<artifactId>vseaf4.4-condition</artifactId>
-			<version>1.0.0-SNAPSHOT</version>
-		</dependency>
 		<dependency>
 			<groupId>cn.com.victorysoft</groupId>
 			<artifactId>vseaf4.4-cyyzs</artifactId>
 			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
-		<dependency>
-			<groupId>cn.com.victorysoft</groupId>
-			<artifactId>vseaf4.4-technology</artifactId>
-			<version>1.0.0-SNAPSHOT</version>
-		</dependency>
 		<dependency>
 			<groupId>cn.com.victorysoft</groupId>
 			<artifactId>vseaf4.4-calc</artifactId>
 			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
-		<dependency>
-			<groupId>cn.com.victorysoft</groupId>
-			<artifactId>vseaf4.4-analyze</artifactId>
-			<version>1.0.0-SNAPSHOT</version>
-		</dependency>
 
 		<dependency>
 			<groupId>com.github.xiaoymin</groupId>