外销合同 报价单 分页赋值流程id

hx-account/src/main/java/com/fjhx/account/service/account/impl/AccountRequestFundsServiceImpl.java

@@ -22,9 +22,9 @@ import com.fjhx.common.entity.corporation.po.Corporation;
 import com.fjhx.common.service.corporation.CorporationService;
 import com.fjhx.flow.entity.flow.po.FlowExample;
 import com.fjhx.flow.service.flow.FlowExampleService;
-import com.obs.services.internal.ServiceException;
 import com.ruoyi.common.core.domain.BasePo;
 import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.system.service.ISysDeptService;
 import com.ruoyi.system.utils.UserUtil;
@@ -96,8 +96,8 @@ public class AccountRequestFundsServiceImpl extends ServiceImpl<AccountRequestFu
         wrapper.ge(ObjectUtil.isNotEmpty(dto.getBeginTime()), "arf.create_time", dto.getBeginTime());
         wrapper.le(ObjectUtil.isNotEmpty(dto.getEndTime()), "arf.create_time", dto.getEndTime());
         // 请款金额
-        wrapper.ge(ObjectUtil.isNotEmpty(dto.getMinAdvanceAmounts()), "arf.advance_amounts", dto.getMinAdvanceAmounts());
-        wrapper.le(ObjectUtil.isNotEmpty(dto.getMaxAdvanceAmounts()), "arf.advance_amounts", dto.getMaxAdvanceAmounts());
+        wrapper.ge(ObjectUtil.isNotEmpty(dto.getMinAdvanceAmounts()), "arf.total", dto.getMinAdvanceAmounts());
+        wrapper.le(ObjectUtil.isNotEmpty(dto.getMaxAdvanceAmounts()), "arf.total", dto.getMaxAdvanceAmounts());
         // 用款说明
         wrapper.like(ObjectUtil.isNotEmpty(dto.getPaymentRemarks()), "arf.payment_remarks", dto.getPaymentRemarks());
         // 付款方式

hx-sale/src/main/java/com/fjhx/sale/entity/contract/vo/ContractVo.java

@@ -115,6 +115,11 @@ public class ContractVo extends Contract {
 
     private BigDecimal refundMoney;
 
+    /**
+     * 流程id
+     */
+    private Long flowId;
+
     public BigDecimal getRefundMoney() {
         return sumClaimMoney;
     }

hx-sale/src/main/java/com/fjhx/sale/entity/sale/vo/SaleQuotationVo.java

@@ -90,8 +90,10 @@ public class SaleQuotationVo extends SaleQuotation {
      */
     private Integer contractCount;
 
-
-
+    /**
+     * 流程id
+     */
+    private Long flowId;
 
 
 }

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

@@ -32,6 +32,7 @@ import com.fjhx.customer.entity.customer.po.Customer;
 import com.fjhx.customer.service.customer.CustomerService;
 import com.fjhx.file.entity.FileInfoVo;
 import com.fjhx.file.utils.ObsFileUtil;
+import com.fjhx.flow.service.flow.FlowExampleService;
 import com.fjhx.item.entity.product.dto.ProductInfoSelectDto;
 import com.fjhx.item.service.product.ProductInfoService;
 import com.fjhx.purchase.entity.arrival.po.ArrivalDetail;
@@ -151,6 +152,9 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
     @Autowired
     private QualityDetailService qualityDetailService;
 
+    @Autowired
+    private FlowExampleService flowExampleService;
+
     /**
      * 分页
      *
@@ -201,26 +205,31 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
             // 获取包装附件
             Map<Long, List<FileInfoVo>> packageFileMap = ObsFileUtil.getFileMap(ids, 2);
             for (ContractVo p : list) {
-                if (MapUtils.isNotEmpty(cusMap)) {//客户
+
+                // 客户
+                if (MapUtils.isNotEmpty(cusMap)) {
                     List<Customer> customers = cusMap.getOrDefault(p.getBuyCorporationId(), null);
                     p.setBuyCorporationName(customers == null ? null : customers.get(0).getName());
-                    //赋值客户标签
+                    // 赋值客户标签
                     p.setTag(customers == null ? null : customers.get(0).getTag());
                 }
 
-            // 赋值交接单附件
-            if (MapUtils.isNotEmpty(fileMap)) {
-                List<FileInfoVo> fileInfoVos = fileMap.get(p.getId());
-                p.setFileInfoVos(fileInfoVos);
-            }
+                // 赋值交接单附件
+                if (MapUtils.isNotEmpty(fileMap)) {
+                    List<FileInfoVo> fileInfoVos = fileMap.get(p.getId());
+                    p.setFileInfoVos(fileInfoVos);
+                }
 
-            // 赋值包装附件信息
-            if (MapUtils.isNotEmpty(packageFileMap)) {
-                List<FileInfoVo> packageFileInfoVOList = packageFileMap.get(p.getId());
-                p.setPackageFileInfoVOList(packageFileInfoVOList);
-            }
+                // 赋值包装附件信息
+                if (MapUtils.isNotEmpty(packageFileMap)) {
+                    List<FileInfoVo> packageFileInfoVOList = packageFileMap.get(p.getId());
+                    p.setPackageFileInfoVOList(packageFileInfoVOList);
+                }
 
             }
+
+            // 赋值流程id
+            flowExampleService.setFlowId(list, ContractVo::setFlowId);
         }
         return page;
     }

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

@@ -17,6 +17,7 @@ import com.fjhx.customer.entity.customer.dto.CustomerSelectDto;
 import com.fjhx.customer.entity.customer.po.Customer;
 import com.fjhx.customer.entity.customer.vo.CustomerVo;
 import com.fjhx.customer.service.customer.CustomerService;
+import com.fjhx.flow.service.flow.FlowExampleService;
 import com.fjhx.sale.entity.contract.vo.ContractVo;
 import com.fjhx.sale.entity.quotation.po.QuotationPay;
 import com.fjhx.sale.entity.quotation.po.QuotationProduct;
@@ -69,6 +70,9 @@ public class SaleQuotationServiceImpl extends ServiceImpl<SaleQuotationMapper, S
     @Autowired
     private DictTenantDataService dictTenantDataService;
 
+    @Autowired
+    private FlowExampleService flowExampleService;
+
 
     /**
      * 报价表分页
@@ -94,6 +98,10 @@ public class SaleQuotationServiceImpl extends ServiceImpl<SaleQuotationMapper, S
 
         // 赋值用户名称
         UserUtil.assignmentNickName(saleQuotationVoList, BasePo::getCreateUser, SaleQuotationVo::setUserName);
+
+        //  赋值流程id
+        flowExampleService.setFlowId(saleQuotationVoList, SaleQuotationVo::setFlowId);
+
         return page;
     }