From a5f62fff4330f1ffa9046e9c248b08924dd72067 Mon Sep 17 00:00:00 2001
From: chenlw <874313221@qq.com>
Date: Mon, 31 Oct 2016 18:53:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=A0=A1=E9=AA=8C=E7=9A=84?=
 =?UTF-8?q?=E9=9C=80=E8=A6=81=E7=9A=84sql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/dao/mapper/data-details-mapper.xml    | 14 +++++
 .../mapper/standard_data_details-mapper.xml   | 58 +++++++++++--------
 2 files changed, 47 insertions(+), 25 deletions(-)

diff --git a/src/com/dao/mapper/data-details-mapper.xml b/src/com/dao/mapper/data-details-mapper.xml
index f4b79e5d..32c4695b 100644
--- a/src/com/dao/mapper/data-details-mapper.xml
+++ b/src/com/dao/mapper/data-details-mapper.xml
@@ -46,6 +46,10 @@ PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN"
 			jdbcType="VARCHAR" />
 		<result property="mark" column="mark" javaType="string"
 		jdbcType="VARCHAR" />
+		<result property="volumePath" column="volume_path" javaType="string"
+			jdbcType="VARCHAR" />
+		<result property="mark" column="mark" javaType="string"
+		jdbcType="VARCHAR" />
 	</resultMap>
 	<sql id="conditionsFilters">
 		<if test="dataType!=null">
@@ -112,6 +116,16 @@ PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN"
 		FROM data_details
 		ORDER BY data_details.id
 	</select>
+	
+		<!-- 获取数据 条件：采集时间 -->
+	<select id="findByParam" resultType="com.platform.entities.DataInfoEntity" parameterType="com.platform.entities.DataInfoEntity">
+		SELECT
+		regionalism_code regionalismCode,system_code systemCode,checkout_indicate execResult,checkout_pay payResult
+		FROM data_details
+		WHERE 
+		collection_time > #{collectingTime}
+		ORDER BY data_details.id
+	</select>
 
 	<!-- 获取数据符合筛选条件的总记录条数 -->
 	<select id="getLimitedDataCount" resultType="java.lang.Integer"
diff --git a/src/com/dao/mapper/standard_data_details-mapper.xml b/src/com/dao/mapper/standard_data_details-mapper.xml
index 3262b75f..f41ef6f4 100644
--- a/src/com/dao/mapper/standard_data_details-mapper.xml
+++ b/src/com/dao/mapper/standard_data_details-mapper.xml
@@ -157,6 +157,14 @@ PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN"
 		ORDER BY standard_data_details.area_code,standard_data_details.sys_code
 	</select>
 	
+	<select id="findAllCollect" resultMap="getEntityByText">
+		SELECT
+		<include refid="Base_Column_List" />
+		FROM standard_data_details
+		WHERE is_collection='是'
+		ORDER BY standard_data_details.area_code,standard_data_details.sys_code
+	</select>
+	
 	<!-- 批量插入 -->
 	<select id="insertBatch" parameterType="java.util.List">
 	    INSERT INTO default_data_description ( <include refid="Batch_Column_List" /> ) 
@@ -173,78 +181,78 @@ PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN"
 	<!-- 更新字段 -->
 	<update id="update" parameterType="com.platform.entities.PreDataInfo">
 		UPDATE
-		default_data_description
+		default_data_description a
 		<set>
 			<trim suffixOverrides=",">
 				<if test="collection != null and collection != ''">
-					is_collect= #{collection},
+					a.is_collection= #{collection},
 				</if>
 				<if test="areaLevel != null and areaLevel != ''">
-					area_level= #{areaLevel},
+					a.area_level= #{areaLevel},
 				</if>
 				<if test="dataVersion != null and dataVersion != ''">
-					data_version= #{dataVersion},
+					a.data_version= #{dataVersion},
 				</if>
 				<if test="beginUseTime != null and beginUseTime != ''">
-					begin_in_use= #{beginUseTime},
+					a.begin_in_use= #{beginUseTime},
 				</if>
 				<if test="functionDetails != null and functionDetails != ''">
-					function_details= #{functionDetails},
+					a.function_details= #{functionDetails},
 				</if>
 				<if test="departmentManager != null and departmentManager != ''">
-					department_manager= #{departmentManager},
+					a.department_manager= #{departmentManager},
 				</if>
 				<if test="managerContacts != null and managerContacts != ''">
-					manager_contacts= #{managerContacts},
+					a.manager_contacts= #{managerContacts},
 				</if>
 				<if test="developerFullName != null and developerFullName != ''">
-					sys_developer_full_name= #{developerFullName},
+					a.sys_developer_full_name= #{developerFullName},
 				</if>
 				<if test="dataBaseType != null and dataBaseType != ''">
-					data_base_type= #{dataBaseType},
+					a.data_base_type= #{dataBaseType},
 				</if>
 				<if test="dataBaseVersion != null and dataBaseVersion != ''">
-					data_base_version= #{dataBaseVersion},
+					a.data_base_version= #{dataBaseVersion},
 				</if>
 				<if test="departmentBudgetManage != null and departmentBudgetManage != ''">
-					is_department_budget= #{departmentBudgetManage},
+					a.is_department_budget= #{departmentBudgetManage},
 				</if>
 				<if test="budgetQuotaManage != null and budgetQuotaManage != ''">
-					is_budget_quota= #{budgetQuotaManage},
+					a.is_budget_quota= #{budgetQuotaManage},
 				</if>
 				<if test="budgetExecManage != null and budgetExecManage != ''">
-					is_budget_exec= #{budgetExecManage},
+					a.is_budget_exec= #{budgetExecManage},
 				</if>
 				<if test="totalBudgetAccount != null and totalBudgetAccount != ''">
-					total_budget_account= #{totalBudgetAccount},
+					a.total_budget_account= #{totalBudgetAccount},
 				</if>
 				<if test="finalAccountManage != null and finalAccountManage != ''">
-					final_account_manage= #{finalAccountManage},
+					a.final_account_manage= #{finalAccountManage},
 				</if>
 				<if test="reportFormManage != null and reportFormManage != ''">
-					report_form_manage= #{reportFormManage},
+					a.report_form_manage= #{reportFormManage},
 				</if>
 				<if test="nonTaxManage != null and nonTaxManage != ''">
-					non_tax_revenue_manage= #{nonTaxManage},
+					a.non_tax_revenue_manage= #{nonTaxManage},
 				</if>
 				<if test="wageSystem != null and wageSystem != ''">
-					wage_system= #{wageSystem},
+					a.wage_system= #{wageSystem},
 				</if>
 				<if test="analysisOfFinancialEconomicProsperity != null and analysisOfFinancialEconomicProsperity != ''">
-					analysis_of_financial_economic_prosperity= #{analysisOfFinancialEconomicProsperity},
+					a.analysis_of_financial_economic_prosperity= #{analysisOfFinancialEconomicProsperity},
 				</if>
 				<if test="governmentDebtManage != null and governmentDebtManage != ''">
-					government_debt= #{governmentDebtManage},
+					a.government_debt= #{governmentDebtManage},
 				</if>
 				<if test="updateTime != null and updateTime != ''">
-					update_time= #{updateTime},
+					a.update_time= #{updateTime},
 				</if>
 			</trim>
 		</set>
 		<where>
-			area_code = #{areaCode}
-			AND sys_code = #{sysCode}
-			AND remove ='0'
+			a.area_code = #{areaCode}
+			AND a.sys_code = #{sysCode}
+			AND a.remove ='0'
 		</where> 
 	</update>