问题处理

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

@@ -45,4 +45,19 @@ public class CostControlVo extends CostControl {
      */
     private String applyUserName;
 
+    /**
+     * 所属中心
+     */
+    private String companyName;
+
+    /**
+     * 所属部门
+     */
+    private String deptName;
+
+    /**
+     * 收付款方式名称
+     */
+    private String costTypeName;
+
 }

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

@@ -16,6 +16,7 @@ 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.account.service.payment.PaymentTypeService;
 import com.fjhx.common.controller.Label;
 import com.fjhx.common.enums.FlowStatusEnum1;
 import com.fjhx.common.service.logistics.LogisticsCompanyInfoService;
@@ -25,8 +26,10 @@ import com.fjhx.flow.enums.FlowStatusEnum;
 import com.fjhx.flow.service.flow.FlowExampleService;
 import com.ruoyi.common.core.domain.BaseIdPo;
 import com.ruoyi.common.core.domain.BasePo;
+import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.ruoyi.system.service.ISysDeptService;
 import com.ruoyi.system.utils.UserUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -52,12 +55,22 @@ public class CostControlServiceImpl extends ServiceImpl<CostControlMapper, CostC
     private CostControlDetailService costControlDetailService;
     @Autowired
     private FlowExampleService flowExampleService;
+    @Autowired
+    private ISysDeptService sysDeptService;
+    @Autowired
+    private PaymentTypeService paymentTypeService;
 
     @Override
     public Page<CostControlVo> getPage(CostControlSelectDto dto) {
         IWrapper<CostControl> wrapper = getWrapper();
         wrapper.orderByDesc("cc", CostControl::getId);
         Page<CostControlVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        List<CostControlVo> records = page.getRecords();
+        if (ObjectUtil.isEmpty(records)) {
+            return page;
+        }
+        //赋值主表基础信息
+        setInfo(records);
         return page;
     }
 
@@ -77,6 +90,10 @@ public class CostControlServiceImpl extends ServiceImpl<CostControlMapper, CostC
     }
 
     private void setInfo(List<CostControlVo> costControlVos) {
+        //赋值收付款方式
+        paymentTypeService.attributeAssign(costControlVos, CostControlVo::getCostType, (detail, paymentType) -> {
+            detail.setCostTypeName(paymentType.getName());
+        });
         //赋值物流公司信息
         logisticsCompanyInfoService.attributeAssign(costControlVos, CostControlVo::getLogisticsCompanyId, (detail, logistics) -> {
             detail.setLogisticsName(logistics.getName());
@@ -87,6 +104,17 @@ public class CostControlServiceImpl extends ServiceImpl<CostControlMapper, CostC
         });
         //赋值申请人信息
         UserUtil.assignmentNickName(costControlVos, CostControlVo::getApplyUserId, CostControlVo::setApplyUserName);
+        //归属公司、部门
+        List<SysDept> deptList = sysDeptService.list();
+        Map<Long, String> deptMap = new HashMap<>();
+        if (ObjectUtil.isNotEmpty(deptList)) {
+            deptMap = deptList.stream().collect(Collectors.toMap(SysDept::getDeptId, SysDept::getDeptName));
+        }
+        for (CostControlVo costControlVo : costControlVos) {
+            //归属公司、部门
+            costControlVo.setCompanyName(deptMap.get(costControlVo.getCompanyId()));
+            costControlVo.setDeptName(deptMap.get(costControlVo.getDeptId()));
+        }
     }
 
     @Override

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

@@ -2,27 +2,7 @@
 <!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.CostControlMapper">
     <select id="getPage" resultType="com.fjhx.account.entity.cost.vo.CostControlVo">
-        select cc.id,
-               cc.trade_type,
-               cc.cost_type,
-               cc.voucher_no,
-               cc.apply_time,
-               cc.code,
-               cc.logistics_company_id,
-               cc.is_voucher,
-               cc.company_id,
-               cc.dept_id,
-               cc.apply_user_id,
-               cc.is_advance,
-               cc.amount,
-               cc.is_public_transfer,
-               cc.account_name,
-               cc.account_bank,
-               cc.account_number,
-               cc.create_user,
-               cc.create_time,
-               cc.update_user,
-               cc.update_time
+        select cc.*
         from cost_control cc
             ${ew.customSqlSegment}
     </select>