add

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

@@ -189,9 +189,9 @@ public class InstallProduceDataUploadServiceImpl implements InstallProduceDataUp
                         .eq(OutJiasmToGreeUploadTaskList::getSynStatus,0)
                         .eq(OutJiasmToGreeUploadTaskList::getUploadTaskType,uploadTaskType)
 
-                        // .eq(OutJiasmToGreeUploadTaskList::getSynReqId,24157) // 测试用
-                        // .eq(OutJiasmToGreeUploadTaskList::getOrderNo,"A1690989338035544065") // 测试用
-                        // .eq(OutJiasmToGreeUploadTaskList::getTableName,"order_base") // 测试用
+                        //.eq(OutJiasmToGreeUploadTaskList::getSynReqId,25801) // 测试用
+                        //.eq(OutJiasmToGreeUploadTaskList::getOrderNo,"A1691362450992390146") // 测试用
+                        //.eq(OutJiasmToGreeUploadTaskList::getTableName,"order_base") // 测试用
 
                         .lt(OutJiasmToGreeUploadTaskList::getSynTimes,10)
                         .orderByAsc(OutJiasmToGreeUploadTaskList::getSynReqId).list();

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

@@ -791,6 +791,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
                 // 获取文件
                 newFile = oldFile;
                 WebsitFWS websitFWS = publicService.shshwdToptshwd(orderBase.getWebsitId(), orderBase);
+                log.info("图片上传网点编号:{}",websitFWS.getWebsitId());
                 Boolean flag = uploadFileexc(newFile, oldFile,websitFWS.getWebsitId(), file);
                 new File(newFile).delete();
                 if (!flag) {

src/main/resources/bootstrap.properties

@@ -1,4 +1,4 @@
-spring.profiles.active=test
+spring.profiles.active=dev
 spring.application.name=jiasm-syncdata
 spring.main.allow-bean-definition-overriding=true
 # 修改线程池的拒绝策略

src/main/resources/mapper/OrderInformationNewMapper.xml

@@ -16,7 +16,7 @@
     <select id="getOrderInformationrepair" parameterType="com.zfire.jiasm.syncdata.parameter.OrderPar" resultType="com.zfire.jiasm.syncdata.plus.entity.ItfTblAssignXzydUpload">
         select order_base_id as worker_order_no,auto_id as fa_order_repair_information_id,
                xzid,create_by,create_time as created_date,update_by as last_modified_by,
-               update_time as last_modified_date,b.pgid,create_by as czren,create_time as czsj,
+               update_time as last_modified_date,create_by as czren,create_time as czsj,
                websit_id as wdno,read_status as cshu,remark as xzyq,ask_category_id as xzyqlb,
                read_status as ydbz,read_time as ydsj,read_name as ydren,read_name as ydrmc,
                '' as ydwd,'' as ydwdmc