Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrowerFeign.java

@@ -105,4 +105,9 @@ public interface BusSalesOrderBorrowerFeign {
     @PostMapping("/updateState")
     @ResponseBody
     ResultBean updateState(@RequestParam("saleOrderBorrowerSid") String saleOrderBorrowerSid,@RequestParam("state") String state);
+
+    @ApiOperation("查询该销售订单已确定的数量")
+    @PostMapping("/selectByNum")
+    @ResponseBody
+    ResultBean<Integer> selectByNum(@RequestParam("saleOrderSid") String saleOrderSid);
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrowerFeignFallback.java

@@ -99,4 +99,9 @@ public class BusSalesOrderBorrowerFeignFallback implements BusSalesOrderBorrower
     public ResultBean updateState(String saleOrderBorrowerSid, String state) {
         return null;
     }
+
+    @Override
+    public ResultBean<Integer> selectByNum(String saleOrderSid) {
+        return null;
+    }
 }

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

@@ -7668,11 +7668,9 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             for (int i = 0; i < vins.size(); i++) {
                 String busVinSid = vins.get(i);
                 BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.fetchBySid(busVinSid);
-                if (StringUtils.isBlank(busSalesOrderVehicle.getBorrowerSid())) {
-                    busSalesOrderVehicle.setBorrowerSid(busSalesOrderBorrower.getSid());
-                    busSalesOrderVehicle.setBorrowName(busSalesOrderBorrower.getBorrowerName());
-                    busSalesOrderVehicleService.updateById(busSalesOrderVehicle);
-                }
+                busSalesOrderVehicle.setBorrowerSid(busSalesOrderBorrower.getSid());
+                busSalesOrderVehicle.setBorrowName(busSalesOrderBorrower.getBorrowerName());
+                busSalesOrderVehicleService.updateById(busSalesOrderVehicle);
             }
             //更新业务状态码
             busSalesOrderBorrower.setBusName("家访准备");

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerRest.java

