欠款开票选择合同调整

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java

@@ -2676,7 +2676,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
             createDate = DateUtil.formatDate(dateTime);
             record.setCreateDate(createDate);
             BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(record.getContractNo()).getData();
-            if (!"已办结".equals(busSalesOrder.getNodeState())){
+            if (!"已办结".equals(busSalesOrder.getNodeState()) || !"2".equals(busSalesOrder.getFinancePlan())){
                 continue;
             }
             record.setSaleTypeKey(busSalesOrder.getPayTypeKey());
@@ -2706,7 +2706,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
             SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.selectByOrgSidPath(params.getOrgPath()).getData();
             qw.eq("staffSid", staffSid);
             qw.eq("orgSid", sysOrganizationVo.getSid());
-            ResultBean<List<String>> busList = busSalesOrderFeign.selectBusinessSidByQKKP(params.getUserSid(), params.getOrgPath());
+            ResultBean<List<String>> busList = busSalesOrderFeign.selectBusinessSidByQKKP(params.getUserSid(), useOrgSid);
             if (!busList.getData().isEmpty()) {
                 qw.in("busSid", busList.getData());
             }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java

@@ -313,7 +313,7 @@ public interface BusSalesOrderFeign {
     @ApiOperation("欠款开票三方金融-外部金融已审核通过的业务sid")
     @GetMapping("/selectBusinessSidByQKKP")
     @ResponseBody
-    ResultBean<List<String>> selectBusinessSidByQKKP(@RequestParam("userSid") String userSid, @RequestParam("orgPath") String orgPath);
+    ResultBean<List<String>> selectBusinessSidByQKKP(@RequestParam("userSid") String userSid, @RequestParam("useOrgSid") String useOrgSid);
 
     @ApiOperation("销售订单流程预演测试")
     @GetMapping("/yuyanTestBean")

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

@@ -368,8 +368,8 @@ public class BusSalesOrderRest implements BusSalesOrderFeign {
     }
 
     @Override
-    public ResultBean<List<String>> selectBusinessSidByQKKP(String userSid, String orgPath) {
-        return busSalesOrderService.selectBusinessSidByQKKP(userSid,orgPath);
+    public ResultBean<List<String>> selectBusinessSidByQKKP(String userSid, String useOrgSid) {
+        return busSalesOrderService.selectBusinessSidByQKKP(userSid,useOrgSid);
     }
 
     @Override

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

@@ -6537,9 +6537,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         return rb.success().setData(stringList);
     }
 
-    public ResultBean<List<String>> selectBusinessSidByQKKP(String userSid, String orgPath) {
+    public ResultBean<List<String>> selectBusinessSidByQKKP(String userSid, String useOrgSid) {
         ResultBean<List<String>> rb = ResultBean.fireFail();
-        String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
         List<String> stringList = baseMapper.selectQKBusinessSid(userSid, useOrgSid);
         stringList.removeAll(Collections.singleton(null));
         List<String> busSids = new ArrayList<>();