款项确认

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/AppBusCollectionConfirmationPageVo.java

@@ -33,5 +33,8 @@ public class AppBusCollectionConfirmationPageVo implements Vo {
     private boolean showDownload;
     @ApiModelProperty("是否显示删除")
     private boolean showDelete;
+    @ApiModelProperty("认款状态")
+    private String state;
+
 
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/AppBusSelectedReceivablesPaymentDetailsVo.java

@@ -34,4 +34,7 @@ public class AppBusSelectedReceivablesPaymentDetailsVo implements Vo {
     @ApiModelProperty("认款时间")
     private String confirmDate;
 
+    @ApiModelProperty("认款状态")
+    private String state;
+
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedFeign.java

@@ -52,6 +52,7 @@ import java.util.List;
 @FeignClient(
         contextId = "anrui-buscenter-BusUncollectedReceivablesDetailed",
         name = "anrui-buscenter",
+
         path = "busuncollectedreceivablesdetailed",
         fallback = BusUncollectedReceivablesDetailedFeignFallback.class)
 public interface BusUncollectedReceivablesDetailedFeign {

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationService.java

@@ -373,7 +373,8 @@ public class BusCollectionConfirmationService extends MybatisBaseService<BusColl
     public IPage<AppBusSelectedReceivablesPaymentDetailsVo> getPaymentDetailsList(PagerQuery<AppBusSelectedReceivablesPaymentDetailsQuery> pagerQuery) {
         IPage<AppBusSelectedReceivablesPaymentDetailsQuery> page = PagerUtil.queryToPage(pagerQuery);
         QueryWrapper<AppBusSelectedReceivablesPaymentDetailsVo> qw = appPaymentDetailsBuildQueryWrapper(pagerQuery.getParams());
-        IPage<AppBusSelectedReceivablesPaymentDetailsVo> collectionConfirmList = busSelectedReceivablesDetailedService.getPaymentDetailsList(page, qw);
+        List<String> sidList = pagerQuery.getParams().getSidList();
+        IPage<AppBusSelectedReceivablesPaymentDetailsVo> collectionConfirmList = busSelectedReceivablesDetailedService.getPaymentDetailsList(sidList, page, qw);
         return collectionConfirmList;
     }
 

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedMapper.java

@@ -81,7 +81,8 @@ public interface BusSelectedReceivablesDetailedMapper extends BaseMapper<BusSele
      * @param qw
      * @return
      */
-    IPage<AppBusSelectedReceivablesPaymentDetailsVo> getPaymentDetailsList(IPage<AppBusSelectedReceivablesPaymentDetailsQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppBusSelectedReceivablesPaymentDetailsVo> qw);
+    IPage<AppBusSelectedReceivablesPaymentDetailsVo> getPaymentDetailsList(@Param("sidList") List<String> sidList, IPage<AppBusSelectedReceivablesPaymentDetailsQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppBusSelectedReceivablesPaymentDetailsVo> qw);
+
 
     @Select("select * from bus_selected_receivables_detailed where auditState = #{auditState}")
     List<BusSelectedReceivablesDetailedVo> fetchByAuditState(int auditState);

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedMapper.xml

@@ -22,5 +22,30 @@
     <!--手机端—查询可使用款项明细列表-->
     <select id="getPaymentDetailsList"
             resultType="com.yxt.anrui.buscenter.api.buscollectionconfirmation.AppBusSelectedReceivablesPaymentDetailsVo">
+        SELECT
+        <!--合同编号-->
+        -- AS contractId,
+        <!--项目名称-->
+        -- AS projectName,
+        <!--联系电话-->
+        -- AS mobile,
+        <!--客户名称-->
+        -- AS `name`,
+        <!--应收金额-->
+        -- AS receivable,
+        <!--合同sid-->
+        -- AS contractSid,
+        <!--付款金额-->
+        -- AS confirmMoney,
+        <!--车架号-->
+        -- VIN AS vin,
+        <!--认款时间-->
+        -- subscriptionDate AS confirmDate,
+        <!--认款状态-->
+        -- AS `state`
+        FROM bus_selected_receivables_detailed bsrd WHERE bsrd.sid NOT IN
+        <foreach collection="sidList" item="sids" index="index" separator="," open="(" close=")">
+            #{sids}
+        </foreach>
     </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedService.java

@@ -42,6 +42,7 @@ import com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedRec
 import com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedDto;
 import com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedFeign;
 
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -69,10 +70,12 @@ public class BusSelectedReceivablesDetailedService extends MybatisBaseService<Bu
         PagerVo<BusSelectedReceivablesDetailed> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
+
     public List<BusSelectedReceivablesDetailed> listAll(BusSelectedReceivablesDetailedQuery query) {
         QueryWrapper<BusSelectedReceivablesDetailed> qw = createQueryWrapper(query);
         return baseMapper.selectList(qw);
     }
+
     private QueryWrapper<BusSelectedReceivablesDetailed> createQueryWrapper(BusSelectedReceivablesDetailedQuery query) {
         // todo: 这里根据具体业务调整查询条件
         // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
@@ -151,13 +154,13 @@ public class BusSelectedReceivablesDetailedService extends MybatisBaseService<Bu
         return baseMapper.selectListVo();
     }
 
-	public void saveOrUpdateDto(BusSelectedReceivablesDetailedDto dto){
+    public void saveOrUpdateDto(BusSelectedReceivablesDetailedDto dto) {
         BusSelectedReceivablesDetailed entity = new BusSelectedReceivablesDetailed();
         dto.fillEntity(entity);
         this.saveOrUpdate(entity);
     }
 
-	public BusSelectedReceivablesDetailedVo fetchByIdVo(String id){
+    public BusSelectedReceivablesDetailedVo fetchByIdVo(String id) {
         BusSelectedReceivablesDetailed entity = this.fetchById(id);
         BusSelectedReceivablesDetailedVo vo = new BusSelectedReceivablesDetailedVo();
         BeanUtil.copyProperties(entity, vo);
@@ -179,8 +182,8 @@ public class BusSelectedReceivablesDetailedService extends MybatisBaseService<Bu
      * @param qw
      * @return
      */
-    public IPage<AppBusSelectedReceivablesPaymentDetailsVo> getPaymentDetailsList(IPage<AppBusSelectedReceivablesPaymentDetailsQuery> page, QueryWrapper<AppBusSelectedReceivablesPaymentDetailsVo> qw) {
-        return baseMapper.getPaymentDetailsList(page, qw);
+    public IPage<AppBusSelectedReceivablesPaymentDetailsVo> getPaymentDetailsList(List<String> sidList, IPage<AppBusSelectedReceivablesPaymentDetailsQuery> page, QueryWrapper<AppBusSelectedReceivablesPaymentDetailsVo> qw) {
+        return baseMapper.getPaymentDetailsList(sidList, page, qw);
     }
 
     public List<BusSelectedReceivablesDetailedVo> fetchByAuditState() {