Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeign.java

@@ -195,6 +195,10 @@ public interface BaseDistributorFeign {
     @GetMapping("/selectAllDisList")
     ResultBean<List<BaseDistributorListVo>> selectAllDisList(@RequestParam("orgSid") String orgSid, @RequestParam("staffSid") String staffSid);
 
+    @ApiOperation("开票申请中获取开票名称")
+    @GetMapping("/selectAllDisList2")
+    ResultBean<List<BaseDistributorListVo>> selectAllDisList2(@RequestParam("orgSid") String orgSid, @RequestParam("staffSid") String staffSid,@RequestParam("state")String state);
+
     @ApiOperation("移动端查询经销商和客户信息")
     @GetMapping("/invoiceName")
     ResultBean<List<AppDisAndCustm>> invoiceName(@RequestParam("userSid") String userSid, @RequestParam("orgPath") String orgPath, @RequestParam(value = "search", required = false) String search);

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeignFallback.java

@@ -214,6 +214,11 @@ public class BaseDistributorFeignFallback implements BaseDistributorFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<List<BaseDistributorListVo>> selectAllDisList2(String orgSid, String staffSid,String state) {
+        return null;
+    }
+
     @Override
     public ResultBean<List<AppDisAndCustm>> invoiceName(String userSid, String orgPath, String search) {
         return null;

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorListVo.java

@@ -1,6 +1,7 @@
 package com.yxt.anrui.base.api.basedistributor;
 
 import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -24,4 +25,9 @@ public class BaseDistributorListVo implements Vo {
     private String openTickRemarks;//拼接的开票信息
 
     private String nameAndPhone;//个人名字手机号拼接
+
+    @ApiModelProperty("开票类型key")
+    private String openTickTypeKey;
+    @ApiModelProperty("开票类型value")
+    private String openTickTypeValue;
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorRest.java

@@ -348,6 +348,11 @@ public class BaseDistributorRest implements BaseDistributorFeign {
         return baseDistributorService.selectAllDisList(orgSid, staffSid);
     }
 
+    @Override
+    public ResultBean<List<BaseDistributorListVo>> selectAllDisList2(String orgSid, String staffSid,String state) {
+        return baseDistributorService.selectAllDisList2(orgSid, staffSid,state);
+    }
+
     @Override
     public ResultBean<List<AppDisAndCustm>> invoiceName(String userSid, String orgPath, String search) {
         return baseDistributorService.invoiceName(userSid, orgPath, search);

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java

@@ -1263,6 +1263,56 @@ public class BaseDistributorService extends MybatisBaseService<BaseDistributorMa
         return rb.success().setData(baseDistributorListVos);
     }
 
+    public ResultBean<List<BaseDistributorListVo>> selectAllDisList2(String orgSid, String staffSid,String state) {
+        ResultBean rb = ResultBean.fireFail();
+        List<FinCompanyInvoicingBillListVo> finCompanyInvoicingBillListVos = new ArrayList<>();
+        if("1".equals(state)){//开票申请
+            finCompanyInvoicingBillListVos = finCompanyInvoicingFeign.qySelByUseOrgSidTwo(orgSid);
+        }else{
+            finCompanyInvoicingBillListVos = finCompanyInvoicingFeign.qySelByUseOrgSid(orgSid);
+        }
+        List<BaseDistributorListVo> baseDistributorListVos = new ArrayList<>();
+        for (FinCompanyInvoicingBillListVo finCompanyInvoicingBillListVo : finCompanyInvoicingBillListVos) {
+            BaseDistributorListVo baseDistributorListVo = new BaseDistributorListVo();
+            BeanUtil.copyProperties(finCompanyInvoicingBillListVo, baseDistributorListVo);
+            String openTickRemarks = "";
+            if (StringUtils.isNotBlank(openTickRemarks + baseDistributorListVo.getRegistNum())) {
+                openTickRemarks = openTickRemarks + baseDistributorListVo.getRegistNum() + "；";
+            }
+            if (StringUtils.isNotBlank(baseDistributorListVo.getRegistDetailAddress())) {
+                openTickRemarks = openTickRemarks + baseDistributorListVo.getRegistDetailAddress() + "；";
+            }
+            if (StringUtils.isNotBlank(baseDistributorListVo.getInvoPhone())) {
+                openTickRemarks = openTickRemarks + baseDistributorListVo.getInvoPhone() + "；";
+            }
+            if (StringUtils.isNotBlank(baseDistributorListVo.getInvoBank())) {
+                openTickRemarks = openTickRemarks + baseDistributorListVo.getInvoBank() + "；";
+            }
+            if (StringUtils.isNotBlank(baseDistributorListVo.getInvoBankNum())) {
+                openTickRemarks = openTickRemarks + baseDistributorListVo.getInvoBankNum() + "；";
+            }
+            baseDistributorListVo.setOpenTickRemarks(openTickRemarks);
+            baseDistributorListVos.add(baseDistributorListVo);
+        }
+        CrmCustomerTempListQuery crmCustomerTempListQuery = new CrmCustomerTempListQuery();
+        crmCustomerTempListQuery.setStaffSid(staffSid);
+        SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(orgSid).getData();
+        crmCustomerTempListQuery.setOrgPath(sysOrganizationVo.getOrgSidPath());
+        crmCustomerTempListQuery.setCertificateTypeKey("01");
+        List<CrmCustomerTempListVo> crmCustomerTempListVos = crmCustomerTempFeign.selectCustomerList(crmCustomerTempListQuery).getData();
+        for (CrmCustomerTempListVo crmCustomerTempListVo : crmCustomerTempListVos) {
+            BaseDistributorListVo baseDistributorListVo = new BaseDistributorListVo();
+            baseDistributorListVo.setName(crmCustomerTempListVo.getName());
+            baseDistributorListVo.setSid(crmCustomerTempListVo.getSid());
+            baseDistributorListVo.setOpenTickRemarks(crmCustomerTempListVo.getIdCard());
+            baseDistributorListVo.setRegistNum(crmCustomerTempListVo.getIdCard());
+            baseDistributorListVo.setInvoPhone(crmCustomerTempListVo.getMobile());
+            baseDistributorListVo.setNameAndPhone(crmCustomerTempListVo.getName() + crmCustomerTempListVo.getMobile());
+            baseDistributorListVos.add(baseDistributorListVo);
+        }
+        return rb.success().setData(baseDistributorListVos);
+    }
+
     public ResultBean<BaseDistributorListVo> selectDisListBySid(String sid) {
         ResultBean rb = ResultBean.fireFail();
         BaseDistributorListVo baseDistributorListVo = baseMapper.selectDisListBySid(sid);

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingBillListVo.java

@@ -1,6 +1,7 @@
 package com.yxt.anrui.fin.api.fincompanyinvoicing;
 
 import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -21,4 +22,9 @@ public class FinCompanyInvoicingBillListVo implements Vo {
     private String invoBankNum;//开票银行账号
 
     private String openTickRemarks;
+
+    @ApiModelProperty("开票类型key")
+    private String openTickTypeKey;
+    @ApiModelProperty("开票类型value")
+    private String openTickTypeValue;
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeign.java

@@ -126,6 +126,11 @@ public interface FinCompanyInvoicingFeign {
     @ResponseBody
     List<FinCompanyInvoicingBillListVo> qySelByUseOrgSid(@RequestParam("orgSid") String orgSid);
 
+    @ApiOperation("企业开票信息管理根据分公司sid查询不带采购系统的开票信息")
+    @PostMapping("/qySelByUseOrgSidTwo")
+    @ResponseBody
+    List<FinCompanyInvoicingBillListVo> qySelByUseOrgSidTwo(@RequestParam("orgSid") String orgSid);
+
     @ApiOperation("企业开票信息管理移动端根据分公司sid查询不带采购系统的开票信息")
     @PostMapping("/qyAppSelByUseOrgSid")
     @ResponseBody

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeignFallback.java

@@ -120,6 +120,11 @@ public class FinCompanyInvoicingFeignFallback implements FinCompanyInvoicingFeig
         return null;
     }
 
+    @Override
+    public List<FinCompanyInvoicingBillListVo> qySelByUseOrgSidTwo(String orgSid) {
+        return null;
+    }
+
     @Override
     public List<FinCompanyInvoicingBillListVo> qyAppSelByUseOrgSid(String useOrgSid, String search) {
         return null;

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.java

@@ -85,4 +85,5 @@ public interface FinBillApplicationMapper extends BaseMapper<FinBillApplication>
     @Update("update fin_bill_application set nodeState = '终止' where sid = #{businessSid}")
     void updateZZ(String businessSid);
 
+    List<String> getSelectBySid(String businessSid);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.xml

@@ -128,4 +128,12 @@
             ${ew.sqlSegment}
         </where>
     </select>
+
+    <select id="getSelectBySid" resultType="java.lang.String">
+        select bv.sid from fin_bill_vehicle fv
+        left join fin_bill_application fa on fv.billAppSid = fa.sid
+        left join anrui_buscenter.bus_sales_order bo on bo.contractNo = fa.contractNo
+        left join anrui_buscenter.bus_sales_order_vehicle bv on bv.linkSid = fv.vehSid
+        where fa.sid = #{businessSid}
+    </select>
 </mapper>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java

@@ -3456,7 +3456,12 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             List<String> orgPathList = Arrays.asList(finBillApplication1.getOrgSidPath().split("/"));
             SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(orgPathList.get(orgPathList.size() - 1)).getData();
             String nextNodeUserSids_ = sysOrganization.getManagerSid();
-            bv.setNextNodeUserSids(nextNodeUserSids_);
+            if(StringUtils.isBlank(nextNodeUserSids_)){//若主管人员为空，则默认为管理员
+                bv.setNextNodeUserSids(ProcDefEnum.DEFAUL_TADMIN_SID.getProDefId());
+            }else{
+                bv.setNextNodeUserSids(nextNodeUserSids_);
+            }
+
         }
         //=======================================
         if (r == 1) {
@@ -3529,7 +3534,12 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             List<String> orgPathList = Arrays.asList(finBillApplication.getOrgSidPath().split("/"));
             SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(orgPathList.get(orgPathList.size() - 1)).getData();
             String nextNodeUserSids_ = sysOrganization.getManagerSid();
-            bv.setNextNodeUserSids(nextNodeUserSids_);
+            if(StringUtils.isBlank(nextNodeUserSids_)){
+                bv.setNextNodeUserSids(ProcDefEnum.DEFAUL_TADMIN_SID.getProDefId());
+            }else{
+                bv.setNextNodeUserSids(nextNodeUserSids_);
+            }
+
         }
         //=======================================
         if (bv.getTaskId().equals(finBillApplication.getTaskId())) {
@@ -3702,6 +3712,32 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             //极光推送
             UpdateFlowFieldVo ufVo = resultBean1.getData();
             finBillApplication = fetchBySid(bv.getBusinessSid());
+            //============================================================================修改车辆的持久状态组装数据
+            try {
+                ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
+                        .setNameFormat("demo-pool-%d").build();
+                ExecutorService pool = new ThreadPoolExecutor(2, 100,
+                        0L, TimeUnit.MILLISECONDS,
+                        new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
+                Future future1 = pool.submit(() -> {
+                    List<BaseVehicleStateDto> dtoList = new ArrayList<>();
+                    List<String> vehicleList = baseMapper.getSelectBySid(bv.getBusinessSid());
+//                    List<BusSalesOrderVehicle> vehicleList = busSalesOrderVehicleService.selectListByOrderSid(bv.getBusinessSid());
+                    vehicleList.removeAll(Collections.singleton(null));
+                    if (!vehicleList.isEmpty()) {
+                        vehicleList.stream().forEach(v -> {
+                            BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
+                            baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.LPSQTG.getTypeKey());
+                            baseVehicleStateDto.setBusSid(v);
+                            dtoList.add(baseVehicleStateDto);
+                        });
+                        ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(dtoList);
+                    }
+                });
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            //============================================================================
             try {
                 ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
                         .setNameFormat("demo-pool-%d").build();

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@@ -1020,6 +1020,9 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
             return rb.setMsg("该申请不存在");
         }
         List<AppFinSelectedReceivablesDetailedDto> finSelectedReceivablesDetailedDtos = dto.getContractList();
+        if(finSelectedReceivablesDetailedDtos.isEmpty()){
+            return rb.setMsg("请添加认款信息");
+        }
         //认款金额相加
         BigDecimal subscriptionMoneyAll = finSelectedReceivablesDetailedDtos.stream().map(AppFinSelectedReceivablesDetailedDto::getConfirmMoney).reduce(BigDecimal.ZERO, BigDecimal::add);
         //判断收款金额与所选的总认款金额是否相等

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.xml

@@ -65,13 +65,16 @@
         address AS registDetailAddress,
         phone AS invoPhone,
         bankName AS invoBank,
-        bankAccount AS invoBankNum
+        bankAccount AS invoBankNum,
+        invoiceType AS openTickTypeValue,
+        invoiceTypeKey AS openTickTypeKey
         FROM
         fin_company_invoicing
         <where>
             ${ew.sqlSegment}
+            AND (purchaseSystemSid IS NULL OR LENGTH(purchaseSystemSid) = 0)
         </where>
-        AND (purchaseSystemSid IS NULL OR LENGTH(purchaseSystemSid) = 0)
+
     </select>
 
 

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingRest.java

@@ -151,6 +151,11 @@ public class FinCompanyInvoicingRest implements FinCompanyInvoicingFeign {
         return finCompanyInvoicingService.qySelByUseOrgSid(orgSid);
     }
 
+    @Override
+    public List<FinCompanyInvoicingBillListVo> qySelByUseOrgSidTwo(String orgSid) {
+        return finCompanyInvoicingService.qySelByUseOrgSidTwo(orgSid);
+    }
+
     @Override
     public List<FinCompanyInvoicingBillListVo> qyAppSelByUseOrgSid(String useOrgSid, String search) {
         return finCompanyInvoicingService.qyAppSelByUseOrgSid(useOrgSid, search);

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java

@@ -454,6 +454,14 @@ public class FinCompanyInvoicingService extends MybatisBaseService<FinCompanyInv
         return finCompanyInvoicingBillListVos;
     }
 
+    public List<FinCompanyInvoicingBillListVo> qySelByUseOrgSidTwo(String orgSid) {
+        QueryWrapper qw = new QueryWrapper<>();
+        qw.eq("useOrgSid", orgSid);
+        qw.eq("isDelete", 0);
+        List<FinCompanyInvoicingBillListVo> finCompanyInvoicingBillListVos = baseMapper.qySelByUseOrgSid(qw);
+        return finCompanyInvoicingBillListVos;
+    }
+
     public List<FinCompanyInvoicingBillListVo> qySelByUseOrgSid2(String useOrgSid, String invoiceKey) {
         QueryWrapper qw = new QueryWrapper<>();
         qw.eq("useOrgSid", useOrgSid);