优化

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -7302,7 +7302,12 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 }
             }
             vinList.add(vinListVo2);
-            busSalesOrderVehicleList = busSalesOrderVehicleService.selectListByOrderSid2(saleOrderSid, borrowSid);
+            if(StringUtils.isNotBlank(borrowSid)){
+                busSalesOrderVehicleList = busSalesOrderVehicleService.selectListByOrderSid2(saleOrderSid, borrowSid);
+            }else{
+                busSalesOrderVehicleList = busSalesOrderVehicleService.selectListByOrderSid3(saleOrderSid);
+            }
+
             busSalesOrderVehicleList.removeAll(Collections.singleton(null));
             if (!busSalesOrderVehicleList.isEmpty()) {
                 for (int i = 0; i < busSalesOrderVehicleList.size(); i++) {

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java

@@ -109,6 +109,7 @@ public interface BusSalesOrderVehicleMapper extends BaseMapper<BusSalesOrderVehi
 
     List<BusSalesOrderVehicle> selectByOrderSid(@Param("salesOrderSid") String salesOrderSid);
     List<BusSalesOrderVehicle> selectByOrderSid2(@Param("salesOrderSid") String salesOrderSid,@Param("borrowSid") String borrowSid);
+    List<BusSalesOrderVehicle> selectByOrderSid3(@Param("salesOrderSid") String salesOrderSid);
 
     @Select("select * from bus_sales_order_vehicle where sid = #{busVinSid}")
     BusSalesOrderVehicle selectBySalesOrderVehiclerSid(String busVinSid);

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml

@@ -86,6 +86,12 @@
         where salesOrderSid = #{salesOrderSid} and borrowerSid = #{borrowSid}
     </select>
 
+    <select id="selectByOrderSid3" resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle">
+        select *
+        from bus_sales_order_vehicle
+        where salesOrderSid = #{salesOrderSid} and (borrowerSid IS NULL OR borrowerSid = '')
+    </select>
+
     <select id="selectByNoAndVinSid" resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle">
         select bv.*
         from bus_sales_order_vehicle bv

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java

@@ -298,6 +298,10 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
         return baseMapper.selectByOrderSid2(saleOrderSid,borrowSid);
     }
 
+    public List<BusSalesOrderVehicle> selectListByOrderSid3(String saleOrderSid) {
+        return baseMapper.selectByOrderSid3(saleOrderSid);
+    }
+
     public ResultBean<List<BusVehicleQKKPVo>> appVehicleQKKPList2(BusVehicleQKKPQuery query) {
         ResultBean rb = ResultBean.fireFail();
         QueryWrapper<BaseVehicle> qw = new QueryWrapper<>();

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow2/FlowableMessageVo.java

@@ -24,4 +24,6 @@ public class FlowableMessageVo implements Vo {
     private String assignee;
     @ApiModelProperty("接收时间")
     private String createTime;
+
+    private String taskId;
 }

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowService.java

@@ -753,6 +753,6 @@ public class FlowService extends MybatisBaseService<FlowMapper, Flowable> {
         ResultBean<List<FlowableMessageVo>> rb = ResultBean.fireFail();
         List<FlowableMessageVo> list = baseMapper.getMessageList(minutes);
 
-        return null;
+        return rb.success().setData(list);
     }
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicy.java

@@ -1,5 +1,7 @@
 package com.yxt.anrui.riskcenter.api.loanfinotherPolicy;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yxt.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
@@ -37,8 +39,10 @@ public class LoanFinOtherPolicy extends BaseEntity {
     @ApiModelProperty("车辆大类value")
     private String vehCategoryValue;
     @ApiModelProperty("车辆功能key")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String vehTypeKey;
     @ApiModelProperty("车辆功能value")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String vehTypeValue;
     @ApiModelProperty("最高融资额比例（%）")
     private BigDecimal maxLoanRatio;

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanFinPolicyDto.java

@@ -32,12 +32,12 @@ public class LoanFinPolicyDto implements Dto {
     private String vehCategoryKey;
     @ApiModelProperty("车辆大类value")
     private String vehCategoryValue;
-    private List<String> vehTypeKeyList;
+    private List<String> vehTypeKeyList = new ArrayList<>();
     @ApiModelProperty("车辆功能key")
     private String vehTypeKey;
     @ApiModelProperty("车辆功能value")
     private String vehTypeValue;
-    private List<String> vehTypeValueList;
+    private List<String> vehTypeValueList = new ArrayList<>();
     @ApiModelProperty("是否打包：1打包、0不打包")
     private int isPack;
     @ApiModelProperty("担保类型key")

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyRest.java

@@ -69,7 +69,7 @@ public class LoanFinPolicyRest implements LoanFinPolicyFeign {
     }
 
     @Override
-    public ResultBean<List<PolicyVo>> selectList(String orgPath, String userSid,String isPack,String name) {
-        return loanFinPolicyService.selectList(orgPath,userSid,isPack,name);
+    public ResultBean<List<PolicyVo>> selectList(String orgPath, String userSid, String isPack, String name) {
+        return loanFinPolicyService.selectList(orgPath, userSid, isPack, name);
     }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyService.java

@@ -146,6 +146,14 @@ public class LoanFinPolicyService extends MybatisBaseService<LoanFinPolicyMapper
                 loanFinOtherPolicy.setCreateOrgSid(useOrgSid);
                 loanFinOtherPolicy.setUseOrgName(useOrgName);
                 loanFinOtherPolicy.setCreateOrgName(useOrgName);
+                if (!vehTypeKeyList.isEmpty()) {
+                    String vehTypeKey = String.join(",", vehTypeKeyList);
+                    loanFinOtherPolicy.setVehTypeKey(vehTypeKey);
+                }
+                if (!vehTypeValueList.isEmpty()) {
+                    String vehTypeValue = String.join(",", vehTypeValueList);
+                    loanFinOtherPolicy.setVehTypeValue(vehTypeValue);
+                }
                 loanFinOtherPolicyService.insert(loanFinOtherPolicy);
             } else {
                 loanFinPolicy.setIsOtherProduct(0);
@@ -202,6 +210,18 @@ public class LoanFinPolicyService extends MybatisBaseService<LoanFinPolicyMapper
                         name = name + loanFinOtherPolicy.getMaxLoanRatio() + "%";
                     }
                     loanFinOtherPolicy.setOtherPolicyName(name);
+                    if (!vehTypeKeyList.isEmpty()) {
+                        String vehTypeKey = String.join(",", vehTypeKeyList);
+                        loanFinOtherPolicy.setVehTypeKey(vehTypeKey);
+                    }else{
+                        loanFinOtherPolicy.setVehTypeKey("");
+                    }
+                    if (!vehTypeValueList.isEmpty()) {
+                        String vehTypeValue = String.join(",", vehTypeValueList);
+                        loanFinOtherPolicy.setVehTypeValue(vehTypeValue);
+                    }else{
+                        loanFinOtherPolicy.setVehTypeValue("");
+                    }
                     loanFinOtherPolicyService.updateById(loanFinOtherPolicy);
                 } else {
                     loanFinOtherPolicy = new LoanFinOtherPolicy();
@@ -220,6 +240,14 @@ public class LoanFinPolicyService extends MybatisBaseService<LoanFinPolicyMapper
                         name = name + loanFinOtherPolicy.getMaxLoanRatio() + "%";
                     }
                     loanFinOtherPolicy.setOtherPolicyName(name);
+                    if (!vehTypeKeyList.isEmpty()) {
+                        String vehTypeKey = String.join(",", vehTypeKeyList);
+                        loanFinOtherPolicy.setVehTypeKey(vehTypeKey);
+                    }
+                    if (!vehTypeValueList.isEmpty()) {
+                        String vehTypeValue = String.join(",", vehTypeValueList);
+                        loanFinOtherPolicy.setVehTypeValue(vehTypeValue);
+                    }
                     loanFinOtherPolicyService.insert(loanFinOtherPolicy);
                 }
             }