款项确认

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

@@ -57,17 +57,17 @@ import java.util.List;
 @Mapper
 public interface BusSelectedReceivablesDetailedMapper extends BaseMapper<BusSelectedReceivablesDetailed> {
 
-	//@Update("update bus_selected_receivables_detailed set name=#{msg} where id=#{id}")
-	//IPage<BusSelectedReceivablesDetailedVo> voPage(IPage<BusSelectedReceivablesDetailed> page, @Param(Constants.WRAPPER) QueryWrapper<BusSelectedReceivablesDetailed> qw);
-	
-	IPage<BusSelectedReceivablesDetailedVo> selectPageVo(IPage<BusSelectedReceivablesDetailed> page, @Param(Constants.WRAPPER) Wrapper<BusSelectedReceivablesDetailed> qw);
-	
-	List<BusSelectedReceivablesDetailedVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BusSelectedReceivablesDetailed> qw);
-	
-	@Select("select * from bus_selected_receivables_detailed")
-	List<BusSelectedReceivablesDetailedVo> selectListVo();
+    //@Update("update bus_selected_receivables_detailed set name=#{msg} where id=#{id}")
+    //IPage<BusSelectedReceivablesDetailedVo> voPage(IPage<BusSelectedReceivablesDetailed> page, @Param(Constants.WRAPPER) QueryWrapper<BusSelectedReceivablesDetailed> qw);
 
-	@Delete("delete from bus_selected_receivables_detailed where collSid = #{sid}")
+    IPage<BusSelectedReceivablesDetailedVo> selectPageVo(IPage<BusSelectedReceivablesDetailed> page, @Param(Constants.WRAPPER) Wrapper<BusSelectedReceivablesDetailed> qw);
+
+    List<BusSelectedReceivablesDetailedVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BusSelectedReceivablesDetailed> qw);
+
+    @Select("select * from bus_selected_receivables_detailed")
+    List<BusSelectedReceivablesDetailedVo> selectListVo();
+
+    @Delete("delete from bus_selected_receivables_detailed where collSid = #{sid}")
     void deleteByCollSid(String sid);
 
     @Select("select * from bus_selected_receivables_detailed where collSid = #{sid}")
