yaozhixue 1 year ago
parent
commit
b0d675d586

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

@@ -86,7 +86,7 @@ public class RepairProduceUploadListServiceImpl implements RepairProduceUploadLi
         // 从需要上传的订单数据表中提取数据
         List<OutJiasmToGreeUploadnotifylist> taskResults = outJiasmToGreeUploadnotifylistService.lambdaQuery()
                 .eq(OutJiasmToGreeUploadnotifylist::getSynStatus,0)
-                // .eq(OutJiasmToGreeUploadnotifylist::getSynReqId,20916)// 测试用
+                // .eq(OutJiasmToGreeUploadnotifylist::getSynReqId,416094L)// 测试用
                 .in(OutJiasmToGreeUploadnotifylist::getOrderNo, orderNos)// 测试用
                 .orderByAsc(OutJiasmToGreeUploadnotifylist::getSynReqId).list();
         try{

+ 2 - 2
src/main/resources/bootstrap-prdt.properties

@@ -311,7 +311,7 @@ installjyc=FALSE
 installsyc=FALSE
 installshc=FALSE
 #维修结算、数据预生成
-repairjsc=TRUE
+repairjsc=FALSE
 repaironec=FALSE
 #故障维修
 masterdownloadratec=FALSE
@@ -390,7 +390,7 @@ azuploadyscc=FALSE
 azuploadscc=FALSE
 #维修工单上传  生成需要上传的数据、生成上传任务清单列表
 wxuploadyscc=FALSE
-wxuploadscc=FALSE
+wxuploadscc=TRUE
 #以旧换新 鉴定单、生成条码、条码上传
 yjhxjddc=FALSE
 yjhxsctmc=FALSE

+ 1 - 1
src/main/resources/mapper/DetailOrderRepairMapper.xml

@@ -17,7 +17,7 @@
                a.trouble_analysis as gzfx,a.repaire_item as wxnr,a.remark as beiz,a.create_time as ldrq,a.worker_name as czrmc,
                if(length(a.gps_address)>110,left(a.gps_address,110),a.gps_address) as gpsdzxx,
                d.user_mobile as yddh,0 as zsfy,0 as dzfy,h.ref_dict_code as spid,
-               c.ref_dict_name as spmc,a.settle_time as zjssj,a.create_time as cjdt,i.pgmxid,j.zbby,
+               c.ref_dict_name as spmc,a.settle_time as zjssj,a.create_time as cjdt,i.pgmxid,IFNULL(j.zbby,'') as zbby,
                case when length(a.lng) >12  then left(a.lng,12) else a.lng end as sjcjjd,
                case when length(a.lat) >12  then left(a.lat,12) else a.lat end as sjcjwd,
                if(j.zbby = '1' and c.ref_dict_code = 101 , 8, 1 ) as wxlx,a.over_time as bwgsj