加合同id过滤

hx-sale/src/main/java/com/fjhx/sale/entity/documents/dto/DocumentsSelectDto.java

@@ -14,4 +14,9 @@ import lombok.Setter;
 @Setter
 public class DocumentsSelectDto extends BaseSelectDto {
 
+    /**
+     * 销售合同id
+     */
+    private Long contractId;
+
 }

hx-sale/src/main/java/com/fjhx/sale/service/contract/impl/ContractDocumentaryServiceImpl.java

@@ -1,30 +1,27 @@
 package com.fjhx.sale.service.contract.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.fjhx.account.entity.account.po.AccountPayment;
-import com.fjhx.account.entity.account.vo.AccountPaymentVo;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.common.enums.FlowStatusEnum1;
 import com.fjhx.customer.service.customer.CustomerService;
 import com.fjhx.file.utils.ObsFileUtil;
+import com.fjhx.sale.entity.contract.dto.ContractDocumentaryDto;
+import com.fjhx.sale.entity.contract.dto.ContractDocumentarySelectDto;
 import com.fjhx.sale.entity.contract.dto.ContractSelectDto;
 import com.fjhx.sale.entity.contract.enums.DocumentaryTypeEnum;
 import com.fjhx.sale.entity.contract.po.Contract;
 import com.fjhx.sale.entity.contract.po.ContractDocumentary;
-import com.fjhx.sale.entity.contract.vo.ContractVo;
+import com.fjhx.sale.entity.contract.vo.ContractDocumentaryVo;
 import com.fjhx.sale.mapper.contract.ContractDocumentaryMapper;
 import com.fjhx.sale.service.contract.ContractDocumentaryService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.ruoyi.system.utils.UserUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.sale.entity.contract.vo.ContractDocumentaryVo;
-import com.fjhx.sale.entity.contract.dto.ContractDocumentarySelectDto;
-import com.ruoyi.common.utils.wrapper.IWrapper;
-import com.fjhx.sale.entity.contract.dto.ContractDocumentaryDto;
-import cn.hutool.core.bean.BeanUtil;
 
 import java.util.HashMap;
 import java.util.List;
@@ -106,18 +103,22 @@ public class ContractDocumentaryServiceImpl extends ServiceImpl<ContractDocument
         wrapper.in("t1", Contract::getBuyCorporationId, authIdList);
         wrapper.orderByDesc("t1", Contract::getCreateTime);
         wrapper.eq("t1", Contract::getIsChange, "0");//列表只展示未变更得数据
-        wrapper.ne("t1",Contract::getIsShow,1);
+        wrapper.ne("t1", Contract::getIsShow, 1);
         wrapper.eq("t1", Contract::getStatus, FlowStatusEnum1.PASS.getKey());
         wrapper.eq("t1.orderStatus", dto.getOrderStatus());
