add

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

@@ -712,7 +712,7 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
         itfTblwxjspjmxjyktService.save(pjt);
     }
 
-    public boolean generateItfTblWxjsWxxmJyktUploadAndTow(OrderBase orderBase, String j_syn_task_no, OrderRepairDetail item) {
+    public boolean generateItfTblWxjsWxxmJyktUploadAndTowBak(OrderBase orderBase, String j_syn_task_no, OrderRepairDetail item) {
         // 提取维修项目数据
         List<OrderRepairDetailItem> ordList =  orderRepairDetailItemService.lambdaQuery()
                 .eq(OrderRepairDetailItem::getOrderRepairDetailId, item.getId()).list();
@@ -733,7 +733,21 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
                 ord.setWxjsguid(ordr.getWxjsguid());
             }
             // 生成维修项目现象数据
-            ItfTblWxjsWxxmJyktUpload wxxm = generateItfTblWxjsWxxmJyktUpload(orderBase, ord);
+            ItfTblWxjsWxxmJyktUpload wxxm = generateItfTblWxjsWxxmJyktUpload(orderBase, ord.getId());
+            // 生成维修项目现象2表数据
+            generateItfTblwxjswxxmjykt(j_syn_task_no, wxxm);
+        }
+        return false;
+    }
+
+    public boolean generateItfTblWxjsWxxmJyktUploadAndTow(OrderBase orderBase, String j_syn_task_no, OrderRepairDetail item) {
+        // 提取维修项目数据
+        List<OrderRepairDetailReason> ordrs =  orderRepairDetailReasonService.lambdaQuery()
+                .eq(OrderRepairDetailReason::getOrderBaseId, orderBase.getId()).list();
+
+        for (OrderRepairDetailReason i: ordrs){
+            // 生成维修项目现象数据
+            ItfTblWxjsWxxmJyktUpload wxxm = generateItfTblWxjsWxxmJyktUpload(orderBase, i.getId());
             // 生成维修项目现象2表数据
             generateItfTblwxjswxxmjykt(j_syn_task_no, wxxm);
         }
@@ -741,9 +755,9 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
     }
 
     @NotNull
-    public ItfTblWxjsWxxmJyktUpload generateItfTblWxjsWxxmJyktUpload(OrderBase orderBase, OrderRepairDetailItem ord) {
+    public ItfTblWxjsWxxmJyktUpload generateItfTblWxjsWxxmJyktUpload(OrderBase orderBase, String id) {
         OrderPar request = new OrderPar();
-        request.setId(ord.getId());
+        request.setId(id);
         ItfTblWxjsWxxmJyktUpload wxxm = reasonOrderRepairDetailMapper.getItfTblWxjsWxxmJyktUpload(request);
         wxxm.setWorkerOrderNo(orderBase.getId());
         wxxm.setSynStatus(44);
@@ -1135,6 +1149,10 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
                 outId++;
                 ite.setOutId(outId);
                 ite.setXxyyguid(IdWorker.getIdStr());
+                if (StringUtils.isEmpty(ite.getWxjsguid())){
+                    ite.setWxjsguid(IdWorker.getIdStr());
+                }
+
                 upList.add(ite);
             }
         }
@@ -1312,9 +1330,9 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
         }
     }
 
-    public void generateFee(OrderBase orderBase, OrderRepairDetail detail,Brand brand,
-                             List<ItfTblWxjsWxxmJyktUpload> wxxms,
-                             List<ItfTblAssignFeeUpload> fees){
+    public void generateFeeBak(OrderBase orderBase, OrderRepairDetail detail,Brand brand,
+                            List<ItfTblWxjsWxxmJyktUpload> wxxms,
+                            List<ItfTblAssignFeeUpload> fees){
         // 提取维修项目数据
         List<OrderRepairDetailItem> ords =  orderRepairDetailItemService.lambdaQuery()
                 .eq(OrderRepairDetailItem::getOrderRepairDetailId, detail.getId()).list();
@@ -1350,6 +1368,33 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
         }
     }
 
+    public void generateFee(OrderBase orderBase, OrderRepairDetail detail,Brand brand,
+                            List<ItfTblWxjsWxxmJyktUpload> wxxms,
+                            List<ItfTblAssignFeeUpload> fees){
+        // 提取维修项目数据
+        List<OrderRepairDetailItem> ords =  orderRepairDetailItemService.lambdaQuery()
+                .eq(OrderRepairDetailItem::getOrderRepairDetailId, detail.getId()).list();
+
+        List<OrderRepairDetailReason> ordrs =  orderRepairDetailReasonService.lambdaQuery()
+                .eq(OrderRepairDetailReason::getOrderBaseId, orderBase.getId()).list();
+        for (OrderRepairDetailReason item : ordrs){
+            // 生成维修项目现象数据
+            OrderPar request = new OrderPar();
+            request.setId(item.getId());
+            ItfTblWxjsWxxmJyktUpload wxxm = reasonOrderRepairDetailMapper.getItfTblWxjsWxxmJyktUpload(request);
+            wxxm.setWorkerOrderNo(orderBase.getId());
+            wxxms.add(wxxm);
+
+            // 生成维修费用数据
+            request.setBrandId(brand.getBrandId());
+            request.setMainId(orderBase.getMainId());
+            ItfTblAssignFeeUpload fee = reasonOrderRepairDetailMapper.getItfTblAssignFeeUpload(request);
+            fee.setWorkerOrderNo(orderBase.getId());
+            fee.setPgid(Long.valueOf(orderBase.getPgid()));
+            fees.add(fee);
+        }
+    }
+
     public void generateFile(OrderBase orderBase, OrderRepairDetail detail, List<ItfTblWxjsFjJyktUpload> fjs){
         // 提取数据采集附件数据
         List<OrderDetailFile> odfs =  orderDetailFileService.lambdaQuery()

src/main/resources/mapper/ReasonOrderRepairDetailMapper.xml

@@ -7,9 +7,10 @@
                a.out_id as wxxmguid,'guangfo' as created_by,
                a.create_time as created_date,'guangfo' as last_modified_by,
                a.update_time as last_modified_date,
-               b.brand_wxjsguid as wxjsguid,a.repair_item_id as wxxmh,a.remark as mshu,b.repair_fees as wxfy,c.number as xxyyh,
+               b.brand_wxjsguid as wxjsguid,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,
-               '' as wxxmhmc,case b.flag when 'A' then '上门' else '送修' end as smorsx
+               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