add

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

@@ -1832,8 +1832,8 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
                 outId++;
                 OrderRepairDetail n = new OrderRepairDetail();
                 n.setId(ite.getId());
-                //n.setOutId(outId);
-                n.setOutId(Integer.valueOf(IdWorker.getIdStr().substring(0,11)));
+                n.setOutId(outId);
+                // n.setOutId(Integer.valueOf(IdWorker.getIdStr().substring(0,11)));
                 upList.add(n);
             }
         }

src/main/resources/mapper/FileOrderDetailMapper.xml

@@ -79,7 +79,7 @@
                a.fjguid,'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.brand_file_path as wjlj,a.create_time as cjsj,
-               a.file_type as tpms,a.file_path as wjnm,a.pgwcmxid as wxmxguid,
+               a.file_name as tpms,a.file_path as wjnm,a.pgwcmxid as wxmxguid,
                b.wxjsmxguid as wxjsmxguid,a.repair_item_id as repairitemno,a.number as repairtroubleno
         from order_detail_file a
                  left join order_repair_detail b on a.order_base_id = b.order_base_id and b.id=a.order_detail_id