-        if(dto.getDocumentarySearch()==1&&ObjectUtil.isNotEmpty(dto.getDocumentaryType())){//无记录
-            wrapper.eq("t1.documentaryCount",0);
+        if (dto.getDocumentarySearch() == 1 && ObjectUtil.isNotEmpty(dto.getDocumentaryType())) {//无记录
+            wrapper.eq("t1.documentaryCount", 0);
         }
-        if(dto.getDocumentarySearch()==2&&ObjectUtil.isNotEmpty(dto.getDocumentaryType())){//无记录
-            wrapper.gt("t1.documentaryCount",0);
+        if (dto.getDocumentarySearch() == 2 && ObjectUtil.isNotEmpty(dto.getDocumentaryType())) {//无记录
+            wrapper.gt("t1.documentaryCount", 0);
         }
-        wrapper.groupBy("t3.documentary_type","t1.id");
-        List<ContractDocumentary> list = baseMapper.getSumCount(wrapper,dto.getDocumentaryType());
-        Map<String,Integer> countMap = setCount(list);
+        wrapper.groupBy("t3.documentary_type", "t1.id");
+
+        //合同id过滤
+        wrapper.eq("t1", Contract::getId, dto.getId());
+
+        List<ContractDocumentary> list = baseMapper.getSumCount(wrapper, dto.getDocumentaryType());
+        Map<String, Integer> countMap = setCount(list);
         return countMap;
     }
 

hx-sale/src/main/java/com/fjhx/sale/service/contract/impl/ContractServiceImpl.java

@@ -456,6 +456,9 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
         wrapper.ge("t1", Contract::getCreateTime, dto.getBeginTime());
         wrapper.le("t1", Contract::getCreateTime, dto.getEndTime());
 
+        //销售合同id过滤
+        wrapper.eq("t1", Contract::getId, dto.getId());
+
 
         Page<ContractBudgetVo> page = this.baseMapper.getProfitBudgetPage(dto.getPage(), wrapper);
         List<ContractBudgetVo> list = page.getRecords();
@@ -508,6 +511,9 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
         wrapper.ge("t1", Contract::getCreateTime, dto.getBeginTime());
         wrapper.le("t1", Contract::getCreateTime, dto.getEndTime());
 
+        //销售合同id过滤
+        wrapper.eq("t1", Contract::getId, dto.getId());
+
         List<ContractBudgetVo> list = this.baseMapper.getProfitBudgetHeadStatistic(wrapper);
         if (CollectionUtils.isNotEmpty(list)) {
             statisticCommon(list);
@@ -761,6 +767,9 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
         wrapper.ge("t1", Contract::getCreateTime, dto.getBeginTime());
         wrapper.le("t1", Contract::getCreateTime, dto.getEndTime());
 
+        //销售合同id过滤
+        wrapper.eq("t1", Contract::getId, dto.getId());
+
         Page<ContractBudgetVo> page = this.baseMapper.getProfitClearingPage(dto.getPage(), wrapper);
         List<ContractBudgetVo> list = page.getRecords();
         if (ObjectUtil.isEmpty(list)) {
@@ -2112,7 +2121,10 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
      */
     @Override
     public List<EhsdPurchase> getPurchaseListByContractId(Long id) {
-        return ehsdPurchaseService.list(q -> q.eq(EhsdPurchase::getDataResourceId, id));
+        return ehsdPurchaseService.list(q -> q
+                .in(EhsdPurchase::getStatus, 10, 30)
+                .eq(EhsdPurchase::getDataResourceId, id)
+        );
     }
 
     /**
@@ -2199,6 +2211,10 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
                     .or().in("t1", Contract::getBuyCorporationId, customerIds)
             );
         }
+
+        //合同id过滤
+        wrapper.eq("t1", Contract::getId, dto.getId());
+
         Page<ContractVo> page = baseMapper.getExportCopyList(dto.getPage(), wrapper, dto.getDocumentaryType());
         List<ContractVo> list = page.getRecords();
         if (CollectionUtils.isNotEmpty(list)) {

hx-sale/src/main/java/com/fjhx/sale/service/documents/impl/DocumentsServiceImpl.java

@@ -5,8 +5,6 @@ import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson2.JSONObject;
 import com.alibaba.fastjson2.JSONWriter;
 import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -43,10 +41,8 @@ import com.fjhx.sale.service.pack.PackDetailService;
 import com.fjhx.sale.service.pack.PackShipmentService;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.exception.ServiceException;
-import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.wrapper.IWrapper;
-import com.ruoyi.common.utils.wrapper.SqlField;
 import com.ruoyi.system.service.ISysUserService;
 import com.ruoyi.system.utils.UserUtil;
 import org.apache.commons.collections4.CollectionUtils;
@@ -143,6 +139,10 @@ public class DocumentsServiceImpl extends ServiceImpl<DocumentsMapper, Documents
                     .or().in("c", Contract::getBuyCorporationId, customerIds)
             );
         }
+
+        //外销合同id过滤
+        wrapper.eq(ObjectUtil.isNotEmpty(dto.getContractId()), "c.id", dto.getContractId());
+
         Page<DocumentsVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         //切换数据源
         DynamicDataSourceContextHolder.push(SourceConstant.COMMON);