yaozhixue 1 год назад
Родитель
Сommit
5960bbe1d1

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

@@ -841,7 +841,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
                     .last("limit 1")
                     .one();
 
-            // 修改附件的pgwcmxid
+            // 修改附件的pgwcmxid,fjguid
             if (detailone != null){
                 OrderDetailFile upf = new OrderDetailFile();
                 upf.setId(file.getId());
@@ -1356,7 +1356,6 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
         if (!getCJMXDataCj(cjOrWg, brand, orderBase, lcls, detail, mainName, taskno)){
             return Boolean.FALSE;
         }
-
         // 获取采集附件数据 (家用、商用、其他)  TL_fa_order_install_detail_append_js
         if ("cj".equals(cjOrWg)){
             if (!getcjfjdataCj(detail, mainName, taskno)){

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

@@ -3,7 +3,7 @@
 <mapper namespace="com.zfire.jiasm.syncdata.dao.mapper.FileOrderDetailMapper">
 
     <select id="getId" parameterType="com.zfire.jiasm.syncdata.parameter.InstallCJDetailFile" resultType="com.zfire.jiasm.syncdata.plus.entity.OrderDetailFile">
-        select a.id,a.file_path,a.brand_file_index,a.order_detail_id,a.order_base_id,a.brand_file_path
+        select a.id,a.file_path,a.brand_file_index,a.order_detail_id,a.order_base_id,a.brand_file_path,a.fjguid
         from order_detail_file a, order_install_detail b
         where a.order_base_id = #{request.orderNo} and b.order_base_id = #{request.orderNo}
           and a.order_detail_id = b.id
@@ -89,7 +89,7 @@
 
 
     <select id="getIdCj" parameterType="com.zfire.jiasm.syncdata.parameter.InstallCJDetailFile" resultType="com.zfire.jiasm.syncdata.plus.entity.OrderDetailFile">
-        select a.id,a.file_path,a.brand_file_index,a.order_detail_id,a.order_base_id,a.brand_file_path
+        select a.id,a.file_path,a.brand_file_index,a.order_detail_id,a.order_base_id,a.brand_file_path,a.fjguid
         from order_detail_file a, order_install_detail b
         where a.order_base_id = #{request.orderNo} and b.order_base_id = #{request.orderNo}
           and a.order_detail_id = b.id