Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/LoanOtherReceivablePush.java

@@ -14,4 +14,5 @@ public class LoanOtherReceivablePush {
     private String borrowerSid;
     @ApiModelProperty("销售订单sid")
     private String saleOrderSid;
+    private String loanContractSid;
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java

@@ -139,6 +139,11 @@ public interface BusSalesOrderVehicleFeign {
     @ResponseBody
     ResultBean<BusSalesOrderVehicle> selectOneByBorrowerSid(@RequestParam("borrowerSid") String borrowerSid);
 
+    @ApiOperation("根据贷款人sid查询车辆")
+    @GetMapping("/selectOneByBorrowerSid2")
+    @ResponseBody
+    ResultBean<BusSalesOrderVehicle> selectOneByBorrowerSid2(@RequestParam("borrowerSid") String borrowerSid,@RequestParam("contractSid")String contractSid);
+
     @ApiOperation("根据销售订单sid和贷款人sid查车辆信息")
     @PostMapping("/selectListByOrderSidAndDkrSid")
     @ResponseBody

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java

@@ -133,6 +133,11 @@ public class BusSalesOrderVehicleFeignFallback implements BusSalesOrderVehicleFe
         return null;
     }
 
+    @Override
+    public ResultBean<BusSalesOrderVehicle> selectOneByBorrowerSid2(String borrowerSid, String contractSid) {
+        return null;
+    }
+
     @Override
     public ResultBean<List<BusSalesOrderVehicle>> selectListByOrderSidAndDkrSid(String saleOrderSid, String borrowerSid) {
         return null;

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java

@@ -291,7 +291,7 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
         BusSalesOrderLoancontract busSalesOrderLoancontract = fetchBySid(loanContractSid);
         if (busSalesOrderLoancontract != null) {
             //根据销售订单的贷款人sid查询车辆表中的数据
-            BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectByBorrowSid(busSalesOrderLoancontract.getBorrowerSid());
+            BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectByBorrowSid2(busSalesOrderLoancontract.getBorrowerSid(),loanContractSid);
             //这是生成业务系统融资放款应收的逻辑：
             // 融资放款=融资项目总额-融资首付-[贷款保证金]-[厂家贴息]，根据选择的产品政策来判断，若贷款保证金为固定的，需要减去，若为敞口的，不需要减；差额放款需要减厂家贴息，全额放款不需要。差额放款的厂家贴息金额存入“其他应收”字段中，
             //计算融资放款的金额以及厂家贴息金额
@@ -352,7 +352,7 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
                 //-----------获取其他应收单对象----------------
                 CapitalCreditResult creditResult = new CapitalCreditResult();
                 //根据销售订单的贷款人sid查询车辆表中的数据
-                BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectByBorrowSid(borrowerDetailsVo.getSid());
+                BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectByBorrowSid2(borrowerDetailsVo.getSid(),loanOtherReceivablePush.getLoanContractSid());
                 if (null != busSalesOrderVehicle) {
                     String customerNumber = "";
                     //判断财务系统是否有客户

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

@@ -154,6 +154,7 @@ public interface BusSalesOrderVehicleMapper extends BaseMapper<BusSalesOrderVehi
     List<BusBorrowVehicleVo> selectListByOrdersSid2(String saleOrderSid);
 
     BusSalesOrderVehicle selectByBorrowSid(String sid);
+    BusSalesOrderVehicle selectByBorrowSid2(@Param("sid") String sid,@Param("loanContractSid") String loanContractSid);
 
     @Select("select * from bus_sales_order_vehicle where linkSid = #{vehSid} and salesOrderSid = #{sid}")
     BusSalesOrderVehicle selectByOrderSidAndVehSid(@Param("sid") String sid,@Param("vehSid") String vehSid);

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

@@ -290,6 +290,10 @@
         select * from bus_sales_order_vehicle where borrowerSid = #{sid}
     </select>
 
+    <select id="selectByBorrowSid2" resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle">
+        select * from bus_sales_order_vehicle where borrowerSid = #{sid} and loanContractSid = #{loanContractSid}
+    </select>
+
     <select id="saleOrderInputLenderVins"
             resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.BusVehicleBorrowVo">
         select if(bso.payTypeKey = 1,bv.temporaryNo,RIGHT(bv.temporaryNo, 2)) as temporaryNo,concat(if(bso.payTypeKey = 1,bv.temporaryNo,RIGHT(bv.temporaryNo, 2)),':',if(bv.linkNo is null or LENGTH(trim(bv.linkNo)) &lt; 1,'-',RIGHT(bv.linkNo, 8))) as dictValue,bv.sid dictKey

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

@@ -148,6 +148,11 @@ public class BusSalesOrderVehicleRest implements BusSalesOrderVehicleFeign {
         return busSalesOrderVehicleService.selectOneByBorrowerSid(borrowerSid);
     }
 
+    @Override
+    public ResultBean<BusSalesOrderVehicle> selectOneByBorrowerSid2(String borrowerSid, String contractSid) {
+        return busSalesOrderVehicleService.selectOneByBorrowerSid2(borrowerSid,contractSid);
+    }
+
     @Override
     public ResultBean<List<BusSalesOrderVehicle>> selectListByOrderSidAndDkrSid(String saleOrderSid, String borrowerSid) {
         ResultBean rb = ResultBean.fireFail();

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

@@ -598,6 +598,10 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
         return baseMapper.selectByBorrowSid(sid);
     }
 
+    public BusSalesOrderVehicle selectByBorrowSid2(String sid,String loanContractSid) {
+        return baseMapper.selectByBorrowSid2(sid,loanContractSid);
+    }
+
     public ResultBean<BusSalesOrderVehicle> selectByOrderSidAndVehSid(String sid, String vehSid) {
         ResultBean rb = ResultBean.fireFail();
         BusSalesOrderVehicle busSalesOrderVehicle = baseMapper.selectByOrderSidAndVehSid(sid, vehSid);
@@ -620,6 +624,12 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
         return rb.success().setData(busSalesOrderVehicle);
     }
 
+    public ResultBean<BusSalesOrderVehicle> selectOneByBorrowerSid2(String borrowerSid,String contractSid) {
+        ResultBean<BusSalesOrderVehicle> rb = ResultBean.fireFail();
+        BusSalesOrderVehicle busSalesOrderVehicle = selectByBorrowSid2(borrowerSid,contractSid);
+        return rb.success().setData(busSalesOrderVehicle);
+    }
+
     public List<BusSalesOrderVehicle> selectListByOrderSidAndDkrSid(String saleOrderSid, String borrowerSid) {
         return baseMapper.selectListByOrderSidAndDkrSid(saleOrderSid, borrowerSid);
     }

anrui-portal/anrui-portal-biz/pom.xml

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

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/PortalApplication.java

@@ -14,7 +14,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
         "com.yxt.anrui.portal"
 })
 @EnableDiscoveryClient
-@EnableFeignClients(basePackages = {"com.yxt.anrui.crm", "com.yxt.anrui.flowable", "com.yxt.messagecenter", "com.yxt.anrui.terminal", "com.yxt.anrui.base", "com.yxt.anrui.scm", "com.yxt.anrui.fin", "com.yxt.anrui.buscenter"})
+@EnableFeignClients(basePackages = {"com.yxt.anrui.crm", "com.yxt.anrui.flowable", "com.yxt.messagecenter", "com.yxt.anrui.terminal", "com.yxt.anrui.base", "com.yxt.anrui.scm", "com.yxt.anrui.fin", "com.yxt.anrui.buscenter", "com.yxt.anrui.riskcenter"})
 public class PortalApplication {
 
     public static void main(String[] args) {

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexEnum.java

@@ -16,8 +16,9 @@ public class AppIndexEnum {
          */
         GYL("98ff0724-5df4-4fc7-ab6d-3996e7706acd", "供应链"),
 
-        YW("e25e13b5-f2ed-421f-bdb3-6f2eca2a3028", "业务");
+        YW("e25e13b5-f2ed-421f-bdb3-6f2eca2a3028", "业务"),
 
+        FK("fec4e243-491a-11ec-94cd-fa163e0cb33c","风控");
         /**
          * code值
          */
@@ -51,6 +52,8 @@ public class AppIndexEnum {
         SC("92659535-38f6-4456-a45a-ab5e9ced3fac", "收车"),
         HTSH("f4d75ebc-cbab-4c44-bf93-2d38f70c1c15", "合同审核"),
         JZKHBA("6a80aa48-c988-4880-b0a0-f2a406d8cad5", "价值客户备案"),
+        JFKC("a204a3fa-c8ac-4795-966c-df1d0e131bcf", "家访考察"),
+        FKZLSC("65dc12e0-9213-4364-ae81-18afa9c7e1ee", "放款资料上传"),
         ;
 
         /**

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexService.java

@@ -17,12 +17,16 @@ import com.yxt.anrui.portal.biz.sysmobilemenu.SysMobileMenuService;
 import com.yxt.anrui.portal.biz.sysmobilemenurole.SysMobileMenuRoleService;
 import com.yxt.anrui.portal.biz.sysuser.SysUserService;
 import com.yxt.anrui.portal.biz.sysuserrole.SysUserRoleService;
+import com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineFeign;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigateFeign;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.RiskToDoNumQuery;
 import com.yxt.anrui.scm.api.scmvehicleenterlibrary.ScmVehicleEnterlibraryFeign;
 import com.yxt.anrui.scm.api.scmvehicleexamine.AppToDoNumQuery;
 import com.yxt.anrui.scm.api.scmvehicleexamine.ScmVehicleExamineFeign;
 import com.yxt.anrui.scm.api.scmvehiclegression.ScmVehicleGressionFeign;
 import com.yxt.anrui.scm.api.scmvehicleinventory.ScmVehicleInventoryFeign;
 import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.ScmVehiclePatrolinspectionFeign;
+import com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.LoanHomeVisitInvestigateFeign;
 import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.result.ResultBean;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -59,11 +63,14 @@ public class AppIndexService {
     private ScmVehiclePatrolinspectionFeign scmVehiclePatrolinspectionFeign;
     @Autowired
     private SysUserService sysUserService;
-
     @Autowired
     private CommonContractFeign commonContractFeign;
     @Autowired
     private BusValcustFilingFeign busValcustFilingFeign;
+    @Autowired
+    private LoanHomevisitInvestigateFeign loanHomevisitInvestigateFeign;
+    @Autowired
+    private LoanFileexamineFeign loanFileexamineFeign;
 
     public ResultBean<List<AppIndexNewVo>> getBusinessList(String userSid, String appSid, String orgPath) {
         ResultBean<List<AppIndexNewVo>> rb = ResultBean.fireFail();
@@ -125,8 +132,10 @@ public class AppIndexService {
         appToDoNumQuery.setOrgPath(orgPath);
         CommonToDoNumQuery commonToDoNumQuery = new CommonToDoNumQuery();
         BusToDoNumQuery busToDoNumQuery = new BusToDoNumQuery();
+        RiskToDoNumQuery riskToDoNumQuery = new RiskToDoNumQuery();
         BeanUtil.copyProperties(appToDoNumQuery, commonToDoNumQuery);
         BeanUtil.copyProperties(appToDoNumQuery, busToDoNumQuery);
+        BeanUtil.copyProperties(appToDoNumQuery, riskToDoNumQuery);
         //根据appSid查询菜单的信息
         List<SysMobileMenu> sysMobileMenus = sysMobileMenuService.getMenu(appSid);
         List<AppIndexNumVo> list = new ArrayList<>();
@@ -184,6 +193,23 @@ public class AppIndexService {
                 list.add(appIndexNumVo);
             }
 
+        }else if (AppIndexEnum.AppVersionSubAppSid.FK.getCode().equals(appSid)){
+            //风控
+            for (SysMobileMenu menu : sysMobileMenus) {
+                AppIndexNumVo appIndexNumVo = new AppIndexNumVo();
+                appIndexNumVo.setSid(menu.getSid());
+                //家访考察
+                if (AppIndexEnum.AppMenu.JFKC.getRemarks().equals(menu.getTitle())) {
+                    String num = loanHomevisitInvestigateFeign.getToDoNum(riskToDoNumQuery).getData();
+                    appIndexNumVo.setNum(num);
+                }
+                //放款资料上传
+                if (AppIndexEnum.AppMenu.FKZLSC.getRemarks().equals(menu.getTitle())) {
+                    String num = loanFileexamineFeign.getToDoNum(riskToDoNumQuery).getData();
+                    appIndexNumVo.setNum(num);
+                }
+                list.add(appIndexNumVo);
+            }
         }
 
         return rb.success().setData(list);

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineFeign.java

@@ -25,12 +25,14 @@
  *********************************************************/
 package com.yxt.anrui.riskcenter.api.loanfileexamine;
 
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.RiskToDoNumQuery;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -85,4 +87,9 @@ public interface LoanFileexamineFeign {
     @GetMapping("/selectOrderSidAndContract")
     @ResponseBody
     ResultBean<LoanFileexamine> selectOrderSidAndContract(@RequestParam("saleOrderSid") String saleOrderSid, @RequestParam(value = "loanContractSid",required = false) String loanContractSid);
+
+    @ApiOperation("手机端-查询本分公司下代办数量:切换机构")
+    @GetMapping("/getToDoNum")
+    @ResponseBody
+    ResultBean<String> getToDoNum(@SpringQueryMap RiskToDoNumQuery riskToDoNumQuery);
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineFeignFallback.java

@@ -25,6 +25,7 @@
  *********************************************************/
 package com.yxt.anrui.riskcenter.api.loanfileexamine;
 
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.RiskToDoNumQuery;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -79,4 +80,9 @@ public class LoanFileexamineFeignFallback implements LoanFileexamineFeign {
 	public ResultBean<LoanFileexamine> selectOrderSidAndContract(String saleOrderSid, String loanContractSid) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<String> getToDoNum(RiskToDoNumQuery riskToDoNumQuery) {
+		return null;
+	}
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeign.java

@@ -42,6 +42,7 @@ import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
@@ -206,4 +207,9 @@ public interface LoanHomevisitInvestigateFeign {
     @GetMapping("/details2")
     @ResponseBody
     public ResultBean<LoanHomeVisitInvestigateInitZLVo> details2(@RequestParam("sid") String sid);
+
+    @ApiOperation("手机端-查询本分公司下代办数量:切换机构")
+    @GetMapping("/getToDoNum")
+    @ResponseBody
+    ResultBean<String> getToDoNum(@SpringQueryMap RiskToDoNumQuery riskToDoNumQuery);
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeignFallback.java

@@ -200,4 +200,9 @@ public class LoanHomevisitInvestigateFeignFallback implements LoanHomevisitInves
 	public ResultBean<LoanHomeVisitInvestigateInitZLVo> details2(String sid) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<String> getToDoNum(RiskToDoNumQuery riskToDoNumQuery) {
+		return null;
+	}
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/RiskToDoNumQuery.java

@@ -0,0 +1,13 @@
+package com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class RiskToDoNumQuery {
+
+    @ApiModelProperty("用户sid")
+    private String userSid;
+    @ApiModelProperty("组织机构sid")
+    private String orgPath;
+}

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

@@ -206,6 +206,7 @@ public class LoanCapitalCreditResultService extends MybatisBaseService<LoanCapit
             loanContractPush.setSaleOrderSid(loanCapitalCreditResult.getSaleOrderSid());
             BusSalesOrderLoancontractDetailsVo loancontractDetailsVo = busSalesOrderLoancontractFeign.fetchDetailsBySid(loanCapitalCreditResult.getLoanContractSid()).getData();
             loanOtherReceivablePush.setSaleOrderSid(loanCapitalCreditResult.getSaleOrderSid());
+            loanOtherReceivablePush.setLoanContractSid(loanCapitalCreditResult.getLoanContractSid());
             String borrowerSid = "";
             if (loancontractDetailsVo != null) {
                 loanOtherReceivablePush.setBorrowerSid(loancontractDetailsVo.getBorrowerSid());
@@ -215,7 +216,7 @@ public class LoanCapitalCreditResultService extends MybatisBaseService<LoanCapit
             //资方信审终审通过后推送财务的融资放款及金融方案中各项费用其他应收单
             ResultBean pushOtherReceivable = busSalesOrderLoancontractFeign.pushOtherReceivable(loanOtherReceivablePush);
             //资方信审终审通过后修改车辆业务状态中的资方终审为1.
-            ResultBean<BusSalesOrderVehicle> busSalesOrderVehicle = busSalesOrderVehicleFeign.selectOneByBorrowerSid(borrowerSid);
+            ResultBean<BusSalesOrderVehicle> busSalesOrderVehicle = busSalesOrderVehicleFeign.selectOneByBorrowerSid2(borrowerSid,loanCapitalCreditResult.getLoanContractSid());
             if (busSalesOrderVehicle.getData() != null) {
                 ResultBean updateManageState = baseVehicleStateFeign.updateManageState(busSalesOrderVehicle.getData().getSid());
             }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineMapper.java

@@ -64,4 +64,6 @@ public interface LoanFileexamineMapper extends BaseMapper<LoanFileexamine> {
 	List<LoanFileexamineVo> selectListVo();
 
     LoanFileexamine selectOrderSidAndContract(@Param("saleOrderSid") String saleOrderSid, @Param("loanContractSid") String loanContractSid);
+
+    int getToDoNum(@Param("orgPath") String orgPath,@Param("userSid") String userSid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineMapper.xml

@@ -40,4 +40,14 @@
     <select id="selectOrderSidAndContract" resultType="com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamine">
         SELECT * FROM loan_fileexamine where saleOrderSid = #{saleOrderSid} and loanContractSid = #{loanContractSid} order by id desc limit 1
     </select>
+
+    <select id="getToDoNum" resultType="int">
+        SELECT COUNT(*)
+        FROM loan_fileexamine lf
+                     LEFT JOIN anrui_buscenter.`bus_sales_order` bo
+                ON lf.`saleOrderSid` = bo.`sid`
+        WHERE bo.createBySid = #{userSid}
+          AND bo.orgSidPath = #{orgPath}
+          AND lf.`zlState` = '0'
+    </select>
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineRest.java

@@ -26,6 +26,7 @@
 package com.yxt.anrui.riskcenter.biz.loanfileexamine;
 
 import com.yxt.anrui.riskcenter.api.loanfileexamine.*;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.RiskToDoNumQuery;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -104,4 +105,9 @@ public class LoanFileexamineRest implements LoanFileexamineFeign {
 	public ResultBean<LoanFileexamine> selectOrderSidAndContract(String saleOrderSid, String loanContractSid) {
 		return loanFileexamineService.selectOrderSidAndContract(saleOrderSid,loanContractSid);
 	}
+
+	@Override
+	public ResultBean<String> getToDoNum(RiskToDoNumQuery riskToDoNumQuery) {
+		return loanFileexamineService.getToDoNum(riskToDoNumQuery);
+	}
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineService.java

@@ -47,6 +47,7 @@ import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum;
 import com.yxt.anrui.riskcenter.api.loanfileexamine.*;
 import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineVo;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.RiskToDoNumQuery;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanAttachTypeEnum;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFileDetailsVo;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFileDto;
@@ -509,4 +510,12 @@ public class LoanFileexamineService extends MybatisBaseService<LoanFileexamineMa
         }
         return rb.success().setData(loanFileexamine);
     }
+
+    public ResultBean<String> getToDoNum(RiskToDoNumQuery riskToDoNumQuery) {
+        ResultBean rb = ResultBean.fireFail();
+        String userSid = riskToDoNumQuery.getUserSid();
+        String orgPath = riskToDoNumQuery.getOrgPath();
+        int count = baseMapper.getToDoNum(orgPath, userSid);
+        return rb.success().setData(String.valueOf(count));
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateMapper.java

@@ -84,4 +84,6 @@ public interface LoanHomevisitInvestigateMapper extends BaseMapper<LoanHomevisit
 
     @Update("update loan_homevisit_investigate set state = #{state},investigateKey = '',investigateValue = '' where sid = #{sid}")
     void updateState(@Param("sid") String sid, @Param("state") String state);
+
+    int getToDoNum(@Param("orgPath") String orgPath,@Param("userSid") String userSid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateMapper.xml

@@ -75,16 +75,32 @@
     </select>
 
     <select id="selectName" resultType="java.lang.String">
-        select bb.borrowerName from loan_homevisit_investigate li left join
-            anrui_buscenter.bus_sales_order_borrower bb on bb.sid = li.saleOrderBorrowerSid
+        select bb.borrowerName
+        from loan_homevisit_investigate li
+                     left join
+                     anrui_buscenter.bus_sales_order_borrower bb on bb.sid = li.saleOrderBorrowerSid
         where li.sid = #{sid}
     </select>
 
     <update id="setState">
-        update anrui_buscenter.bus_sales_order_borrower set state = 0 where sid = #{saleOrderBorrowerSid}
+        update anrui_buscenter.bus_sales_order_borrower
+        set state = 0
+        where sid = #{saleOrderBorrowerSid}
     </update>
 
     <update id="setState2">
-        update anrui_buscenter.bus_sales_order_loancontract set state = 0 where borrowerSid = #{saleOrderBorrowerSid}
+        update anrui_buscenter.bus_sales_order_loancontract
+        set state = 0
+        where borrowerSid = #{saleOrderBorrowerSid}
     </update>
+
+    <select id="getToDoNum" resultType="int">
+        SELECT COUNT(*)
+        FROM loan_homevisit_investigate li
+                     LEFT JOIN anrui_buscenter.`bus_sales_order` bo
+                ON li.`saleOrderSid` = bo.`sid`
+        WHERE bo.createBySid = #{userSid}
+          AND bo.orgSidPath = #{orgPath}
+          AND li.`state` = '1'
+    </select>
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateRest.java

@@ -223,4 +223,9 @@ public class LoanHomevisitInvestigateRest implements LoanHomevisitInvestigateFei
     public ResultBean<LoanHomeVisitInvestigateInitZLVo> details2(String sid) {
         return loanHomevisitInvestigateService.details2(sid);
     }
+
+    @Override
+    public ResultBean<String> getToDoNum(RiskToDoNumQuery riskToDoNumQuery) {
+        return loanHomevisitInvestigateService.getToDoNum(riskToDoNumQuery);
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java

@@ -1732,4 +1732,12 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
     public void updateState(String sid, String state) {
         baseMapper.updateState(sid,state);
     }
+
+    public ResultBean<String> getToDoNum(RiskToDoNumQuery riskToDoNumQuery) {
+        ResultBean rb = ResultBean.fireFail();
+        String userSid = riskToDoNumQuery.getUserSid();
+        String orgPath = riskToDoNumQuery.getOrgPath();
+        int count = baseMapper.getToDoNum(orgPath, userSid);
+        return rb.success().setData(String.valueOf(count));
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java

@@ -26,6 +26,7 @@
 package com.yxt.anrui.riskcenter.biz.loanpreloancreditapply;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendixDto;
@@ -33,6 +34,7 @@ import com.yxt.anrui.base.api.commonappendix.CommonAppendixFeign;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendixSelectQuery;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
+import com.yxt.anrui.portal.api.sysparameter.SysParameterFeign;
 import com.yxt.anrui.riskcenter.api.loancreditappealapply.LoanCreditAppealApply;
 import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicy;
 import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.*;
@@ -51,6 +53,7 @@ import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.riskcenter.biz.loansolutions.LoanSolutionsService;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.DateUtils;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -60,9 +63,7 @@ import org.apache.poi.ss.formula.functions.Now;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
+import java.util.*;
 
 @Service
 public class LoanPreloanCreditApplyService extends MybatisBaseService<LoanPreloanCreditApplyMapper, LoanPreloanCreditApply> {
@@ -82,7 +83,7 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService<LoanPreloa
     @Autowired
     private LoanFinPolicyService loanFinPolicyService;
     @Autowired
-    private LoanParameterService loanParameterService;
+    private SysParameterFeign sysParameterFeign;
     @Autowired
     private CrmCustomerTempFeign crmCustomerTempFeign;
 
@@ -564,8 +565,12 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService<LoanPreloa
             return rb.setMsg("保存失败");
         }
         String sid = stringResultBean.getData();
-        String dqxyshyxq = loanParameterService.fetchByParNo("DQXYSHYXQ").getData();
-        baseMapper.updateStateBySid(sid, 2, dqxyshyxq);
+        String dqxyshyxq = sysParameterFeign.fetchByParNo("DQXYSHYXQ").getData();
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(new Date());
+        calendar.add(Calendar.DATE,Integer.parseInt(dqxyshyxq));
+        Date time = calendar.getTime();
+        baseMapper.updateStateBySid(sid, 2, DateUtil.formatDate(time));
         return rb.success();
     }
 

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java

@@ -2665,7 +2665,10 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                 if ("01".equals(loanFinPolicy.getDiscountUseTypeKey())) {//01差额放款
                     if (loanSolutions.getFactoryDiscount() != null) {
                         bg = bg.subtract(loanSolutions.getFactoryDiscount());
-                        pushVo.setOtherReceivableMoney(loanSolutions.getFactoryDiscountUse());
+                        if(loanSolutions.getFactoryDiscount() != null){
+                            pushVo.setOtherReceivableMoney(loanSolutions.getFactoryDiscount().toString());
+                        }
+
                     }
                 }
             }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutionsdetail/LoanSolutionsDetailMapper.xml

@@ -33,8 +33,8 @@
 
     <delete id="deleteByLoanSid">
         delete
-        from loan_solution_detail
-        where solutionSid = #{sid}
+        from loan_solutions_detail
+        where solutionsSid = #{sid}
     </delete>
 
     <select id="selectLoanSid" resultType="com.yxt.anrui.riskcenter.api.loansolutionsdetail.LoanSolutionsDetail">