diff --git a/src/com/dao/mapper/data-details-mapper.xml b/src/com/dao/mapper/data-details-mapper.xml
index 23a135e3..abc1eac4 100644
--- a/src/com/dao/mapper/data-details-mapper.xml
+++ b/src/com/dao/mapper/data-details-mapper.xml
@@ -30,7 +30,7 @@ PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN"
-
+
@@ -125,7 +125,7 @@ PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN"
@@ -224,6 +224,9 @@ PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN"
data_base_type,
+
+ src_id,
+
)
VALUES(
@@ -291,6 +294,9 @@ PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN"
#{dataBaseType},
+
+ #{srcId},
+
)
@@ -305,6 +311,17 @@ PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN"
and remove ='0'
+
+
UPDATE
data_info
diff --git a/src/com/dao/mapper/dataInfoMoveTmpmapper.xml b/src/com/dao/mapper/dataInfoMoveTmpmapper.xml
index a26c2ed3..814c8a9f 100644
--- a/src/com/dao/mapper/dataInfoMoveTmpmapper.xml
+++ b/src/com/dao/mapper/dataInfoMoveTmpmapper.xml
@@ -49,7 +49,7 @@ PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN"
- regionalism_code,system_code,dst_path,lasttime,fkid,dst_volume_ip,dst_volume_path
+ regionalism_code,system_code,dst_path,lasttime,fkid,dst_volume_ip,dst_volume_path,add_data
@@ -57,7 +57,7 @@ PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN"
SELECT
a.id id,a.regionalism_code regionalismCode,a.dst_path dstPath,a.complete_status completeStatus,
a.rate rate, a.lasttime lastTime, a.system_code systemCode,a.dst_volume_ip dstVolumeIp,a.dst_volume_path dstVolumePath,
- b.city_name cityName,b.district_name districtName,b.system_name systemName,b.data_type dataType,
+ a.add_data addData,b.city_name cityName,b.district_name districtName,b.system_name systemName,b.data_type dataType,
b.data_version dataVersion,b.submitted_batch submittedBatch,b.data_path dataPath,b.data_charset charset,
b.collection_time collectingTime,b.collector_name collectorName,b.collector_contacts collectorContacts,
b.data_year year,b.extract_status extractStatus,b.start_year startYear,b.end_year endYear,
@@ -73,7 +73,7 @@ PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN"
diff --git a/src/com/dao/mapper/hotDataDetailsMapper.xml b/src/com/dao/mapper/hotDataDetailsMapper.xml
deleted file mode 100644
index be523283..00000000
--- a/src/com/dao/mapper/hotDataDetailsMapper.xml
+++ /dev/null
@@ -1,357 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- AND data_details.data_type=#{dataType}
-
-
- AND data_details.mark=#{mark}
-
-
- AND
- data_details.submitted_batch=#{submittedBatch}
-
-
- AND data_details.city_name=#{cityName}
-
-
- AND
- data_details.district_name=#{districtName}
-
-
- AND data_details.data_version=#{dataVersion}
-
-
- AND data_details.system_name=#{systemName}
-
-
- AND data_details.data_year=#{dataYear}
-
-
- AND data_details.data_base_type=#{dataBaseType}
-
-
-
- AND CONCAT(regionalism_code,system_code,city_name,district_name,system_name,data_year) LIKE CONCAT('%',CONCAT('${item}','%'))
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- INSERT INTO
- data_info(
-
-
- regionalism_code,
-
-
- system_code,
-
-
- data_type,
-
-
- data_version,
-
-
- submitted_batch,
-
-
- data_path,
-
-
- collection_time,
-
-
- collector_name,
-
-
- collector_contacts,
-
-
- data_charset,
-
-
- data_year,
-
-
- start_year,
-
-
- end_year,
-
-
- volume_ip,
-
-
- volume_path,
-
-
- extract_status,
-
-
- checkout_pay,
-
-
- checkout_indicate,
-
-
- start_month,
-
-
- end_month,
-
-
- data_base_type,
-
-
- )
- VALUES(
-
-
- #{regionalismCode},
-
-
- #{systemCode},
-
-
- #{dataType},
-
-
- #{dataVersion},
-
-
- #{submittedBatch},
-
-
- #{dataPath},
-
-
- #{collectingTime},
-
-
- #{collectorName},
-
-
- #{collectorContacts},
-
-
- #{charset},
-
-
- #{year},
-
-
- #{startYear},
-
-
- #{endYear},
-
-
- #{volumeIp},
-
-
- #{volumePath},
-
-
- #{extractStatus},
-
-
- #{payResult},
-
-
- #{execResult},
-
-
- #{startMonth},
-
-
- #{endMonth},
-
-
- #{dataBaseType},
-
-
- )
-
-
-
-
-
- UPDATE
- data_info
- set remove = '1'
- where id in
-
- #{item}
-
- and remove ='0'
-
-
-
-
-
- UPDATE
- data_info
-
-
-
- data_path= #{dataPath},
-
-
- extract_status= #{extractStatus},
-
-
- checkout_pay_last= #{payResultLast},
-
-
- checkout_indicate_last= #{execResultLast},
-
-
- checkout_flag= #{checkoutFlag},
-
-
-
-
- id = #{id}
- AND remove ='0'
-
-
-
-
\ No newline at end of file
diff --git a/src/com/dao/mapper/standard_data_details-mapper.xml b/src/com/dao/mapper/standard_data_details-mapper.xml
index 225a5c0e..3930946a 100644
--- a/src/com/dao/mapper/standard_data_details-mapper.xml
+++ b/src/com/dao/mapper/standard_data_details-mapper.xml
@@ -196,18 +196,7 @@ PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN"
SELECT
FROM standard_data_details a left join collection_data_description l on a.area_code=l.regionalism_code AND a.sys_code=l.sys_code
- left join data_details d on a.area_code=d.regionalism_code AND a.sys_code=d.system_code
-
- a.is_collection='是' AND a.city_name=#{cityName}
-
- ORDER BY a.area_code,a.sys_code,d.data_version
-
-
-