费控明细

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

@@ -48,4 +48,5 @@ public class AccountSubjects extends BasePo {
      */
     private Integer sort;
 
+
 }

hx-account/src/main/java/com/fjhx/account/entity/account/vo/AccountSubjectsVo.java

@@ -14,4 +14,14 @@ import lombok.Setter;
 @Setter
 public class AccountSubjectsVo extends AccountSubjects {
 
+    /**
+     * 科目名称
+     */
+    private String subjectsName;
+
+    /**
+     * 核算项目名称
+     */
+    private String subjectsCalculateItemName;
+
 }

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

@@ -6,6 +6,8 @@ import com.ruoyi.common.core.domain.BasePo;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.math.BigDecimal;
+
 /**
  * <p>
  * 费控
@@ -52,7 +54,7 @@ public class CostControl extends BasePo {
      * 物流公司id
      */
     @Label("物流公司信息")
-    private String logisticsCompanyId;
+    private Long logisticsCompanyId;
 
     /**
      * 是否提交凭证
@@ -64,37 +66,40 @@ public class CostControl extends BasePo {
      * 所属中心
      */
     @Label("所属中心")
-    private String companyId;
+    private Long companyId;
 
     /**
      * 所属部门
      */
     @Label("所属部门")
-    private String deptId;
+    private Long deptId;
 
     /**
      * 申请人id
      */
     @Label("申请人")
-    private String applyUserId;
+    private Long applyUserId;
 
     /**
      * 是否预付
      */
     @Label("是否预付")
-    private String isAdvance;
+    private Integer isAdvance;
 
     /**
      * 合计金额
      */
     @Label("合计金额")
-    private String amount;
+    private BigDecimal amount;
 
     /**
      * 是否公户转出
      */
     @Label("是否公户转出")
-    private String isPublicTransfer;
+    private Integer isPublicTransfer;
+
+    @Label("付款方式")
+    private String paymentMethod;
 
     /**
      * 开户名
@@ -114,4 +119,7 @@ public class CostControl extends BasePo {
     @Label("开户账号")
     private String accountNumber;
 
+    @Label("开票税点")
+    private String invoiceTaxPoint;
+
 }

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

@@ -6,6 +6,8 @@ import com.ruoyi.common.core.domain.BasePo;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.math.BigDecimal;
+
 /**
  * <p>
  * 费控明细
@@ -20,6 +22,11 @@ import lombok.Setter;
 public class CostControlDetail extends BasePo {
 
     /**
+     * 费控id
+     */
+    private Long costControlId;
+
+    /**
      * 付款说明
      */
     @Label("付款说明")
@@ -65,19 +72,19 @@ public class CostControlDetail extends BasePo {
      * 记账科目
      */
     @Label("记账科目")
-    private String accountSubjectsId;
+    private Long accountSubjectsId;
 
     /**
      * 记账金额
      */
     @Label("记账金额")
-    private String money;
+    private BigDecimal money;
 
     /**
      * 快递公司
      */
     @Label("快递公司")
-    private String logisticsCompanyId;
+    private Long logisticsCompanyId;
 
     /**
      * 开票税点
@@ -175,4 +182,7 @@ public class CostControlDetail extends BasePo {
     @Label("税费")
     private String taxation;
 
+    @Label("归还金额")
+    private BigDecimal returnAmount;
+
 }

hx-account/src/main/java/com/fjhx/account/entity/cost/vo/CostControlDetailVo.java

@@ -14,4 +14,43 @@ import lombok.Setter;
 @Setter
 public class CostControlDetailVo extends CostControlDetail {
 
+    /**
+     * 物流公司名称
+     */
+    private String logisticsName;
+
+    /**
+     * 物流公司税点
+     */
+    private Integer logisticsTaxPoints;
+
+    /**
+     * 物流公司开户名
+     */
+    private String logisticsAccountName;
+
+    /**
+     * 物流公司开户行
+     */
+    private String logisticsAccountBank;
+
+    /**
+     * 物流公司户账号
+     */
+    private String logisticsAccountNumber;
+
+    /**
+     * 供应商名称
+     */
+    private String supplierName;
+
+    /**
+     * 科目名称
+     */
+    private String subjectsName;
+
+    /**
+     * 核算项目名称
+     */
+    private String subjectsCalculateItemName;
 }

