Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussolutionschange/BusSolutionsChangeDetailsVo.java

@@ -49,5 +49,5 @@ public class BusSolutionsChangeDetailsVo implements Vo {
     private String taskId;
     @ApiModelProperty("实例id")
     private String instanceId;
-
+    private String modelSid;
 }

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

@@ -2002,7 +2002,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             }
             record.setShowFinancialBtn(false);
             if (StringUtils.isNotBlank(record.getSaleOrderState())) {
-                if (record.getSaleOrderState().equals("已办结")) {
+                if (record.getSaleOrderState().equals("已办结") && record.getCarPurchaseKey().equals("2")) {
                     //查询金融方案
                     LoanSolutions solutions = loanSolutionsFeign.getOneByOrderSid(record.getSaleOrderSid()).getData();
                     if (solutions != null) {
@@ -5713,7 +5713,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
     }
 
     public static void main(String[] args) {
-        System.out.println(new BigDecimal(0.00).compareTo(BigDecimal.ZERO)==0);
+        System.out.println(new BigDecimal(0.00).compareTo(BigDecimal.ZERO) == 0);
     }
 
     public void createCarFin(AppOrderDetailsVo vo, BusSalesOrder busSalesOrder) {

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussolutionschange/BusSolutionsChangeRest.java

@@ -126,7 +126,7 @@ public class BusSolutionsChangeRest implements BusSolutionsChangeFeign {
 
     @Override
     public ResultBean<List<SolutionsGetNodeVo>> getPreviousNodesForReject(SolutionsGetNodeQuery query) {
-        return busSolutionsChangeService.getNextNodesForSubmit(query);
+        return busSolutionsChangeService.getPreviousNodesForReject(query);
     }
 
 

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussolutionschange/BusSolutionsChangeService.java

@@ -30,6 +30,8 @@ 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.basevehiclemodel.BaseVehicleModel;
+import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelFeign;
 import com.yxt.anrui.buscenter.api.buscenterfile.BuscenterFile;
 import com.yxt.anrui.buscenter.api.buscenterfile.BuscenterFileEnum;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
@@ -119,6 +121,8 @@ public class BusSolutionsChangeService extends MybatisBaseService<BusSolutionsCh
     private FlowableFeign flowableFeign;
     @Autowired
     private FlowTaskFeign flowTaskFeign;
+    @Autowired
+    private BaseVehicleModelFeign baseVehicleModelFeign;
 
     public PagerVo<BusSolutionsChangeVo> listPage(PagerQuery<BusSolutionsChangeQuery> pq) {
         IPage<BusSolutionsChange> page = PagerUtil.queryToPage(pq);
@@ -262,6 +266,13 @@ public class BusSolutionsChangeService extends MybatisBaseService<BusSolutionsCh
                 }
             }
         }
+        //车型
+        BusSalesOrderModel vinModel = busSalesOrderModelService.fetchByOrderSid(salesOrderSid).getData();
+        if (null != vinModel) {
+            if (StringUtils.isNotBlank(vinModel.getModelSid())) {
+                vo.setModelSid(vinModel.getModelSid());
+            }
+        }
         return rb.success().setData(vo);
     }
 
@@ -278,6 +289,9 @@ public class BusSolutionsChangeService extends MybatisBaseService<BusSolutionsCh
             if (StringUtils.isNotBlank(busSolutionsChange.getProcInstId())) {
                 vo.setInstanceId(busSolutionsChange.getProcInstId());
             }
+            if (StringUtils.isNotBlank(busSolutionsChange.getModelSid())) {
+                vo.setModelSid(busSolutionsChange.getModelSid());
+            }
             if (StringUtils.isNotBlank(busSolutionsChange.getCreateBySid())) {
                 vo.setUserSid(busSolutionsChange.getCreateBySid());
             }
@@ -286,7 +300,7 @@ public class BusSolutionsChangeService extends MybatisBaseService<BusSolutionsCh
             }
             if (StringUtils.isNotBlank(busSolutionsChange.getSolutionsBusSId())) {
 
-                ResultBean<SolutionsDetailsVo> solutionsDetailsVoResultBean = loanSolutionsFeign.selectSolutionsChange(busSolutionsChange.getSolutionsBusSId(),busSolutionsChange.getSalesOrderSid());
+                ResultBean<SolutionsDetailsVo> solutionsDetailsVoResultBean = loanSolutionsFeign.selectSolutionsChange(busSolutionsChange.getSolutionsBusSId(), busSolutionsChange.getSalesOrderSid());
                 if (solutionsDetailsVoResultBean.getData() != null) {
                     SolutionsVo solutionsDetailsssVo = new
                             SolutionsVo();
@@ -522,6 +536,23 @@ public class BusSolutionsChangeService extends MybatisBaseService<BusSolutionsCh
         //流程中的参数赋值
         Map<String, Object> variables = BeanUtil.beanToMap(dto);
         Map<String, Object> appMap = new HashMap<>();
+        //        -----------------------------------------
+        //部门名称<客户>系列-全款/贷款销售订单
+        String customerName = entity.getCustomerName();
+        String xilie = "";
+        if (StringUtils.isNotBlank(entity.getModelSid())) {
+            ResultBean<BaseVehicleModel> vehicleModelResultBean = baseVehicleModelFeign.selectDetails(entity.getModelSid());
+            if (vehicleModelResultBean.getData() != null) {
+                xilie = vehicleModelResultBean.getData().getProductLineValue();
+            }
+        }
+        String orgName = "";
+        if (StringUtils.isNotBlank(entity.getDept())) {
+            orgName = entity.getDept();
+        }
+        String orderNames = orgName + "<" + customerName + ">" + xilie + "-" + "贷款销售订单" + "-" + "金融方案变更";
+        variables.put("orderNames", orderNames);
+//        -------------------------------------------
         //若有网关，则赋值网关中判断的字段。
         variables.put("businessSid", businessSid);
         appMap.put("sid", businessSid);
@@ -537,8 +568,8 @@ public class BusSolutionsChangeService extends MybatisBaseService<BusSolutionsCh
         //用户sid
         bv.setUserSid(dto.getUserSid());
         bv.setFormVariables(variables);
-        String nextNodeUserSids_ = sysOrganization.getManagerSid();
-        bv.setNextNodeUserSids(nextNodeUserSids_);
+//        String nextNodeUserSids_ = sysOrganization.getManagerSid();
+//        bv.setNextNodeUserSids(nextNodeUserSids_);
         //流程定义id
         bv.setModelId(ProcDefEnum.BUSSOLUTIONSCHANGE.getProDefId());
         if (r == 1) {
@@ -1181,6 +1212,23 @@ public class BusSolutionsChangeService extends MybatisBaseService<BusSolutionsCh
         //流程中的参数赋值
         Map<String, Object> variables = BeanUtil.beanToMap(dto);
         Map<String, Object> appMap = new HashMap<>();
+//        -----------------------------------------
+        //部门名称<客户>系列-全款/贷款销售订单
+        String customerName = entity.getCustomerName();
+        String xilie = "";
+        if (StringUtils.isNotBlank(entity.getModelSid())) {
+            ResultBean<BaseVehicleModel> vehicleModelResultBean = baseVehicleModelFeign.selectDetails(entity.getModelSid());
+            if (vehicleModelResultBean.getData() != null) {
+                xilie = vehicleModelResultBean.getData().getProductLineValue();
+            }
+        }
+        String orgName = "";
+        if (StringUtils.isNotBlank(entity.getDept())) {
+            orgName = entity.getDept();
+        }
+        String orderNames = orgName + "<" + customerName + ">" + xilie + "-" + "贷款销售订单" + "-" + "金融方案变更";
+        variables.put("orderNames", orderNames);
+//        -------------------------------------------
         //若有网关，则赋值网关中判断的字段。
         variables.put("businessSid", businessSid);
         appMap.put("sid", businessSid);
@@ -1196,8 +1244,8 @@ public class BusSolutionsChangeService extends MybatisBaseService<BusSolutionsCh
         //用户sid
         bv.setUserSid(dto.getUserSid());
         bv.setFormVariables(variables);
-        String nextNodeUserSids_ = sysOrganization.getManagerSid();
-        bv.setNextNodeUserSids(nextNodeUserSids_);
+//        String nextNodeUserSids_ = sysOrganization.getManagerSid();
+//        bv.setNextNodeUserSids(nextNodeUserSids_);
         //流程定义id
         bv.setModelId(ProcDefEnum.BUSSOLUTIONSCHANGE.getProDefId());
         if (r == 1) {

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml

@@ -41,7 +41,7 @@
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceVo">
-        SELECT DISTINCT
+        SELECT
         v.useOrgSid,
         v.sid,
         v.`state`,
@@ -75,7 +75,7 @@
         left join anrui_portal.sys_organization so on v.useOrgSid = so.sid
         <where>
             ${ew.sqlSegment}
-            ORDER BY v.billingStateKey ASC,v.invoiceDate DESC
+            ORDER BY v.billingStateKey ASC,v.invoiceDate DESC,v.id
         </where>
     </select>
 

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancapitalcreditresult/LoanCapitalCreditResult.java

@@ -58,5 +58,6 @@ public class LoanCapitalCreditResult extends BaseEntity {
     private String saleOrderSid; // 销售订单sid
 	@ApiModelProperty("销售订单消贷合同sid")
     private String loanContractSid; // 销售订单消贷合同sid
-
+    @ApiModelProperty("家访考察sid")
+    private String homeVisitSid;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancapitalcreditresult/LoanCapitalCreditResultDetailsVo.java

@@ -59,5 +59,6 @@ public class LoanCapitalCreditResultDetailsVo implements Vo {
     private String saleOrderSid; // 销售订单sid
 	@ApiModelProperty("销售订单消贷合同sid")
     private String loanContractSid; // 销售订单消贷合同sid
-
+    @ApiModelProperty("家访考察sid")
+    private String homeVisitSid;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancapitalcreditresult/LoanCapitalCreditResultDto.java

@@ -63,4 +63,6 @@ public class LoanCapitalCreditResultDto implements Dto {
     private String bankContractNo;
 	@ApiModelProperty("销售订单消贷合同sid")
     private String loanContractSid; // 销售订单消贷合同sid
+    @ApiModelProperty("家访考察sid")
+    private String homeVisitSid;
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancapitalcreditresult/LoanCapitalCreditResultMapper.xml

@@ -23,6 +23,8 @@
         bo.contractNo
         FROM
         loan_capital_credit_result lr
+        LEFT JOIN loan_homevisit_fileexamine lf
+        ON lr.`homeVisitSid` = lf.`homeVisitSid`
         LEFT JOIN anrui_buscenter.bus_sales_order_loancontract bl
         ON lr.`loanContractSid` = bl.`sid`
         LEFT JOIN anrui_buscenter.`bus_sales_order` bo

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancapitalcreditresult/LoanCapitalCreditResultService.java

@@ -102,6 +102,7 @@ public class LoanCapitalCreditResultService extends MybatisBaseService<LoanCapit
         LoanCapitalCreditResultQuery query = pq.getParams();
         QueryWrapper<LoanCapitalCreditResult> qw = new QueryWrapper<>();
         qw.eq("lr.state", query.getType());
+        qw.eq("lf.state","2");
         if ("1".equals(query.getType())) {
             qw.eq("bl.busNo", 304);
         }
@@ -171,6 +172,7 @@ public class LoanCapitalCreditResultService extends MybatisBaseService<LoanCapit
         if (StringUtils.isNotBlank(query.getCapCarefulResult())) {
             qw.like("lr.capCarefulResult", query.getCapCarefulResult());
         }
+        qw.orderByDesc("lr.createTime");
         IPage<LoanCapitalCreditResult> page = PagerUtil.queryToPage(pq);
         IPage<LoanCapitalCreditResultVo> pagging = baseMapper.selectPageVo(page, qw);
         PagerVo<LoanCapitalCreditResultVo> p = PagerUtil.pageToVo(pagging, null);

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitfileexamine/LoanHomevisitFileexamineService.java

@@ -417,6 +417,7 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService<LoanHome
                 LoanCapitalCreditResultDto loanCapitalCreditResultDto = new LoanCapitalCreditResultDto();
                 loanCapitalCreditResultDto.setSaleOrderSid(dto.getSaleOrderSid());
                 loanCapitalCreditResultDto.setLoanContractSid(busSalesOrderLoancontract.getSid());
+                loanCapitalCreditResultDto.setHomeVisitSid(dto.getHomeVisitSid());
                 loanCapitalCreditResultService.saveOrUpdateDto(loanCapitalCreditResultDto);
             }
         }