add

src/main/java/com/zfire/jiasm/syncdata/download/order/DetailDownloadInstallTask.java

@@ -66,10 +66,10 @@ public class DetailDownloadInstallTask {
 			for (Map<String, Object> downloadType : types) {
 				int topDownloadTaskType = (Integer) downloadType.get("download_task_type");
 				// 关联任务表提取相应的数据
-				List<Map<String, Object>> result = detailDownloadService.getTaskDataInstall(topDownloadTaskType);
+				// List<Map<String, Object>> result = detailDownloadService.getTaskDataInstall(topDownloadTaskType);
 
 				// 测试用
-				// List<Map<String, Object>> result = detailDownloadService.getTaskDataInstallTest(topDownloadTaskType);
+				List<Map<String, Object>> result = detailDownloadService.getTaskDataInstallTest(topDownloadTaskType);
 
 				for (Map<String, Object> row : result) {
 					// ID

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

@@ -275,7 +275,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
 
     @Override
     public Boolean orderBaseInstallCjOrWg(String cjOrWg, Brand brand, OutJiasmToGreeUploadTaskList ojtutl,
-                                          Map<String, List<SysDictRef>> CategoryRefmap){
+                                          Map<String, List<SysDictRef>> CategoryRefmap) throws Exception {
         OrderBase orderBase = orderBaseService.lambdaQuery()
                 .eq(OrderBase::getId, ojtutl.getId())
                 .last("limit 1")
@@ -992,52 +992,59 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
 
     @Transactional(rollbackFor = Exception.class)
     public Boolean orderInstallCjOrWg(String cjOrWg, Brand brand, OutJiasmToGreeUploadTaskList ojtutl,
-                                      Map<String, List<SysDictRef>> CategoryRefmap, OrderBase orderBase){
-        // TL_fa_order_install_js
-        if (orderBase !=null  && orderBase.getUploadFlag()){
-            // 生成待同步的安装工单主表
-            ItfTblAzAssignLcLsUpload lcls = getItfTblAzAssignLcLsUpload(brand, orderBase);
-            // 1： 插入工单主表数据
-            if (!itfTblAzAssignLcLsUploadService.save(lcls)){
-                return Boolean.FALSE;
-            }
+                                      Map<String, List<SysDictRef>> CategoryRefmap, OrderBase orderBase) throws Exception {
+        try{
+            // TL_fa_order_install_js
+            if (orderBase !=null  && orderBase.getUploadFlag()){
+                // 生成待同步的安装工单主表
+                ItfTblAzAssignLcLsUpload lcls = getItfTblAzAssignLcLsUpload(brand, orderBase);
+                // 1： 插入工单主表数据
+                if (!itfTblAzAssignLcLsUploadService.save(lcls)){
+                    return Boolean.FALSE;
+                }
 
-            // 同步采集明细数据
-            List<OrderInstallDetail> details = orderInstallDetailService.lambdaQuery()
-                    .eq(OrderInstallDetail::getOrderBaseId, orderBase.getId())
-                    .list();
-            // TL_fa_order_install_detail_js
-            for (OrderInstallDetail detail:details){
-                // 状态:3=临时保存;2=作废,1=已采集,0=未采集
-                if ((detail.getStatus().equals(1) || detail.getStatus().equals(2)) &&
-                        (("cj".equals(cjOrWg) && detail.getIsCjSend().equals("NO")) ||
-                                ("wg".equals(cjOrWg) && detail.getIsWgSend().equals("NO")))) {
+                // 同步采集明细数据
+                List<OrderInstallDetail> details = orderInstallDetailService.lambdaQuery()
+                        .eq(OrderInstallDetail::getOrderBaseId, orderBase.getId())
+                        .list();
+                // TL_fa_order_install_detail_js
+                for (OrderInstallDetail detail:details){
+                    // 状态:3=临时保存;2=作废,1=已采集,0=未采集
+                    if ((detail.getStatus().equals(1) || detail.getStatus().equals(2)) &&
+                            (("cj".equals(cjOrWg) && detail.getIsCjSend().equals("NO")) ||
+                                    ("wg".equals(cjOrWg) && detail.getIsWgSend().equals("NO")))) {
 
-                    log.info("测试信息a   id={} ",ojtutl.getSynReqId());
+                        log.info("测试信息a   id={} ",ojtutl.getSynReqId());
 
 
-                    // 生成taskno,pgwcmxid 共用
-                    String taskno = IdWorker.getIdStr();
+                        // 生成taskno,pgwcmxid 共用
+                        String taskno = IdWorker.getIdStr();
 
-                    // 根据产品类别名称 生成不同的完工明细数据
-                    String mainName = CategoryRefmap.get(orderBase.getMainId()).get(0).getRefDictName();
+                        // 根据产品类别名称 生成不同的完工明细数据
+                        String mainName = CategoryRefmap.get(orderBase.getMainId()).get(0).getRefDictName();
 
-                    // 数据生成
-                    if (! installDtailJS(cjOrWg, brand, orderBase, lcls, detail, taskno, mainName,ojtutl.getSynReqId())){
-                        return Boolean.FALSE;
-                    }
+                        // 数据生成
+                        if (! installDtailJS(cjOrWg, brand, orderBase, lcls, detail, taskno, mainName,ojtutl.getSynReqId())){
+                            return Boolean.FALSE;
+                        }
 
-                    // 数据明细检查(如果明细不存在则不写主表以免数据不完整)
-                    if (!checkInstallitem(cjOrWg,taskno,detail,lcls,ojtutl)){
-                        return Boolean.FALSE;
+                        // 数据明细检查(如果明细不存在则不写主表以免数据不完整)
+                        if (!checkInstallitem(cjOrWg,taskno,detail,lcls,ojtutl)){
+                            return Boolean.FALSE;
+                        }
                     }
                 }
             }
+            // 修改数据上传任务表中的状态
+            publicService.updateUploadTaskListStatus(ojtutl.getOrderNo(),ojtutl.getSynReqId(),1,ojtutl.getUploadTaskType());
+
+            return Boolean.TRUE;
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            // 抛异常目的是把前期的数据操作回滚
+            throw new Exception(ex);
         }
-        // 修改数据上传任务表中的状态
-        publicService.updateUploadTaskListStatus(ojtutl.getOrderNo(),ojtutl.getSynReqId(),1,ojtutl.getUploadTaskType());
 
-        return Boolean.TRUE;
     }
 
 

src/main/java/com/zfire/jiasm/syncdata/service/orderBaseInstallCjOrWgService.java

@@ -13,7 +13,7 @@ public interface orderBaseInstallCjOrWgService {
     boolean orderBaseInstall(Brand brand, @NotNull OutJiasmToGreeUploadTaskList ojtutl, Map<String, List<SysDictRef>> CategoryRefmap);
 
     void upOutId(String orderBaseId);
-    Boolean orderBaseInstallCjOrWg(String cjOrWg, Brand brand, OutJiasmToGreeUploadTaskList ojtutl, Map<String, List<SysDictRef>> CategoryRefmap);
+    Boolean orderBaseInstallCjOrWg(String cjOrWg, Brand brand, OutJiasmToGreeUploadTaskList ojtutl, Map<String, List<SysDictRef>> CategoryRefmap) throws Exception;
     void upCodep(OrderInstallDetail detail);
 
 

src/main/resources/bootstrap-prdt.properties

@@ -296,7 +296,7 @@ SMSSelf_marketing_Rate=5000
 #师傅 证件、师傅、工单子表信息
 workercertificatec=FALSE
 workerceruploadc=FALSE
-detaildownc=TRUE
+detaildownc=FALSE
 #回收工单下载、获取工单的反馈明细数据、(获取对应的采集数据、附件数据、条码明细数据)、与总部进行确认下载完成、同步到业务表
 recycledownc=FALSE
 recyclefkdownc=FALSE
@@ -311,7 +311,7 @@ installjyc=FALSE
 installsyc=FALSE
 installshc=FALSE
 #维修结算、数据预生成
-repairjsc=FALSE
+repairjsc=TRUE
 repaironec=FALSE
 #故障维修
 masterdownloadratec=FALSE

src/main/resources/mapper/ReasonOrderRepairDetailMapper.xml

@@ -8,12 +8,11 @@
                a.create_time as created_date,'guangfo' as last_modified_by,
                a.update_time as last_modified_date,
                b.brand_wxjsguid as wxjsguid,ifnull(a.repair_item_id,'') as wxxmh,
-               a.repair_item_name as mshu,ifnull(b.repair_fees,0) as wxfy,c.number as xxyyh,
-               c.xxyyguid,ifnull(c.wxjsguid,'') as wxjsmxguid,a.create_time as cjsj,ifnull(a.repair_item_name,'') as mshu,
+               a.repair_item_name as mshu,ifnull(b.repair_fees,0) as wxfy,a.number as xxyyh,
+               a.xxyyguid,ifnull(a.wxjsguid,'') as wxjsmxguid,a.create_time as cjsj,ifnull(a.repair_item_name,'') as mshu,
                a.repair_item_name as wxxmhmc,case b.flag when 'A' then '上门' else '送修' end as smorsx
         from order_repair_detail_reason a
                  left join order_repair_detail b on b.id=a.order_repair_detail_id
-                 left join order_repair_detail_reason c on c.order_repair_detail_id=a.order_repair_detail_id
         where a.id =  #{request.id}
     </select>