Merge remote-tracking branch 'origin/master'

anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/vehRebate/AppVehRebateFeign.java

@@ -0,0 +1,21 @@
+package com.yxt.anrui.reportcenter.api.vehRebate;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+@FeignClient(
+        contextId = "anrui-reportcenter-AppVehRebate",
+        name = "anrui-reportcenter",
+        path = "v1/carRebate")
+public interface AppVehRebateFeign {
+
+    @ApiOperation("单车返利统计列表")
+    @PostMapping("/list")
+    @ResponseBody
+    ResultBean<VehRebatePageVo> list(@RequestBody PagerQuery<VehRebatePageQuery> pagerQuery);
+}

anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/vehRebate/ListVehRebate.java

@@ -0,0 +1,43 @@
+package com.yxt.anrui.reportcenter.api.vehRebate;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class ListVehRebate {
+
+    @ApiModelProperty("车架号")
+    private String vin;
+    @ApiModelProperty("销售日期")
+    private String saleTime;
+    @ApiModelProperty("实销日期")
+    private String realSaleTime;
+    @ApiModelProperty("预提返利")
+    private String rebateEstimate;
+    @ApiModelProperty("上传")
+    private String rebateUpload;
+    @ApiModelProperty("二次上传")
+    private String rebateSecondaryUpload;
+    @ApiModelProperty("待确定")
+    private String rebateStayDetermine;
+    @ApiModelProperty("调整")
+    private String rebateAdjust;
+    @ApiModelProperty("未上传")
+    private String rebateNoUpload;
+    @ApiModelProperty("费用预提")
+    private String feesEstimate;
+    @ApiModelProperty("上传")
+    private String feeUpload;
+    @ApiModelProperty("车型")
+    private String model;
+    @ApiModelProperty("品牌")
+    private String brand;
+    @ApiModelProperty("采购系统")
+    private String buySystem;
+    @ApiModelProperty("分公司")
+    private String branch;
+    @ApiModelProperty("事业部")
+    private String division;
+    @ApiModelProperty("车辆sid")
+    private String sid;
+}

anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/vehRebate/TotalVehRebate.java

@@ -0,0 +1,45 @@
+package com.yxt.anrui.reportcenter.api.vehRebate;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class TotalVehRebate implements Vo {
+    private static final long serialVersionUID = -8631337422991366458L;
+
+    @ApiModelProperty("sid")
+    private String sid;
+    @ApiModelProperty("合同状态")
+    private String contractType;
+    @ApiModelProperty("合同编号")
+    private String contractId;
+    @ApiModelProperty("欠款金额")
+    private String arrearsMoney;
+    @ApiModelProperty("承诺汇款日期")
+    private String paymentDate;
+    @ApiModelProperty("申请人")
+    private String applicant;
+    @ApiModelProperty("数量")
+    private String number;
+    @ApiModelProperty("原因")
+    private String reason;
+    @ApiModelProperty("创建日期")
+    private String date;
+    @ApiModelProperty("客户名称")
+    private String customerName;
+    @ApiModelProperty("是否显示办理按钮")
+    private Boolean showUpdateBtn;
+    @ApiModelProperty("是否显示删除按钮")
+    private Boolean showDeleteBtn;
+    @ApiModelProperty("是否显示领票按钮")
+    private Boolean showGetInvoiceBtn;
+    @ApiModelProperty("车型")
+    private String model;
+    @ApiModelProperty("销售类型")
+    private String type;
+    @ApiModelProperty("车架号（拼接）")
+    private String vinNo;
+    @ApiModelProperty("是否领取发票原件")
+    private String isLQOrigInvoice;
+}

anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/vehRebate/VehRebatePageQuery.java

@@ -0,0 +1,22 @@
+package com.yxt.anrui.reportcenter.api.vehRebate;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class VehRebatePageQuery implements Query {
+
+    @ApiModelProperty("组织全路径")
+    private String orgPath;
+    @ApiModelProperty("用户sid")
+    private String userSid;
+    @ApiModelProperty("菜单sid")
+    private String menuSid;
+    @ApiModelProperty("条件")
+    private String names;
+    @ApiModelProperty("销售日期")
+    private String date;
+    @ApiModelProperty("实销日期")
+    private String date2;
+}

anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/vehRebate/VehRebatePageVo.java

@@ -0,0 +1,17 @@
+package com.yxt.anrui.reportcenter.api.vehRebate;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class VehRebatePageVo {
+
+    @ApiModelProperty("合计")
+    private TotalVehRebate total;
+    @ApiModelProperty("列表")
+    private List<ListVehRebate> list;
+    @ApiModelProperty("总页数")
+    private Integer pages;
+}

anrui-reportcenter/anrui-reportcenter-biz/pom.xml

@@ -116,6 +116,12 @@
             <version>0.0.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.yxt.anrui.scm</groupId>
+            <artifactId>anrui-scm-api</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
 
 
     </dependencies>

anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/ReportcenterApplication.java

@@ -14,7 +14,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
         "com.yxt.anrui.reportcenter"
 })
 @EnableDiscoveryClient
