利润预算表问题处理

hx-sale/src/main/java/com/fjhx/sale/controller/contract/ContractController.java

@@ -94,6 +94,14 @@ public class ContractController {
 //    }
 
     /**
+     * 修改合同代理费
+     */
+    @PostMapping("/modifyAgencyFee")
+    public void modifyAgencyFee(@RequestBody ContractDto contractDto) {
+        contractService.modifyAgencyFee(contractDto);
+    }
+
+    /**
      * 外销合同表删除
      */
     @PostMapping("/delete")

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

@@ -14,7 +14,6 @@ import com.fjhx.sale.entity.contract.vo.*;
 import com.fjhx.sale.entity.purchase.po.EhsdPurchase;
 import com.fjhx.sale.entity.sale.vo.SaleQuotationVo;
 import com.ruoyi.common.core.service.BaseService;
-import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -80,6 +79,11 @@ public interface ContractService extends BaseService<Contract> {
     void edit(ContractDto contractDto);
 
     /**
+     * 修改合同代理费
+     */
+    void modifyAgencyFee(ContractDto contractDto);
+
+    /**
      * 外销合同表删除
      */
     void delete(Long id);

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

@@ -699,6 +699,9 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
         }
         Page<ContractBudgetVo> page = this.baseMapper.getProfitClearingPage(dto.getPage(), wrapper);
         List<ContractBudgetVo> list = page.getRecords();
+        if (ObjectUtil.isEmpty(list)) {
+            return page;
+        }
         // 赋值客户名称
         customerService.attributeAssign(list, Contract::getBuyCorporationId, (item, customer) -> {
             item.setCustomerName(customer.getName());
@@ -882,6 +885,17 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
     }
 
     @Override
+    public void modifyAgencyFee(ContractDto contractDto) {
+        this.update(q -> q
+                .eq(Contract::getId, contractDto.getId())
+                .set(Contract::getProfitAgencyFee, contractDto.getProfitAgencyFee())
+                .set(BasePo::getUpdateTime, new Date())
+                .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
+        );
+    }
+
+
+    @Override
     public void delete(Long id) {
         this.removeById(id);
     }

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

@@ -144,10 +144,10 @@ public class EhsdPurchaseServiceImpl extends ServiceImpl<EhsdPurchaseMapper, Ehs
         }
 
         //不显示 在审批中 但是 有历史合同id的数据
-        wrapper.not(q -> q
-                .eq(EhsdPurchase::getStatus, FlowStatusEnum1.UNDER_REVIEW.getKey())
-                .isNotNull("t1.old_purchase_id")
-        );
+//        wrapper.not(q -> q
+//                .eq(EhsdPurchase::getStatus, FlowStatusEnum1.UNDER_REVIEW.getKey())
+//                .isNotNull("t1.old_purchase_id")
+//        );
 
         Page<EhsdPurchaseVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         List<EhsdPurchaseVo> records = page.getRecords();