diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/PartnerOwnController.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/PartnerOwnController.java index c43e446d..490ffdf3 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/PartnerOwnController.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/PartnerOwnController.java @@ -826,6 +826,19 @@ public class PartnerOwnController extends BaseController { return success(partnerList.staticsTable5(partners.getPartnerId(), startTime, endTime)); } + /** + * @description :待收款 + * @author xyc + * @date 09:46 2025/10/10 + * @param startTime {@link String} + * @param endTime {@link String} + * @return cn.iocoder.yudao.framework.common.pojo.CommonResult + **/ + @GetMapping("/channelMoneyStaticsByBusi") + public CommonResult channelMoneyStaticsByBusi(String busi, String startTime, String endTime) throws Exception { + return success(partnerList.channelMoneyStaticsByBusi(busi,startTime, endTime)); + } + /** * 查询检测类型统计 * diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/UserClientPartnerOwnController.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/UserClientPartnerOwnController.java index 12a1737b..04101d0d 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/UserClientPartnerOwnController.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/UserClientPartnerOwnController.java @@ -757,13 +757,33 @@ public class UserClientPartnerOwnController extends BaseController { return success(partnerList.staticsTable4(partners.getPartnerId(), startTime, endTime)); } - //统计表格5 + /** + * @description :待收款 + * @author xyc + * @date 09:46 2025/10/10 + * @param startTime {@link String} + * @param endTime {@link String} + * @return cn.iocoder.yudao.framework.common.pojo.CommonResult + **/ @GetMapping("/staticsTable5") public CommonResult staticsTable5(String startTime, String endTime) throws Exception { ShopMallPartners partners = partnerList.shopInfo(); return success(partnerList.staticsTable5(partners.getPartnerId(), startTime, endTime)); } + /** + * @description :待收款 + * @author xyc + * @date 09:46 2025/10/10 + * @param startTime {@link String} + * @param endTime {@link String} + * @return cn.iocoder.yudao.framework.common.pojo.CommonResult + **/ + @GetMapping("/channelMoneyStaticsByBusi") + public CommonResult channelMoneyStaticsByBusi(String busi, String startTime, String endTime) throws Exception { + return success(partnerList.channelMoneyStaticsByBusi(busi,startTime, endTime)); + } + /** * 查询检测类型统计 * diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/AppInspectionPartnerMapper.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/AppInspectionPartnerMapper.java index 68d135e1..e384b86a 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/AppInspectionPartnerMapper.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/AppInspectionPartnerMapper.java @@ -101,6 +101,8 @@ public interface AppInspectionPartnerMapper extends BaseMapper List> staticsTable4(@Param("partnerId") Long partnerId, @Param("startTime") String startTime, @Param("endTime") String endTime); List> staticsTable5(@Param("partnerId") Long partnerId, @Param("startTime") String startTime, @Param("endTime") String endTime); + List> busiMoneyStatics( @Param("startTime") String startTime, @Param("endTime") String endTime); + List> channelMoneyStaticsByBusi(@Param("busi")String busi, @Param("startTime") String startTime, @Param("endTime") String endTime); Long dhjNum(@Param("partnerId") Long partnerId, @Param("dateStr") String dateStr); diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/query/InspectionListQuery.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/query/InspectionListQuery.java index 35a5ff1c..6e0b8c33 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/query/InspectionListQuery.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/query/InspectionListQuery.java @@ -36,4 +36,9 @@ public class InspectionListQuery { * 项目id */ private String projectId; + + /** + * 类型 1=待收款 + */ + private String type; } diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/AppInspectionPartnerService.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/AppInspectionPartnerService.java index 2cf3d604..a23ef852 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/AppInspectionPartnerService.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/AppInspectionPartnerService.java @@ -169,6 +169,15 @@ public interface AppInspectionPartnerService extends IService List> staticsTable4(Long partnerId, String startTime, String endTime); List> staticsTable5(Long partnerId, String startTime, String endTime); + /** + * @description : 来源待收款金额统计(通过渠道) + * @author xyc + * @date 10:53 2025/10/10 + * @param startTime {@link String} + * @param endTime {@link String} + * @return java.util.List> + **/ + List> channelMoneyStaticsByBusi(String busi,String startTime, String endTime); //新检测金额折线图 diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/AppInspectionPartnerServiceImpl.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/AppInspectionPartnerServiceImpl.java index 014bbe9a..32404e90 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/AppInspectionPartnerServiceImpl.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/AppInspectionPartnerServiceImpl.java @@ -2285,6 +2285,15 @@ public class AppInspectionPartnerServiceImpl extends ServiceImpl> + **/ @Override public List> staticsTable5(Long partnerId, String startTime, String endTime) { if (StringUtils.isEmpty(startTime)) { @@ -2293,7 +2302,27 @@ public class AppInspectionPartnerServiceImpl extends ServiceImpl> res = baseMapper.staticsTable5(partnerId, startTime, endTime); + List> res = baseMapper.busiMoneyStatics(startTime, endTime); + return res; + } + + /** + * @description : 来源待收款金额统计(通过渠道) + * @author xyc + * @date 10:53 2025/10/10 + * @param startTime {@link String} + * @param endTime {@link String} + * @return java.util.List> + **/ + @Override + public List> channelMoneyStaticsByBusi(String busi,String startTime, String endTime) { + if (StringUtils.isEmpty(startTime)) { + startTime = DateUtil.format(new Date(), "yyyy-MM-dd"); + endTime = DateUtil.format(new Date(), "yyyy-MM-dd"); + } + startTime = startTime + " 00:00:00"; + endTime = endTime + " 23:59:59"; + List> res = baseMapper.channelMoneyStaticsByBusi(busi,startTime, endTime); return res; } diff --git a/dl-module-inspection/src/main/resources/mapper/InspectionWorkNodeMapper.xml b/dl-module-inspection/src/main/resources/mapper/InspectionWorkNodeMapper.xml index aa2e0488..8c89cb76 100644 --- a/dl-module-inspection/src/main/resources/mapper/InspectionWorkNodeMapper.xml +++ b/dl-module-inspection/src/main/resources/mapper/InspectionWorkNodeMapper.xml @@ -364,8 +364,8 @@ AND ii.create_time BETWEEN CONCAT(#{query.datetimeRange[0]}, ' 00:00:00') AND CONCAT(#{query.datetimeRange[1]}, ' 23:59:59') - - AND ii.customer_source = #{query.customSource} + + AND (oi.pay_type = 'sz' OR oi.cashier_confirm != '1' OR oi.pay_money IS NULL) AND ii.business_channel = #{query.bussiness} @@ -373,7 +373,10 @@ AND ip.id = #{query.projectId} - AND iwn.status = '2' + + AND iwn.status = '2' + + AND iwn.deleted = b'0' GROUP BY ii.id diff --git a/dl-module-inspection/src/main/resources/mapper/inspection/AppInspectionPartnerMapper.xml b/dl-module-inspection/src/main/resources/mapper/inspection/AppInspectionPartnerMapper.xml index d5d5bcb1..a58d3950 100644 --- a/dl-module-inspection/src/main/resources/mapper/inspection/AppInspectionPartnerMapper.xml +++ b/dl-module-inspection/src/main/resources/mapper/inspection/AppInspectionPartnerMapper.xml @@ -919,5 +919,43 @@ FROM GROUP BY ibc.name + +