跟单配置排序

销售合同到账按钮

hx-common/src/main/java/com/fjhx/common/service/documentary/impl/DocumentaryServiceImpl.java

@@ -1,16 +1,16 @@
 package com.fjhx.common.service.documentary.impl;
 
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.common.entity.documentary.dto.DocumentaryDto;
+import com.fjhx.common.entity.documentary.dto.DocumentarySelectDto;
 import com.fjhx.common.entity.documentary.po.Documentary;
+import com.fjhx.common.entity.documentary.vo.DocumentaryVo;
 import com.fjhx.common.mapper.documentary.DocumentaryMapper;
 import com.fjhx.common.service.documentary.DocumentaryService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.common.entity.documentary.vo.DocumentaryVo;
-import com.fjhx.common.entity.documentary.dto.DocumentarySelectDto;
 import com.ruoyi.common.utils.wrapper.IWrapper;
-import com.fjhx.common.entity.documentary.dto.DocumentaryDto;
-import cn.hutool.core.bean.BeanUtil;
+import org.springframework.stereotype.Service;
 
 
 /**
@@ -27,7 +27,9 @@ public class DocumentaryServiceImpl extends ServiceImpl<DocumentaryMapper, Docum
     @Override
     public Page<DocumentaryVo> getPage(DocumentarySelectDto dto) {
         IWrapper<Documentary> wrapper = getWrapper();
-        wrapper.orderByDesc("d", Documentary::getId);
+
+        wrapper.orderByAsc("d", Documentary::getType);
+        wrapper.orderByAsc("d", Documentary::getSort);
         Page<DocumentaryVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         return page;
     }

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

@@ -2,14 +2,12 @@ package com.fjhx.sale.controller.contract;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.item.entity.product.dto.ProductInfoSelectDto;
-import com.fjhx.item.entity.product.vo.ProductInfoVo;
 import com.fjhx.sale.entity.contract.dto.ContractDto;
 import com.fjhx.sale.entity.contract.dto.ContractSelectDto;
 import com.fjhx.sale.entity.contract.po.Contract;
 import com.fjhx.sale.entity.contract.vo.ContractBudgetVo;
 import com.fjhx.sale.entity.contract.vo.ContractPdfInfoVo;
 import com.fjhx.sale.entity.contract.vo.ContractVo;
-import com.fjhx.sale.entity.sample.dto.SampleDto;
 import com.fjhx.sale.service.contract.ContractService;
 import com.ruoyi.common.core.domain.BaseSelectDto;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -177,15 +175,23 @@ public class ContractController {
      */
     @PostMapping("/getProfitBudgetPage")
     public  Page<ContractBudgetVo> getProfitBudgetPage(@RequestBody ContractSelectDto dto){
-        return  contractService.getProfitBudgetPage(dto);
+        return contractService.getProfitBudgetPage(dto);
     }
 
     /**
      * 利润结算
      */
     @PostMapping("/getProfitClearingPage")
-    public  Page<ContractBudgetVo> getProfitClearingPage(@RequestBody ContractSelectDto dto){
-        return  contractService.getProfitClearingPage(dto);
+    public Page<ContractBudgetVo> getProfitClearingPage(@RequestBody ContractSelectDto dto) {
+        return contractService.getProfitClearingPage(dto);
+    }
+
+    /**
+     * 销售合同-》到账完成
+     */
+    @PostMapping("/toTheAccount")
+    public void toTheAccount(@RequestBody Contract dto) {
+        contractService.toTheAccount(dto);
     }
 
 }

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

@@ -4,12 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.customer.entity.customer.dto.CustomerDto;
 import com.fjhx.item.entity.product.dto.ProductInfoSelectDto;
-import com.fjhx.item.entity.product.vo.ProductInfoVo;
-import com.fjhx.sale.entity.commission.dto.CommissionDto;
 import com.fjhx.sale.entity.contract.dto.ContractDto;
 import com.fjhx.sale.entity.contract.dto.ContractSelectDto;
 import com.fjhx.sale.entity.contract.po.Contract;
-import com.fjhx.sale.entity.contract.po.ContractBudget;
 import com.fjhx.sale.entity.contract.vo.ContractBudgetVo;
 import com.fjhx.sale.entity.contract.vo.ContractPdfInfoVo;
 import com.fjhx.sale.entity.contract.vo.ContractVo;
@@ -147,4 +144,10 @@ public interface ContractService extends BaseService<Contract> {
      * 合同销售统计（合同列表）
      */
     Map<String, Object> covenantStatistics(ContractDto dto);
+
+    /**
+     * 销售合同-》到账完成
+     */
+    void toTheAccount(Contract dto);
+
 }

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

@@ -56,9 +56,12 @@ import com.fjhx.sale.service.contract.ContractProductService;
 import com.fjhx.sale.service.contract.ContractProjectService;
 import com.fjhx.sale.service.contract.ContractService;
 import com.fjhx.sale.service.purchase.EhsdPurchaseProductService;
+import com.ruoyi.common.core.domain.BaseIdPo;
+import com.ruoyi.common.core.domain.BasePo;
 import com.ruoyi.common.core.domain.BaseSelectDto;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.PageUtils;
+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;
@@ -679,14 +682,32 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
         });
         DynamicDataSourceContextHolder.poll();
 
-        //过滤掉卖方公司为null的数据（因为如果归属公司为null说明服务合同表的是没有数据）
+        // 过滤掉卖方公司为null的数据（因为如果归属公司为null说明服务合同表的是没有数据）
         contractList = contractList.stream().filter(serviceContract -> ObjectUtil
                 .isNotEmpty(serviceContract.getSellCorporationId())).collect(Collectors.toList());
 
-        map.put("serviceContractList",contractList);
+        map.put("serviceContractList", contractList);
         return map;
     }
 
+    @Override
+    public void toTheAccount(Contract dto) {
+
+        Long contractId = dto.getId();
+
+        if (ObjectUtil.isNull(contractId)) {
+            throw new ServiceException("销售合同id不能为空");
+        }
+
+        update(q -> q
+                .eq(BaseIdPo::getId, contractId)
+                .set(Contract::getRefundStatus, 20)
+                .set(BasePo::getUpdateTime, new Date())
+                .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
+        );
+
+    }
+
 
     /**
      * 赋值外销合同信息