Merge remote-tracking branch 'origin/master'

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

@@ -1933,7 +1933,10 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             FinBillVehicleDto finBillVehicleDto1 = finBillVehicles.get(0);
             BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(dto.getContractNo(), finBillVehicleDto1.getVehSid()).getData();
             //应收金额
-            BigDecimal unYs = new BigDecimal(finUncollectedReceivablesDetailedService.fetchSumYS(busSalesOrderVehicle.getSid()));
+            BigDecimal unYs = new BigDecimal("0");
+            if (StringUtils.isNotBlank(finUncollectedReceivablesDetailedService.fetchSumYS(busSalesOrderVehicle.getSid()))){
+                unYs = new BigDecimal(finUncollectedReceivablesDetailedService.fetchSumYS(busSalesOrderVehicle.getSid()));
+            }
             List<String> ysSids = finUncollectedReceivablesDetailedService.fetchYsSidByOrderVehSid(busSalesOrderVehicle.getSid());
             //已收金额
             BigDecimal seYs = new BigDecimal("0");

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

@@ -212,11 +212,13 @@ public class FinCompanyInvoicingService extends MybatisBaseService<FinCompanyInv
         FinCompanyInvoicing entity = fetchBySid(sid);
         FinCompanyInvoicingDetailsVo vo = new FinCompanyInvoicingDetailsVo();
         BeanUtil.copyProperties(entity, vo);
-        if (StringUtils.isNotBlank(entity.getInvoiceType())) {
-            vo.setOpenTickTypeValue(entity.getInvoiceType());
-        }
-        if (StringUtils.isNotBlank(entity.getInvoiceTypeKey())) {
-            vo.setOpenTickTypeKey(entity.getInvoiceTypeKey());
+        if (entity != null){
+            if (StringUtils.isNotBlank(entity.getInvoiceType())) {
+                vo.setOpenTickTypeValue(entity.getInvoiceType());
+            }
+            if (StringUtils.isNotBlank(entity.getInvoiceTypeKey())) {
+                vo.setOpenTickTypeKey(entity.getInvoiceTypeKey());
+            }
         }
         List<String> fileList = new ArrayList<>();
         List<FinBillFileVo> clmmhtApplicationAppendxs = finBillFileService.fetchcyyzzBySid(sid);

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceDto.java

@@ -33,6 +33,10 @@ public class AdvanceInvoiceDto implements Dto {
     private String invoicingUnit;
     @ApiModelProperty("是否领取原件")
     private String getOriginalValue;
+    @ApiModelProperty("开票类型key")
+    private String openTickTypeKey;
+    @ApiModelProperty("开票类型value")
+    private String openTickTypeValue;
     @ApiModelProperty("默认开票sid")
     private String openTickSid;
     @ApiModelProperty("默认开票名称")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceInfoVo.java

@@ -32,6 +32,8 @@ public class AdvanceInvoiceInfoVo implements Vo {
     private String name;
     @ApiModelProperty("开票单位")
     private String invoicingUnit;
+    @ApiModelProperty("是否领取原件key")
+    private String getOriginalKey;
     @ApiModelProperty("是否领取原件")
     private String getOriginalValue;
     @ApiModelProperty("默认开票类型key")

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

@@ -214,6 +214,11 @@ public class AppBusAdvanceGinvoiceapplyService {
         vo.setReasonKey(finBillApplicationDetailsVo.getArrearsOpenYYKey());
         vo.setReasonValue(finBillApplicationDetailsVo.getArrearsOpenYYValue());
         vo.setCollectionDate(finBillApplicationDetailsVo.getReturnedMoneyDate());
+        if ("是".equals(finBillApplicationDetailsVo.getIsLQOrigInvoice())){
+            vo.setGetOriginalKey("1");
+        }else if ("否".equals(finBillApplicationDetailsVo.getIsLQOrigInvoice())){
+            vo.setGetOriginalKey("0");
+        }
         vo.setGetOriginalValue(finBillApplicationDetailsVo.getIsLQOrigInvoice());
         vo.setProcInsId(finBillApplicationDetailsVo.getProcInstSid());
         vo.setInvoiceTotal(finBillApplicationDetailsVo.getArrearsMoney());
@@ -509,6 +514,8 @@ public class AppBusAdvanceGinvoiceapplyService {
         finBillApplicationDto.setBillNo(dto.getBillNo());
         finBillApplicationDto.setModelSid(dto.getModelSid());
         finBillApplicationDto.setModelName(dto.getModelName());
+        finBillApplicationDto.setOpenTickTypeKey(dto.getOpenTickTypeKey());
+        finBillApplicationDto.setOpenTickTypeValue(dto.getOpenTickTypeValue());
         String publishInfo = dto.getPublishInfo();
         String[] split = publishInfo.split("-");
         finBillApplicationDto.setDeptName(split[0]);