@@ -124,4 +124,11 @@ public class BusSalesOrderBorrowerRest implements BusSalesOrderBorrowerFeign {
     public ResultBean updateState(String saleOrderBorrowerSid, String state) {
         return busSalesOrderBorrowerService.updateState(saleOrderBorrowerSid, state);
     }
+
+    @Override
+    public ResultBean<Integer> selectByNum(String saleOrderSid) {
+        ResultBean rb = ResultBean.fireFail();
+        int num = busSalesOrderBorrowerService.selectByNum(saleOrderSid);
+        return rb.success().setData(num);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceMapper.xml

@@ -75,6 +75,11 @@
     </select>
 
     <select id="selectByOrdersSid" resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle">
-        select * from bus_sales_order_vehicle where salesOrderSid = #{sid} and (borrowerSid is null or borrowerSid = '')
+        select a.* from(select bv.* from bus_sales_order_vehicle bv where bv.salesOrderSid = #{sid} and (bv.borrowerSid is null or bv.borrowerSid = '')
+                          union all
+                          select bv.* from bus_sales_order_vehicle bv
+                                               left join bus_sales_order_borrower bob on bv.borrowerSid = bob.sid
+                          where bv.salesOrderSid =#{sid} and length(bv.borrowerSid)>0 and bob.state = 0) a group by a.sid
+
     </select>
 </mapper>

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysparametersetting/SysParameterSetting.java

@@ -0,0 +1,31 @@
+package com.yxt.anrui.portal.api.sysparametersetting;
+
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/11/3
+ **/
+@Data
+public class SysParameterSetting extends BaseEntity {
+    private static final long serialVersionUID = 5546089724912096395L;
+    @ApiModelProperty("表名key")
+    private String tableNameKey;
+    @ApiModelProperty("表名value")
+    private String tableNameValue;
+    @ApiModelProperty("列名")
+    private String columnName;
+    @ApiModelProperty("注释")
+    private String columnComment;
+    @ApiModelProperty("创建人机构sid")
+    private String createOrgSid;
+    @ApiModelProperty("分公司全路径")
+    private String orgSidPath;
+    @ApiModelProperty("分公司sid")
+    private String useOrgSid;
+    @ApiModelProperty("分公司名称")
+    private String useOrgName;
+}

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysparametersetting/SysParameterSettingFeign.java

@@ -0,0 +1,28 @@
+package com.yxt.anrui.portal.api.sysparametersetting;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+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;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/11/3
+ **/
+@Api(tags = "统计参数设置")
+@FeignClient(
+        contextId = "anrui-portal-SysParameterSetting",
+        name = "anrui-portal",
+        path = "v1/SysParameterSetting",
+        fallback = SysParameterSettingFeignFallback.class)
+public interface SysParameterSettingFeign {
+
+    @ApiOperation("分页")
+    @PostMapping("/listPage")
+    ResultBean<PagerVo<SysParameterSettingVo>> listPage(@RequestBody PagerQuery<SysParameterSettingQuery> pagerQuery);
+}

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysparametersetting/SysParameterSettingFeignFallback.java

@@ -0,0 +1,12 @@
+package com.yxt.anrui.portal.api.sysparametersetting;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/11/3
+ **/
+@Component
+public class SysParameterSettingFeignFallback {
+}

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysparametersetting/SysParameterSettingQuery.java

@@ -0,0 +1,14 @@
+package com.yxt.anrui.portal.api.sysparametersetting;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/11/3
+ **/
+@Data
+public class SysParameterSettingQuery implements Query {
+    private static final long serialVersionUID = 8109733209988872255L;
+}

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysparametersetting/SysParameterSettingVo.java

@@ -0,0 +1,25 @@
+package com.yxt.anrui.portal.api.sysparametersetting;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/11/3
+ **/
+@Data
+public class SysParameterSettingVo {
+
+    private String sid;
+    @ApiModelProperty("表名key")
+    private String tableNameKey;
+    @ApiModelProperty("表名value")
+    private String tableNameValue;
+    @ApiModelProperty("列名")
+    private String columnName;
+    @ApiModelProperty("注释")
+    private String columnComment;
+    @ApiModelProperty("分公司名称")
+    private String useOrgName;
+}

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysparametersetting/SysParameterSettingRest.java

@@ -0,0 +1,26 @@
+package com.yxt.anrui.portal.biz.sysparametersetting;
+
+import com.yxt.anrui.portal.api.sysparametersetting.SysParameterSettingFeign;
+import com.yxt.anrui.portal.api.sysparametersetting.SysParameterSettingQuery;
+import com.yxt.anrui.portal.api.sysparametersetting.SysParameterSettingVo;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/11/3
+ **/
+@Api(tags = "统计参数设置")
+@RestController
+@RequestMapping("v1/SysParameterSetting")
+public class SysParameterSettingRest implements SysParameterSettingFeign {
+    @Override
+    public ResultBean<PagerVo<SysParameterSettingVo>> listPage(PagerQuery<SysParameterSettingQuery> pagerQuery) {
+        return null;
+    }
+}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitappeal/LoanHomevisitAppealService.java

@@ -39,6 +39,8 @@ import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerFeign;
+import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPriceFeign;
+import com.yxt.anrui.buscenter.api.bussalesorderprice.app.AppBusSalesOrderPriceVo;
 import com.yxt.anrui.flowable.api.flow.FlowProcessMapQuery;
 import com.yxt.anrui.flowable.api.flow.FlowableFeign;
 import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
@@ -123,9 +125,9 @@ public class LoanHomevisitAppealService extends MybatisBaseService<LoanHomevisit
     @Autowired
     private FlowTaskFeign flowTaskFeign;
     @Autowired
-    private LoanHomevisitFileexamineService loanHomevisitFileexamineService;
-    @Autowired
     private BusSalesOrderBorrowerFeign busSalesOrderBorrowerFeign;
+    @Autowired
+    private BusSalesOrderPriceFeign busSalesOrderPriceFeign;
 
     public PagerVo<LoanHomevisitAppealVo> listPageVo(PagerQuery<LoanHomevisitAppealQuery> pq) {
         LoanHomevisitAppealQuery query = pq.getParams();
@@ -498,8 +500,15 @@ public class LoanHomevisitAppealService extends MybatisBaseService<LoanHomevisit
             UpdateFlowFieldVo ufVo = resultBean.getData();
             updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
             if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
-                //修改贷款人状态为正常(1正常，0作废)
-                busSalesOrderBorrowerFeign.updateState(loanHomevisitInvestigate.getSaleOrderBorrowerSid(), "1");
+                //查询该销售订单已确定的数量
+                int count = busSalesOrderBorrowerFeign.selectByNum(loanHomevisitInvestigate.getSaleOrderSid()).getData();
+                //查询销售订单价格中数量
+                AppBusSalesOrderPriceVo appBusSalesOrderPriceVo = busSalesOrderPriceFeign.getPriceInfo(loanHomevisitInvestigate.getSaleOrderSid()).getData();
+                int jgNum = Integer.parseInt(appBusSalesOrderPriceVo.getNumber());
+                if (count < jgNum){
+                    //修改贷款人状态为正常(1正常，0作废)
+                    busSalesOrderBorrowerFeign.updateState(loanHomevisitInvestigate.getSaleOrderBorrowerSid(), "1");
+                }
                 //修改家访考察为待考察，并清空考察结果
                 loanHomevisitInvestigateService.updateState(loanHomevisitInvestigate.getSid(), "1");
             } else {

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

@@ -8,7 +8,7 @@
         SELECT
         li.`sid`,
         li.state,
-        bo.createDate,
+        DATE_FORMAT(bo.createDate, '%Y-%m-%d') as createDate,
         li.`resHomeVisDate`,
         li.`homeVisAddress`,
         bo.`useOrgName`,