优化

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/PcSelBillVinNoQuery.java

@@ -54,8 +54,10 @@ public class PcSelBillVinNoQuery implements Query {
     private String orgPath;
 	@ApiModelProperty("合同号")
     private String contractId;
-	@ApiModelProperty("已选车架号")
+	@ApiModelProperty("已选车辆sid")
     private List<String> vins;
+    @ApiModelProperty("已选车架号")
+    private List<String> vinNos;
 	@ApiModelProperty("客户名称")
     private String name;
     @ApiModelProperty("车架号")

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

@@ -405,11 +405,15 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             qw.eq("bo.customerName", query.getName());
         }
         if (StringUtils.isNotBlank(query.getVinNo())) {
+
             qw.eq("bv.linkNo", query.getVinNo());
         }
         if (query.getVins() != null && query.getVins().size() > 0) {
             qw.notIn("bv.linkSid", query.getVins());
         }
+        if (query.getVinNos() != null && query.getVinNos().size() > 0) {
+            qw.notIn("bv.linkNo", query.getVinNos());
+        }
         //移动端条件
         if (StringUtils.isNotBlank(query.getName())) {
             qw.and(wrapper -> wrapper.like("bo.contractNo", query.getName()).or().like("bo.customerName", query.getName()));
@@ -1275,6 +1279,14 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                 }
             }
         }
+        //判断车辆是否发起过开票申请
+        List<FinBillVehicleDto> finBillVehicles = dto.getFinBillVehicles();
+        for (FinBillVehicleDto finBillVehicle : finBillVehicles) {
+            int i = finBillVehicleService.checkIsKp(contractNo, finBillVehicle.getVehSid());
+            if (i > 0){
+                return rb.setMsg(finBillVehicle.getVinNo() + "已发起过开票申请");
+            }
+        }
         //用户的组织全路径
         String orgSidPath = "";
         if (StringUtils.isNotBlank(dto.getOrgSidPath())) {
@@ -2420,8 +2432,10 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                                 finVehicleInvoiceDto.setTaxpayerNo(finCompanyInvoicingDetailsVo.getTaxpayerNo());
                             } else {
                                 CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(finBillVehicleVo.getOpenTickSid()).getData();
-                                finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile());
+                                if (crmCustomerTempVo != null){
-                                finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber());
+                                    finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile());
+                                    finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber());
+                                }
                             }
                             finVehicleInvoiceDto.setIsTakeTicket(finBillApplication.getIsLQOrigInvoice());
                             finVehicleInvoiceService.mySave(finVehicleInvoiceDto);

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleMapper.java

@@ -83,4 +83,6 @@ public interface FinBillVehicleMapper extends BaseMapper<FinBillVehicle> {
 	List<FinBillVehicleVo> fetchByMainSid(String sid);
 
     List<String> fetchByUseOrgSid(@Param(Constants.WRAPPER) Wrapper<FinBillVehicle> qw);
+
+    int checkIsKp(@Param("contractNo") String contractNo,@Param("vehSid") String vehSid);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleMapper.xml

@@ -45,4 +45,15 @@
           AND fba.`nodeState` != "待提交"
   AND fba.`nodeState` != "终止"
     </select>
+
+    <select id="checkIsKp" resultType="int">
+        SELECT COUNT(*)
+        FROM fin_bill_vehicle fv
+                     JOIN fin_bill_application fa
+                ON fv.`billAppSid` = fa.`sid`
+        WHERE fa.`contractNo` = #{contractNo}
+          AND fv.`vehSid` = #{vehSid}
+          AND fa.`nodeState` != '待提交'
+          AND fv.`isDelete` = 0
+    </select>
 </mapper>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleService.java

@@ -161,4 +161,8 @@ public class FinBillVehicleService extends MybatisBaseService<FinBillVehicleMapp
         qw.ne("fba.nodeState","终止");
         return baseMapper.fetchByUseOrgSid(qw);
     }
+
+    public int checkIsKp(String contractNo, String vehSid) {
+        return baseMapper.checkIsKp(contractNo,vehSid);
+    }
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/InvoicedFeign.java