@@ -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;
@@ -61,112 +62,114 @@ import java.util.List;
  */
 @Service
 public class BusSelectedReceivablesDetailedService extends MybatisBaseService<BusSelectedReceivablesDetailedMapper, BusSelectedReceivablesDetailed> {
-	public PagerVo<BusSelectedReceivablesDetailed> listPage(PagerQuery<BusSelectedReceivablesDetailedQuery> pq) {
-		BusSelectedReceivablesDetailedQuery query = pq.getParams();
-		QueryWrapper<BusSelectedReceivablesDetailed> qw = createQueryWrapper(query);
-		IPage<BusSelectedReceivablesDetailed> page = PagerUtil.queryToPage(pq);
-		IPage<BusSelectedReceivablesDetailed> pagging = baseMapper.selectPage(page, qw);
-		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()));
-		QueryWrapper<BusSelectedReceivablesDetailed> qw = new QueryWrapper<>();
-
-
-		if (StringUtils.isNotBlank(query.getCreateByName())) {
-			qw.eq("createByName", query.getCreateByName());
-		}
-
-		if (StringUtils.isNotBlank(query.getContractSid())) {
-			qw.eq("contractSid", query.getContractSid());
-		}
-
-		if (StringUtils.isNotBlank(query.getContractNo())) {
-			qw.eq("contractNo", query.getContractNo());
-		}
-
-		if (StringUtils.isNotBlank(query.getCustomerSid())) {
-			qw.eq("customerSid", query.getCustomerSid());
-		}
-
-		if (StringUtils.isNotBlank(query.getCustomerName())) {
-			qw.eq("customerName", query.getCustomerName());
-		}
-
-		if (StringUtils.isNotBlank(query.getVIN())) {
-			qw.eq("VIN", query.getVIN());
-		}
-
-		if (StringUtils.isNotBlank(query.getUseOrgSid())) {
-			qw.eq("useOrgSid", query.getUseOrgSid());
-		}
-
-		if (StringUtils.isNotBlank(query.getCustomerPhone())) {
-			qw.eq("customerPhone", query.getCustomerPhone());
-		}
-
-		if (StringUtils.isNotBlank(query.getReceivablesName())) {
-			qw.eq("receivablesName", query.getReceivablesName());
-		}
-
-		if (query.getCurrentReceivableMoney() != null) {
-			qw.eq("currentReceivableMoney", query.getCurrentReceivableMoney());
-		}
-
-		if (query.getSubscriptionMoney() != null) {
-			qw.eq("subscriptionMoney", query.getSubscriptionMoney());
-		}
-
-		if (StringUtils.isNotBlank(query.getSubscriptionDate())) {
-			qw.eq("subscriptionDate", query.getSubscriptionDate());
-		}
-
-		if (StringUtils.isNotBlank(query.getCollSid())) {
-			qw.eq("collSid", query.getCollSid());
-		}
-		return qw;
-	}
-	
-	public PagerVo<BusSelectedReceivablesDetailedVo> listPageVo(PagerQuery<BusSelectedReceivablesDetailedQuery> pq) {
-		BusSelectedReceivablesDetailedQuery query = pq.getParams();
-		QueryWrapper<BusSelectedReceivablesDetailed> qw = createQueryWrapper(query);
-		IPage<BusSelectedReceivablesDetailed> page = PagerUtil.queryToPage(pq);
-		IPage<BusSelectedReceivablesDetailedVo> pagging = baseMapper.selectPageVo(page, qw);
-		PagerVo<BusSelectedReceivablesDetailedVo> p = PagerUtil.pageToVo(pagging, null);
-		return p;
-	}
-	
-	public List<BusSelectedReceivablesDetailedVo> listAllVo(BusSelectedReceivablesDetailedQuery query) {
-		QueryWrapper<BusSelectedReceivablesDetailed> qw = createQueryWrapper(query);
-		return baseMapper.selectListAllVo(qw);
-	}
-	
-	public List<BusSelectedReceivablesDetailedVo> listVo() {
-		return baseMapper.selectListVo();
-	}
-	
-	public void saveOrUpdateDto(BusSelectedReceivablesDetailedDto dto){
-		BusSelectedReceivablesDetailed entity = new BusSelectedReceivablesDetailed();
-		dto.fillEntity(entity);
-		this.saveOrUpdate(entity);
-	}
-	
-	public BusSelectedReceivablesDetailedVo fetchByIdVo(String id){
-		BusSelectedReceivablesDetailed entity = this.fetchById(id);
-		BusSelectedReceivablesDetailedVo vo = new BusSelectedReceivablesDetailedVo();
-		BeanUtil.copyProperties(entity, vo);
-		return vo;
-	}
-
-	public void deleteByCollSid(String sid) {
-		baseMapper.deleteByCollSid(sid);
-	}
+    public PagerVo<BusSelectedReceivablesDetailed> listPage(PagerQuery<BusSelectedReceivablesDetailedQuery> pq) {
+        BusSelectedReceivablesDetailedQuery query = pq.getParams();
+        QueryWrapper<BusSelectedReceivablesDetailed> qw = createQueryWrapper(query);
+        IPage<BusSelectedReceivablesDetailed> page = PagerUtil.queryToPage(pq);
+        IPage<BusSelectedReceivablesDetailed> pagging = baseMapper.selectPage(page, qw);
+        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()));
+        QueryWrapper<BusSelectedReceivablesDetailed> qw = new QueryWrapper<>();
+
+
+        if (StringUtils.isNotBlank(query.getCreateByName())) {
+            qw.eq("createByName", query.getCreateByName());
+        }
+
+        if (StringUtils.isNotBlank(query.getContractSid())) {
+            qw.eq("contractSid", query.getContractSid());
+        }
+
+        if (StringUtils.isNotBlank(query.getContractNo())) {
+            qw.eq("contractNo", query.getContractNo());
+        }
+
+        if (StringUtils.isNotBlank(query.getCustomerSid())) {
+            qw.eq("customerSid", query.getCustomerSid());
+        }
+
+        if (StringUtils.isNotBlank(query.getCustomerName())) {
+            qw.eq("customerName", query.getCustomerName());
+        }
+
+        if (StringUtils.isNotBlank(query.getVIN())) {
+            qw.eq("VIN", query.getVIN());
+        }
+
+        if (StringUtils.isNotBlank(query.getUseOrgSid())) {
+            qw.eq("useOrgSid", query.getUseOrgSid());
+        }
+
+        if (StringUtils.isNotBlank(query.getCustomerPhone())) {
+            qw.eq("customerPhone", query.getCustomerPhone());
+        }
+
+        if (StringUtils.isNotBlank(query.getReceivablesName())) {
+            qw.eq("receivablesName", query.getReceivablesName());
+        }
+
+        if (query.getCurrentReceivableMoney() != null) {
+            qw.eq("currentReceivableMoney", query.getCurrentReceivableMoney());
+        }
+
+        if (query.getSubscriptionMoney() != null) {
+            qw.eq("subscriptionMoney", query.getSubscriptionMoney());
+        }
+
+        if (StringUtils.isNotBlank(query.getSubscriptionDate())) {
+            qw.eq("subscriptionDate", query.getSubscriptionDate());
+        }
+
+        if (StringUtils.isNotBlank(query.getCollSid())) {
+            qw.eq("collSid", query.getCollSid());
+        }
+        return qw;
+    }
+
+    public PagerVo<BusSelectedReceivablesDetailedVo> listPageVo(PagerQuery<BusSelectedReceivablesDetailedQuery> pq) {
+        BusSelectedReceivablesDetailedQuery query = pq.getParams();
+        QueryWrapper<BusSelectedReceivablesDetailed> qw = createQueryWrapper(query);
+        IPage<BusSelectedReceivablesDetailed> page = PagerUtil.queryToPage(pq);
+        IPage<BusSelectedReceivablesDetailedVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<BusSelectedReceivablesDetailedVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public List<BusSelectedReceivablesDetailedVo> listAllVo(BusSelectedReceivablesDetailedQuery query) {
+        QueryWrapper<BusSelectedReceivablesDetailed> qw = createQueryWrapper(query);
+        return baseMapper.selectListAllVo(qw);
+    }
+
+    public List<BusSelectedReceivablesDetailedVo> listVo() {
+        return baseMapper.selectListVo();
+    }
+
+    public void saveOrUpdateDto(BusSelectedReceivablesDetailedDto dto) {
+        BusSelectedReceivablesDetailed entity = new BusSelectedReceivablesDetailed();
+        dto.fillEntity(entity);
+        this.saveOrUpdate(entity);
+    }
+
+    public BusSelectedReceivablesDetailedVo fetchByIdVo(String id) {
+        BusSelectedReceivablesDetailed entity = this.fetchById(id);
+        BusSelectedReceivablesDetailedVo vo = new BusSelectedReceivablesDetailedVo();
+        BeanUtil.copyProperties(entity, vo);
+        return vo;
+    }
+
+    public void deleteByCollSid(String sid) {
+        baseMapper.deleteByCollSid(sid);
+    }
 
     public List<BusSelectedReceivablesDetailedVo> fetchByCillSid(String sid) {
         return baseMapper.fetchByCillSid(sid);
@@ -179,12 +182,12 @@ 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() {
-		int auditState = 3;
-		return baseMapper.fetchByAuditState(auditState);
-	}
+    public List<BusSelectedReceivablesDetailedVo> fetchByAuditState() {
+        int auditState = 3;
+        return baseMapper.fetchByAuditState(auditState);
+    }
 }