出库申请推送销售台账接口开发

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

@@ -11,10 +11,10 @@ public class AppRovalContractPageQuery implements Query {
 
     @ApiModelProperty("用户sid")
     private String userSid;
-
     @ApiModelProperty("车架号 客户名称 合同编号")
     private String name;
-
     @ApiModelProperty("状态")
     private int stateType;
+    @ApiModelProperty("组织全路径")
+    private String orgPath;
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyService.java

@@ -430,7 +430,7 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService<BusAdvanc
         if (vinLists.size() > 0) {
             for (AppRovalContractPageVo appRovalContractPageVo : vinLists) {
                 AdCarListVo adCarListVo = new AdCarListVo();
-                adCarListVo.setVin(appRovalContractPageVo.getVin());
+                //adCarListVo.setVin(appRovalContractPageVo.getVin());
                 CommonContractVo commonContractVo = commonContractFeign.getContractBySalesOrderSid(appRovalContractPageVo.getBusSid()).getData();
                 if (commonContractVo != null) {
                     adCarListVo.setPrice(commonContractVo.getPrice());

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java

@@ -502,12 +502,12 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
         if (carLists.size() > 0) {
             for (AppRovalContractPageVo appRovalContractPageVo : vinLists) {
                 AdCarListVo adCarListVo = new AdCarListVo();
-                adCarListVo.setVin(appRovalContractPageVo.getVin());
+                //adCarListVo.setVin(appRovalContractPageVo.getVin());
                 //获取车辆sid
-                BaseVehicle baseVehicle = baseVehicleFeign.selectByVinNoAndOrgSid(appRovalContractPageVo.getVin(), useOrgSid).getData();
+                /*BaseVehicle baseVehicle = baseVehicleFeign.selectByVinNoAndOrgSid(appRovalContractPageVo.getVin(), useOrgSid).getData();
                 if (baseVehicle != null) {
                     adCarListVo.setCarSid(baseVehicle.getSid());
-                }
+                }*/
                 CommonContractVo commonContractVo = commonContractFeign.getContractBySalesOrderSid(appRovalContractPageVo.getBusSid()).getData();
                 if (commonContractVo != null) {
                     adCarListVo.setPrice(commonContractVo.getPrice());

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

@@ -5300,22 +5300,27 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
     public IPage<AppRovalContractPageVo> getApprovalContractList(PagerQuery<AppRovalContractPageQuery> pagerQuery) {
         AppRovalContractPageQuery params = pagerQuery.getParams();
         SysUserVo sysUserVo = sysUserFeign.fetchBySid(params.getUserSid()).getData();
-        QueryWrapper<AppRovalContractPageVo> qw = new QueryWrapper<>();
+        String orgPath = params.getOrgPath();
-        qw.eq("staffSid",sysUserVo.getStaffSid());
+        String deptSid = orgPath.substring(orgPath.lastIndexOf("/") + 1);
-        qw.eq("orgSid",sysUserVo.getDepartmentSid());
+        if (params.getStateType() == 2){
-        if (StringUtils.isNotBlank(params.getName())){
+            QueryWrapper<AppRovalContractPageVo> qw = new QueryWrapper<>();
-            qw.and(wrapper -> wrapper.like("partyB", params.getName()).or().like("contractNo", params.getName()));
+            qw.eq("staffSid",sysUserVo.getStaffSid());
-        }
+            qw.eq("orgSid",deptSid);
-        qw.orderByDesc("createDate");
+            if (StringUtils.isNotBlank(params.getName())){
-        IPage<AppRovalContractPageVo> page = PagerUtil.queryToPage(pagerQuery);
+                qw.and(wrapper -> wrapper.like("partyB", params.getName()).or().like("contractNo", params.getName()));
-        IPage<AppRovalContractPageVo> iPage = baseMapper.selectByStaffSid(page, qw);
+            }
-        for (AppRovalContractPageVo record : iPage.getRecords()) {
+            qw.orderByDesc("createDate");
-            String createDate = record.getCreateDate();
+            IPage<AppRovalContractPageVo> page = PagerUtil.queryToPage(pagerQuery);
-            DateTime dateTime = DateUtil.parse(createDate, "yyyy-MM-dd");
+            IPage<AppRovalContractPageVo> iPage = baseMapper.selectByStaffSid(page, qw);
-            createDate = DateUtil.formatDate(dateTime);
+            for (AppRovalContractPageVo record : iPage.getRecords()) {
-            record.setCreateDate(createDate);
+                String createDate = record.getCreateDate();
-        }
+                DateTime dateTime = DateUtil.parse(createDate, "yyyy-MM-dd");
-        return iPage;
+                createDate = DateUtil.formatDate(dateTime);
+                record.setCreateDate(createDate);
+            }
+            return iPage;
+        }
+        return null;
     }
 
     public List<AppRovalContractPageVo> selectByContractNo(String contractNo) {

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

@@ -2059,18 +2059,20 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         String userSid = query.getUserSid();
         String contractNo = query.getContractNo();
         String orgPath = query.getOrgPath();
+        String deptSid = orgPath.substring(orgPath.lastIndexOf("/") + 1);
+        String deptName = sysOrganizationFeign.fetchBySid(deptSid).getData().getName();
         FinBillApplicationDetailsVo finBillApplicationDetailsVo = new FinBillApplicationDetailsVo();
         if (StringUtils.isBlank(sid)){
             finBillApplicationDetailsVo.setCreateBySid(userSid);
             SysUserVo sysUserVo = sysUserFeign.fetchBySid(userSid).getData();
             finBillApplicationDetailsVo.setCreateByName(sysUserVo.getName());
-            finBillApplicationDetailsVo.setDeptSid(sysUserVo.getDepartmentSid());
+            finBillApplicationDetailsVo.setDeptSid(deptSid);
-            finBillApplicationDetailsVo.setDeptName(sysUserVo.getDepartmentName());
+            finBillApplicationDetailsVo.setDeptName(deptName);
             finBillApplicationDetailsVo.setApplyDate(DateUtil.formatDate(new Date()));
             finBillApplicationDetailsVo.setStaffSid(sysUserVo.getStaffSid());
             finBillApplicationDetailsVo.setStaffName(sysUserVo.getName());
-            finBillApplicationDetailsVo.setSaleDeptSid(sysUserVo.getDepartmentSid());
+            finBillApplicationDetailsVo.setSaleDeptSid(deptSid);
-            finBillApplicationDetailsVo.setSaleDeptName(sysUserVo.getDepartmentName());
+            finBillApplicationDetailsVo.setSaleDeptName(deptName);
             BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(contractNo).getData();
             finBillApplicationDetailsVo.setSaleTypeKey(busSalesOrder.getPayTypeKey());
             finBillApplicationDetailsVo.setSaleTypeValue(busSalesOrder.getPayType());

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/approval/AppRovalFeignFallback.java

@@ -26,4 +26,9 @@ public class AppRovalFeignFallback implements AppRovalFeign {
     public ResultBean<PagerVo<RovalContractPageVo>> getApprovalContractList(PagerQuery<RovalContractPageQuery> pagerQuery) {
         return null;
     }
+
+    @Override
+    public ResultBean<PagerVo<AppVehicleQKKPVo>> getVehicleQKKPList(PagerQuery<AppVehicleQKKPQuery> pagerQuery) {
+        return null;
+    }
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/approval/RovalContractPageQuery.java

@@ -14,4 +14,6 @@ public class RovalContractPageQuery implements Query {
     private String name;
     @ApiModelProperty("状态")
     private int stateType;
+    @ApiModelProperty("组织全路径")
+    private String orgPath;
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java

@@ -167,16 +167,18 @@ public class AppBusAdvanceGinvoiceapplyService {
         //车辆信息
         List<AppCarListVo> vinListVos = new ArrayList<>();
         List<FinBillVehicleVo> finBillVehicles = finBillApplicationDetailsVo.getFinBillVehicles();
-        for (FinBillVehicleVo finBillVehicle : finBillVehicles) {
+        if (finBillVehicles != null){
-            AppCarListVo vinListVo = new AppCarListVo();
+            for (FinBillVehicleVo finBillVehicle : finBillVehicles) {
-            vinListVo.setVin(finBillVehicle.getVinNo());
+                AppCarListVo vinListVo = new AppCarListVo();
-            vinListVo.setCertificateStateKey(finBillVehicle.getCertificateStateKey());
+                vinListVo.setVin(finBillVehicle.getVinNo());
-            vinListVo.setCertificateState(finBillVehicle.getCertificateStateValue());
+                vinListVo.setCertificateStateKey(finBillVehicle.getCertificateStateKey());
-            vinListVo.setInvoiceTypeKey(finBillVehicle.getBillTypeKey());
+                vinListVo.setCertificateState(finBillVehicle.getCertificateStateValue());
-            vinListVo.setInvoiceType(finBillVehicle.getBillTypeValue());
+                vinListVo.setInvoiceTypeKey(finBillVehicle.getBillTypeKey());
-            vinListVo.setInvoiceName(finBillVehicle.getOpenTickName());
+                vinListVo.setInvoiceType(finBillVehicle.getBillTypeValue());
-            vinListVo.setInvoiceInfo(finBillVehicle.getOpenTickRemarks());
+                vinListVo.setInvoiceName(finBillVehicle.getOpenTickName());
-            vinListVos.add(vinListVo);
+                vinListVo.setInvoiceInfo(finBillVehicle.getOpenTickRemarks());
+                vinListVos.add(vinListVo);
+            }
         }
         vo.setVinList(vinListVos);
         //挂车信息
@@ -203,22 +205,22 @@ public class AppBusAdvanceGinvoiceapplyService {
         List<String> invoiceApplyConfirmImages = new ArrayList<>();//开票信息确认书
         List<String> registerContractImages = new ArrayList<>();//车辆登记合同
         List<String> idCardImages = new ArrayList<>();
-        if (zjApplicationAppendxs.size() > 0){
+        if (zjApplicationAppendxs != null){
             for (FinBillFileVo zjApplicationAppendx : zjApplicationAppendxs) {
                 idCardImages.add(zjApplicationAppendx.getFileUrl());
             }
         }
-        if (khkpsqsApplicationAppendxs.size() > 0){
+        if (khkpsqsApplicationAppendxs != null){
             for (FinBillFileVo khkpsqsApplicationAppendx : khkpsqsApplicationAppendxs) {
                 customerInvoiceApplyImages.add(khkpsqsApplicationAppendx.getFileUrl());
             }
         }
-        if (kpxxqrsApplicationAppendxs.size() > 0){
+        if (kpxxqrsApplicationAppendxs != null){
             for (FinBillFileVo kpxxqrsApplicationAppendx : kpxxqrsApplicationAppendxs) {
                 invoiceApplyConfirmImages.add(kpxxqrsApplicationAppendx.getFileUrl());
             }
         }
-        if (cldjhtApplicationAppendxs.size() > 0){
+        if (cldjhtApplicationAppendxs != null){
             for (FinBillFileVo cldjhtApplicationAppendx : cldjhtApplicationAppendxs) {
                 registerContractImages.add(cldjhtApplicationAppendx.getFileUrl());
             }