add'

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

@@ -1066,7 +1066,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
             req.setSynReqId(lcls.getSynReqId());
             m = getLcLsUploadMapper.getInstallitem(req);
             m.setSynTaskNo(taskno);
-            m.setStatus(detail.getStatus());
+            m.setStatus(itemStatus);
             m.setStat(itemStat);
             m.setSyjd(itemSyjd * 1L);
             m.setDqjd(itemdqjd * 1L);

src/main/resources/mapper/GDOrderBaseMapper.xml

@@ -120,7 +120,8 @@
                a.remark as beiz,a.user_attr as yhsx,c.ref_dict_code as spid,c.ref_dict_name as spmc,a.worker_name as azren,
                a.websit_id as azwdno,a.rece_websit_id as jspgwdno,a.rece_time as jspgwdsj,a.rece_websit_id as ssqy,
                a.external_sys as qqlyno,a.external_name2 as qqlymc,a.external_no as qqlyxh,a.external_pk as qqlyzj,
-               a.expect_start_time as yhqwkssj,a.expect_end_time as yhqwjssj,m.brand_order_state as stat,
+               ifnull(a.appointment_time,a.expect_start_time) as yhqwkssj,ifnull(a.appointment_end_time,a.expect_end_time) as yhqwjssj,
+               m.brand_order_state as stat,
                if(length(a.gps_address)>130,left(a.gps_address,130),a.gps_address) as gpsdzxx,
                a.create_websit_id as cjren,a.create_name as cjrmc,a.create_time as cjdt,
                a.last_operator_time as zjczsj,a.sale_type as xslx,a.appointment_time as yyazsj,