hx-account/src/main/java/com/fjhx/account/entity/cost/vo/CostControlVo.java

@@ -4,6 +4,8 @@ import com.fjhx.account.entity.cost.po.CostControl;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.List;
+
 /**
  * 费控列表查询返回值实体
  *
@@ -14,4 +16,33 @@ import lombok.Setter;
 @Setter
 public class CostControlVo extends CostControl {
 
+    /**
+     * 费控明细
+     */
+    List<CostControlDetailVo> costControlDetailList;
+    /**
+     * 物流公司名称
+     */
+    private String logisticsName;
+    /**
+     * 物流公司税点
+     */
+    private Integer logisticsTaxPoints;
+    /**
+     * 物流公司开户名
+     */
+    private String logisticsAccountName;
+    /**
+     * 物流公司开户行
+     */
+    private String logisticsAccountBank;
+    /**
+     * 物流公司户账号
+     */
+    private String logisticsAccountNumber;
+    /**
+     * 申请人名称
+     */
+    private String applyUserName;
+
 }

hx-account/src/main/java/com/fjhx/account/mapper/cost/CostControlDetailMapper.java

@@ -2,7 +2,11 @@ package com.fjhx.account.mapper.cost;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fjhx.account.entity.cost.po.CostControlDetail;
+import com.fjhx.account.entity.cost.vo.CostControlDetailVo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
 
 /**
  * <p>
@@ -14,4 +18,9 @@ import com.fjhx.account.entity.cost.po.CostControlDetail;
  */
 public interface CostControlDetailMapper extends BaseMapper<CostControlDetail> {
 
+    /**
+     * 费控明细列表
+     */
+    List<CostControlDetailVo> getList(@Param("ew") IWrapper<CostControlDetail> wrapper);
+
 }

hx-account/src/main/java/com/fjhx/account/service/cost/CostControlDetailService.java

@@ -1,8 +1,11 @@
 package com.fjhx.account.service.cost;
 
 import com.fjhx.account.entity.cost.po.CostControlDetail;
+import com.fjhx.account.entity.cost.vo.CostControlDetailVo;
 import com.ruoyi.common.core.service.BaseService;
+import com.ruoyi.common.utils.wrapper.IWrapper;
 
+import java.util.List;
 
 /**
  * <p>
@@ -14,4 +17,8 @@ import com.ruoyi.common.core.service.BaseService;
  */
 public interface CostControlDetailService extends BaseService<CostControlDetail> {
 
+    /**
+     * 费控明细列表
+     */
+    List<CostControlDetailVo> getList(IWrapper wrapper);
 }

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

@@ -2,10 +2,16 @@ package com.fjhx.account.service.cost.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.account.entity.cost.po.CostControlDetail;
+import com.fjhx.account.entity.cost.vo.CostControlDetailVo;
 import com.fjhx.account.mapper.cost.CostControlDetailMapper;
+import com.fjhx.account.service.account.AccountSubjectsService;
 import com.fjhx.account.service.cost.CostControlDetailService;
