Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys...

Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys into V20231129-中建一局二公司

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/CbDirectExpenseServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.ReUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.dsk.common.excel.ExcelUtils;
@@ -65,7 +66,7 @@ public class CbDirectExpenseServiceImpl extends ServiceImpl<CbDirectExpenseMappe
         //校验项目是否存在
         this.checkProjectExist(projectId);
 
-        //查询清单/费用项分类标识为数字的数字
+        //查询清单/费用项分类标识为数字123的数据
         List<CbDirectExpenseMenuVo> menuVoList = baseMapper.selectMenuData(projectId, regx, CbProjectConstants.DELETE_FLAG_EXIST);
         Assert.isFalse(menuVoList.isEmpty(), "当前项目不存在直接费菜单");
 
@@ -241,19 +242,28 @@ public class CbDirectExpenseServiceImpl extends ServiceImpl<CbDirectExpenseMappe
      */
     @Override
     public List<CbDirectExpenseDataDetailVo> getDataDetail(Long menuId) {
-        //查询该菜单下的清
-        List<CbDirectExpenseDataDetailVo> qingList = BeanUtil.copyToList(baseMapper.selectList(new LambdaQueryWrapper<CbDirectExpense>()
+        //查询该菜单下的子集
+        List<CbDirectExpenseDataDetailVo> level4List = BeanUtil.copyToList(baseMapper.selectList(new LambdaQueryWrapper<CbDirectExpense>()
                 .eq(CbDirectExpense::getParentId, menuId)
-                //.eq(CbDirectExpense::getExpenseCategoryTag, CbProjectConstants.DIRECT_EXPENSE_CATEGORY_TAG_QING)
         ), CbDirectExpenseDataDetailVo.class);
-        Assert.isFalse(qingList.isEmpty(), "该菜单下无数据");
+        Assert.isFalse(level4List.isEmpty(), "该菜单下无数据");
 
         //生成数据树形
-        qingList.forEach(qing -> {
-            qing.getChildrenList().addAll(BeanUtil.copyToList(baseMapper.selectList(new LambdaQueryWrapper<CbDirectExpense>()
-                    .eq(CbDirectExpense::getParentId, qing.getId())), CbDirectExpenseDataDetailVo.class));
+        this.generateDataDetailTree(level4List);
+        return level4List;
+    }
+
+    //生成数据详情树形
+    public void generateDataDetailTree(List<CbDirectExpenseDataDetailVo> level4List) {
+        level4List.forEach(item -> {
+            if (ReUtil.isMatch(regx, item.getExpenseCategoryTag())) {
+                item.setExpenseCategoryTag(null);
+            }
+            List<CbDirectExpenseDataDetailVo> childrenList = BeanUtil.copyToList(baseMapper.selectList(new LambdaQueryWrapper<CbDirectExpense>()
+                    .eq(CbDirectExpense::getParentId, item.getId())), CbDirectExpenseDataDetailVo.class);
+            item.getChildrenList().addAll(childrenList);
+            generateDataDetailTree(childrenList);
         });
-        return qingList;
     }
 
     /**

dsk-module/dsk-biz-api/src/main/resources/mapper/cscec/CbSummaryMapper.xml

@@ -134,12 +134,12 @@
 
     <select id="getGainLossAnalysisById" resultType="com.dsk.cscec.domain.vo.CbGainLossAnalysisListVo">
         select csu.id, csu.cb_name, csu.tax_exclusive_total, csu.cb_taxes_total, csu.tax_inclusive_total, csa.tax_inclusive_expense, csa.tax_exclusive_expense,
-            sum(cde.tender_control_sum_price) tenderSumPrice, sum(cde.exclude_tax_cb_sum_price) taxExcludeTenderSumPrice, sum(cde.include_tax_cb_sum_price) taxIncludeTenderSumPrice,
+--             sum(cde.tender_control_sum_price) tenderSumPrice, sum(cde.exclude_tax_cb_sum_price) taxExcludeTenderSumPrice, sum(cde.include_tax_cb_sum_price) taxIncludeTenderSumPrice,
             sum(csa1.tax_inclusive_expense) sumTaxInclusiveExpense, sum(csa1.tax_exclusive_expense) sumTaxExclusiveExpense
         from cb_summary csu
         left join cb_summary_actual csa on (csu.id = csa.cb_summary_id and csa.expense_date = #{expenseDate}  AND csa.del_flag = 0)
         left join cb_summary_actual csa1 on (csu.id = csa1.cb_summary_id and csa1.expense_date &lt;= #{expenseDate}  AND csa1.del_flag = 0)
-        left join cb_direct_expense cde on (csu.project_id = cde.project_id and cde.del_flag = 0)
+--         left join cb_direct_expense cde on (csu.project_id = cde.project_id and cde.del_flag = 0)
         where csu.id = #{id} and csu.del_flag = 0
         group by csu.id
         order by csu.sort
@@ -147,12 +147,12 @@
 
     <select id="getGainLossAnalysisByParentId" resultType="com.dsk.cscec.domain.vo.CbGainLossAnalysisListVo">
         select csu.id, csu.cb_name, csu.tax_exclusive_total, csu.cb_taxes_total, csu.tax_inclusive_total, csa.tax_inclusive_expense, csa.tax_exclusive_expense,
-            sum(cde.tender_control_sum_price) tenderSumPrice, sum(cde.exclude_tax_cb_sum_price) taxExcludeTenderSumPrice, sum(cde.include_tax_cb_sum_price) taxIncludeTenderSumPrice,
+--             sum(cde.tender_control_sum_price) tenderSumPrice, sum(cde.exclude_tax_cb_sum_price) taxExcludeTenderSumPrice, sum(cde.include_tax_cb_sum_price) taxIncludeTenderSumPrice,
             sum(csa1.tax_inclusive_expense) sumTaxInclusiveExpense, sum(csa1.tax_exclusive_expense) sumTaxExclusiveExpense
         from cb_summary csu
         left join cb_summary_actual csa on (csu.id = csa.cb_summary_id and csa.expense_date = #{expenseDate}  AND csa.del_flag = 0)
         left join cb_summary_actual csa1 on (csu.id = csa1.cb_summary_id and csa1.expense_date &lt;= #{expenseDate}  AND csa1.del_flag = 0)
-        left join cb_direct_expense cde on (csu.project_id = cde.project_id  and cde.del_flag = 0)
+--         left join cb_direct_expense cde on (csu.project_id = cde.project_id  and cde.del_flag = 0)
         where csu.parent_id = #{parentId} and csu.del_flag = 0
         group by csu.id
         order by csu.sort