yaozhixue 1 year ago
parent
commit
e9c8ab3616

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

@@ -180,7 +180,7 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
                 List<OutJiasmToGreeUploadTaskList> result = outJiasmToGreeUploadTaskListService.lambdaQuery()
                         .eq(OutJiasmToGreeUploadTaskList::getSynStatus,0)
                         .eq(OutJiasmToGreeUploadTaskList::getUploadTaskType,uploadTaskType)
-                        // .eq(OutJiasmToGreeUploadTaskList::getSynReqId,115L)// 测试用
+                        .eq(OutJiasmToGreeUploadTaskList::getSynReqId,115L)// 测试用
                         .orderByAsc(OutJiasmToGreeUploadTaskList::getSynReqId).list();
                 // 相同任务类型的数据逐个处理
                 for (OutJiasmToGreeUploadTaskList row: result){

+ 2 - 2
src/main/resources/mapper/FileOrderDetailMapper.xml

@@ -75,7 +75,7 @@
     </select>
 
     <select id="getItfTblWxjsFjJyktUpload" parameterType="com.zfire.jiasm.syncdata.parameter.InstallCJDetailFile" resultType="com.zfire.jiasm.syncdata.plus.entity.ItfTblWxjsFjJyktUpload">
-        select a.order_base_id as worker_order_no,out_id as fa_order_repair_annex_id,
+        select a.order_base_id as worker_order_no,a.out_id as fa_order_repair_annex_id,
                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,
@@ -84,7 +84,7 @@
         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
                  left join order_repair_detail_item c on c.order_repair_detail_id = a.order_detail_id
-        where order_base_id =  #{request.orderNo} and a.id =  #{request.id}
+        where a.order_base_id =  #{request.orderNo} and a.id =  #{request.id}
     </select>