@@ -29,7 +29,7 @@ public interface InvoicedFeign {
     public ResultBean<PagerVo<BillApplicationPageVo>> getInvoicedApplyList(@RequestBody PagerQuery<BillApplicationPageQuery> pagerQuery);
 
     @ApiOperation("手机端-删除开票申请")
-    @GetMapping("/deleteInvoice")
+    @DeleteMapping("/deleteInvoice")
     @ResponseBody
     public ResultBean deleteInvoice(@RequestParam("sid") String sid);
 

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/SelBillVinNoPageVo.java

@@ -24,6 +24,12 @@ public class SelBillVinNoPageVo implements Vo {
     private String invoicingUnit;
     @ApiModelProperty("客户名称")
     private String name;
+    @ApiModelProperty("单台开票金额")
+    private String invoiceMoney;
+    @ApiModelProperty("车型sid")
+    private String modelSid;
+    @ApiModelProperty("车型名称")
+    private String modelName;
 
     @ApiModelProperty("主车信息")
     private List<SelBillZcVo> cars;

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java

@@ -50,6 +50,7 @@ import org.springframework.stereotype.Service;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -128,32 +129,71 @@ public class InvoicedService {
     public ResultBean<PagerVo<SelBillVinNoPageVo>> getSelectVinsList(PagerQuery<SelBillVinNoQuery> pagerQuery) {
         ResultBean<PagerVo<SelBillVinNoPageVo>> rb = ResultBean.fireFail();
         SelBillVinNoQuery params = pagerQuery.getParams();
-        FinBillApplicationQuery finBillApplicationQuery = new FinBillApplicationQuery();
+        PcSelBillVinNoQuery pcSelBillVinNoQuery = new PcSelBillVinNoQuery();
-        finBillApplicationQuery.setCreateBySid(params.getUserSid());
+        pcSelBillVinNoQuery.setUserSid(params.getUserSid());
-        finBillApplicationQuery.setName(params.getName());
+        pcSelBillVinNoQuery.setName(params.getName());
-        finBillApplicationQuery.setOrgPath(params.getOrgPath());
+        pcSelBillVinNoQuery.setOrgPath(params.getOrgPath());
-        //finBillApplicationQuery.setType(params.getType());
+        pcSelBillVinNoQuery.setContractId(params.getContractId());
-        //finBillApplicationQuery.setMenuSid(params.getMenuSid());
+        pcSelBillVinNoQuery.setVinNos(params.getVins());
-        PagerQuery<FinBillApplicationQuery> pcq = new PagerQuery<>();
+        PagerQuery<PcSelBillVinNoQuery> pcq = new PagerQuery<>();
-        pcq.setParams(finBillApplicationQuery);
+        pcq.setParams(pcSelBillVinNoQuery);
-        ResultBean<PagerVo<FinBillApplicationVo>> resultBean = finBillApplicationFeign.listPage(pcq);
+        PagerVo<PcSelBillVinNoPageVo> data = finBillApplicationFeign.getSelectVinsList(pcq).getData();
-        List<FinBillApplicationVo> records = resultBean.getData().getRecords();
+        List<SelBillVinNoPageVo> selBillVinNoPageVos = new ArrayList<>();
-        List<SelBillVinNoPageVo> billApplicationPageVos = new ArrayList<>();
+        List<SelBillZcVo> selBillZcVos = new ArrayList<>();
         PagerVo<SelBillVinNoPageVo> v = new PagerVo<>();
-        v.setRecords(billApplicationPageVos);
+        for (PcSelBillVinNoPageVo record : data.getRecords()) {
+            //第一层
+            SelBillVinNoPageVo selBillVinNoPageVo = new SelBillVinNoPageVo();
+            if (selBillVinNoPageVos.stream().
+                    filter(item -> item.getContractId().
+                            equals(record.getContractId())).findAny().
+                    isPresent()) {
+            } else {
+                selBillZcVos = new ArrayList<>();
+                BeanUtil.copyProperties(record, selBillVinNoPageVo);
+                selBillVinNoPageVo.setInvoiceMoney(record.getKpMoney());
+                selBillVinNoPageVos.add(selBillVinNoPageVo);
+            }
+            //第二层
+            if (selBillVinNoPageVos.stream().
+                    filter(item -> item.getContractId().
+                            equals(record.getContractId())).findAny().
+                    isPresent()) {
+                SelBillZcVo selBillZcVo = new SelBillZcVo();
+                BeanUtil.copyProperties(record, selBillZcVo);
+                //第三层
+                List<PcSelBillGcVo> finBillTrailers = record.getFinBillTrailers();
+                List<SelBillGcVo> selBillGcVos = new ArrayList<>();
+                if (finBillTrailers != null && finBillTrailers.size() > 0) {
+                    for (PcSelBillGcVo finBillTrailer : finBillTrailers) {
+                        SelBillGcVo selBillGcVo = new SelBillGcVo();
+                        BeanUtil.copyProperties(finBillTrailer, selBillGcVo);
+                        selBillGcVos.add(selBillGcVo);
+                    }
+                }
+                selBillZcVo.setFinBillTrailers(selBillGcVos);
+                selBillZcVos.add(selBillZcVo);
+                selBillVinNoPageVo.setCars(selBillZcVos);
+            }
+        }
+        v.setRecords(selBillVinNoPageVos);
         return rb.success().setData(v);
     }
 
     public ResultBean<BillApplicationIInfoVo> getInvoicedApply(BillApplicationPageInfoQuery query) {
         ResultBean<BillApplicationIInfoVo> rb = ResultBean.fireFail();
         BillApplicationIInfoVo vo = new BillApplicationIInfoVo();
-        if (StringUtils.isBlank(query.getSid())){
+        if (StringUtils.isBlank(query.getSid())) {
             String userSid = query.getUserSid();
             String orgPath = query.getOrgPath();
             SysUserVo sysUserVo = sysUserFeign.fetchBySid(userSid).getData();
             SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.selectByOrgSidPath(orgPath).getData();
-            vo.setPublishInfo(sysOrganizationVo.getName() + sysUserVo.getName());
+            vo.setPublishInfo(sysOrganizationVo.getName() + "-" + sysUserVo.getName());
             vo.setShowBtn(true);
+            vo.setInvoiceStateKey("001");
+            vo.setInvoiceState("正常开票");
+            vo.setDate(DateUtil.formatDate(new Date()));
+            return rb.success().setData(vo);
         }
         ResultBean<FinBillApplicationDetailsVo> resultBean = finBillApplicationFeign.fetchDetailsBySid(query.getSid());
         if (!resultBean.getSuccess()) {
@@ -428,9 +468,9 @@ public class InvoicedService {
         FinBillApplicationDto finBillApplicationDto = new FinBillApplicationDto();
         BeanUtil.copyProperties(dto, finBillApplicationDto, "carBuyContractImages");
         String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData();
-        if (dto.getShowBtn()){
+        if (dto.getShowBtn()) {
             finBillApplicationDto.setShowBtnStr("1");
-        }else {
+        } else {
             finBillApplicationDto.setShowBtnStr("0");
         }
         finBillApplicationDto.setUseOrgSid(useOrgSid);
@@ -540,6 +580,7 @@ public class InvoicedService {
         finBillApplicationDto.setKpxxqrsApplicationAppendxs(kpxxqrsApplicationAppendxs);
         finBillApplicationDto.setCldjhtApplicationAppendxs(cldjhtApplicationAppendxs);
         finBillApplicationDto.setZjApplicationAppendxs(idCardImagesPC);
+        finBillApplicationDto.setArrearsMoney("0");
         ResultBean resultBean = finBillApplicationFeign.save(finBillApplicationDto);
         return resultBean;
     }
@@ -740,9 +781,9 @@ public class InvoicedService {
 
     public ResultBean submitInvoicedInfo(SubmitInvoicedInfoDto dto) {
         ResultBean rb = ResultBean.fireFail();
-        if (dto.getShowBtn()){
+        if (dto.getShowBtn()) {
             List<VinListDto> vinList = dto.getVinList();
-            if (vinList == null || vinList.size() == 0){
+            if (vinList == null || vinList.size() == 0) {
                 return rb.setMsg("车辆不能为空");
             }
         }