add

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

@@ -1674,8 +1674,9 @@ public class UploadWorkeCertificateServiceImpl implements UploadWorkeCertificate
 
 
     private List<WebsitWorker> getWorkerUploadsBx() {
+        // 用接单状态来控制
         List<WebsitWorker> wws = websitWorkerService.lambdaQuery()
-                .eq(WebsitWorker::getInsureStatus,2)
+                .eq(WebsitWorker::getReceOrderStatus,"ON")
                 .isNotNull(WebsitWorker::getInsureFiles).list();
 
         return wws;

src/main/resources/mapper/CodeOrderInstallDetailMapper.xml

@@ -13,8 +13,8 @@
     <select id="getJyCode" parameterType="com.zfire.jiasm.syncdata.parameter.InstalDetailCode" resultType="com.zfire.jiasm.syncdata.plus.entity.ItfTblAzWgmxJyktTmmxUpload">
         select order_base_id as worker_order_no,out_id as fa_order_install_detail_code_id,tmguid, 'guangfo' as created_by,
                create_time as created_date,'guangfo' as last_modified_by,update_time as last_modified_date,pgwcmxid,
-               code as xjqtm,type as tmlx,gree_image_id as scwj,gree_image_id as scid,IFNULL(substr(password, 1, 40), '') as kjmm,create_time as cjsj,
-               password2 as kjmm2, gree_image_id as imgpath
+               code as xjqtm,type as tmlx,gree_image_id as scwj,gree_image_id as scid,left(password, 6) as kjmm,create_time as cjsj,
+               left(password2, 6) as kjmm2, gree_image_id as imgpath
         from order_install_detail_code
             where order_base_id = #{request.orderNo} and id = #{request.id}
     </select>
@@ -24,8 +24,8 @@
                create_time as created_date,'guangfo' as last_modified_by,update_time as last_modified_date,pgwcmxid,
                code as jqtm,
                case when type = '1' then 2 else 1 end as tmlx,
-               gree_image_id as scwj,gree_image_id as scid,IFNULL(substr(password, 1, 40), '') as kjmm,create_time	as cjsj,
-               password2 as kjmm2,gree_image_id as imgpath
+               gree_image_id as scwj,gree_image_id as scid,left(password, 6) as kjmm,create_time	as cjsj,
+               left(password2, 6) as kjmm2,gree_image_id as imgpath
         from order_install_detail_code
         where order_base_id = #{request.orderNo} and id = #{request.id}
     </select>
@@ -33,8 +33,8 @@
     <select id="getOtherCode" parameterType="com.zfire.jiasm.syncdata.parameter.InstalDetailCode" resultType="com.zfire.jiasm.syncdata.plus.entity.ItfTblAzWgmxQitaTmmxUpload">
         select order_base_id as worker_order_no,out_id as fa_order_install_detail_code_id,tmguid,'guangfo' as created_by,
                create_time as created_date,'guangfo' as last_modified_by,update_time as last_modified_date,
-               pgwcmxid as pgwcmxid,code as jqtm,type as tmlx,gree_image_id as scwj,gree_image_id as scid,IFNULL(substr(password, 1, 40), '') as kjmm,
-               create_time as cjsj,password2 as kjmm2,gree_image_id
+               pgwcmxid as pgwcmxid,code as jqtm,type as tmlx,gree_image_id as scwj,gree_image_id as scid,left(password, 6) as kjmm,
+               create_time as cjsj,left(password2, 6) as kjmm2,gree_image_id
         from order_install_detail_code
         where order_base_id = #{request.orderNo} and id = #{request.id}
     </select>
@@ -51,8 +51,8 @@
         select a.order_base_id as worker_order_no,a.out_id as fa_order_install_detail_code_id,a.tmguid,'guangfo' as created_by,
                a.create_time as created_date,'guangfo' as last_modified_by,a.update_time as last_modified_date,b.pgwcmxid,
                a.code as jqtm,case when a.type = '1' then 2 else 1 end as tmlx,
-               a.gree_image_id as scwj,a.gree_image_id as scid,IFNULL(substr(a.password, 1, 40), '') as kjmm,a.create_time	as cjsj,
-               a.password2 as kjmm2,a.gree_image_id as imgpath
+               a.gree_image_id as scwj,a.gree_image_id as scid,left(a.password, 6) as kjmm,a.create_time	as cjsj,
+               left(a.password2, 6) as kjmm2,a.gree_image_id as imgpath
         from order_install_detail_code a left join order_install_detail b on a.order_base_id=b.order_base_id and a.order_detail_id=b.id
         where a.order_base_id = #{request.orderNo} and a.id = #{request.id}
     </select>

src/main/resources/mapper/DetailOrderInstallMapper.xml

@@ -23,7 +23,7 @@
                case a.source when 'MOBILE' then 2 else 1 end as dnorsj,a.settle_websit_id as jsdwxtbh,
                if(a.first_time is null,a.update_time,a.first_time) as scazsj,
                a.settle_amount as azfy,a.settle_amount as jsfy,
-               IFNULL(substr(a.inside_password, 1, 44), '') as kjmm, if(a.inside_password != '', 1, 8) as kjmmbs,
+               left(a.inside_password, 6) as kjmm, if(a.inside_password != '', 1, 8) as kjmmbs,
                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,
@@ -59,7 +59,7 @@
                case a.source when 'MOBILE' then 2 else 1 end as dnorsj,a.settle_websit_id as jsdwxtbh,
                if(a.first_time is null,a.update_time,a.first_time) as scazsj,
                a.settle_amount as azfy,a.settle_amount as jsfy,
-               IFNULL(substr(a.inside_password, 1, 44), '') as kjmm, if(a.inside_password != '', 1, 8) as kjmmbs,
+               left(a.inside_password, 6) as kjmm, if(a.inside_password != '', 1, 8) as kjmmbs,
                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,
@@ -96,7 +96,7 @@
                case a.source when 'MOBILE' then 2 else 1 end as dnorsj,a.settle_websit_id as jsdwxtbh,
                if(a.first_time is null,a.update_time,a.first_time) as scazsj,
                a.settle_amount as azfy,a.settle_amount as jsfy,
-               IFNULL(substr(a.inside_password, 1, 44), '') as kjmm, if(a.inside_password != '', 1, 8) as kjmmbs,
+               left(a.inside_password, 6) as kjmm, if(a.inside_password != '', 1, 8) as kjmmbs,
                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,
@@ -132,7 +132,7 @@
                case a.source when 'MOBILE' then 2 else 1 end as dnorsj,a.settle_websit_id as jsdwxtbh,
                if(a.first_time is null,a.update_time,a.first_time) as scazsj,
                a.settle_amount as azfy,a.settle_amount as jsfy,
-               IFNULL(substr(a.inside_password, 1, 44), '') as kjmm, if(a.inside_password != '', 1, 8) as kjmmbs,
+               left(a.inside_password, 6) as kjmm, if(a.inside_password != '', 1, 8) as kjmmbs,
                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,
@@ -168,7 +168,7 @@
                case a.source when 'MOBILE' then 2 else 1 end as dnorsj,a.settle_websit_id as jsdwxtbh,
                if(a.first_time is null,a.update_time,a.first_time) as scazsj,
                a.settle_amount as azfy,a.settle_amount as jsfy,
-               IFNULL(substr(a.inside_password, 1, 44), '') as kjmm, if(a.inside_password != '', 1, 8) as kjmmbs,
+               left(a.inside_password, 6) as kjmm, if(a.inside_password != '', 1, 8) as kjmmbs,
                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,
@@ -204,7 +204,7 @@
                case a.source when 'MOBILE' then 2 else 1 end as dnorsj,a.settle_websit_id as jsdwxtbh,
                if(a.first_time is null,a.update_time,a.first_time) as scazsj,
                a.settle_amount as azfy,a.settle_amount as jsfy,
-               IFNULL(substr(a.inside_password, 1, 44), '') as kjmm, if(a.inside_password != '', 1, 8) as kjmmbs,
+               left(a.inside_password, 6) as kjmm, if(a.inside_password != '', 1, 8) as kjmmbs,
                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,