Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleappendix/BaseVehicleAppendixFeign.java

@@ -6,6 +6,9 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.List;
 
 /**
  * @Author dimengzhe
@@ -23,4 +26,9 @@ public interface BaseVehicleAppendixFeign {
     @ApiImplicitParam(name = "fullPath", value = "文件全路径", required = true, dataTypeClass = String.class)
     @PostMapping("/deleteFilesOss")
     ResultBean deleteFilesOss(@RequestParam(value = "fullPath") String fullPath);
+
+    @ApiOperation(value = "查询车辆合格证照片")
+    @PostMapping("/selectBySid")
+    @ResponseBody
+    ResultBean<List<String>> selectBySid(@RequestParam("sid") String sid);
 }

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

@@ -46,8 +46,7 @@
 
     <select id="selectListByOrgSid"
             resultType="com.yxt.anrui.base.api.basemodelmodprice.BaseModelModpriceImportVo">
-        SELECT
-               bvm.sid as modelSid,
+        SELECT bvm.sid as modelSid,
                bvm.modelName,
                bvm.vehicleTypeCode,
                bmc.configCode,
@@ -57,12 +56,13 @@
                bvc.guidedPrice,
                bvc.manufactorSettlementPrice
         FROM
--- 车型表
-base_vehicle_model AS bvm
+            -- 车型表
+            base_vehicle_model AS bvm
 -- 车型配置关联表
-    LEFT JOIN base_vehmodel_config AS bvc ON bvm.sid = bvc.modelSid
+                LEFT JOIN base_vehmodel_config AS bvc ON bvm.sid = bvc.modelSid
 -- 配置表
-    LEFT JOIN base_model_config AS bmc ON bmc.sid = bvc.configurationItemsSid
-        WHERE bvm.createOrg = #{sid}
+                LEFT JOIN base_model_config AS bmc ON bmc.sid = bvc.configurationItemsSid
+        WHERE bvc.useOrgSid = #{sid}
+        ORDER BY bvm.vehicleTypeCode
     </select>
 </mapper>

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

@@ -616,6 +616,7 @@ public class BaseModelModpriceService extends MybatisBaseService<BaseModelModpri
 
         //根据传入的车型orgSid查询当前可查看的车型以及配置数据库信息
         List<BaseModelModpriceImportVo> voList = baseMapper.selectListByOrgSid(sid);
+        System.out.println(voList.size());
         StringBuilder stringBuilder = new StringBuilder();
 //        ==============map======================
         Map<String, BaseModelModpriceImportVo> importVoMap = new HashMap<>();
@@ -706,10 +707,10 @@ public class BaseModelModpriceService extends MybatisBaseService<BaseModelModpri
                 }
             }
             //判断销售指导价是不是数字
-            if (!isNumericFirst(importVo.getGuidedPrice()) && StringUtils.isNotBlank(importVo.getGuidedPrice())) {
+            if (!isNum(importVo.getGuidedPrice()) && StringUtils.isNotBlank(importVo.getGuidedPrice())) {
                 sb.append("第" + importVo.getRankNo() + "行调整后全款销售指导价（元）不是数字格式").append(";");
             }
-            if (!isNumericFirst(importVo.getManufactorSettlementPrice()) && StringUtils.isNotBlank(importVo.getManufactorSettlementPrice())) {
+            if (!isNum(importVo.getManufactorSettlementPrice()) && StringUtils.isNotBlank(importVo.getManufactorSettlementPrice())) {
                 sb.append("第" + importVo.getRankNo() + "行调整后贷款销售指导价（元）不是数字格式").append(";");
             }
             if (importVoMap.containsKey(importVo.getVehicleTypeCode() + importVo.getConfigCode())) {
@@ -850,11 +851,14 @@ public class BaseModelModpriceService extends MybatisBaseService<BaseModelModpri
     }
 
     public boolean isNum(String s) {
-        if (s.contains(".")) {
-            return isNumeric(s);
-        } else {
-            return isNumericFirst(s);
+        if (StringUtils.isNotBlank(s)) {
+            if (s.contains(".")) {
+                return isNumeric(s);
+            } else {
+                return isNumericFirst(s);
+            }
         }
+        return false;
     }
 
     public boolean isNumeric(String s) {
@@ -874,6 +878,7 @@ public class BaseModelModpriceService extends MybatisBaseService<BaseModelModpri
 
     public boolean isNumericFirst(String str) {
         Pattern pattern = Pattern.compile("[0-9]*");
+        System.out.println(str);
         Matcher isNum = pattern.matcher(str);
         if (!isNum.matches()) {
             return false;

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleappendix/BaseVehicleAppendixRest.java

@@ -9,6 +9,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.io.File;
+import java.util.List;
 
 /**
  * @Author dimengzhe
@@ -46,4 +47,12 @@ public class BaseVehicleAppendixRest implements BaseVehicleAppendixFeign {
         }
         return rb.success().setMsg("移除成功");
     }
+
+    @Override
+    public ResultBean<List<String>> selectBySid(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        String path = fileUploadComponent.getUrlPrefix();
+        List<String> clhgzImages = baseVehicleAppendixService.selectBySid("0002", sid, path);
+        return rb.success().setData(clhgzImages);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java

@@ -724,6 +724,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                 busDiscountpackageHandoverDto.setCustomerName(busDeliveredApply.getName());
                 busDiscountpackageHandoverDto.setRecName(busDeliveredApply.getApplyName());
                 busDiscountpackageHandoverDto.setRecTime(new Date());
+                busDiscountpackageHandoverDto.setCreateBySid(busDeliveredApply.getApplySid());
                 //根据用户sid查询电话
                 ResultBean<SysUserVo> sysUserVoResultBean = sysUserFeign.fetchBySid(busDeliveredApply.getApplySid());
                 if (sysUserVoResultBean.getData() != null) {

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

@@ -4779,6 +4779,15 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 //更新临时号
                 ResultBean busSalesOrderResultBean = busSalesOrderVehicleService.updateTemporaryNo(salesOrderVinSid, temporaryNo);
             }
+        }else{
+            for (int i = 0; i < vinList.size(); i++) {
+                //销售订单中车辆表的sid
+                String salesOrderVinSid = vinList.get(i).getSid();
+                String temporaryNum = String.format("%02d", i + 1);
+                //更新临时号
+                ResultBean busSalesOrderResultBean = busSalesOrderVehicleService.updateTemporaryNo(salesOrderVinSid, temporaryNum);
+            }
+
         }
         //查询是否是结转金额，如果是，则订金金额为补交金额/台数。若为现金则为单台订金
         String key = depositInfo.getDepositTypeKey();
@@ -5718,7 +5727,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             String totaldiscount = appOrderDetailsVo.getTotaldiscount();
             if (StringUtils.isNotBlank(totaldiscount)) {
                 //计算单台优惠
-                BigDecimal bigDecimal = new BigDecimal(totaldiscount).divide(new BigDecimal(total));
+                BigDecimal bigDecimal = new BigDecimal(totaldiscount).divide(new BigDecimal(total),BigDecimal.ROUND_CEILING);
                 busSaleOrderVehicleOutVo.setTotaldiscount(bigDecimal.toString());
                 //赠送情况
                 List<AppOrderDiscountListVo> discountList = appOrderDetailsVo.getDiscountList();

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicleVo.java

@@ -33,6 +33,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * Project: anrui-fin(开票申请管理) <br/>
  * File: FinBillVehicleVo.java <br/>
@@ -83,4 +85,7 @@ public class FinBillVehicleVo implements Vo {
     private String certificateStateValue; // 合格证状态value
     @ApiModelProperty("开票信息")
     private String openTickRemarks; // 开票信息
+
+    @ApiModelProperty("合格证图片")
+    private List<String> certificatePhoto; // 合格证图片
 }

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

@@ -40,6 +40,9 @@ import com.yxt.anrui.base.api.basetrailer.TrailerVo;
 import com.yxt.anrui.base.api.basetrailer.TraliveredVo;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
+import com.yxt.anrui.base.api.basevehicleappendix.BaseVehicleAppendixFeign;
+import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateFeign;
+import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateVo;
 import com.yxt.anrui.base.api.commonappendix.*;
 import com.yxt.anrui.base.api.commoncontract.CommonContract;
 import com.yxt.anrui.base.api.commoncontract.CommonContractFeign;
@@ -164,6 +167,10 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
     private FinUncollectedReceivablesDetailedService finUncollectedReceivablesDetailedService;
     @Autowired
     private FinSelectedReceivablesDetailedService finSelectedReceivablesDetailedService;
+    @Autowired
+    private BaseVehicleCertificateFeign baseVehicleCertificateFeign;
+    @Autowired
+    private BaseVehicleAppendixFeign baseVehicleAppendixFeign;
 
     private QueryWrapper<FinBillApplication> createQueryWrapper(FinBillApplicationQuery query) {
         // todo: 这里根据具体业务调整查询条件
@@ -242,21 +249,14 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                 BeanUtil.copyProperties(finBillVehicleDto, finBillVehicle, "sid");
                 finBillVehicle.setBillAppSid(finBillApplication.getSid());
                 finBillVehicleService.save(finBillVehicle);
-            }
-            //挂车开票信息
-            if (finBillTrailers != null){
-                for (FinBillTrailerDto finBillTrailerDto : finBillTrailers) {
+                String vehSid = finBillVehicleDto.getVehSid();
+                TraliveredVo data = baseTrailerFeign.trailerList(vehSid, dto.getContractNo()).getData();
+                List<TrailerVo> list = data.getList();
+                for (TrailerVo trailerVo : list) {
                     FinBillTrailer finBillTrailer = new FinBillTrailer();
-                    BeanUtil.copyProperties(finBillTrailerDto, finBillTrailer, "sid");
+                    finBillTrailer.setGcVinNo(trailerVo.getTrailerVinNo());
+                    finBillTrailer.setVinNo(finBillVehicleDto.getVinNo());
                     finBillTrailer.setBillAppSid(finBillApplication.getSid());
-                    for (FinBillVehicleDto finBillVehicle : finBillVehicles) {
-                        if (finBillVehicle.getVinNo().equals(finBillTrailerDto.getVinNo())) {
-                            finBillTrailer.setBillTypeKey(finBillVehicle.getBillTypeKey());
-                            finBillTrailer.setBillTypeValue(finBillVehicle.getBillTypeValue());
-                            finBillTrailer.setOpenTickSid(finBillVehicle.getOpenTickSid());
-                            finBillTrailer.setOpenTickName(finBillVehicle.getOpenTickName());
-                        }
-                    }
                     finBillTrailerService.save(finBillTrailer);
                 }
             }
@@ -367,7 +367,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             finBillVehicleService.save(finBillVehicle);
         }
         finBillTrailerService.delByBillAppSid(dtoSid);
-        if (finBillTrailers != null){
+        if (finBillTrailers != null) {
             for (FinBillTrailerDto finBillTrailerDto : finBillTrailers) {
                 FinBillTrailer finBillTrailer = new FinBillTrailer();
                 BeanUtil.copyProperties(finBillTrailerDto, finBillTrailer, "sid");
@@ -415,6 +415,13 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         FinBillApplicationDetailsVo vo = new FinBillApplicationDetailsVo();
         BeanUtil.copyProperties(entity, vo);
         List<FinBillVehicleVo> finBillVehicleVos = finBillVehicleService.fetchVehBySid(sid);
+        for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) {
+            BaseVehicleCertificateVo baseVehicleCertificateVo = baseVehicleCertificateFeign.selStateByVehicleSid(finBillVehicleVo.getVehSid()).getData();
+            if (baseVehicleCertificateVo != null){
+                List<String> clhgeImages = baseVehicleAppendixFeign.selectBySid(baseVehicleCertificateVo.getSid()).getData();
+                finBillVehicleVo.setCertificatePhoto(clhgeImages);
+            }
+        }
         vo.setFinBillVehicles(finBillVehicleVos);
         List<FinBillTrailerVo> finBillTrailerVos = finBillTrailerService.fetchByMainSid(sid);
         if (finBillTrailerVos.size() > 0) {
@@ -1346,7 +1353,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             BigDecimal seYs = new BigDecimal("0");
             for (String ysSid : ysSids) {
                 String s = finSelectedReceivablesDetailedService.fetchSumSeYsByReceivablesSid(ysSid);
-                if (StringUtils.isBlank(s)){
+                if (StringUtils.isBlank(s)) {
                     s = "0";
                 }
                 seYs = seYs.add(new BigDecimal(s));
@@ -1365,7 +1372,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                 finBillVehicleService.save(finBillVehicle);
             }
             //挂车开票信息
-            if (finBillTrailers != null){
+            if (finBillTrailers != null) {
                 for (FinBillTrailerDto finBillTrailerDto : finBillTrailers) {
                     FinBillTrailer finBillTrailer = new FinBillTrailer();
                     BeanUtil.copyProperties(finBillTrailerDto, finBillTrailer, "sid");
@@ -1497,7 +1504,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             finBillVehicleService.save(finBillVehicle);
         }
         finBillTrailerService.delByBillAppSid(dtoSid);
-        if (finBillTrailers != null){
+        if (finBillTrailers != null) {
             for (FinBillTrailerDto finBillTrailerDto : finBillTrailers) {
                 FinBillTrailer finBillTrailer = new FinBillTrailer();
                 BeanUtil.copyProperties(finBillTrailerDto, finBillTrailer, "sid");
@@ -1525,7 +1532,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         if (StringUtils.isBlank(dtoSid)) {//新增
             String qkkpBillNo = dto.getBillNo();
             FinBillApplicationDetailsVo finBillApplicationDetailsVo = baseMapper.fetchByQkkpBillNo(qkkpBillNo);
-            if (finBillApplicationDetailsVo != null && !finBillApplicationDetailsVo.getNodeState().equals("终止")){
+            if (finBillApplicationDetailsVo != null && !finBillApplicationDetailsVo.getNodeState().equals("终止")) {
                 return rb.setMsg("该欠款开票的领票申请已存在");
             }
             FinBillApplication finBillApplication = new FinBillApplication();
@@ -1545,7 +1552,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                 finBillVehicleService.save(finBillVehicle);
             }
             //挂车开票信息
-            if (finBillTrailers != null){
+            if (finBillTrailers != null) {
                 for (FinBillTrailerDto finBillTrailerDto : finBillTrailers) {
                     FinBillTrailer finBillTrailer = new FinBillTrailer();
                     BeanUtil.copyProperties(finBillTrailerDto, finBillTrailer, "sid");
@@ -1605,7 +1612,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             finBillVehicleService.save(finBillVehicle);
         }
         finBillTrailerService.delByBillAppSid(dtoSid);
-        if (finBillTrailers != null){
+        if (finBillTrailers != null) {
             for (FinBillTrailerDto finBillTrailerDto : finBillTrailers) {
                 FinBillTrailer finBillTrailer = new FinBillTrailer();
                 BeanUtil.copyProperties(finBillTrailerDto, finBillTrailer, "sid");
@@ -1851,10 +1858,10 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         List<FinBillFileDto> kpxxqrsApplicationAppendxs = query.getKpxxqrsApplicationAppendxs();
         List<FinBillFileDto> cldjhtApplicationAppendxs = query.getCldjhtApplicationAppendxs();
         List<FinBillFileDto> zjApplicationAppendxs = query.getZjApplicationAppendxs();
-        if (zjApplicationAppendxs.size() == 0){
+        if (zjApplicationAppendxs.size() == 0) {
             return rb.setMsg("证件不能为空");
         }
-        if (khkpsqsApplicationAppendxs.size() == 0){
+        if (khkpsqsApplicationAppendxs.size() == 0) {
             return rb.setMsg("客户开票申请书不能为空");
         }
         FinBillApplication finBillApplication = fetchBySid(businessSid);
@@ -2139,9 +2146,9 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         for (FinBillApplicationVo record : pagging.getRecords()) {
             String qkkpBillNo = record.getBillNo();
             FinBillApplicationDetailsVo finBillApplicationDetailsVo = baseMapper.fetchByQkkpBillNo(qkkpBillNo);
-            if (finBillApplicationDetailsVo != null && !finBillApplicationDetailsVo.getNodeState().equals("终止")){
+            if (finBillApplicationDetailsVo != null && !finBillApplicationDetailsVo.getNodeState().equals("终止")) {
                 record.setIsExistQKLP(true);
-            }else {
+            } else {
                 record.setIsExistQKLP(false);
             }
         }
@@ -2195,9 +2202,9 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         for (FinBillApplicationVo record : pagging.getRecords()) {
             String qkkpBillNo = record.getBillNo();
             FinBillApplicationDetailsVo finBillApplicationDetailsVo = baseMapper.fetchByQkkpBillNo(qkkpBillNo);
-            if (finBillApplicationDetailsVo != null && !finBillApplicationDetailsVo.getNodeState().equals("终止")){
+            if (finBillApplicationDetailsVo != null && !finBillApplicationDetailsVo.getNodeState().equals("终止")) {
                 record.setIsExistQKLP(true);
-            }else {
+            } else {
                 record.setIsExistQKLP(false);
             }
         }
@@ -2431,11 +2438,11 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         }
     }
 
-    public ResultBean completeByQKLP(BusinessVariables bv,FinBillCompleteDto query) {
+    public ResultBean completeByQKLP(BusinessVariables bv, FinBillCompleteDto query) {
         ResultBean rb = ResultBean.fireFail();
         String businessSid = bv.getBusinessSid();
         List<FinBillFileDto> fjApplicationAppendxs = query.getFjApplicationAppendxs();
-        if (fjApplicationAppendxs.size() == 0){
+        if (fjApplicationAppendxs.size() == 0) {
             return rb.setMsg("附件不能为空");
         }
         FinBillApplication finBillApplication = fetchBySid(businessSid);
@@ -2692,10 +2699,10 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         List<FinBillFileDto> kpxxqrsApplicationAppendxs = query.getKpxxqrsApplicationAppendxs();
         List<FinBillFileDto> cldjhtApplicationAppendxs = query.getCldjhtApplicationAppendxs();
         List<FinBillFileDto> zjApplicationAppendxs = query.getZjApplicationAppendxs();
-        if (zjApplicationAppendxs.size() == 0){
+        if (zjApplicationAppendxs.size() == 0) {
             return rb.setMsg("证件不能为空");
         }
-        if (khkpsqsApplicationAppendxs.size() == 0){
+        if (khkpsqsApplicationAppendxs.size() == 0) {
             return rb.setMsg("客户开票申请书不能为空");
         }
         FinBillApplication finBillApplication = fetchBySid(businessSid);

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

@@ -1117,6 +1117,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                     } else {
                         if ("2".equals(record.getPayTypeKey())) {
                             record.setVin(temporaryNo.substring(temporaryNo.length() - 2));
+                        }else{
+                            record.setVin(temporaryNo);
                         }
                     }
                 }
@@ -1139,6 +1141,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                     } else {
                         if ("2".equals(record.getPayTypeKey())) {
                             record.setVin(temporaryNo.substring(temporaryNo.length() - 2));
+                        }else{
+                            record.setVin(temporaryNo);
                         }
                     }
                 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java

@@ -63,7 +63,6 @@ import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.poi.hpsf.Decimal;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -211,6 +210,8 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
                     } else {
                         if ("2".equals(v.getPayTypeKey())) {
                             v.setVIN(temporaryNo.substring(temporaryNo.length() - 2));
+                        }else{
+                            v.setVIN(temporaryNo);
                         }
                     }
                 }

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

@@ -52,6 +52,8 @@ public class AdvanceInvoiceInfoVo implements Vo {
     private String reasonValue;
     @ApiModelProperty("原因备注")
     private String remarks;
+    @ApiModelProperty("领票欠款原因（拼接）")
+    private String reasonRemarks;
     @ApiModelProperty("欠款开票挂车信息")
     private List<FinBillTrailerVo> finBillTrailers;
     @ApiModelProperty("附件")
@@ -73,7 +75,7 @@ public class AdvanceInvoiceInfoVo implements Vo {
     @ApiModelProperty("合同编号")
     private String contractId;
     @ApiModelProperty("单据编号")
-    private String billNo; // 单据编号
+    private String billNo;
     @ApiModelProperty("任务id")
     private String taskId;
     @ApiModelProperty("流程实列id")
@@ -81,9 +83,9 @@ public class AdvanceInvoiceInfoVo implements Vo {
     @ApiModelProperty("流程状态")
     private String nodeState;
     @ApiModelProperty("车型sid")
-    private String modelSid; // 车型sid
+    private String modelSid;
     @ApiModelProperty("车型名称")
-    private String modelName; // 车型名称
+    private String modelName;
     @ApiModelProperty("提前领取发票原件原因")
     private String reason;
 }

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

@@ -224,6 +224,15 @@ public class AppBusAdvanceGinvoiceapplyService {
         vo.setModelSid(finBillApplicationDetailsVo.getModelSid());
         vo.setModelName(finBillApplicationDetailsVo.getModelName());
         vo.setPublishInfo(finBillApplicationDetailsVo.getDeptName() + "-" + finBillApplicationDetailsVo.getCreateByName());
+        String reasonValue = vo.getReasonValue();
+        String remarks = vo.getRemarks();
+        String reasonRemarks = "";
+        if (StringUtils.isNotBlank(remarks)){
+            reasonRemarks = reasonValue + " \n" + remarks;
+        }else {
+            reasonRemarks = reasonValue;
+        }
+        vo.setReasonRemarks(reasonRemarks);
         //车辆信息
         List<AppCarListVo> vinListVos = new ArrayList<>();
         List<FinBillVehicleVo> finBillVehicles = finBillApplicationDetailsVo.getFinBillVehicles();

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyService.java

@@ -290,7 +290,7 @@ public class AppBusDeliveredApplyService {
         List<BaseVehinstallmodelDetailsVo> vehillModelList = traliveredVo.getVehillModelList();
         if (!list.isEmpty()) {
             for (int i = 0; i < list.size(); i++) {
-                String title = "挂车" + i + 1;
+                String title = "挂车" + (i + 1);
                 titles.add(title);
                 TrailerVo trailerVo = list.get(i);
                 List<ConfigVo> configVoList = new ArrayList<>();
@@ -421,7 +421,7 @@ public class AppBusDeliveredApplyService {
         }
         if (!vehillModelList.isEmpty()) {
             for (int i = 0; i < vehillModelList.size(); i++) {
-                String title = "上装" + i + 1;
+                String title = "上装" + (i + 1);
                 titles.add(title);
                 BaseVehinstallmodelDetailsVo baseVehinstallmodelDetailsVo = vehillModelList.get(i);
                 List<ConfigVo> configVoList = new ArrayList<>();
@@ -463,6 +463,7 @@ public class AppBusDeliveredApplyService {
         }
 
         deliveredTralierVo.setHandCarInfo(handCarInfo);
+        deliveredTralierVo.setTitles(titles);
         return rb.success().setData(deliveredTralierVo);
     }