Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basebrandletpricepowimit/BaseBrandletpricepowimitService.java

@@ -144,7 +144,7 @@ public class BaseBrandletpricepowimitService extends MybatisBaseService<BaseBran
         ResultBean rb = ResultBean.fireFail();
         String dtoSid = dto.getSid();
         List<BaseRoleletpricepowimitDto> baseRoleletpricepowimits = dto.getBaseRoleletpricepowimits();
-        List<BaseRoleletpricepowimitDto> baseRoleletpricepowimitsNew = new ArrayList<>();
+        List<BaseRoleletpricepowimitDto> baseRoleletpricepowimitsNew = dto.getBaseRoleletpricepowimits();
         if (StringUtils.isBlank(dtoSid)) {
             this.insertByDto(dto);
             return rb.success();
@@ -161,15 +161,16 @@ public class BaseBrandletpricepowimitService extends MybatisBaseService<BaseBran
             if (i > 0) {
                 return rb.setMsg("选择的关系已存在，请重新选择");
             }
-            //判断选择的数据是否重复
-            if (baseRoleletpricepowimitsNew.size() == 0){
-                baseRoleletpricepowimitsNew.add(baseRoleletpricepowimit);
         }
-            for (BaseRoleletpricepowimitDto baseRoleletpricepowimitDto : baseRoleletpricepowimitsNew) {
+        //判断选择的数据是否存在重复数据
-                if (baseRoleletpricepowimit.getDeptSid().equals(baseRoleletpricepowimitDto.getDeptSid()) && baseRoleletpricepowimit.getRoleSid().equals(baseRoleletpricepowimitDto.getRoleSid())){
+        for (int i = 0; i < baseRoleletpricepowimits.size(); i++) {
+            BaseRoleletpricepowimitDto baseRoleletpricepowimitDto = baseRoleletpricepowimits.get(i);
+            for (int j = i + 1; j < baseRoleletpricepowimitsNew.size(); j++) {
+                BaseRoleletpricepowimitDto baseRoleletpricepowimitDto1 = baseRoleletpricepowimitsNew.get(j);
+                if (baseRoleletpricepowimitDto1 != null){
+                    if (baseRoleletpricepowimitDto1.getDeptSid().equals(baseRoleletpricepowimitDto.getDeptSid()) && baseRoleletpricepowimitDto1.getRoleSid().equals(baseRoleletpricepowimitDto.getRoleSid())) {
                         return rb.setMsg("选择的部门和角色不可重复，请重新选择");
-                }else {
+                    }
-                    baseRoleletpricepowimitsNew.add(baseRoleletpricepowimit);
                 }
             }
         }

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

@@ -6800,6 +6800,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         orderContractQuery.setUserSid(busSalesOrder.getCreateBySid());
         saveContract(orderContractQuery);
         ResultBean<AppOrderDetailsVo> details = getSaleOrderDetails(sid);
+        busSalesOrder = fetchBySid(sid);
         AppOrderDetailsVo vo = details.getData();
         //为三方金融和担保贷款
         if ("2".equals(busSalesOrder.getFinancePlan()) || "2".equals(busSalesOrder.getPayTypeKey())) {

anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshouzhengce/xiaoshouzhengceAdd.vue

@@ -48,7 +48,7 @@
             </el-col>
             <el-col :span="4">
               <el-form-item>
-                <el-input v-model="temp.projectCost" class="addinputw" placeholder="" clearable @keyup.native="oninput"/>
+                <el-input v-model="temp.projectCost" :disabled="temp.salesPolicyKey === '0001'" class="addinputw" placeholder="" clearable @keyup.native="oninput"/>
               </el-form-item>
             </el-col>
             <el-col :span="4" class="tleftb">
@@ -340,6 +340,9 @@ export default {
         this.$message({ showClose: true, type: 'error', message: '因政策类别为优惠,则优惠包类别只能选择赠送优惠' })
         return
       }
+      if (this.temp.salesPolicyKey === '0001') {
+        this.temp.projectCost = '0'
+      }
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
           this.disabled = true
@@ -367,6 +370,9 @@ export default {
         this.$message({ showClose: true, type: 'error', message: '因政策类别为优惠,则优惠包类别只能选择赠送优惠' })
         return
       }
+      if (this.temp.salesPolicyKey === '0001') {
+        this.temp.projectCost = '0'
+      }
       if (this.temp.salesPolicy === '促销' && this.temp.baseDiscountpackageVehs.length === 0) {
         this.$message({ showClose: true, type: 'error', message: '因政策类别为促销,则享受促销政策的车辆列表不能为空' })
         return

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

@@ -14,27 +14,29 @@ import lombok.Data;
 public class FinSelectReceivablesDetailedVo implements Vo {
     private static final long serialVersionUID = -1672232048017802807L;
 
-    @ApiModelProperty("应收未收款项sid")
+    @ApiModelProperty("当前行sid")
-    private String sid; // 应收未收款项sid
+    private String sid;
     @ApiModelProperty("合同sid")
-    private String contractSid; // 合同sid
+    private String contractSid;
     @ApiModelProperty("合同编号")
-    private String contractNo; // 合同编号
+    private String contractNo;
     @ApiModelProperty("客户sid")
-    private String customerSid; // 客户sid
+    private String customerSid;
     @ApiModelProperty("客户名称")
-    private String customerName; // 客户名称
+    private String customerName;
     @ApiModelProperty("车架号")
     @JsonProperty("VIN")
-    private String VIN; // 车架号
+    private String VIN;
     @ApiModelProperty("联系电话")
-    private String customerPhone; // 联系电话
+    private String customerPhone;
     @ApiModelProperty("应收项目名称")
-    private String receivablesName; // 应收项目名称
+    private String receivablesName;
     @ApiModelProperty("当前应收金额")
-    private String currentReceivableMoney; // 当前应收金额
+    private String currentReceivableMoney;
+    @ApiModelProperty("应收未收sid")
+    private String receivablesSid;
 
-    @ApiModelProperty("应收金额")
+    @ApiModelProperty("剩余金额")
     private String reveivableMoney;
     @ApiModelProperty("业务车辆sid")
     private String busVinSid;
@@ -46,4 +48,9 @@ public class FinSelectReceivablesDetailedVo implements Vo {
 
     @ApiModelProperty("是否是已认款的选择：0不是（应收未收），1是（已认款）")
     private int subscribedOf;
+
+    private String subscriptionMoney;
+
+    @ApiModelProperty("分公司sid")
+    private String useOrgSid;
 }

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

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

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/fincollectionconfirmation/FinCollectionConfirmationService.java

@@ -1080,6 +1080,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         if (collList.isEmpty()) {
             collList = finSelectedReceivablesDetailedService.getPaymentList(qw, "");
             for (AppFinUncollectedReceivablesDetailedVo record : collList) {
+                record.setReceivablesSid(record.getSid());
                 record.setSubscribedOf(0);
                 record.setConfirmDate(dateFormat.format(new Date()));
                 String busVinSid = record.getBusVinSid();
@@ -1105,6 +1106,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
             }
         } else {
             for (AppFinUncollectedReceivablesDetailedVo record : collList) {
+                record.setReceivablesSid(record.getSid());
                 record.setSubscribedOf(0);
                 record.setConfirmDate(dateFormat.format(new Date()));
                 String busVinSid = record.getBusVinSid();

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

@@ -288,10 +288,22 @@
 
     <select id="selectPageList"
             resultType="com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectReceivablesDetailedVo">
-        select fd.*
+        select fd.sid,
+        fd.receivablesSid,
+        fd.contractNo,
+        fd.customerSid,
+        fd.customerName,
+        fd.customerPhone,
+        fd.receivablesName,
+        fd.currentReceivableMoney,
+        furd.busVinSid,
+        furd.payType,
+        furd.payTypeKey,
+        fd.subscriptionMoney,
+        fd.useOrgSid
         from fin_selected_receivables_detailed fd
         left join fin_uncollected_receivables_detailed furd on furd.sid = fd.receivablesSid
-        where fd.receivablesName != '订金'
+        where fd.receivablesName != '订金' and fd.auditState = 3
         <where>
             ${ew.sqlSegment}
             <if test="name != null and name != ''">

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

@@ -46,6 +46,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -350,15 +351,27 @@ 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()) {
+        if (collList.isEmpty()) {
             collList = baseMapper.selectPageList(qw, "");
             for (FinSelectReceivablesDetailedVo record : collList) {
+                BigDecimal currentMoney = new BigDecimal(record.getCurrentReceivableMoney());
+                BigDecimal subscriptionMoney = new BigDecimal(record.getSubscriptionMoney());
+                if(currentMoney.compareTo(BigDecimal.ZERO)<=0){
+                    record.setReveivableMoney("0");
+                }else{
+                    BigDecimal bigDecimal1 = currentMoney.subtract(subscriptionMoney);
+                    if(bigDecimal1.compareTo(BigDecimal.ZERO)<=0){
+                        record.setReveivableMoney("0");
+                    }else{
+                        record.setReveivableMoney(bigDecimal1.toString());
+                    }
+                }
                 record.setSubscribedOf(1);
                 String busVinSid = record.getBusVinSid();
                 ResultBean<BusSalesOrderVehicle> resultBean = busSalesOrderVehicleFeign.details(busVinSid);
@@ -366,20 +379,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 +403,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();

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigMapper.java

@@ -24,4 +24,6 @@ public interface SysFlowableConfigMapper extends BaseMapper<SysFlowableConfig> {
     int deleteBySid(String userSid);
 
     String selectBySid(String changeUserSid);
+
+    int updateDateByUserSid(String userSid);
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.yxt.anrui.portal.biz.sysflowableconfig.SysFlowableConfigMapper">
     <select id="selectByUserSid" resultType="com.yxt.anrui.portal.api.sysflowableconfig.SysFlowableConfig">
         select * from sys_flowable_config where userSid = #{userSid}
-        and(startDate is null or startDate &lt;#{nowDate})
+        and(startDate &lt;#{nowDate})
         and(endDate is null or endDate>#{nowDate})
     </select>
 
@@ -29,4 +29,8 @@
         left join sys_staffinfo si on si.sid = su.staffSid
         where su.sid = #{changeUserSid}
     </select>
+
+    <update id="updateDateByUserSid">
+        update sys_flowable_config set startDate = NULL,endDate = NULL WHERE userSid = #{userSid}
+    </update>
 </mapper>

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigService.java

@@ -50,6 +50,8 @@ public class SysFlowableConfigService extends MybatisBaseService<SysFlowableConf
     }
 
     public ResultBean setBlank(String userSid) {
-        return null;
+        ResultBean rb = ResultBean.fireFail();
+        baseMapper.updateDateByUserSid(userSid);
+        return rb.success();
     }
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenurole/SysMenuRoleMapper.xml

@@ -44,9 +44,13 @@
     </select>
 
     <select id="selMenuByRole" resultType="com.yxt.anrui.portal.api.sysmenurole.SysMenuRoleDataVo">
-        SELECT smr.sid,sm.`name`,smr.`dataRuleId`
+        SELECT
-        FROM sys_menu_role smr
+        smr.sid,
-        LEFT JOIN sys_menu sm
+        sm.`name`,
+        smr.`dataRuleId`
+        FROM
+        sys_menu sm
+        LEFT JOIN sys_menu_role smr
         ON smr.`menuSid` = sm.`sid`
         <where>
             ${ew.sqlSegment}

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenurole/SysMenuRoleService.java

@@ -173,11 +173,6 @@ public class SysMenuRoleService extends MybatisBaseService<SysMenuRoleMapper, Sy
             qw.like("sm.name",query.getMenuName());
         }
         List<SysMenuRoleDataVo> sysMenuRoleDataVos = baseMapper.selMenuByRole(qw);
-        for (SysMenuRoleDataVo sysMenuRoleDataVo : sysMenuRoleDataVos) {
-            if (StringUtils.isBlank(sysMenuRoleDataVo.getName())){
-                sysMenuRoleDataVos.remove(sysMenuRoleDataVo);
-            }
-        }
         return rb.success().setData(sysMenuRoleDataVos);
     }
 

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java

@@ -11,7 +11,6 @@ import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.portal.biz.sysstaffinfo.SysStaffinfoService;
 import com.yxt.anrui.portal.biz.sysstafforg.SysStaffOrgService;
 import com.yxt.anrui.portal.biz.sysuser.SysUserService;
-import com.yxt.anrui.terminal.api.base.common.FinanceVo;
 import com.yxt.common.base.config.RedisUtil;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.utils.QRCodeUtil;
@@ -131,6 +130,9 @@ public class SysOrganizationRest implements SysOrganizationFeign {
             sysOrganization.setManagerName(sysStaffinfo.getName());
             SysUserVo sysUser = sysUserService.selectByStaffsid(zgStaffSid);
             sysOrganization.setManagerSid(sysUser.getSid());
+        }else{
+            sysOrganization.setManagerName("");
+            sysOrganization.setManagerSid("");
         }
         //删除关联关系中的所有主管与分管的人员关系
         sysStaffOrgService.delZGAndFGByOrgSid(sid);

anrui-system-ui/src/views/organizationManage/organizationManage.vue

@@ -36,7 +36,7 @@
         <tr>
           <td>主管人员</td>
           <td>
-            <el-select v-model="form.zgStaffSid" style="width:300px" filterable>
+            <el-select v-model="form.zgStaffSid" style="width:300px" filterable clearable>
               <el-option v-for="item in staffdata" :key="item.sid" :label="item.name" :value="item.sid"/>
             </el-select>
           </td>
@@ -210,7 +210,7 @@
           <tr>
             <td>主管人员</td>
             <td>
-              <el-select v-model="form.zgStaffSid" style="width:300px" filterable>
+              <el-select v-model="form.zgStaffSid" style="width:300px" filterable clearable>
                 <el-option v-for="item in staffdata" :key="item.sid" :label="item.name" :value="item.sid"/>
               </el-select>
             </td>

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/AppFinCollectionConfirmationFeign.java

@@ -95,4 +95,7 @@ public interface AppFinCollectionConfirmationFeign {
     @PostMapping("/getCustomerBillDetail/{paymentSid}")
     public ResultBean<PagerVo<AppCustomerBillDetailsVo>> getCustomerBillDetail(@PathVariable("paymentSid") String paymentSid);
 
+    @ApiOperation("查询已认款列表")
+    @PostMapping("/selectPageList")
+    ResultBean<CollectedReceivablesDetailedVo> selectPageList(@RequestBody PagerQuery<ReceivablesPaymentDetailsQuery> pagerQuery);
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/AppFinCollectionConfirmationFeignFallback.java

@@ -96,4 +96,9 @@ public class AppFinCollectionConfirmationFeignFallback implements AppFinCollecti
 	public ResultBean<PagerVo<AppCustomerBillDetailsVo>> getCustomerBillDetail(String paymentSid) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<CollectedReceivablesDetailedVo> selectPageList(PagerQuery<ReceivablesPaymentDetailsQuery> pagerQuery) {
+		return null;
+	}
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/CollectedReceivablesDetailedVo.java

@@ -0,0 +1,60 @@
+package com.yxt.anrui.terminal.api.finance.collectionConfirm;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description: 已认款的选择列表
+ * @author: dimengzhe
+ * @date: 2023/6/30
+ **/
+@Data
+public class CollectedReceivablesDetailedVo implements Vo {
+    private static final long serialVersionUID = -3610496597863356874L;
+
+    @ApiModelProperty("当前行sid")
+    private String sid;
+    @ApiModelProperty("应收未收sid")
+    private String receivablesSid;
+    @ApiModelProperty("合同编号")
+    @JsonProperty("contractId")
+    private String contractNo;
+    @ApiModelProperty("客户sid")
+    private String customerSid;
+    @ApiModelProperty("客户名称")
+    @JsonProperty("name")
+    private String customerName;
+    @ApiModelProperty("车架号")
+    @JsonProperty("vin")
+    private String VIN;
+    @ApiModelProperty("联系电话")
+    @JsonProperty("mobile")
+    private String customerPhone;
+    @ApiModelProperty("应收项目名称")
+    @JsonProperty("projectName")
+    private String receivablesName;
+    @ApiModelProperty("当前应收金额")
+    @JsonProperty("receivable")
+    private String currentReceivableMoney;
+
+
+    @ApiModelProperty("剩余金额")
+    @JsonProperty("receivable")
+    private String reveivableMoney;
+    @ApiModelProperty("业务车辆sid")
+    private String busVinSid;
+
+    @ApiModelProperty("全款贷款key:1是全款，2贷款")
+    private String payTypeKey;
+    @ApiModelProperty("全款贷款")
+    private String payType;
+
+    @ApiModelProperty("是否是已认款的选择：0不是（应收未收），1是（已认款）")
+    private int subscribedOf;
+
+    private String subscriptionMoney;
+    @ApiModelProperty("分公司sid")
+    private String useOrgSid;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/UncollectedReceivablesDetailedVo.java

@@ -8,6 +8,10 @@ import lombok.Data;
 public class UncollectedReceivablesDetailedVo implements Vo {
     private static final long serialVersionUID = 6090426752725222574L;
 
+    @ApiModelProperty("sid")
+    private String sid;
+    @ApiModelProperty("应收未收sid")
+    private String receivablesSid;
     @ApiModelProperty("合同编号")
     private String contractId;
 
@@ -19,28 +23,18 @@ public class UncollectedReceivablesDetailedVo implements Vo {
 
     @ApiModelProperty("客户名称")
     private String name;
-
     @ApiModelProperty("应收金额")
     private String receivable;
-
     @ApiModelProperty("合同sid")
     private String contractSid;
-
     @ApiModelProperty("认款金额")
     private String confirmMoney;
-
     @ApiModelProperty("车架号")
     private String vin;
-
     @ApiModelProperty("认款时间")
     private String confirmDate;
-
     @ApiModelProperty("认款状态")
     private String state;
-
-    @ApiModelProperty("sid")
-    private String sid;
-
     @ApiModelProperty("付款方式value")
     private String payType;
     @ApiModelProperty("付款方式key:1全款、2贷款")
@@ -50,4 +44,7 @@ public class UncollectedReceivablesDetailedVo implements Vo {
     @ApiModelProperty("分公司sid")
     private String useOrgSid;
 
+    @ApiModelProperty("是否是已认款的选择：0不是（应收未收），1是（已认款）")
+    private int subscribedOf;
+
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/collectionConfirm/AppFinCollectionConfirmationRest.java

@@ -25,10 +25,6 @@
  *********************************************************/
 package com.yxt.anrui.terminal.biz.finance.collectionConfirm;
 
-import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppCustomerBillDetailVo;
-import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppCustomerBillSummaryQuery;
-import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppCustomerBillSummaryVo;
-import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedQuery;
 import com.yxt.anrui.terminal.api.finance.collectionConfirm.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -150,4 +146,9 @@ public class AppFinCollectionConfirmationRest implements AppFinCollectionConfirm
     public ResultBean<PagerVo<AppCustomerBillDetailsVo>> getCustomerBillDetail(String paymentSid) {
         return appfinCollectionConfirmationService.getCustomerBillDetail(paymentSid);
     }
+
+    @Override
+    public ResultBean<CollectedReceivablesDetailedVo> selectPageList(PagerQuery<ReceivablesPaymentDetailsQuery> pagerQuery) {
+        return appfinCollectionConfirmationService.selectPageList(pagerQuery);
+    }
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/collectionConfirm/AppFinCollectionConfirmationService.java

@@ -223,4 +223,8 @@ public class AppFinCollectionConfirmationService {
         v.setRecords(voList);
         return rb.success().setMsg("当前共查询到" + v.getTotal() + "条记录").setData(v);
     }
+
+    public ResultBean<CollectedReceivablesDetailedVo> selectPageList(PagerQuery<ReceivablesPaymentDetailsQuery> pagerQuery) {
+        return null;
+    }
 }