-@EnableFeignClients(basePackages = {"com.yxt.anrui.portal","com.yxt.anrui.base"})
+@EnableFeignClients(basePackages = {"com.yxt.anrui.*"})
 public class ReportcenterApplication {
 
     public static void main(String[] args) {

anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/vehRebate/AppVehRebateRest.java

@@ -0,0 +1,48 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.reportcenter.biz.vehRebate;
+
+import com.yxt.anrui.reportcenter.api.vehRebate.AppVehRebateFeign;
+import com.yxt.anrui.reportcenter.api.vehRebate.VehRebatePageQuery;
+import com.yxt.anrui.reportcenter.api.vehRebate.VehRebatePageVo;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController()
+@RequestMapping("v1/carRebate")
+public class AppVehRebateRest implements AppVehRebateFeign {
+
+    @Autowired
+    private AppVehRebateService appVehRebateService;
+
+    @Override
+    public ResultBean<VehRebatePageVo> list(PagerQuery<VehRebatePageQuery> query) {
+        return appVehRebateService.list(query);
+    }
+}

anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/vehRebate/AppVehRebateService.java

@@ -0,0 +1,117 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.reportcenter.biz.vehRebate;
+
+import com.yxt.anrui.reportcenter.api.vehRebate.ListVehRebate;
+import com.yxt.anrui.reportcenter.api.vehRebate.TotalVehRebate;
+import com.yxt.anrui.reportcenter.api.vehRebate.VehRebatePageQuery;
+import com.yxt.anrui.reportcenter.api.vehRebate.VehRebatePageVo;
+import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateFeign;
+import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateStatQuery;
+import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateStatVo;
+import com.yxt.common.base.utils.StringUtils;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class AppVehRebateService {
+
+    @Autowired
+    private ScmVehRebateFeign scmVehRebateFeign;
+
+    public ResultBean<VehRebatePageVo> list(PagerQuery<VehRebatePageQuery> query) {
+        ResultBean rb = ResultBean.fireFail();
+        //返回值
+        VehRebatePageVo vehRebatePageVo = new VehRebatePageVo();
+        TotalVehRebate totalVehRebate = new TotalVehRebate();
+        List<ListVehRebate> listVehRebates = new ArrayList<>();
+        //查询条件
+        PagerQuery<ScmVehRebateStatQuery> scmVehRebateStatQueryPagerQuery = new PagerQuery<>();
+        ScmVehRebateStatQuery scmVehRebateStatQuery = new ScmVehRebateStatQuery();
+        VehRebatePageQuery params = query.getParams();
+        scmVehRebateStatQuery.setOrgPath(params.getOrgPath());
+        scmVehRebateStatQuery.setUserSid(params.getUserSid());
+        scmVehRebateStatQuery.setMenuSid(params.getMenuSid());
+        scmVehRebateStatQuery.setNames(params.getNames());
+        //发起日期查询
+        String date = params.getDate();
+        if(StringUtils.isNotBlank(date)){
+            String[] s = date.split("至");
+            String startDate = s[0];
+            if (StringUtils.isNotBlank(startDate)) {
+                scmVehRebateStatQuery.setSaleDateStart(startDate);
+            }
+            String endDate = s[1];
+            if (StringUtils.isNotBlank(endDate)) {
+                scmVehRebateStatQuery.setSaleDateEnd(endDate);
+            }
+        }
+        String date2 = params.getDate2();
+        if(StringUtils.isNotBlank(date2)){
+            String[] s = date2.split("至");
+            String startDate = s[0];
+            if (StringUtils.isNotBlank(startDate)) {
+                scmVehRebateStatQuery.setAcSaleDateStart(startDate);
+            }
+            String endDate = s[1];
+            if (StringUtils.isNotBlank(endDate)) {
+                scmVehRebateStatQuery.setAcSaleDateEnd(endDate);
+            }
+        }
+        scmVehRebateStatQueryPagerQuery.setParams(scmVehRebateStatQuery);
+        PagerVo<ScmVehRebateStatVo> data = scmVehRebateFeign.statistics(scmVehRebateStatQueryPagerQuery).getData();
+        for (ScmVehRebateStatVo record : data.getRecords()) {
+            ListVehRebate listVehRebate = new ListVehRebate();
+            listVehRebate.setVin(record.getVinNo());
+            listVehRebate.setSaleTime(record.getSaleDate());
+            listVehRebate.setRealSaleTime(record.getAcSaleDate());
+            listVehRebate.setRebateEstimate(record.getEstimateRebate().toString());
+            listVehRebate.setRebateUpload(record.getUploadMoney().toString());
+            listVehRebate.setRebateSecondaryUpload(record.getSecondaryUploadMoney().toString());
+            listVehRebate.setRebateStayDetermine(record.getStayDetermineMoney().toString());
+            listVehRebate.setRebateAdjust(record.getAdjustmentMoney().toString());
+            listVehRebate.setRebateNoUpload(record.getNotUploadMoney().toString());
+            listVehRebate.setFeesEstimate(record.getExpectCost().toString());
+            listVehRebate.setFeeUpload(record.getMoney().toString());
+            listVehRebate.setModel(record.getVehModelName());
+            listVehRebate.setBrand(record.getBrandName());
+            listVehRebate.setBuySystem(record.getPurchaseSystemName());
+            listVehRebate.setBranch(record.getUseOrgName());
+            listVehRebate.setDivision(record.getDivision());
+            listVehRebate.setSid(record.getVehSid());
+            listVehRebates.add(listVehRebate);
+        }
+        vehRebatePageVo.setList(listVehRebates);
+        vehRebatePageVo.setPages((int) data.getPages());
+        return rb.success().setData(vehRebatePageVo);
+    }
+}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoutboundapply/LoanOutboundApplyService.java

@@ -787,7 +787,7 @@ public class LoanOutboundApplyService extends MybatisBaseService<LoanOutboundApp
             String lq = loanRepaymentPlanDetailsService.getYqLq(busVinSid);
             lqMoney = lqMoney.add(new BigDecimal(StringUtils.isBlank(lq) ? "0" : lq));
             //未到期欠款
-            String wdq = alrepaidAndArrVo.getUnexpiredMoney();
+            String wdq = loanRepaymentPlanDetailsService.getWdq(busVinSid);
             wdqMoney = wdqMoney.add(new BigDecimal(StringUtils.isBlank(wdq) ? "0" : wdq));
             String bj = loanRepaymentPlanDetailsService.getBj(busVinSid);
             bjMoney = bjMoney.add(new BigDecimal(StringUtils.isBlank(bj) ? "0" : bj));

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesnotapply/LoanSecondarySalesNotApplyMapper.java

@@ -46,4 +46,6 @@ public interface LoanSecondarySalesNotApplyMapper extends BaseMapper<LoanSeconda
     String selectNum(String billNo);
 
     int selectBySid(String join);
+
+    String selectByBusVinSid(String busVinSid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesnotapply/LoanSecondarySalesNotApplyMapper.xml

@@ -77,4 +77,14 @@
         WHERE nodeState != '待提交'
 		  and find_in_set(sid, #{list})
     </select>
+
+    <select id="selectByBusVinSid" resultType="java.lang.String">
+        SELECT
+            IFNULL(SUM( IFNULL( se.subscriptionMoney, 0 ) ),0)
+        FROM
+            anrui_fin.fin_selected_receivables_detailed AS se
+        WHERE
+                se.receivablesSid in (select sid from anrui_riskcenter.loan_repayment_plan_details where busVinSid = #{busVinSid})
+          AND se.auditState = '3' and se.receivablesName in('月还','预计资方结清费用')
+    </select>
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesnotapply/LoanSecondarySalesNotApplyService.java

@@ -30,11 +30,23 @@ import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
+import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign;
 import com.yxt.anrui.base.common.utils.Rule;
+import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
+import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
+import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerDetailsVo;
+import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerFeign;
 import com.yxt.anrui.buscenter.api.bussalesorderreturnveh.BusSalesOrderReturnVehDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.BusSalesOrderReturnVehApplyDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.BusSalesOrderReturnVehPdfVo;
+import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
+import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
 import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordSourceLCVo;
+import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
+import com.yxt.anrui.fin.api.kingdee.bdcustomer.BdCustomer;
+import com.yxt.anrui.fin.api.kingdee.voucher.Voucher;
 import com.yxt.anrui.flowable.api.flow.FlowProcessMapQuery;
 import com.yxt.anrui.flowable.api.flow.FlowableFeign;
 import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
@@ -54,8 +66,10 @@ import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.riskcenter.api.loanfile.LoanFile;
 import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum;
+import com.yxt.anrui.riskcenter.api.loanoutboundapply.LoanOutboundApply;
 import com.yxt.anrui.riskcenter.api.loanrestorereportapply.AlrepaidAndArrVo;
 import com.yxt.anrui.riskcenter.api.loansecondarysalesapply.*;
+import com.yxt.anrui.riskcenter.api.loansecondarysalescost.LoanSecondarySalesCost;
 import com.yxt.anrui.riskcenter.api.loansecondarysalescost.LoanSecondarySalesCostVo;
 import com.yxt.anrui.riskcenter.api.loansecondarysalesnotapply.*;
 import com.yxt.anrui.riskcenter.api.loansecondarysalesnotapply.flowable.*;
@@ -63,6 +77,7 @@ import com.yxt.anrui.riskcenter.api.loansecondarysalesnotveh.LoanSecondarySalesN
 import com.yxt.anrui.riskcenter.api.loansecondarysalesnotveh.LoanSecondarySalesNotVehDto;
 import com.yxt.anrui.riskcenter.api.loansecondarysalesveh.LoanSecondarySalesVehVo;
 import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService;
+import com.yxt.anrui.riskcenter.biz.loanrepaymentplandetails.LoanRepaymentPlanDetailsService;
 import com.yxt.anrui.riskcenter.biz.loanrestorereportapply.LoanRestoreReportApplyService;
 import com.yxt.anrui.riskcenter.biz.loansecondarysalesapply.LoanSecondarySalesApplyService;
 import com.yxt.anrui.riskcenter.biz.loansecondarysalescost.LoanSecondarySalesCostService;
@@ -90,6 +105,7 @@ import org.springframework.stereotype.Service;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.*;
+import java.util.concurrent.*;
 import java.util.stream.Collectors;
 
 import static java.util.Comparator.comparing;
@@ -130,6 +146,19 @@ public class LoanSecondarySalesNotApplyService extends MybatisBaseService<LoanSe
     @Autowired
     private com.yxt.anrui.portal.api.flow.FlowableFeign flowableFeignSp;
 
+    @Autowired
+    private BusSalesOrderVehicleFeign busSalesOrderVehicleFeign;
+    @Autowired
+    private BusSalesOrderFeign busSalesOrderFeign;
+    @Autowired
+    private FinKingDeeFeign finKingDeeFeign;
+    @Autowired
+    private LoanRepaymentPlanDetailsService loanRepaymentPlanDetailsService;
+    @Autowired
+    private BusSalesOrderBorrowerFeign busSalesOrderBorrowerFeign;
+    @Autowired
+    private BasePurchaseSystemFeign basePurchaseSystemFeign;
+
     public PagerVo<LoanSecondarySalesNotApplyVo> listPageVo(PagerQuery<LoanSecondarySalesNotApplyQuery> pq) {
         LoanSecondarySalesNotApplyQuery query = pq.getParams();
         QueryWrapper<LoanSecondarySalesNotApply> qw = new QueryWrapper<>();
@@ -542,6 +571,27 @@ public class LoanSecondarySalesNotApplyService extends MybatisBaseService<LoanSe
             UpdateFlowFieldVo ufVo = resultBean.getData();
             updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
             if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
+
+                try {
+                    ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
+                            .setNameFormat("demo-pool-%d").build();
+                    ExecutorService pool = new org.apache.tomcat.util.threads.ThreadPoolExecutor(2, 100,
+                            0L, TimeUnit.MILLISECONDS,
+                            new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new org.apache.tomcat.util.threads.ThreadPoolExecutor.AbortPolicy());
+                    LoanSecondarySalesNotApply finalLoanSecondarySalesNotApply = loanSecondarySalesNotApply;
+                    Future future1 = pool.submit(() -> {
+                        //推送不追偿申请凭证
+                        //TOdO:
+                        List<String> busVinSidList = loanSecondarySalesNotVehService.selectByMainSid(businessSid);
+                        busVinSidList.removeAll(Collections.singleton(null));
+                        if(!busVinSidList.isEmpty()){
+                            pushRiskToFin2(finalLoanSecondarySalesNotApply,busVinSidList);
+                        }
+                    });
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+
             } else {
                 //极光推送
                 loanSecondarySalesNotApply = fetchBySid(businessSid);
@@ -564,6 +614,142 @@ public class LoanSecondarySalesNotApplyService extends MybatisBaseService<LoanSe
         }
     }
 
+    private void pushRiskToFin2(LoanSecondarySalesNotApply loanSecondarySalesNotApply, List<String> busVinSidList) {
+        LoanSecondarySalesCost loanSecondarySalesCost = loanSecondarySalesCostService.selectMainSu(loanSecondarySalesNotApply.getSecSaleSid());
+        Voucher voucher = new Voucher();
+        SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(loanSecondarySalesNotApply.getUseOrgSid()).getData();
+        if (null != organizationVo) {
+            voucher.setAccountBook(organizationVo.getOrgCode());
+            voucher.setVoucherNo(organizationVo.getOrgCode());
+        }
+        List<Voucher.VoucherResultDetailDto> voucherResultDetailDtos = new ArrayList<>();
+        SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(loanSecondarySalesNotApply.getCreateDeptSid()).getData();
+        for (int i = 0; i < busVinSidList.size(); i++){
+            String busVinSid = busVinSidList.get(i);
+            //ToDo:
+            BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(busVinSid).getData();
+            String customerNumber = "";
+            BusSalesOrder salesOrder = busSalesOrderFeign.fetchBySid(busSalesOrderVehicle.getSalesOrderSid()).getData();
+            if (salesOrder != null && busSalesOrderVehicle != null) {
+                //判断财务系统是否有客户
+                Boolean aBoolean = finKingDeeFeign.customerExistState(busSalesOrderVehicle.getTemporaryNo()).getData();
+                String linkNo = "";
+                BusSalesOrderBorrowerDetailsVo borrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(busSalesOrderVehicle.getBorrowerSid()).getData();
+                if (!aBoolean) {
+                    //  List<BdCustomer> bdCustomers = new ArrayList<>();
+                    BdCustomer bdCustomer = new BdCustomer();
+                    bdCustomer.setFNumber(busSalesOrderVehicle.getTemporaryNo());
+                    bdCustomer.setFShortName(salesOrder.getContractNo());
+                    if (StringUtils.isNotBlank(salesOrder.getPurchaseSystemSid())) {
+                        BasePurchaseSystemDetailsVo data = basePurchaseSystemFeign.fetchDetailsByDeptSid(salesOrder.getPurchaseSystemSid()).getData();
+                        bdCustomer.setTOrgIds(data.getOrgCode());
+                    }
+                    bdCustomer.setTOrgIds(deptVo.getOrgCode());
+                    if (org.apache.commons.lang3.StringUtils.isNotBlank(busSalesOrderVehicle.getLinkNo())) {
+                        String vinNo = busSalesOrderVehicle.getLinkNo();
+                        if (vinNo.length() > 8) {
+                            linkNo = vinNo.substring(vinNo.length() - 8);
+                        } else {
+                            linkNo = busSalesOrderVehicle.getLinkNo();
+                        }
+                        if (null != borrowerDetailsVo) {
+                            bdCustomer.setFName(borrowerDetailsVo.getBorrowerName() + linkNo);
+                        }
+                    } else {
+                        if (null != borrowerDetailsVo) {
+                            bdCustomer.setFName(borrowerDetailsVo.getBorrowerName() + busSalesOrderVehicle.getTemporaryNo());
+                        }
+                    }
+                    //  bdCustomers.add(bdCustomer);
+                    ResultBean<String> resultBean = finKingDeeFeign.draftBdCustomer(bdCustomer);
+                    if (resultBean.getSuccess()) {
+                        customerNumber = bdCustomer.getFNumber();
+                    }
+                } else {
+                    customerNumber = busSalesOrderVehicle.getTemporaryNo();
+                }
+            }
+            BigDecimal all = BigDecimal.ZERO;//扣回车辆费用=扣回入库-已认款+资方结清费用
+            BigDecimal bxbzjMoney = BigDecimal.ZERO;//保险保证金
+            BigDecimal cssMoney = BigDecimal.ZERO;//车损失---计算=扣回车辆费用-贷款保证金-保险保证金
+            AlrepaidAndArrVo alrepaidAndArrVo = loanRestoreReportApplyService.getAlrepaidAndArr2(busVinSid);
+            //应收贷款车欠款_到期欠款_累欠
+            BigDecimal lqMoney = BigDecimal.ZERO;
+            //应收贷款车欠款_未到期欠款_未到期欠款
+            BigDecimal wdqMoney = BigDecimal.ZERO;
+            //应收贷款车欠款_到期欠款_本金
+            BigDecimal bjMoney = BigDecimal.ZERO;
+            BigDecimal zjzyfMoney = BigDecimal.ZERO;
+            String lq = loanRepaymentPlanDetailsService.getYqLq(busVinSid);
+            lqMoney = lqMoney.add(new BigDecimal(StringUtils.isBlank(lq) ? "0" : lq));
+            //未到期欠款
+            String wdq = loanRepaymentPlanDetailsService.getWdq(busVinSid);
+            wdqMoney = wdqMoney.add(new BigDecimal(StringUtils.isBlank(wdq) ? "0" : wdq));
+            String bj = loanRepaymentPlanDetailsService.getBj(busVinSid);
+            bjMoney = bjMoney.add(new BigDecimal(StringUtils.isBlank(bj) ? "0" : bj));
+            all = lqMoney.add(wdqMoney).add(bjMoney);
+            //已认款
+            String subAll = baseMapper.selectByBusVinSid(busVinSid);
+            if(loanSecondarySalesCost.getBankSettleCost().compareTo(BigDecimal.ZERO)>0){
+                all = all.add(loanSecondarySalesCost.getBankSettleCost()).subtract(new BigDecimal(subAll));
+            }
+
+            BigDecimal bankSettleCost = loanSecondarySalesCost.getBankSettleCost();
+            all = all.subtract(new BigDecimal(subAll)).add(bankSettleCost);
+            BigDecimal loanDeposit = loanSecondarySalesCost.getLoanDeposit();//贷款保证金
+            cssMoney = all.subtract(loanDeposit).subtract(bxbzjMoney);//车损失
+            String zjzyf = alrepaidAndArrVo.getWheFundOccMoney();
+            zjzyfMoney = zjzyfMoney.add(new BigDecimal(StringUtils.isBlank(zjzyf)?"0":zjzyf));
+
+            if(cssMoney.compareTo(BigDecimal.ZERO)>0){//贷方
+                Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto();
+                voucherResultDetailDtoDf.setSummary("**扣回车辆再次销售-不追偿处理");
+                voucherResultDetailDtoDf.setSubjectNo("1201.03.04.01");
+                //核算部门
+                voucherResultDetailDtoDf.setDimensionDept(deptVo.getOrgCode());
+                //核算客户
+                voucherResultDetailDtoDf.setDimensionCustom(customerNumber);
+                voucherResultDetailDtoDf.setCredit(cssMoney.toString());
+                voucherResultDetailDtos.add(voucherResultDetailDtoDf);
+                Voucher.VoucherResultDetailDto voucherResultDetailDtoJf = new Voucher.VoucherResultDetailDto();
+                voucherResultDetailDtoJf.setSummary("**扣回车辆再次销售-不追偿处理");
+                voucherResultDetailDtoJf.setSubjectNo("1911.05");
+                //核算部门
+                voucherResultDetailDtoJf.setDimensionDept(deptVo.getOrgCode());
+                //核算客户
+                voucherResultDetailDtoJf.setDimensionCustom(customerNumber);
+                voucherResultDetailDtoJf.setDebit(cssMoney.toString());
+                voucherResultDetailDtos.add(voucherResultDetailDtoJf);
+            }
+            if(zjzyfMoney.compareTo(BigDecimal.ZERO)>0){
+                Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto();
+                voucherResultDetailDtoDf.setSummary("**扣回车辆再次销售-不追偿减免资金占用费");
+                voucherResultDetailDtoDf.setSubjectNo("2191.05.00");
+                //核算部门
+                voucherResultDetailDtoDf.setDimensionDept(deptVo.getOrgCode());
+                //核算客户
+                voucherResultDetailDtoDf.setDimensionCustom(customerNumber);
+                voucherResultDetailDtoDf.setCredit(zjzyfMoney.negate().toString());
+                voucherResultDetailDtos.add(voucherResultDetailDtoDf);
+                Voucher.VoucherResultDetailDto voucherResultDetailDtoJf = new Voucher.VoucherResultDetailDto();
+                voucherResultDetailDtoJf.setSummary("**扣回车辆再次销售-不追偿减免资金占用费");
+                voucherResultDetailDtoDf.setSubjectNo("1201.02.02");
+                //核算部门
+                voucherResultDetailDtoJf.setDimensionDept(deptVo.getOrgCode());
+                //核算客户
+                voucherResultDetailDtoJf.setDimensionCustom(customerNumber);
+                voucherResultDetailDtoJf.setDebit(zjzyfMoney.negate().toString());
+                voucherResultDetailDtos.add(voucherResultDetailDtoJf);
+
+            }
+        }
+
+        if(!voucherResultDetailDtos.isEmpty()){
+            voucher.setResultDetails(voucherResultDetailDtos);
+            finKingDeeFeign.saveVoucher(voucher);
+        }
+    }
+
     public ResultBean<List<NodeVo>> getPreviousNodesForReject(NodeQuery query) {
         ResultBean<List<NodeVo>> rb = ResultBean.fireFail();
         BusinessVariables bv = new BusinessVariables();

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesnotveh/LoanSecondarySalesNotVehMapper.java

@@ -40,4 +40,6 @@ public interface LoanSecondarySalesNotVehMapper extends BaseMapper<LoanSecondary
 
     @Select("select * from loan_secondary_sales_not_veh where mainSid = #{mainSid}")
     List<LoanSecondarySalesNotVehDetailsVo> selByMainSid(String mainSid);
+
+    List<String> selectByMainSid(String businessSid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesnotveh/LoanSecondarySalesNotVehMapper.xml

@@ -9,4 +9,10 @@
 		from loan_secondary_sales_not_veh
 		where mainSid = #{s}
 	</delete>
+
+	<select id="selectByMainSid" resultType="java.lang.String">
+		select busVinSid
+		from loan_secondary_sales_not_veh
+		where mainSid = #{businessSid}
+    </select>
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesnotveh/LoanSecondarySalesNotVehService.java

@@ -62,4 +62,8 @@ public class LoanSecondarySalesNotVehService extends MybatisBaseService<LoanSeco
     public List<LoanSecondarySalesNotVehDetailsVo> selByMainSid(String mainSid) {
         return baseMapper.selByMainSid(mainSid);
     }
+
+    public List<String> selectByMainSid(String businessSid) {
+        return baseMapper.selectByMainSid(businessSid);
+    }
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateStatQuery.java

@@ -56,4 +56,5 @@ public class ScmVehRebateStatQuery implements Query {
     private String orgPath;
     private String menuUrl;
     private String menuSid;
+    private String names;
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java

@@ -361,7 +361,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
         ScmVehRebateStatQuery query = pq.getParams();
         QueryWrapper<ScmVehRebate> qw = new QueryWrapper<>();
         //========================================数据授权开始
-        if (StringUtils.isNotBlank(query.getMenuUrl())) {
+        if (StringUtils.isNotBlank(query.getMenuUrl()) || StringUtils.isNotBlank(query.getMenuSid())) {
             PrivilegeQuery privilegeQuery = new PrivilegeQuery();
             privilegeQuery.setOrgPath(query.getOrgPath());
             privilegeQuery.setMenuUrl(query.getMenuUrl());
@@ -423,11 +423,15 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
         qw.apply(StringUtils.isNotBlank(saleDateStart), "date_format (v.salesDate,'%Y-%m-%d') >= date_format('" + saleDateStart + "','%Y-%m-%d')").
                 apply(StringUtils.isNotBlank(saleDateEnd), "date_format (v.salesDate,'%Y-%m-%d') <= date_format('" + saleDateEnd + "','%Y-%m-%d')"
                 );
-       /* String acSaleDateStart = query.getAcSaleDateStart();
+        String acSaleDateStart = query.getAcSaleDateStart();
         String acSaleDateEnd = query.getAcSaleDateEnd();
-        qw.apply(StringUtils.isNotBlank(acSaleDateStart), "date_format (createTime,'%Y-%m-%d') >= date_format('" + acSaleDateStart + "','%Y-%m-%d')").
-                apply(StringUtils.isNotBlank(acSaleDateEnd), "date_format (createTime,'%Y-%m-%d') <= date_format('" + acSaleDateEnd + "','%Y-%m-%d')"
-                );*/
+        qw.apply(StringUtils.isNotBlank(acSaleDateStart), "date_format (v.solidDate,'%Y-%m-%d') >= date_format('" + acSaleDateStart + "','%Y-%m-%d')").
+                apply(StringUtils.isNotBlank(acSaleDateEnd), "date_format (v.solidDate,'%Y-%m-%d') <= date_format('" + acSaleDateEnd + "','%Y-%m-%d')"
+                );
+        //移动端条件
+        if (StringUtils.isNotBlank(query.getNames())) {
+            qw.and(wrapper -> wrapper.like("r.useOrgName", query.getUseOrgName()).or().like("o.name", query.getNames()).or().like("r.vinNo", query.getNames()).or().like("r.vehModelName", query.getNames()).or().like("r.brandName", query.getNames()).or().like("r.purchaseSystemName", query.getNames()));
+        }
         qw.groupBy("r.vehSid");
         qw.orderByDesc("r.createTime");
         IPage<ScmVehRebate> page = PagerUtil.queryToPage(pq);

anrui-system-ui/src/views/Home/Home.vue

@@ -1,12 +1,14 @@
 <template>
   <div style="height: 100%;">
     <div class="header">
-      <p class="title"><img src="../../assets/loginImg/logo.png"/>安瑞集团信息化平台</p>
-      <div class="head_info" style="display: flex;flex-direction: row;justify-content:space-between;align-items: center">
+      <p class="title"><img src="../../assets/loginImg/logo.png" />安瑞集团信息化平台</p>
+      <div class="head_info"
+        style="display: flex;flex-direction: row;justify-content:space-between;align-items: center">
         <div>欢迎您</div>
         <div>
-          <el-select v-model="defaultOrgPathName" class="selectStyle" size="small" placeholder="" @change="changeOrg" filterable>
-            <el-option v-for="item in orgDept_list" :key="item.orgPath" :label="item.orgName" :value="item.orgName"/>
+          <el-select v-model="defaultOrgPathName" class="selectStyle" size="small" placeholder="" @change="changeOrg"
+            filterable>
+            <el-option v-for="item in orgDept_list" :key="item.orgPath" :label="item.orgName" :value="item.orgName" />
           </el-select>
         </div>
         <div style="padding-right: 5px">
@@ -16,7 +18,10 @@
           </el-tooltip>
         </div>
         <div>{{ name }}</div>
-        <div @click="logout()" style="display: flex;flex-direction: row;justify-content:center;align-items: center;padding-left: 20px;padding-right: 10px"><img src="@/assets/images/dy.png"/></div>
+        <div @click="logout()"
+          style="display: flex;flex-direction: row;justify-content:center;align-items: center;padding-left: 20px;padding-right: 10px">
+          <img src="@/assets/images/dy.png" />
+        </div>
       </div>
     </div>
     <div class="container1">
@@ -25,7 +30,7 @@
           <ul class="grid-content bg-ltop">
             <li @click="todowork">
               <div style="position: relative">
-                <el-badge v-if="shuliang.workCount !== 0" :value="shuliang.workCount" size="mini" class="mark"/>
+                <el-badge v-if="shuliang.workCount !== 0" :value="shuliang.workCount" size="mini" class="mark" />
                 <img src="@/assets/home/ltIcon1.png">
               </div>
               <p>待办工作</p>
@@ -36,7 +41,8 @@
             </li>
             <li @click="tobereadwork">
               <div style="position: relative">
-                <el-badge v-if="shuliang.toBeReadCount !== 0" :value="shuliang.toBeReadCount" size="mini" class="mark"/>
+                <el-badge v-if="shuliang.toBeReadCount !== 0" :value="shuliang.toBeReadCount" size="mini"
+                  class="mark" />
                 <img src="@/assets/home/ltIcon4.png">
               </div>
               <p>待阅工作</p>
@@ -49,11 +55,11 @@
         </el-col>
         <el-col :span="10">
           <div class="grid-content bg-rtop">
-            <img class="anrui" src="@/assets/home/anrui.png"/>
+            <img class="anrui" src="@/assets/home/anrui.png" />
             <p class="rt_title">通知公告</p>
             <ul>
               <li v-for="(item, index) in noticeandannouncement" :key="index" @click="lookInfo(item)">
-                <img class="rtImg" src="../../assets/home/notice.png"/>
+                <img class="rtImg" src="../../assets/home/notice.png" />
                 <span class="notice bluezi">{{ item.title }}</span>
                 <span class="anrui_time">{{ item.createTime }}</span>
               </li>
@@ -76,7 +82,7 @@
             <span>原密码</span>
           </el-col>
           <el-col :span="20">
-            <el-form-item><el-input v-model="form.original" type="password" show-password/></el-form-item>
+            <el-form-item><el-input v-model="form.original" type="password" show-password /></el-form-item>
           </el-col>
         </el-row>
         <el-row>
@@ -84,7 +90,7 @@
             <span>新密码</span>
           </el-col>
           <el-col :span="20">
-            <el-form-item><el-input v-model="form.password" type="password" show-password/></el-form-item>
+            <el-form-item><el-input v-model="form.password" type="password" show-password /></el-form-item>
           </el-col>
         </el-row>
         <el-row>
@@ -92,7 +98,7 @@
             <span>确认密码</span>
           </el-col>
           <el-col :span="20">
-            <el-form-item><el-input v-model="form.confirmPassword" type="password" show-password/></el-form-item>
+            <el-form-item><el-input v-model="form.confirmPassword" type="password" show-password /></el-form-item>
           </el-col>
         </el-row>
       </el-form>
@@ -106,12 +112,16 @@
         <div style="text-align: center;font-weight: bold;font-size: 20px">{{ formobj.title }}</div>
         <el-row style="border-left: 0px;margin-top: 10px">
           <el-col :span="12" style="border-right: 0px;border-bottom: 0px">
-            <div class="span-sty" style="border-right: 0px;font-family: 'SimSun';font-size: 10px;">发布日期:</div>
-            <el-form-item><span style="font-family: 'SimSun';font-weight: bold;margin-left: 60px">{{ formobj.createTime }}</span></el-form-item>
+            <div class="span-sty" style="border-right: 0px;font-family: 'SimSun';font-size: 10px;">发布日期:
+            </div>
+            <el-form-item><span
+                style="font-family: 'SimSun';font-weight: bold;margin-left: 60px">{{ formobj.createTime }}</span></el-form-item>
           </el-col>
           <el-col :span="12" style="border-right: 0px;border-bottom: 0px">
-            <div class="span-sty" style="border-right: 0px;font-family: 'SimSun';font-size: 10px;">有效期至:</div>
-            <el-form-item><span style="font-family: 'SimSun';font-weight: bold;margin-left: 60px">{{ formobj.validityDate }}</span></el-form-item>
+            <div class="span-sty" style="border-right: 0px;font-family: 'SimSun';font-size: 10px;">有效期至:
+            </div>
+            <el-form-item><span
+                style="font-family: 'SimSun';font-weight: bold;margin-left: 60px">{{ formobj.validityDate }}</span></el-form-item>
           </el-col>
         </el-row>
         <el-row style="border-left: 0px">
@@ -122,7 +132,9 @@
         <el-row style="border-left: 0px">
           <el-col :span="24" style="border-right: 0px;border-bottom: 0px">
             <div class="span-sty" style="border-right: 0px;font-family: 'SimSun';font-size: 10px;">附件:</div>
-            <el-form-item><span class="bluezi" style="font-family: 'SimSun';font-weight: bold;margin-left: 60px" v-for="(item, index) in formobj.filesList" :key="index" @click="handleDownLoad(item.url)">{{ item.name }}</span></el-form-item>
+            <el-form-item><span class="bluezi" style="font-family: 'SimSun';font-weight: bold;margin-left: 60px"
+                v-for="(item, index) in formobj.filesList" :key="index"
+                @click="handleDownLoad(item.url)">{{ item.name }}</span></el-form-item>
           </el-col>
         </el-row>
       </el-form>
@@ -131,13 +143,23 @@
 </template>
 
 <script>
-import { getStorage, removeStorage } from '@/utils/auth'
-import User from '@/api/User/login.js'
-import { getLists, getTodoNum } from '@/api/system/home/home'
-import { getToBeReadNum } from '@/api/flow/read'
-import { details } from '@/api/notificationannouncement/notificationannouncement'
+  import {
+    getStorage,
+    removeStorage
+  } from '@/utils/auth'
+  import User from '@/api/User/login.js'
+  import {
+    getLists,
+    getTodoNum
+  } from '@/api/system/home/home'
+  import {
+    getToBeReadNum
+  } from '@/api/flow/read'
+  import {
+    details
+  } from '@/api/notificationannouncement/notificationannouncement'
 
-export default {
+  export default {
     data() {
       return {
         menus: [{
@@ -151,7 +173,7 @@ export default {
           title: '风控管理'
         }, {
           imgUrl: require('@/assets/home/bIcon3.png'),
-        title: '审计管理'
+          title: '车辆挂靠'
         }, {
           imgUrl: require('@/assets/home/bIcon4.png'),
           title: '财务管理'
@@ -242,7 +264,9 @@ export default {
             this.timer = setInterval(this.getNum, 20000)
           }
         })
-      User.getOrgListByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).then((res) => {
+        User.getOrgListByUserSid({
+          userSid: window.sessionStorage.getItem('userSid')
+        }).then((res) => {
           if (res.success) {
             this.orgDept_list = res.data
           }
@@ -288,7 +312,9 @@ export default {
             userSid: ''
           }
           this.TZGGVisible = true
-        details({ sid: item.sid }).then((res) => {
+          details({
+            sid: item.sid
+          }).then((res) => {
             if (res.success) {
               this.formobj = res.data
             }
@@ -301,11 +327,19 @@ export default {
       },
       handleConirm() {
         if (this.form.original === '') {
-        this.$message({ showClose: true, type: 'error', message: '原密码不能为空' })
+          this.$message({
+            showClose: true,
+            type: 'error',
+            message: '原密码不能为空'
+          })
           return
         }
         if (this.form.password !== this.form.confirmPassword) {
-        this.$message({ showClose: true, type: 'error', message: '两次输入密码不一致' })
+          this.$message({
+            showClose: true,
+            type: 'error',
+            message: '两次输入密码不一致'
+          })
           return
         }
         this.form.userSid = window.sessionStorage.getItem('userSid')
@@ -327,11 +361,15 @@ export default {
           password: '',
           confirmPassword: ''
         }
-      User.logout({ token: getStorage() }).then((res) => {
+        User.logout({
+          token: getStorage()
+        }).then((res) => {
           if (res.success) {
             removeStorage()
             this.$store.commit('user/SET_UESRINFO', '')
-          this.$router.push({ path: '/login' })
+            this.$router.push({
+              path: '/login'
+            })
           }
         })
       },
@@ -357,10 +395,14 @@ export default {
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
-        User.logout({ token: getStorage() }).then(res => {
+          User.logout({
+            token: getStorage()
+          }).then(res => {
             removeStorage()
             this.$store.commit('user/SET_UESRINFO', '')
-          this.$router.push({ path: '/login' })
+            this.$router.push({
+              path: '/login'
+            })
           })
         })
       },
@@ -380,67 +422,88 @@ export default {
           defaultOrgPath: this.defaultOrgPath
         }
         if (index == '0') {
-        // let myPopup = window.open('http://127.0.0.1:9531/buscenter/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
-        let myPopup = window.open('http://anrui.yyundong.com/buscenter/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
+          // let myPopup = window.open('http://192.168.0.112:9531/buscenter/#/' + '?token=' + getStorage() +
+          //   '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
+          let myPopup = window.open('http://anrui.yyundong.com/buscenter/#/' + '?token=' + getStorage() +
+            '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
           // let myPopup = window.open('http://120.46.172.184/buscenter/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
         } else if (index == '1') {
-        // let myPopup = window.open('http://127.0.0.1:9531/scm/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
-        let myPopup = window.open('http://anrui.yyundong.com/scm/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
+          // let myPopup = window.open('http://192.168.0.112:9532/scm/#/' + '?token=' + getStorage() +
+          //   '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
+          let myPopup = window.open('http://anrui.yyundong.com/scm/#/' + '?token=' + getStorage() +
+            '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
           // let myPopup = window.open('http://120.46.172.184/scm/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
         } else if (index == '2') {
-        // let myPopup = window.open('http://127.0.0.1:9531/riskcenter/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
-        let myPopup = window.open('http://anrui.yyundong.com/riskcenter/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
+          // let myPopup = window.open('http://192.168.0.112:9531/riskcenter/#/' + '?token=' + getStorage() +
+          //   '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
+          let myPopup = window.open('http://anrui.yyundong.com/riskcenter/#/' + '?token=' + getStorage() +
+            '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
           // let myPopup = window.open('http://120.46.172.184/riskcenter/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
+        } else if (index == '3') { // 车辆挂靠
+          // let myPopup = window.open('http://192.168.0.112:9531/vehfleet/#/' + '?token=' + getStorage() +
+          //   '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
+          let myPopup = window.open('http://anrui.yyundong.com/vehfleet/#/' + '?token=' + getStorage() +
+            '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
+          // let myPopup = window.open('http://120.46.172.184/vehfleet/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
         } else if (index == '4') {
           // let myPopup = window.open('http://127.0.0.1:9531/fin/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
-        let myPopup = window.open('http://anrui.yyundong.com/fin/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
+          let myPopup = window.open('http://anrui.yyundong.com/fin/#/' + '?token=' + getStorage() +
+            '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
           // let myPopup = window.open('http://120.46.172.184/fin/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
         } else if (index == '5') {
           // let myPopup = window.open('http://127.0.0.1:9531/manage/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
-        let myPopup = window.open('http://anrui.yyundong.com/manage/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
+          let myPopup = window.open('http://anrui.yyundong.com/manage/#/' + '?token=' + getStorage() +
+            '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
           // let myPopup = window.open('http://120.46.172.184/manage/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
         } else if (index == '6') {
           // let myPopup = window.open('http://127.0.0.1:9531/reportcenter/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
-        let myPopup = window.open('http://anrui.yyundong.com/reportcenter/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
+          let myPopup = window.open('http://anrui.yyundong.com/reportcenter/#/' + '?token=' + getStorage() +
+            '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
           // let myPopup = window.open('http://120.46.172.184/reportcenter/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
         } else if (index == '7') {
           // let myPopup = window.open('http://127.0.0.1:9531/base/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
-        let myPopup = window.open('http://anrui.yyundong.com/base/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
+          let myPopup = window.open('http://anrui.yyundong.com/base/#/' + '?token=' + getStorage() +
+            '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
           // let myPopup = window.open('http://120.46.172.184/base/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
         } else if (index == '8') {
           // let myPopup = window.open('http://127.0.0.1:9531/message/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
-        let myPopup = window.open('http://anrui.yyundong.com/message/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
+          let myPopup = window.open('http://anrui.yyundong.com/message/#/' + '?token=' + getStorage() +
+            '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
           // let myPopup = window.open('http://120.46.172.184/message/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
         } else if (index == '9') {
-        // let myPopup = window.open('http://127.0.0.1:9531/as/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
-        let myPopup = window.open('http://anrui.yyundong.com/as/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
+          let myPopup = window.open('http://192.168.0.112:9531/as/#/' + '?token=' + getStorage() +
+            '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
+          // let myPopup = window.open('http://anrui.yyundong.com/as/#/' + '?token=' + getStorage() +
+          //   '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
           // let myPopup = window.open('http://120.46.172.184/as/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
         } else if (index == '10') {
           // this.$router.push({path: '/index'})
-        let myPopup = window.open('/#/index' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
+          let myPopup = window.open('/#/index' + '?token=' + getStorage() + '&organizationData=' + encodeURI((
+            JSON
+            .stringify(organizationData))), '_blank')
         }
-//				const page = this.$router.resolve({name: name})
-//				window.open(page.href,'_blank')
+        //				const page = this.$router.resolve({name: name})
+        //				window.open(page.href,'_blank')
       }
     },
     beforeDestroy() {
       clearInterval(this.timer)
     }
-}
+  }
 </script>
 <style scoped="scoped">
-li:hover,
-p:hover {
+  li:hover,
+  p:hover {
     cursor: pointer
-}
+  }
 </style>
 <style lang="scss" scoped>
-p {
+  p {
     margin: 0;
     padding: 0;
-}
+  }
 
-.header {
+  .header {
     background-color: #0294d7;
     color: #fff;
     overflow: hidden;
@@ -470,22 +533,22 @@ p {
     p {
       float: left;
     }
-}
+  }
 
-//.head_info img {
-//  width: 25px;
-//  margin-top: 20px;
-//  margin-left: 30px;
-//  margin-right: 10px;
-//  float: left;
-//}
-//
-//.head_info .dy {
-//  margin-left: 10px;
-//  margin-right: 20px;
-//}
+  //.head_info img {
+  //  width: 25px;
+  //  margin-top: 20px;
+  //  margin-left: 30px;
+  //  margin-right: 10px;
+  //  float: left;
+  //}
+  //
+  //.head_info .dy {
+  //  margin-left: 10px;
+  //  margin-right: 20px;
+  //}
 
-.container1 {
+  .container1 {
     background: #E9F1F7;
     padding: 20px;
     width: 100%;
@@ -602,9 +665,9 @@ p {
         }
       }
     }
-}
+  }
 
-.copy {
+  .copy {
     position: fixed;
     bottom: 0;
     width: calc(100% - 40px);
@@ -615,25 +678,26 @@ p {
     background: #E9F1F7;
     font-size: 14px;
     color: #666;
-}
+  }
 
-.mark {
+  .mark {
     position: absolute;
     top: 38%;
     margin-left: 58px;
-}
+  }
 
-.mark {
+  .mark {
     ::v-deep .el-badge__content {
       font-size: 14px !important;
     }
-}
-.selectStyle {
+  }
+
+  .selectStyle {
     ::v-deep .el-input__inner {
       border: 0px !important;
       background-color: #0294d7 !important;
       font-size: 17px;
       color: #FFFFFF;
     }
-}
+  }
 </style>