开票管理详情 调价模板更新

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java

@@ -722,6 +722,22 @@ public class BaseModelModpriceService extends MybatisBaseService<BaseModelModpri
                 importVo.setOtherConfig(modpriceImportVo.getOtherConfig());
                 importVo.setModelSid(modpriceImportVo.getModelSid());
                 importVo.setConfigSid(modpriceImportVo.getConfigSid());
+                if (StringUtils.isNotBlank(importVo.getGuidedPrice()) && importVo.getGuidedPrice().contains(".")) {
+                    String guidedPrice = importVo.getGuidedPrice();
+                    String substring = guidedPrice.substring(0, guidedPrice.lastIndexOf("."));
+                    String substringLast = guidedPrice.substring(guidedPrice.lastIndexOf(".") + 1);
+                    if ("0".equals(substringLast) || "00".equals(substringLast)) {
+                        importVo.setGuidedPrice(substring);
+                    }
+                }
+                if (StringUtils.isNotBlank(importVo.getManufactorSettlementPrice()) && importVo.getManufactorSettlementPrice().contains(".")) {
+                    String settlementPrice = importVo.getManufactorSettlementPrice();
+                    String substring = settlementPrice.substring(0, settlementPrice.lastIndexOf("."));
+                    String substringLast = settlementPrice.substring(settlementPrice.lastIndexOf(".") + 1);
+                    if ("0".equals(substringLast) || "00".equals(substringLast)) {
+                        importVo.setManufactorSettlementPrice(substring);
+                    }
+                }
                 importVoList.add(importVo);
                 vehTypeAndConfigMap.put(importVo.getRankNo(), importVo.getVehicleTypeCode() + importVo.getConfigCode() + importVo.getGuidedPrice() + importVo.getManufactorSettlementPrice());
                 ranks.add(importVo.getRankNo());

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceDetailsVo.java

@@ -68,4 +68,6 @@ public class FinVehicleInvoiceDetailsVo implements Vo {
     private List<String> billingFilePaths;
     @ApiModelProperty("合格证照片")
     private List<String> certificatePaths;
+    @ApiModelProperty("纳税人识别号")
+    private String taxpayerNo;
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml

@@ -146,6 +146,8 @@
         <result column="bankNum" property="bankNum"></result>
         <result column="recipient" property="recipient"></result>
         <result column="transferTime" property="transferTime"></result>
+        <result column="taxpayerNo" property="taxpayerNo"></result>
+
     </resultMap>
     <select id="getInvoiceDetailsBySid"
             resultMap="getInvoiceDetailsBySidResultMap">
@@ -171,7 +173,8 @@
                         v.openingBank     as openingBank,
                         v.recipient       as recipient,
                         v.transferTime    as transferTime,
-                        v.bankNum         as bankNum
+                        v.bankNum         as bankNum,
+                        v.taxpayerNo      as taxpayerNo
         FROM fin_vehicle_invoice AS v
                  LEFT JOIN anrui_portal.sys_user AS u ON v.createBySid = u.sid
                  LEFT JOIN anrui_portal.sys_staffinfo AS si ON u.staffSid = si.sid