问题优化

2 years ago · 8d07e87901
6 changed files with 71 additions and 33 deletions
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleappendix/BaseVehicleAppendixFeign.java
+++ b/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);
 }
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleappendix/BaseVehicleAppendixRest.java
+++ b/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);
+    }
 }
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicleVo.java
+++ b/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; // 合格证图片
 }
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
+++ b/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,11 @@ 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();
+            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 +1351,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 +1370,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 +1502,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 +1530,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 +1550,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 +1610,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 +1856,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 +2144,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 +2200,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 +2436,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 +2697,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);
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceInfoVo.java
+++ b/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;
 }
--- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java
+++ b/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();