优化

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectReceivablesDetailedVo.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.fin.api.finselectedreceivablesdetailed;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -15,8 +16,8 @@ public class FinSelectReceivablesDetailedVo implements Vo {
 
     @ApiModelProperty("当前行sid")
     private String sid;
-    @ApiModelProperty("应收未收记录sid")
-    private String receivablesSid;
+    @ApiModelProperty("合同sid")
+    private String contractSid;
     @ApiModelProperty("合同编号")
     private String contractNo;
     @ApiModelProperty("客户sid")
@@ -24,15 +25,18 @@ public class FinSelectReceivablesDetailedVo implements Vo {
     @ApiModelProperty("客户名称")
     private String customerName;
     @ApiModelProperty("车架号")
-    private String vinNo;
+    @JsonProperty("VIN")
+    private String VIN;
     @ApiModelProperty("联系电话")
     private String customerPhone;
     @ApiModelProperty("应收项目名称")
     private String receivablesName;
-    @ApiModelProperty("当前应收")
+    @ApiModelProperty("当前应收金额")
     private String currentReceivableMoney;
+    @ApiModelProperty("应收未收sid")
+    private String receivablesSid;
 
-    @ApiModelProperty("剩余应收")
+    @ApiModelProperty("应收金额")
     private String reveivableMoney;
     @ApiModelProperty("业务车辆sid")
     private String busVinSid;

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/DetailsOfReceivablesAndUncollectedItemsVo.java

@@ -81,4 +81,7 @@ public class DetailsOfReceivablesAndUncollectedItemsVo implements Vo {
 
     @ApiModelProperty("是否是已认款的选择：0不是（应收未收），1是（已认款）")
     private int subscribedOf;
+
+    @ApiModelProperty("应收未收sid")
+    private String receivablesSid;
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java

@@ -317,7 +317,7 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
     }
 
     public int updateAuditStateBySid(int i, String sid) {
-        return baseMapper.updateAuditStateBySid(i,sid);
+        return baseMapper.updateAuditStateBySid(i, sid);
     }
 
     public ResultBean<FinSelectedReceivablesDetailed> fetchByReceivablesSidLimt(String ysSid) {
@@ -350,13 +350,13 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
             qw.eq("createBySid", userSid);
         }
         //查询没有认完的车辆sid
-        List<String> stringList = baseMapper.selectUnSelectList(pagerQuery.getParams().getPurchaseSystemSid(),userSid,useOrgSid);
+       /* List<String> stringList = baseMapper.selectUnSelectList(pagerQuery.getParams().getPurchaseSystemSid(),userSid,useOrgSid);
         stringList.removeAll(Collections.singleton(null));
         if(!stringList.isEmpty()){
             qw.notIn("receivablesSid",stringList);
-        }
-        List<FinSelectReceivablesDetailedVo> collList = baseMapper.selectPageList(qw,params.getName());
-        /*if (collList.isEmpty()) {
+        }*/
+        List<FinSelectReceivablesDetailedVo> collList = baseMapper.selectPageList(qw, params.getName());
+        if (collList.isEmpty()) {
             collList = baseMapper.selectPageList(qw, "");
             for (FinSelectReceivablesDetailedVo record : collList) {
                 record.setSubscribedOf(1);
@@ -366,20 +366,20 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
                     String vinNo = resultBean.getData().getLinkNo();
                     String vinSid = resultBean.getData().getLinkSid();
                     String temporaryNo = resultBean.getData().getTemporaryNo();
-                    record.setVin(vinNo);
+                    record.setVIN(vinNo);
                     if (StringUtils.isNotBlank(vinNo)) {
-                        record.setVin(vinNo.substring(vinNo.length() - 8));
+                        record.setVIN(vinNo.substring(vinNo.length() - 8));
                     } else {
                         if ("2".equals(record.getPayTypeKey())) {
-                            record.setVin(temporaryNo.substring(temporaryNo.length() - 2));
+                            record.setVIN(temporaryNo.substring(temporaryNo.length() - 2));
                         } else {
-                            record.setVin(temporaryNo);
+                            record.setVIN(temporaryNo);
                         }
                     }
                 }
             }
             if (StringUtils.isNotBlank(pagerQuery.getParams().getName())) {
-                collList = collList.stream().filter(v -> v.getVin().contains(pagerQuery.getParams().getName())).collect(Collectors.toList());
+                collList = collList.stream().filter(v -> v.getVIN().contains(pagerQuery.getParams().getName())).collect(Collectors.toList());
             }
         } else {
             for (FinSelectReceivablesDetailedVo record : collList) {
@@ -390,28 +390,28 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
                     String vinNo = resultBean.getData().getLinkNo();
                     String vinSid = resultBean.getData().getLinkSid();
                     String temporaryNo = resultBean.getData().getTemporaryNo();
-                    record.setVin(vinNo);
+                    record.setVIN(vinNo);
                     if (StringUtils.isNotBlank(vinNo)) {
-                        record.setVin(vinNo.substring(vinNo.length() - 8));
+                        record.setVIN(vinNo.substring(vinNo.length() - 8));
                     } else {
                         if ("2".equals(record.getPayTypeKey())) {
-                            record.setVin(temporaryNo.substring(temporaryNo.length() - 2));
+                            record.setVIN(temporaryNo.substring(temporaryNo.length() - 2));
                         } else {
-                            record.setVin(temporaryNo);
+                            record.setVIN(temporaryNo);
                         }
                     }
                 }
             }
             if (StringUtils.isNotBlank(pagerQuery.getParams().getName())) {
-                List<FinSelectReceivablesDetailedVo> cll = collList.stream().filter(v -> v.getVin().contains(pagerQuery.getParams().getName())).collect(Collectors.toList());
+                List<FinSelectReceivablesDetailedVo> cll = collList.stream().filter(v -> v.getVIN().contains(pagerQuery.getParams().getName())).collect(Collectors.toList());
                 collList = Stream.of(collList, cll).flatMap(Collection::stream).collect(Collectors.toList());
             }
-        }*/
+        }
         //将collList根据sid去重
         collList = collList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(()
                 -> new TreeSet<>(Comparator.comparing(FinSelectReceivablesDetailedVo::getSid))), ArrayList::new));
         //根据合同编号倒序排序
-//        collList = collList.stream().sorted(Comparator.comparing(FinSelectReceivablesDetailedVo::getContractId).reversed()).collect(Collectors.toList());
+        collList = collList.stream().sorted(Comparator.comparing(FinSelectReceivablesDetailedVo::getContractNo).reversed()).collect(Collectors.toList());
         //分页
         IPage<FinSelectReceivablesDetailedVo> page1 = new Page<>();
         page1.setRecords(collList);

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

@@ -203,6 +203,7 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
                 String busVinSid = v.getBusVinSid();
                 ResultBean<BusSalesOrderVehicle> resultBean = busSalesOrderVehicleFeign.details(busVinSid);
                 if (resultBean.getData() != null) {
+                    v.setReceivablesSid(v.getSid());
                     String vinNo = resultBean.getData().getLinkNo();
                     String vinSid = resultBean.getData().getLinkSid();
                     String temporaryNo = resultBean.getData().getTemporaryNo();