Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicle/BusSalesVehicleMapper.xml

@@ -47,24 +47,33 @@
     </select>
 
     <select id="exportList" resultType="com.yxt.anrui.buscenter.api.bussalesvehicle.BusSalesVehicleExportVo">
-        select bv.useOrgName,
-               bvoa.orgName                                    deptName,
-               bvoa.staffName,
-               bvoa.customerName,
-               bvoa.contractNo,
-               bv.modelName,
-               bv.vinNo,
-               bvoa.saleTypeValue                              saleType,
-               bvoa.saleDate,
-               if(length(bh.closingDate) > 0, '已交付', '未交付') as handoverState,
-               DATE_FORMAT(bh.closingDate, '%Y-%m-%d')      as handoverDate,
-               (@rank := @rank + 1)                            rankNo
-        from (SELECT @rank := 0) t,
-             anrui_base.base_vehicle_out bvo
-                 left join anrui_base.base_vehicle_out_apply bvoa on bvoa.sid = bvo.mainSid
-                 left join anrui_base.base_vehicle bv on bvo.vinSid = bv.sid
-                 left join anrui_buscenter.bus_handover_items bi on bi.vinSid = bv.sid
-                 left join anrui_buscenter.bus_handover bh on bh.sid = bi.handoverSid
+        select t1.useOrgName,
+               t1.deptName,
+               t1.staffName,
+               t1.customerName,
+               t1.contractNo,
+               t1.modelName,
+               t1.vinNo,
+               t1.saleType,
+               t1.saleDate,
+               t1.handoverState,
+               t1.handoverDate,
+               (@rank := @rank + 1) rankNo from (SELECT @rank := 0) t,(select bv.useOrgName,
+                                                                              bvoa.orgName                                    deptName,
+                                                                              bvoa.staffName,
+                                                                              bvoa.customerName,
+                                                                              bvoa.contractNo,
+                                                                              bv.modelName,
+                                                                              bv.vinNo,
+                                                                              bvoa.saleTypeValue                              saleType,
+                                                                              bvoa.saleDate,
+                                                                              if(length(bh.closingDate) > 0, '已交付', '未交付') as handoverState,
+                                                                              DATE_FORMAT(bh.closingDate, '%Y-%m-%d')      as handoverDate
+                                                                       from anrui_base.base_vehicle_out bvo
+                                                                                left join anrui_base.base_vehicle_out_apply bvoa on bvoa.sid = bvo.mainSid
+                                                                                left join anrui_base.base_vehicle bv on bvo.vinSid = bv.sid
+                                                                                left join anrui_buscenter.bus_handover_items bi on bi.vinSid = bv.sid
+                                                                                left join anrui_buscenter.bus_handover bh on bh.sid = bi.handoverSid
 
         <where>
             ${ew.sqlSegment}
@@ -80,6 +89,6 @@
                 </if>
             </if>
         </where>
-        order by bv.useOrgName desc,bvoa.orgName desc,bvoa.staffName desc,bvoa.customerName desc,bvoa.contractNo desc
+        order by bv.useOrgName desc, bvoa.orgName desc, bvoa.staffName desc, bvoa.customerName desc, bvoa.contractNo desc) t1
     </select>
 </mapper>

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java

@@ -66,8 +66,8 @@ public enum ProcDefEnum {
     BEPADSINCEREAPPLY("逾期垫款申请", "process_h1mcb548:1:6712504"),
     BECOLLECTIONAPPLY("催收措施申请", "process_7xz17xva:1:7417504"),
     MONTHLYACCRUAL("当月应收计提申请", "process_7zpo52qj:1:7367504"),
-    LOANOVERDUEFIN("逾期对账申请（财务）", ""),
-    LOANOVERDUEBANK("逾期对账申请（资方）", ""),
+    LOANOVERDUEFIN("逾期对账申请（财务）", "process_b0i03acl:1:7672504"),
+    LOANOVERDUEBANK("逾期对账申请（资方）", "process_wwb7q95x:1:7672508"),
 
     /******************************测试流程id*********************************************/