外销跟单BUG修复

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

@@ -1,5 +1,6 @@
 package com.fjhx.sale.controller.contract;
 
+import com.fjhx.sale.entity.contract.po.ContractDocumentary;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.sale.entity.contract.vo.ContractDocumentaryVo;
@@ -29,7 +30,7 @@ public class EhsdPurchaseDocumentaryController {
      * 外销跟单表分页
      */
     @PostMapping("/page")
-    public Page<ContractDocumentaryVo> page(@RequestBody ContractDocumentarySelectDto dto) {
+    public Page<ContractDocumentary> page(@RequestBody ContractDocumentarySelectDto dto) {
         return contractDocumentaryService.getPage(dto);
     }
 

hx-sale/src/main/java/com/fjhx/sale/entity/contract/po/ContractDocumentary.java

@@ -48,4 +48,10 @@ public class ContractDocumentary extends BasePo {
      */
     @TableField(exist = false)
     private List<ObsFile> fileList;
+
+    /**
+     * 用户名
+     */
+    @TableField(exist = false)
+    private String UserName;
 }

hx-sale/src/main/java/com/fjhx/sale/mapper/contract/ContractDocumentaryMapper.java

@@ -21,6 +21,6 @@ public interface ContractDocumentaryMapper extends BaseMapper<ContractDocumentar
     /**
      * 外销跟单表分页
      */
-    Page<ContractDocumentaryVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<ContractDocumentary> wrapper);
+    Page<ContractDocumentary> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<ContractDocumentary> wrapper);
 
 }

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

@@ -21,7 +21,7 @@ public interface ContractDocumentaryService extends BaseService<ContractDocument
     /**
      * 外销跟单表分页
      */
-    Page<ContractDocumentaryVo> getPage(ContractDocumentarySelectDto dto);
+    Page<ContractDocumentary> getPage(ContractDocumentarySelectDto dto);
 
     /**
      * 外销跟单表明细

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

@@ -2,12 +2,15 @@ package com.fjhx.sale.service.contract.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.dynamic.datasource.annotation.DSTransactional;
+import com.fjhx.account.entity.account.po.AccountPayment;
+import com.fjhx.account.entity.account.vo.AccountPaymentVo;
 import com.fjhx.file.utils.ObsFileUtil;
 import com.fjhx.sale.entity.contract.po.Contract;
 import com.fjhx.sale.entity.contract.po.ContractDocumentary;
 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.system.utils.UserUtil;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.sale.entity.contract.vo.ContractDocumentaryVo;
@@ -16,6 +19,8 @@ import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.fjhx.sale.entity.contract.dto.ContractDocumentaryDto;
 import cn.hutool.core.bean.BeanUtil;
 
+import java.util.List;
+
 
 /**
  * <p>
@@ -34,12 +39,15 @@ public class ContractDocumentaryServiceImpl extends ServiceImpl<ContractDocument
      * @return
      */
     @Override
-    public Page<ContractDocumentaryVo> getPage(ContractDocumentarySelectDto dto) {
+    public Page<ContractDocumentary> getPage(ContractDocumentarySelectDto dto) {
         IWrapper<ContractDocumentary> wrapper = getWrapper();
         wrapper.eq(ObjectUtil.isNotEmpty(dto.getPurchaseId()),"purchase_id",dto.getPurchaseId());
         wrapper.eq(ObjectUtil.isNotEmpty(dto.getDocumentaryType()),"documentary_type",dto.getDocumentaryType());
         wrapper.orderByDesc("cd", ContractDocumentary::getId);
-        Page<ContractDocumentaryVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        Page<ContractDocumentary> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        List<ContractDocumentary> list = page.getRecords();
+        // 赋值用户名称
+        UserUtil.assignmentNickName(list, ContractDocumentary::getCreateUser, ContractDocumentary::setUserName);
         return page;
     }
 

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

@@ -1946,7 +1946,7 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
     @Override
     public void editContractRemark(ContractVo contractVo) {
         this.updateById(contractVo);
-        ObsFileUtil.saveFile(contractVo.getFileList(), contractVo.getId(), 30);
+        ObsFileUtil.saveFile(contractVo.getRemarkFileList(), contractVo.getId(), 30);
     }
 
     public static void main(String[] args) {

hx-sale/src/main/resources/mapper/contract/ContractDocumentaryMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fjhx.sale.mapper.contract.ContractDocumentaryMapper">
-    <select id="getPage" resultType="com.fjhx.sale.entity.contract.vo.ContractDocumentaryVo">
+    <select id="getPage" resultType="com.fjhx.sale.entity.contract.po.ContractDocumentary">
         select
             *
         from ehsd_purchase_documentary cd