+import com.fjhx.common.service.logistics.LogisticsCompanyInfoService;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
 
 /**
  * <p>
@@ -18,4 +24,31 @@ import org.springframework.stereotype.Service;
 @Service
 public class CostControlDetailServiceImpl extends ServiceImpl<CostControlDetailMapper, CostControlDetail> implements CostControlDetailService {
 
+
+    @Autowired
+    private AccountSubjectsService accountSubjectsService;
+    @Autowired
+    private LogisticsCompanyInfoService logisticsCompanyInfoService;
+
+    @Override
+    public List<CostControlDetailVo> getList(IWrapper wrapper) {
+        List<CostControlDetailVo> list = this.baseMapper.getList(wrapper);
+
+        //赋值记账科目
+        accountSubjectsService.attributeAssign(list, CostControlDetailVo::getAccountSubjectsId, (detail, subjects) -> {
+            detail.setSubjectsName(subjects.getSubjectsName());
+            detail.setSubjectsCalculateItemName(subjects.getCalculateItemName());
+        });
+        //赋值物流公司信息
+        logisticsCompanyInfoService.attributeAssign(list, CostControlDetailVo::getLogisticsCompanyId, (detail, logistics) -> {
+            detail.setLogisticsName(logistics.getName());
+            detail.setLogisticsTaxPoints(logistics.getTaxPoints());
+            detail.setLogisticsAccountName(logistics.getAccountName());
+            detail.setLogisticsAccountBank(logistics.getAccountBank());
+            detail.setLogisticsAccountNumber(logistics.getAccountNumber());
+        });
+
+        return list;
+    }
+
 }

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

@@ -8,16 +8,22 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.account.entity.cost.dto.CostControlDto;
 import com.fjhx.account.entity.cost.dto.CostControlSelectDto;
 import com.fjhx.account.entity.cost.po.CostControl;
+import com.fjhx.account.entity.cost.po.CostControlDetail;
 import com.fjhx.account.entity.cost.vo.CostControlDetailVo;
 import com.fjhx.account.entity.cost.vo.CostControlVo;
 import com.fjhx.account.mapper.cost.CostControlMapper;
+import com.fjhx.account.service.cost.CostControlDetailService;
 import com.fjhx.account.service.cost.CostControlService;
 import com.fjhx.common.controller.Label;
+import com.fjhx.common.service.logistics.LogisticsCompanyInfoService;
 import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.ruoyi.system.utils.UserUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
@@ -32,6 +38,10 @@ import java.util.List;
  */
 @Service
 public class CostControlServiceImpl extends ServiceImpl<CostControlMapper, CostControl> implements CostControlService {
+    @Autowired
+    private LogisticsCompanyInfoService logisticsCompanyInfoService;
+    @Autowired
+    private CostControlDetailService costControlDetailService;
 
     @Override
     public Page<CostControlVo> getPage(CostControlSelectDto dto) {
@@ -45,9 +55,30 @@ public class CostControlServiceImpl extends ServiceImpl<CostControlMapper, CostC
     public CostControlVo detail(Long id) {
         CostControl CostControl = this.getById(id);
         CostControlVo result = BeanUtil.toBean(CostControl, CostControlVo.class);
+
+        //赋值详情
+        setInfo(Arrays.asList(result));
+
+        //赋值明细列表
+        List<CostControlDetailVo> costControlDetailVos = costControlDetailService.getList(IWrapper.getWrapper().eq(CostControlDetail::getCostControlId, result.getId()));
+        result.setCostControlDetailList(costControlDetailVos);
+
         return result;
     }
 
+    private void setInfo(List<CostControlVo> costControlVos) {
+        //赋值物流公司信息
+        logisticsCompanyInfoService.attributeAssign(costControlVos, CostControlVo::getLogisticsCompanyId, (detail, logistics) -> {
+            detail.setLogisticsName(logistics.getName());
+            detail.setLogisticsTaxPoints(logistics.getTaxPoints());
+            detail.setLogisticsAccountName(logistics.getAccountName());
+            detail.setLogisticsAccountBank(logistics.getAccountBank());
+            detail.setLogisticsAccountNumber(logistics.getAccountNumber());
+        });
+        //赋值申请人信息
+        UserUtil.assignmentNickName(costControlVos, CostControlVo::getApplyUserId, CostControlVo::setApplyUserName);
+    }
+
     @Override
     public void add(CostControlDto costControlDto) {
         this.save(costControlDto);

hx-account/src/main/resources/mapper/cost/CostControlDetailMapper.xml

@@ -1,4 +1,14 @@
 <?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.account.mapper.cost.CostControlDetailMapper">
+    <select id="getList" resultType="com.fjhx.account.entity.cost.vo.CostControlDetailVo">
+        SELECT ccd.*,
+               sui.`name` AS supplierName,
+               shi.`name` AS shopName
+        FROM cost_control_detail ccd
+                 LEFT JOIN supplier_info sui ON ccd.supplier_id = sui.id
+                 LEFT JOIN shop_info shi ON ccd.shop_id = shi.id
+            ${ew.customSqlSegment}
+    </select>
+
 </mapper>