Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillvehicle/BusBillVehicleMapper.xml

@@ -45,6 +45,6 @@
     </select>
 
     <select id="selectOnes" resultType="com.yxt.anrui.buscenter.api.busbillvehicle.BusBillVehicle">
-        select * from bus_bill_vehicle where billAppSid = #{sid} and vehSid = #{vinSid}
+        select * from anrui_fin.fin_bill_vehicle where billAppSid = #{sid} and vehSid = #{vinSid}
     </select>
 </mapper>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java

@@ -241,7 +241,7 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
             qw.eq("furd.purchaseSystemSid", "0");
         }
         if(StringUtils.isNotBlank(query.getState())){
-            if("1".equals(query.getState())){
+            if("0".equals(query.getState())){
                 qw.notLike("furd.receivablesName","融资放款");
             }
         }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java

@@ -572,6 +572,9 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
             FlowTaskDoVo f = voList.get(i);
             Map<String, Object> flowMap = f.getProcessVariables();
             Map<String, Object> appMap = ConstantUtils.getMap(flowMap, "app");
+            if("process_161otrwo:2:5642504".equals(f.getProcDefId())){
+                appMap.put("type",2);
+            }
             String json = JSONObject.toJSONString(appMap);
             System.out.println(json);
             AppVo appVo = new AppVo();