添加费控列表 客户数据赋值

hx-account/src/main/java/com/fjhx/account/entity/cost/po/CostControlDetail.java

@@ -190,4 +190,29 @@ public class CostControlDetail extends BasePo {
      */
     private String stockJournalDetailsIds;
 
+
+    /**
+     * 付款开户名
+     */
+    private String paymentAccountName;
+    /**
+     * 付款开户行
+     */
+    private String paymentAccountBank;
+    /**
+     * 付款开户账号
+     */
+    private String paymentAccountNumber;
+    /**
+     * 费用金额（含税）
+     */
+    private String costMoneyTax;
+    /**
+     * 费用金额
+     */
+    private String costMoney;
+    /**
+     * 费用合计
+     */
+    private String costMoneySum;
 }

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

@@ -256,5 +256,7 @@ public class ContractVo extends Contract {
      */
     private String paymentAccountNumber;
 
+    private List<ContractOutboundInfoVo> contractOutboundInfoList;
+
 }
 

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

@@ -7,6 +7,8 @@ import com.fjhx.sale.entity.contract.vo.ContractOutboundInfoVo;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 
 /**
  * <p>
@@ -20,6 +22,9 @@ public interface ContractOutboundInfoMapper extends BaseMapper<ContractOutboundI
 
     Page<ContractOutboundInfoVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<ContractOutboundInfo> wrapper);
 
+    List<ContractOutboundInfoVo> getList(@Param("ew") IWrapper<Object> wrapper);
+
+
     ContractOutboundInfoVo detail(Long id);
 
 }

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

@@ -6,6 +6,9 @@ import com.fjhx.sale.entity.contract.dto.ContractOutboundInfoSelectDto;
 import com.fjhx.sale.entity.contract.po.ContractOutboundInfo;
 import com.fjhx.sale.entity.contract.vo.ContractOutboundInfoVo;
 import com.ruoyi.common.core.service.BaseService;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+
+import java.util.List;
 
 
 /**
@@ -19,6 +22,8 @@ import com.ruoyi.common.core.service.BaseService;
 public interface ContractOutboundInfoService extends BaseService<ContractOutboundInfo> {
     Page<ContractOutboundInfoVo> getPage(ContractOutboundInfoSelectDto dto);
 
+    List<ContractOutboundInfoVo> getList(IWrapper wrapper);
+
     void loadTruck(ContractOutboundInfoDto dto);
 
     /**

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

@@ -56,6 +56,11 @@ public class ContractOutboundInfoServiceImpl extends ServiceImpl<ContractOutboun
     }
 
     @Override
+    public List<ContractOutboundInfoVo> getList(IWrapper wrapper) {
+        return baseMapper.getList(wrapper);
+    }
+
+    @Override
     public void loadTruck(ContractOutboundInfoDto dto) {
         this.updateById(dto);
         List<ContractOutboundRecordsDto> outboundRecordList = dto.getOutboundRecordList();

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

@@ -563,6 +563,14 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
         //赋值跟单人
         UserUtil.assignmentNickName(list, Contract::getMerchUserId, ContractVo::setMerchUserName);
 
+        //赋值到货信息列表
+        List<ContractOutboundInfoVo> contractOutboundInfoVos = contractOutboundInfoService.getList(IWrapper.getWrapper().in("c.id", ids));
+        if (ObjectUtil.isNotEmpty(contractOutboundInfoVos)) {
+            Map<Long, List<ContractOutboundInfoVo>> coiMap = contractOutboundInfoVos.stream().collect(Collectors.groupingBy(ContractOutboundInfo::getContractId));
+            for (ContractVo contractVo : list) {
+                contractVo.setContractOutboundInfoList(coiMap.getOrDefault(contractVo.getId(), new ArrayList<>()));
+            }
+        }
         return page;
     }
 

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

@@ -21,6 +21,11 @@
         ${ew.customSqlSegment}
     </select>
 
+    <select id="getList" resultType="com.fjhx.sale.entity.contract.vo.ContractOutboundInfoVo">
+        <include refid="list"/>
+        ${ew.customSqlSegment}
+    </select>
+
     <select id="detail" resultType="com.fjhx.sale.entity.contract.vo.ContractOutboundInfoVo">
         <include refid="list"/>
         WHERE coi.id = #{id}