大中型实收款统计和资产实收款统计修改bug

biz-base/src/main/java/com/dayou/controller/FinanceClaimController.java

@@ -162,8 +162,8 @@ public class FinanceClaimController extends BaseController {
      * @param dto 查询dto
      */
     @GetMapping("assets/stat/export")
-    public void assetsSateExport(HttpServletResponse response, RealFundAssetsStatDTO dto) throws IOException {
-        List<RealFundAssetsStatVO> list = financeClaimService.assetsSateExport(dto);
+    public void assetsSateExport(HttpServletResponse response, RealFundAssetsStatDTO dto,String keyword) throws IOException {
+        List<RealFundAssetsStatVO> list = financeClaimService.assetsSateExport(dto,keyword);
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
         if (ObjectUtil.isNull(dto.getStartTime()) || ObjectUtil.isNull(dto.getEndTime())){
             ErrorCode.throwBusinessException("起始时间和结束时间必填！", "500");

dao/src/main/java/com/dayou/mapper/FinanceClaimMapper.java

@@ -47,7 +47,7 @@ public interface FinanceClaimMapper extends CustomBaseMapper<FinanceClaim> {
      * @param dto 查询dto
      * @return Page<RealFundAssetsStatVO>
      */
-    List<RealFundAssetsStatVO> assetsSateExport(@Param("dto") RealFundAssetsStatDTO dto);
+    List<RealFundAssetsStatVO> assetsSateExport(@Param("dto") RealFundAssetsStatDTO dto,@Param("keyword")String keyword);
 
     Page<RealFundPersonalVO> personalStat(Page page, @Param("dto")RealFundPersonalVO personalVO);
 

dao/src/main/resources/mapper/FinanceClaimMapper.xml

@@ -146,6 +146,7 @@
         LEFT JOIN customer_company cc2 ON cc2.id = m.clientele_sub_id
         LEFT JOIN customer_linkman cl1 ON cl1.id = m.clientele_contact_id
         <where>
+            d.id !=32
             <if test="keyword!=null and keyword!='' ">
                 and (
                 m.order_id like concat ('%',#{keyword},'%')
@@ -242,7 +243,7 @@
         LEFT JOIN `user` AS principalUser ON principalUser.id = assets.principal_id
         LEFT JOIN `user` AS claimUser ON claimUser.id = claim.claim_user_id
         LEFT JOIN assets_production AS prod ON assets.id = prod.business_id AND prodFund.production_no = prod.production_no
-        WHERE order_fund.business_type = 'ASSET_BUSINESS'
+        WHERE order_fund.business_type = 'ASSET_BUSINESS' and claim.deleted = 0
         <if test="keyword!=null and keyword!='' ">
             and (
             assets.order_id like concat ('%',#{keyword},'%')

service/src/main/java/com/dayou/service/IFinanceClaimService.java

@@ -78,7 +78,7 @@ public interface IFinanceClaimService extends IService<FinanceClaim> {
      * @param dto 查询dto
      * @return Page<RealFundAssetsStatVO>
      */
-    List<RealFundAssetsStatVO> assetsSateExport(RealFundAssetsStatDTO dto);
+    List<RealFundAssetsStatVO> assetsSateExport(RealFundAssetsStatDTO dto,String keyword);
 
     Page<RealFundPersonalVO> personalStat(Page page, RealFundPersonalVO personalVO);
 

service/src/main/java/com/dayou/service/impl/FinanceClaimServiceImpl.java

@@ -227,8 +227,8 @@ public class FinanceClaimServiceImpl extends ServiceImpl<FinanceClaimMapper, Fin
      * @return Page<RealFundAssetsStatVO>
      */
     @Override
-    public List<RealFundAssetsStatVO> assetsSateExport(RealFundAssetsStatDTO dto) {
-        return financeClaimMapper.assetsSateExport(dto);
+    public List<RealFundAssetsStatVO> assetsSateExport(RealFundAssetsStatDTO dto,String keyword) {
+        return financeClaimMapper.assetsSateExport(dto,keyword);
     }
 
     @Override