add

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

@@ -1316,7 +1316,7 @@ public class InstallProduceDataUploadServiceImpl implements InstallProduceDataUp
         mxup.setAzrenid(publicService.getBrandWorkerId(orderBase.getWorkerId(),websitSH.getWdId(),brand.getBrandId(),orderBase.getWebsitId()));
 
         mxup.setStat(cjstat);
-        if (cjstat.equals("1120")){
+        if (cjstat.equals(1120)){
             if (orderBase.getOverTime()!=null){
                 mxup.setWcsj(orderBase.getOverTime());
             } else {
@@ -1379,7 +1379,7 @@ public class InstallProduceDataUploadServiceImpl implements InstallProduceDataUp
         mxup.setAzrenid(publicService.getBrandWorkerId(orderBase.getWorkerId(),websitSH.getWdId(),brand.getBrandId(),orderBase.getWebsitId()));
 
         mxup.setStat(cjstat);
-        if (cjstat.equals("1120")){
+        if (cjstat.equals(1120)){
             if (orderBase.getOverTime()!=null){
                 mxup.setWcsj(orderBase.getOverTime());
             } else {
@@ -1443,7 +1443,7 @@ public class InstallProduceDataUploadServiceImpl implements InstallProduceDataUp
         mxup.setAzrenid(publicService.getBrandWorkerId(orderBase.getWorkerId(),websitSH.getWdId(),brand.getBrandId(),orderBase.getWebsitId()));
 
         mxup.setStat(cjstat);
-        if (cjstat.equals("1120")){
+        if (cjstat.equals(1120)){
             if (orderBase.getOverTime()!=null){
                 mxup.setWcsj(orderBase.getOverTime());
             } else {

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

@@ -2035,13 +2035,13 @@ log.info("测试信息a   id={} ",ojtutl.getSynReqId());
         mxup.setAzrenid(publicService.getBrandWorkerId(orderBase.getWorkerId(),websitSH.getWdId(),brand.getBrandId(),orderBase.getWebsitId()));
 
         mxup.setStat(cjstat);
-        if (cjstat.equals("1120")){
+        /*if (cjstat.equals(1120)){
             if (orderBase.getOverTime()!=null){
                 mxup.setWcsj(orderBase.getOverTime());
             } else {
                 mxup.setWcsj(mxup.getLastModifiedDate());
             }
-        }
+        }*/
         mxup.setAzwdno(lcls.getAzwdno());
         mxup.setAzwdmc(lcls.getAzwdmc());
         mxup.setAzwdxtbh(lcls.getAzwdxtbh());
@@ -2104,15 +2104,13 @@ log.info("测试信息a   id={} ",ojtutl.getSynReqId());
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         mxup.setStat(cjstat);
-        if (cjstat.equals("1120")){
+        /*if (cjstat.equals(1120)){
             if (orderBase.getOverTime()!=null){
-                log.info("完成时间处理a：{}",sdf.format(orderBase.getOverTime()));
                 mxup.setWcsj(orderBase.getOverTime());
             } else {
-                log.info("完成时间处理b：{}",sdf.format(mxup.getLastModifiedDate()));
                 mxup.setWcsj(mxup.getLastModifiedDate());
             }
-        }
+        }*/
         mxup.setAzwdno(lcls.getAzwdno());
         mxup.setAzwdmc(lcls.getAzwdmc());
         mxup.setAzwdxtbh(lcls.getAzwdxtbh());
@@ -2150,13 +2148,13 @@ log.info("测试信息a   id={} ",ojtutl.getSynReqId());
         mxup.setAzrenid(publicService.getBrandWorkerId(orderBase.getWorkerId(),websitSH.getWdId(),brand.getBrandId(),orderBase.getWebsitId()));
 
         mxup.setStat(cjstat);
-        if (cjstat.equals("1120")){
+        /*if (cjstat.equals(1120)){
             if (orderBase.getOverTime()!=null){
                 mxup.setWcsj(orderBase.getOverTime());
             } else {
                 mxup.setWcsj(mxup.getLastModifiedDate());
             }
-        }
+        }*/
         mxup.setAzwdno(lcls.getAzwdno());
         mxup.setAzwdmc(lcls.getAzwdmc());
         mxup.setAzwdxtbh(lcls.getAzwdxtbh());
@@ -2196,13 +2194,13 @@ log.info("测试信息a   id={} ",ojtutl.getSynReqId());
         mxup.setAzrenid(publicService.getBrandWorkerId(orderBase.getWorkerId(),websitSH.getWdId(),brand.getBrandId(),orderBase.getWebsitId()));
 
         mxup.setStat(cjstat);
-        if (cjstat.equals("1120")){
+        /*if (cjstat.equals(1120)){
             if (orderBase.getOverTime()!=null){
                 mxup.setWcsj(orderBase.getOverTime());
             } else {
                 mxup.setWcsj(mxup.getLastModifiedDate());
             }
-        }
+        }*/
         mxup.setAzwdno(lcls.getAzwdno());
         mxup.setAzwdmc(lcls.getAzwdmc());
         mxup.setAzwdxtbh(lcls.getAzwdxtbh());
@@ -2260,13 +2258,13 @@ log.info("测试信息a   id={} ",ojtutl.getSynReqId());
         mxup.setAzrenid(publicService.getBrandWorkerId(orderBase.getWorkerId(),websitSH.getWdId(),brand.getBrandId(),orderBase.getWebsitId()));
 
         mxup.setStat(cjstat);
-        if (cjstat.equals("1120")){
+        /*if (cjstat.equals(1120)){
             if (orderBase.getOverTime()!=null){
                 mxup.setWcsj(orderBase.getOverTime());
             } else {
                 mxup.setWcsj(mxup.getLastModifiedDate());
             }
-        }
+        }*/
         mxup.setAzwdno(lcls.getAzwdno());
         mxup.setAzwdmc(lcls.getAzwdmc());
         mxup.setAzwdxtbh(lcls.getAzwdxtbh());

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

@@ -916,7 +916,7 @@ public class PublicServiceImpl implements PublicService {
         } else {
             add.setFjid(orderBase.getPgguid());
         }
-        add.setFjid(orderBase.getUserMobile());
+        add.setSjid(orderBase.getUserMobile());
         add.setFjwd(orderBase.getWebsitId());
         add.setFsma(getFaOrderSmsfsma(orderBase.getUserMobile()));
         add.setFsnr(String.format(ALISMS_RESERVE,

src/main/resources/mapper/DetailOrderInstallMapper.xml

@@ -27,7 +27,7 @@
                if(length(a.gps_address)>140,left(a.gps_address,140),a.gps_address) as sjcjgps,
                if(a.first_time=0,a.update_time,a.first_time) as sjcjsj,'' as kjmm2,
                g.bracket as zjia,g.pipe as jcguan,g.swith_flag as kqkg,g.high_altitude as gkzy,g.hole as yccxqk,
-               a.websit_id as zjczwdxtbh
+               a.websit_id as zjczwdxtbh,a.first_time as wcsj
         from order_install_detail a
                  left join order_product b on b.order_base_id = a.order_base_id and a.order_product_id=b.id
                  left join sys_dict_ref c on c.dict_code=a.main_id and c.brand_id = #{request.brandId} and c.dict_type='MAIN_TYPE'
@@ -62,7 +62,7 @@
                if(length(a.gps_address)>140,left(a.gps_address,140),a.gps_address) as sjcjgps,
                if(a.first_time=0,a.update_time,a.first_time) as sjcjsj,
                g.bracket as zjia,g.pipe as jcguan,g.swith_flag as kqkg,g.high_altitude as gkzy,g.hole as yccxqk,
-               a.websit_id as zjczwdxtbh
+               a.websit_id as zjczwdxtbh,a.first_time as wcsj
         from order_install_detail a
                  left join order_product b on b.order_base_id = a.order_base_id and a.order_product_id=b.id
                  left join sys_dict_ref c on c.dict_code=a.main_id and c.brand_id = #{request.brandId} and c.dict_type='MAIN_TYPE'
@@ -98,7 +98,7 @@
                if(length(a.gps_address)>140,left(a.gps_address,140),a.gps_address) as sjcjgps,
                if(a.first_time=0,a.update_time,a.first_time) as sjcjsj,'' as kjmm2,
                g.bracket as zjia,g.pipe as jcguan,g.swith_flag as kqkg,g.high_altitude as gkzy,g.hole as yccxqk,
-               a.websit_id as zjczwdxtbh
+               a.websit_id as zjczwdxtbh,a.first_time as wcsj
         from order_install_detail a
                  left join order_product b on b.order_base_id = a.order_base_id and a.order_product_id=b.id
                  left join sys_dict_ref c on c.dict_code=a.main_id and c.brand_id = #{request.brandId} and c.dict_type='MAIN_TYPE'
@@ -133,7 +133,7 @@
                if(length(a.gps_address)>140,left(a.gps_address,140),a.gps_address) as sjcjgps,
                if(a.first_time=0,a.update_time,a.first_time) as sjcjsj,'' as kjmm2,
                g.bracket as zjia,g.pipe as jcguan,g.swith_flag as kqkg,g.high_altitude as gkzy,g.hole as yccxqk,
-               a.websit_id as zjczwdxtbh
+               a.websit_id as zjczwdxtbh,a.first_time as wcsj
         from order_install_detail a
                  left join order_product b on b.order_base_id = a.order_base_id and a.order_product_id=b.id
                  left join sys_dict_ref c on c.dict_code=a.main_id and c.brand_id = #{request.brandId} and c.dict_type='MAIN_TYPE'
@@ -168,7 +168,7 @@
                if(length(a.gps_address)>140,left(a.gps_address,140),a.gps_address) as sjcjgps,
                if(a.first_time=0,a.update_time,a.first_time) as sjcjsj,
                g.bracket as zjia,g.pipe as jcguan,g.swith_flag as kqkg,g.high_altitude as gkzy,g.hole as yccxqk,
-               a.websit_id as zjczwdxtbh
+               a.websit_id as zjczwdxtbh,a.first_time as wcsj
         from order_install_detail a
                  left join order_product b on b.order_base_id = a.order_base_id and a.order_product_id=b.id
                  left join sys_dict_ref c on c.dict_code=a.main_id and c.brand_id = #{request.brandId} and c.dict_type='MAIN_TYPE'
@@ -203,7 +203,7 @@
                if(length(a.gps_address)>140,left(a.gps_address,140),a.gps_address) as sjcjgps,
                if(a.first_time=0,a.update_time,a.first_time) as sjcjsj,'' as kjmm2,
                g.bracket as zjia,g.pipe as jcguan,g.swith_flag as kqkg,g.high_altitude as gkzy,g.hole as yccxqk,
-               a.websit_id as zjczwdxtbh
+               a.websit_id as zjczwdxtbh,a.first_time as wcsj
         from order_install_detail a
                  left join order_product b on b.order_base_id = a.order_base_id and a.order_product_id=b.id
                  left join sys_dict_ref c on c.dict_code=a.main_id and c.brand_id = #{request.brandId} and c.dict_type='MAIN_TYPE'