add

src/main/java/com/zfire/jiasm/syncdata/service/impl/DetailDownloadServiceImpl.java

@@ -237,50 +237,56 @@ public class DetailDownloadServiceImpl implements DetailDownloadService {
 
 	@Transactional(rollbackFor = Exception.class)
 	public void process(String downloadTaskNo, int downloadTaskType, String pgguid, Map<String, List<SysDict>> sysDictRefDLMap) throws Exception {
-		if (downloadTaskType == 2201){
-			// 安装工单采集数据下载(家用空调)	TL_SynDataFrom_tbl_az_wgmx_jykt
-			// 安装工单主表的order_base pgguid OK
-			// itf_tbl_az_wgmx_jykt_download.pgguid=order_base.pgguid
-			processOrderInstallDetailJ(downloadTaskNo, pgguid);
-		} else if (downloadTaskType == 220101){
-			// 安装工单采集附件表数据下载(家用空调)	TL_SynDataFrom_tbl_az_wgmx_jykt_child
-			// pgguid = 家用空调完工明细(itf_tbl_az_wgmx_jykt_download)的pgwcmxid　ok
-			// itf_tbl_az_wgmx_jykt_download.pgwcmxid = itf_tbl_az_wgmx_jykt_fj_download.pgwcmxid
-			processJyktFj(downloadTaskNo, pgguid);
-		} else if (downloadTaskType == 2202){
-			// 安装工单采集数据下载(商用空调)	TL_SynDataFrom_tbl_az_wgmx_sykt
-			// 安装工单主表的order_base pgguid OK
-			processOrderInstallDetailS(downloadTaskNo, pgguid);
-		} else if (downloadTaskType == 220201){
-			//  安装工单采集附件表数据下载(商用空调) TL_SynDataFrom_tbl_az_wgmx_sykt_child
-			// pgguid = 商用空调完工明细itf_tbl_az_wgmx_sykt_download的pgwcmxid　ok
-			processSyktFjAndTM(downloadTaskNo, pgguid);
-		} else if (downloadTaskType == 2203){
-			// 安装工单采集数据下载(其他)	TL_SynDataFrom_tbl_az_wgmx_qita
-			// 安装工单主表的order_base pgguid OK
-			processOrderInstallDetailO(downloadTaskNo, pgguid);
-		} else if (downloadTaskType == 220301){
-			// 安装工单采集附件表数据下载(其他) 	TL_SynDataFrom_tbl_az_wgmx_qita_child
-			// pgguid = 其他完工明细itf_tbl_az_wgmx_qita_download.pgwcmxid ok
-			processOktFj(downloadTaskNo, pgguid);
-		} else if (downloadTaskType == 2204){
-			// 以旧换新鉴定单 itf_tbl_yjhx_jdd_download  TL_SynDataFrom_tbl_yjhx_jdd
-			// pgguid 为安装工单下载主表的itf_tbl_az_assign_lc_ls_download pgguid OK
-			processYjhxJdd(downloadTaskNo, pgguid);
-		} else if (downloadTaskType == 2205){
-			// 以旧换新旧机信息 itf_tbl_trade_new_for_old_download  TL_SynDataFrom_tbl_trade_new_for_old
-			// pgguid 为安装工单下载主表的itf_tbl_az_assign_lc_ls_download pgguid OK
-			processOldForNewProduct(downloadTaskNo, pgguid);
-		} else if (downloadTaskType == 2206){
-			// 安装工单子表数据阅读信息 itf_tbl_az_assign_xzyd_download  TL_SynDataFrom_tbl_az_assign_xzyd
-			// pgguid 为安装工单下载主表的itf_tbl_az_assign_lc_ls_download pgguid OK
-			processInformatino(downloadTaskNo, pgguid, sysDictRefDLMap);
-		} else if (downloadTaskType == 6601){
-			// 维修工单二子表下载	TL_SynDataFrom_tbl_wxjs_jykt OK
-			processWxjsJykt(downloadTaskNo, pgguid);
-		} else if (downloadTaskType == 660101){
-			// 维修工单三子表下载  TL_SynDataFrom_tbl_wxjs_jykt_child OK
-			processSix(downloadTaskNo, pgguid);
+		try{
+			if (downloadTaskType == 2201){
+				// 安装工单采集数据下载(家用空调)	TL_SynDataFrom_tbl_az_wgmx_jykt
+				// 安装工单主表的order_base pgguid OK
+				// itf_tbl_az_wgmx_jykt_download.pgguid=order_base.pgguid
+				processOrderInstallDetailJ(downloadTaskNo, pgguid);
+			} else if (downloadTaskType == 220101){
+				// 安装工单采集附件表数据下载(家用空调)	TL_SynDataFrom_tbl_az_wgmx_jykt_child
+				// pgguid = 家用空调完工明细(itf_tbl_az_wgmx_jykt_download)的pgwcmxid　ok
+				// itf_tbl_az_wgmx_jykt_download.pgwcmxid = itf_tbl_az_wgmx_jykt_fj_download.pgwcmxid
+				processJyktFj(downloadTaskNo, pgguid);
+			} else if (downloadTaskType == 2202){
+				// 安装工单采集数据下载(商用空调)	TL_SynDataFrom_tbl_az_wgmx_sykt
+				// 安装工单主表的order_base pgguid OK
+				processOrderInstallDetailS(downloadTaskNo, pgguid);
+			} else if (downloadTaskType == 220201){
+				//  安装工单采集附件表数据下载(商用空调) TL_SynDataFrom_tbl_az_wgmx_sykt_child
+				// pgguid = 商用空调完工明细itf_tbl_az_wgmx_sykt_download的pgwcmxid　ok
+				processSyktFjAndTM(downloadTaskNo, pgguid);
+			} else if (downloadTaskType == 2203){
+				// 安装工单采集数据下载(其他)	TL_SynDataFrom_tbl_az_wgmx_qita
+				// 安装工单主表的order_base pgguid OK
+				processOrderInstallDetailO(downloadTaskNo, pgguid);
+			} else if (downloadTaskType == 220301){
+				// 安装工单采集附件表数据下载(其他) 	TL_SynDataFrom_tbl_az_wgmx_qita_child
+				// pgguid = 其他完工明细itf_tbl_az_wgmx_qita_download.pgwcmxid ok
+				processOktFj(downloadTaskNo, pgguid);
+			} else if (downloadTaskType == 2204){
+				// 以旧换新鉴定单 itf_tbl_yjhx_jdd_download  TL_SynDataFrom_tbl_yjhx_jdd
+				// pgguid 为安装工单下载主表的itf_tbl_az_assign_lc_ls_download pgguid OK
+				processYjhxJdd(downloadTaskNo, pgguid);
+			} else if (downloadTaskType == 2205){
+				// 以旧换新旧机信息 itf_tbl_trade_new_for_old_download  TL_SynDataFrom_tbl_trade_new_for_old
+				// pgguid 为安装工单下载主表的itf_tbl_az_assign_lc_ls_download pgguid OK
+				processOldForNewProduct(downloadTaskNo, pgguid);
+			} else if (downloadTaskType == 2206){
+				// 安装工单子表数据阅读信息 itf_tbl_az_assign_xzyd_download  TL_SynDataFrom_tbl_az_assign_xzyd
+				// pgguid 为安装工单下载主表的itf_tbl_az_assign_lc_ls_download pgguid OK
+				processInformatino(downloadTaskNo, pgguid, sysDictRefDLMap);
+			} else if (downloadTaskType == 6601){
+				// 维修工单二子表下载	TL_SynDataFrom_tbl_wxjs_jykt OK
+				processWxjsJykt(downloadTaskNo, pgguid);
+			} else if (downloadTaskType == 660101){
+				// 维修工单三子表下载  TL_SynDataFrom_tbl_wxjs_jykt_child OK
+				processSix(downloadTaskNo, pgguid);
+			}
+		}catch (Exception ex) {
+			ex.printStackTrace();
+			// 抛异常目的是把前期的数据操作回滚
+			throw new Exception("同步子信息出错");
 		}
 	}
 
@@ -361,7 +367,7 @@ public class DetailDownloadServiceImpl implements DetailDownloadService {
 		int count = 1;
 		int outid=0;
 
-		// 提取数据
+		// 提取数据 pgwcmxid 主键
 		List<ItfTblAzWgmxJyktDownload> jykts = itfTblAzWgmxJyktDownloadService.lambdaQuery()
 				.eq(ItfTblAzWgmxJyktDownload::getDownloadTaskNo, downloadTaskNo)
 				.eq(ItfTblAzWgmxJyktDownload::getSynStatus,0).list();

src/main/resources/mapper/AzWgmxJyktDownloadMapper.xml

@@ -12,7 +12,8 @@
                b.city_id,b.city,b.area_id,b.area,b.street_id,b.street,b.lat,b.lng,a.sjcjgps as lat_lng_address,
                if(length(a.sjcjgps)>100,left(a.sjcjgps,100),a.sjcjgps) as gps_address,0 as is_sync,IFNULL(a.jsdwxtbh, '') as settle_websit_id,
                a.zjssj as settle_time,a.last_modified_date as update_time,b.sale_type as sales_type,b.sale_websit_id as sales_websit_id,
-               p.inside_num,p.out_num,a.pgguid,a.pgwcmxid,0 as detail_source,'NO' as is_cj_send,'NO' as is_wg_send,p.id as pgmxid,
+               p.inside_num,p.out_num,a.pgguid,a.pgwcmxid,0 as detail_source,'NO' as is_cj_send,'NO' as is_wg_send,
+               if(length(p.id)>50,left(p.id,50),p.id) as pgmxid,
                a.czren as operator_account,a.czren as operator_name,a.czwd as operator_websit_id,b.worker_id as main_worker_id,
                b.worker_name as main_worker_name,a.cjren as create_by,a.cjdt as create_time,a.last_modified_by as update_by,
                case a.installenvironment when 1 then 'YES' else 'NO' end as is_special,a.flbz as assist_remark,

src/main/resources/mapper/AzWgmxQitaDownloadMapper.xml

@@ -12,7 +12,8 @@
                b.city_id,b.city,b.area_id,b.area,b.street_id,b.street,b.lat,b.lng,a.sjcjgps as lat_lng_address,
                if(length(a.sjcjgps)>100,left(a.sjcjgps,100),a.sjcjgps) as gps_address,0 as is_sync,IFNULL(a.jsdwxtbh, '') as settle_websit_id,
                a.zjssj as settle_time,a.last_modified_date as update_time,b.sale_type as sales_type,b.sale_websit_id as sales_websit_id,
-               p.inside_num,p.out_num,a.pgguid,a.pgwcmxid,0 as detail_source,'NO' as is_cj_send,'NO' as is_wg_send,p.id as pgmxid,
+               p.inside_num,p.out_num,a.pgguid,a.pgwcmxid,0 as detail_source,'NO' as is_cj_send,'NO' as is_wg_send,
+               if(length(p.id)>50,left(p.id,50),p.id) as pgmxid,
                a.czren as operator_account,a.czren as operator_name,a.czwd as operator_websit_id,b.worker_id as main_worker_id,
                b.worker_name as main_worker_name,a.cjren as create_by,a.cjdt as create_time,a.last_modified_by as update_by,
                case a.installenvironment when 1 then 'YES' else 'NO' end as is_special,a.flbz as assist_remark,IFNULL(a.wcsj,a.czsj) as first_time

src/main/resources/mapper/AzWgmxSyktDownloadMapper.xml

@@ -12,7 +12,8 @@
                b.city_id,b.city,b.area_id,b.area,b.street_id,b.street,b.lat,b.lng,a.sjcjgps as lat_lng_address,
                if(length(a.sjcjgps)>100,left(a.sjcjgps,100),a.sjcjgps) as gps_address,0 as is_sync,IFNULL(a.jsdwxtbh, '') as settle_websit_id,
                a.zjssj as settle_time,a.last_modified_date as update_time,b.sale_type as sales_type,b.sale_websit_id as sales_websit_id,
-               p.inside_num,p.out_num,a.pgguid,a.pgwcmxid,0 as detail_source,'NO' as is_cj_send,'NO' as is_wg_send,p.id as pgmxid,
+               p.inside_num,p.out_num,a.pgguid,a.pgwcmxid,0 as detail_source,'NO' as is_cj_send,'NO' as is_wg_send,
+               if(length(p.id)>50,left(p.id,50),p.id) as pgmxid,
                a.czren as operator_account,a.czren as operator_name,a.czwd as operator_websit_id,b.worker_id as main_worker_id,
                b.worker_name as main_worker_name,a.cjren as create_by,a.cjdt as create_time,a.last_modified_by as update_by,
                case a.installenvironment when 1 then 'YES' else 'NO' end as is_special,a.flbz as assist_remark,