| 
				
			 | 
			
			
				@@ -135,7 +135,7 @@ public class BaseDataController { 
			 | 
		
	
		
			
			| 
				
					135
				
			 | 
			
				
					135
				
			 | 
			
			
				         try { 
			 | 
		
	
		
			
			| 
				
					136
				
			 | 
			
				
					136
				
			 | 
			
			
				             jdbcTemplate = new JdbcTemplate(oracleDataSource); 
			 | 
		
	
		
			
			| 
				
					137
				
			 | 
			
				
					137
				
			 | 
			
			
				             String date = baseDataBody.getDate(); 
			 | 
		
	
		
			
			| 
				
					138
				
			 | 
			
				
			 | 
			
			
				-            String sql = " select distinct  jh,rq,scsj, rcyl1,rcyl,rcql,hs, bz from DBA01 where rq  = to_date('" + date + "','yyyy-MM-dd') and qyrq is not null "; 
			 | 
		
	
		
			
			| 
				
			 | 
			
				
					138
				
			 | 
			
			
				+            String sql = " select distinct  jh,rq,scsj, rcyl1,rcyl,rcql,hs, bz,sccw from DBA01 where rq  = to_date('" + date + "','yyyy-MM-dd') and qyrq is not null "; 
			 | 
		
	
		
			
			| 
				
					139
				
			 | 
			
				
					139
				
			 | 
			
			
				             List<Map<String, Object>> list = jdbcTemplate.queryForList(sql); 
			 | 
		
	
		
			
			| 
				
					140
				
			 | 
			
				
					140
				
			 | 
			
			
				             for (Map<String, Object> map : list) { 
			 | 
		
	
		
			
			| 
				
					141
				
			 | 
			
				
					141
				
			 | 
			
			
				                 if (map.get("SCSJ") == null) map.put("SCSJ", "0.0"); 
			 | 
		
	
	
		
			
			| 
				
			 | 
			
			
				@@ -144,6 +144,7 @@ public class BaseDataController { 
			 | 
		
	
		
			
			| 
				
					144
				
			 | 
			
				
					144
				
			 | 
			
			
				                 if (map.get("RCQL") == null) map.put("RCQL", "0.0"); 
			 | 
		
	
		
			
			| 
				
					145
				
			 | 
			
				
					145
				
			 | 
			
			
				                 if (map.get("HS") == null) map.put("HS", "0.0"); 
			 | 
		
	
		
			
			| 
				
					146
				
			 | 
			
				
					146
				
			 | 
			
			
				                 if (map.get("BZ") == null) map.put("BZ", ""); 
			 | 
		
	
		
			
			| 
				
			 | 
			
				
					147
				
			 | 
			
			
				+                if (map.get("SCCW") == null) map.put("SCCW", ""); 
			 | 
		
	
		
			
			| 
				
					147
				
			 | 
			
				
					148
				
			 | 
			
			
				                 map.put("RCSL", -1); 
			 | 
		
	
		
			
			| 
				
					148
				
			 | 
			
				
					149
				
			 | 
			
			
				                 map.put("QYB", -1); 
			 | 
		
	
		
			
			| 
				
					149
				
			 | 
			
				
					150
				
			 | 
			
			
				                 map.put("SQB", -1); 
			 | 
		
	
	
		
			
			| 
				
			 | 
			
			
				@@ -177,10 +178,10 @@ public class BaseDataController { 
			 | 
		
	
		
			
			| 
				
					177
				
			 | 
			
				
					178
				
			 | 
			
			
				                 if (!map.containsKey("YMD")) { 
			 | 
		
	
		
			
			| 
				
					178
				
			 | 
			
				
					179
				
			 | 
			
			
				                     map.put("YMD", 0.85); 
			 | 
		
	
		
			
			| 
				
					179
				
			 | 
			
				
					180
				
			 | 
			
			
				                 } 
			 | 
		
	
		
			
			| 
				
					180
				
			 | 
			
				
			 | 
			
			
				-                sql = "insert into centralbase.cb_pc_pro_wellbore_vol_daily(well_id,prod_date,prod_time,liq_prod_daily,oil_prod_daily,gas_prod_daily,water_cut,remarks,gas_oil_ratio,water_prod_daily,water_gas_ratio,surface_crude_water_density,surface_crude_oil_density) " + 
			 | 
		
	
		
			
			| 
				
					181
				
			 | 
			
				
			 | 
			
			
				-                        "values(?,?,?,?,?,?,?,?,?,?,?,?,?) "; 
			 | 
		
	
		
			
			| 
				
			 | 
			
				
					181
				
			 | 
			
			
				+                sql = "insert into centralbase.cb_pc_pro_wellbore_vol_daily(well_id,prod_date,prod_time,liq_prod_daily,oil_prod_daily,gas_prod_daily,water_cut,remarks,gas_oil_ratio,water_prod_daily,water_gas_ratio,surface_crude_water_density,surface_crude_oil_density,stim_content) " + 
			 | 
		
	
		
			
			| 
				
			 | 
			
				
					182
				
			 | 
			
			
				+                        "values(?,?,?,?,?,?,?,?,?,?,?,?,?,?) "; 
			 | 
		
	
		
			
			| 
				
					182
				
			 | 
			
				
					183
				
			 | 
			
			
				                 insertCount = insertBaseDataVolDaily(sql, map) + insertCount; 
			 | 
		
	
		
			
			| 
				
					183
				
			 | 
			
				
			 | 
			
			
				-                sql = "select distinct  jh,rq,scsj, rcyl1,rcyl,rcql,hs, bz from DBA01 where rq  = to_date('" + date + "','yyyy-MM-dd') and qyrq is not null "; 
			 | 
		
	
		
			
			| 
				
			 | 
			
				
					184
				
			 | 
			
			
				+                sql = "select distinct  jh,rq,scsj, rcyl1,rcyl,rcql,hs, bz,sccw from DBA01 where rq  = to_date('" + date + "','yyyy-MM-dd') and qyrq is not null "; 
			 | 
		
	
		
			
			| 
				
					184
				
			 | 
			
				
					185
				
			 | 
			
			
				                 updateLiqOliDailyCount = updateBaseDataVolDaily(sql) + updateLiqOliDailyCount; 
			 | 
		
	
		
			
			| 
				
					185
				
			 | 
			
				
					186
				
			 | 
			
			
				             } 
			 | 
		
	
		
			
			| 
				
					186
				
			 | 
			
				
					187
				
			 | 
			
			
				  
			 | 
		
	
	
		
			
			| 
				
			 | 
			
			
				@@ -196,7 +197,7 @@ public class BaseDataController { 
			 | 
		
	
		
			
			| 
				
					196
				
			 | 
			
				
					197
				
			 | 
			
			
				     public int insertBaseDataVolDaily(String sql, Map<String, Object> map) { 
			 | 
		
	
		
			
			| 
				
					197
				
			 | 
			
				
					198
				
			 | 
			
			
				         jdbcTemplate = new JdbcTemplate(baseDataSource); 
			 | 
		
	
		
			
			| 
				
					198
				
			 | 
			
				
					199
				
			 | 
			
			
				         if (map.isEmpty()) return 0; 
			 | 
		
	
		
			
			| 
				
					199
				
			 | 
			
				
			 | 
			
			
				-        return jdbcTemplate.update(sql, map.get("JH"), map.get("RQ"), map.get("SCSJ"), map.get("RCYL1"), map.get("RCYL"), map.get("RCQL"), map.get("HS"), map.get("BZ"), map.get("QYB"), map.get("RCSL"), map.get("SQB"), map.get("SMD"), map.get("YMD")); 
			 | 
		
	
		
			
			| 
				
			 | 
			
				
					200
				
			 | 
			
			
				+        return jdbcTemplate.update(sql, map.get("JH"), map.get("RQ"), map.get("SCSJ"), map.get("RCYL1"), map.get("RCYL"), map.get("RCQL"), map.get("HS"), map.get("BZ"), map.get("QYB"), map.get("RCSL"), map.get("SQB"), map.get("SMD"), map.get("YMD"), map.get("SCCW")); 
			 | 
		
	
		
			
			| 
				
					200
				
			 | 
			
				
					201
				
			 | 
			
			
				     } 
			 | 
		
	
		
			
			| 
				
					201
				
			 | 
			
				
					202
				
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				
					202
				
			 | 
			
				
					203
				
			 | 
			
			
				     public int updateBaseDataVolDaily(String sql) { 
			 |