新增f_ads_bsi_kpi_proj_two相关类

dsk-admin/src/main/resources/application.yml

@@ -184,6 +184,7 @@ tenant:
     - d_customer_safety_certificate
     - d_customer_tax_certificate
     - f_supplier_limited
+    - f_ads_bsi_kpi_proj_two
 
 # MyBatisPlus配置
 # https://baomidou.com/config/

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/FAdsBsiKpiProjTwo.java

+package com.dsk.cscec.domain;
+
+import lombok.Data;
+
+import java.util.Date;
+import java.io.Serializable;
+
+/**
+ * (FAdsBsiKpiProjTwo)实体类
+ *
+ * @author sxk
+ * @since 2024-01-12 13:41:23
+ */
+@Data
+public class FAdsBsiKpiProjTwo implements Serializable {
+    private static final long serialVersionUID = -95800372397949291L;
+    /**
+     * 组织机构id
+     */
+    private String orgId;
+    /**
+     * 项目id
+     */
+    private String projectId;
+    /**
+     * 归属月份
+     */
+    private String monthCode;
+    /**
+     * 流程状态
+     */
+    private String flowState;
+    /**
+     * 商务状态
+     */
+    private String businessState;
+    /**
+     * 项目状态
+     */
+    private String projectState;
+    /**
+     * 业主结算状态
+     */
+    private String ownerbalanceState;
+    /**
+     * 分包结算状态
+     */
+    private String subbalanceState;
+    /**
+     * 财务清算状态
+     */
+    private String financeState;
+    /**
+     * 合同签订月份
+     */
+    private String contractSignMonth;
+    /**
+     * 合同金额
+     */
+    private Double contractValue;
+    /**
+     * 合同自施金额
+     */
+    private Double contractSelfValue;
+
+    private Double contractExecuteValue;
+
+    private Double sideContractValue;
+
+    private Double claimContractValue;
+    /**
+     * 商务自施额
+     */
+    private Double businessSelfValue;
+    /**
+     * 预收益额
+     */
+    private Double estimatedEarning;
+    /**
+     * 预收益率
+     */
+    private Double estimatedEarningRate;
+    /**
+     * 实际收益额
+     */
+    private Double actualEarning;
+
+    private Double actualEarningRateSelf;
+    /**
+     * 实际收益率
+     */
+    private Double actualEarningRate;
+
+    private Double monthImagerevenue;
+
+    private Double monthImagerevenueExcl;
+    /**
+     * 年收入
+     */
+    private Double yearRevenue;
+
+    private Double yearRevenueExcl;
+
+    private Double ttlImagerevenue;
+
+    private Double ttlImagerevenueExcl;
+    /**
+     * 月自施收入
+     */
+    private Double monthSelfRevenue;
+
+    private Double monthSelfRevenueExcl;
+    /**
+     * 年自施收入
+     */
+    private Double yearSelfRevenue;
+
+    private Double yearSelfRevenueExcl;
+
+    private Double ttlSelfRevenue;
+
+    private Double ttlSelfRevenueExcl;
+    /**
+     * 业主批量（含税）本月值
+     */
+    private Double monthOwnerconfirm;
+
+    private Double monthOwnerconfirmExcl;
+    /**
+     * 业主批量（含税）本年值
+     */
+    private Double yearOwnerconfirm;
+
+    private Double yearOwnerconfirmExcl;
+    /**
+     * 业主批量（含税）累计值
+     */
+    private Double ttlOwnerconfirm;
+
+    private Double ttlOwnerConfirmExcl;
+    /**
+     * 工程施工成本本月值
+     */
+    private Double monthCost;
+
+    private Double monthCostExcl;
+    /**
+     * 工程施工成本本年值
+     */
+    private Double yearCost;
+
+    private Double yearCostExcl;
+    /**
+     * 工程施工成本累计值
+     */
+    private Double ttlCost;
+
+    private Double ttlCostExcl;
+    /**
+     * 月度总收款
+     */
+    private Double monthIncome;
+    /**
+     * 年度总收款
+     */
+    private Double yearIncome;
+    /**
+     * 累计总收款
+     */
+    private Double ttlIncome;
+    /**
+     * 预收账款余额本月值
+     */
+    private Double monthPreIncome;
+    /**
+     * 预收账款余额本年值
+     */
+    private Double yearPreIncome;
+    /**
+     * 预收账款余额累计值
+     */
+    private Double ttlPreIncome;
+    /**
+     * 预收抵扣余额本月值
+     */
+    private Double monthPrepayIncome;
+    /**
+     * 预收抵扣余额本年值
+     */
+    private Double yearPrepayIncome;
+    /**
+     * 预收抵扣余额累计值
+     */
+    private Double ttlPrepayIncome;
+
+    private Double monthPresettle;
+
+    private Double monthPresettleExcl;
+
+    private Double yearPresettle;
+
+    private Double yearPresettleExcl;
+
+    private Double ttlPresettle;
+
+    private Double ttlPresettleExcl;
+
+    private Double monthPay;
+
+    private Double yearPaid;
+
+    private Double ttlPay;
+
+    private Double ttlUnpaidScontractor;
+
+    private Double ttlUnpaidSupplier;
+
+    private Double ttlUnpaid;
+
+    private Double ttlUnpaidScontractor2;
+
+    private Double ttlUnpaidSupplier2;
+
+    private Double ttlUnpaid2;
+
+    private Double monthPayableScontractor;
+
+    private Double monthPayableScontractorExcl;
+
+    private Double yearPayableScontractor;
+
+    private Double yearPayableScontractorExcl;
+
+    private Double ttlPayableScontractor;
+
+    private Double ttlPayableScontractorExcl;
+
+    private Double monthPayableSupplier;
+
+    private Double monthPayableSupplierExcl;
+
+    private Double yearPayableSupplier;
+
+    private Double yearPayableSupplierExcl;
+
+    private Double ttlPayableSupplier;
+
+    private Double ttlPayableSupplierExcl;
+
+    private Double monthContractReceivable;
+
+    private Double ttlContractReceivable;
+    /**
+     * 应收账款余额
+     */
+    private Double receivableValue;
+    /**
+     * 有收款权的应收账款
+     */
+    private Double hasrightReceivable;
+
+    private Double hasrightOverdue;
+    /**
+     * 无收款权的应收账款
+     */
+    private Double norightReceivable;
+
+    private Double norightGuarateeValue;
+
+    private Double norightReceivableOther;
+
+    private Double receivableInventory;
+
+    private Double unbalancedValue;
+
+    private Double unbalancedValueExcl;
+
+    private Double inventoryValue;
+
+    private Double inventoryValueExcl;
+
+    private Double ttlStock;
+
+    private Double projectSettleValue;
+
+    private Double projectSettleSelfValue;
+
+    private Double projectContractValue;
+
+    private Double projectContractSelfValue;
+
+    private Double settleEarning;
+
+    private Double settleEarningSelf;
+
+    private Double projectInchargeCost;
+
+    private Double projectInchargeCostSelf;
+
+    private Double manageEarning;
+
+    private Double manageEarningSelf;
+
+    private Double projectPlanCost;
+
+    private Double projectPlanCostExcl;
+
+    private Double operateEarning;
+
+    private Double operateEarningSelf;
+
+    private Double projectRealCost;
+
+    private Double projectRealCostExcl;
+
+    private Double subcontractFee;
+
+    private Double subcontractFeeExcl;
+
+    private Double laborFee;
+
+    private Double laborFeeExcl;
+
+    private Double materialFee;
+
+    private Double materialFeeExcl;
+
+    private Double machineFee;
+
+    private Double machineFeeExcl;
+
+    private Double tmpdeviceFee;
+
+    private Double tmpdeviceFeeExcl;
+
+    private Double indirectFee;
+
+    private Double indirectFeeExcl;
+
+    private Double otherFee;
+
+    private Double otherFeeExcl;
+    /**
+     * 项目人数
+     */
+    private Double personnumProject;
+
+    private Double monthOutput;
+
+    private Double yearOutput;
+
+    private Double ttlOutput;
+
+    private Double monthApprovalSelfExcl;
+
+    private Double monthApprovalSelf;
+
+    private Double yearApprovalSelfExcl;
+
+    private Double yearApprovalSelf;
+
+    private Double ttlApprovalSelfExcl;
+
+    private Double ttlApprovalSelf;
+
+    private Double monthCostSelfExcl;
+
+    private Double monthCostSelf;
+
+    private Double yearCostSelfExcl;
+
+    private Double yearCostSelf;
+
+    private Double ttlCostSelfExcl;
+
+    private Double ttlCostSelf;
+
+    private Double costPlanSelfExcl;
+
+    private Double costPlanSelf;
+
+    private String issumcost;
+
+    private String issumcostmonth;
+
+    private Double monthApplyValue;
+
+    private Double ttlApplyValue;
+
+    private Double monthCrPre;
+
+    private Double monthCrPrepay;
+
+    private Double monthCrStep;
+
+    private Double monthCrSettle;
+
+    private Double monthCrRepair;
+
+    private Double ttlCrPre;
+
+    private Double ttlCrPrepay;
+
+    private Double ttlCrStep;
+
+    private Double ttlCrSettle;
+
+    private Double ttlCrRepair;
+
+    private Double monthStepIncome;
+
+    private Double monthSettleIncome;
+
+    private Double monthRepairIncome;
+
+    private Double ttlStepIncome;
+
+    private Double ttlSettleIncome;
+
+    private Double ttlRepairIncome;
+    /**
+     * 数据加载时间
+     */
+    private Date loadTime;
+
+}

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/mapper/FAdsBsiKpiProjTwoMapper.java

+package com.dsk.cscec.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dsk.cscec.domain.FAdsBsiKpiProjTwo;
+
+/**
+ * (FAdsBsiKpiProjTwo)表数据库访问层
+ *
+ * @author sxk
+ * @since 2024-01-12 13:41:19
+ */
+public interface FAdsBsiKpiProjTwoMapper extends BaseMapper<FAdsBsiKpiProjTwo> {
+
+
+}
+

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

+package com.dsk.cscec.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.dsk.cscec.domain.FAdsBsiKpiProjTwo;
+
+/**
+ * (FAdsBsiKpiProjTwo)表服务接口
+ *
+ * @author sxk
+ * @since 2024-01-12 13:41:25
+ */
+public interface FAdsBsiKpiProjTwoService extends IService<FAdsBsiKpiProjTwo> {
+
+}

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

+package com.dsk.cscec.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dsk.cscec.domain.FAdsBsiKpiProjTwo;
+import com.dsk.cscec.mapper.FAdsBsiKpiProjTwoMapper;
+import com.dsk.cscec.service.FAdsBsiKpiProjTwoService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * (FAdsBsiKpiProjTwo)表服务实现类
+ *
+ * @author sxk
+ * @since 2024-01-12 13:41:25
+ */
+@Service("fAdsBsiKpiProjTwoService")
+public class FAdsBsiKpiProjTwoServiceImpl extends ServiceImpl<FAdsBsiKpiProjTwoMapper, FAdsBsiKpiProjTwo> implements FAdsBsiKpiProjTwoService {
+    @Resource
+    private FAdsBsiKpiProjTwoMapper baseMapper;
+
+}

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

@@ -4,7 +4,6 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -79,24 +78,6 @@ public class IDProjectServiceImpl extends ServiceImpl<DProjectMapper, DProject>
             projectKeys = projectKeys1;
         }
 
-        Page<ProjectSearchVo> page = baseMapper.selectPageProjectList(pageQuery.build(), this.buildProjectQueryWrapper(projectSearchBo, projectKeys));
-
-        for (ProjectSearchVo projectSearchVo : page.getRecords()) {
-            //补充咨询机构信息
-            projectSearchVo.setAdvisoryBody(this.getAdvisoryBodyByProjectKey(projectSearchVo.getProjectKey()));
-
-            //补充项目与咨询机构关联信息
-            projectSearchVo.setAdvisoryBodyProject(advisoryBodyProjectMapper.selectById(projectSearchVo.getProjectKey()));
-
-            //关键字标红
-            if (StringUtils.isNotBlank(projectSearchBo.getProjectName())) {
-                projectSearchVo.setProjectName(StringUtils.markInRed(projectSearchVo.getProjectName(), projectSearchBo.getProjectName()));
-            }
-        }
-        return TableDataInfo.build(page);
-    }
-
-    private Wrapper<DProject> buildProjectQueryWrapper(ProjectSearchBo projectSearchBo, List<Long> projectKeys) {
         QueryWrapper<DProject> wrapper = Wrappers.query();
         //咨询机构的项目数据取中建一局集团第二建筑有限公司和他的下级组织
         wrapper
@@ -127,7 +108,21 @@ public class IDProjectServiceImpl extends ServiceImpl<DProjectMapper, DProject>
                         projectSearchBo.getMinContractAmount(),
                         projectSearchBo.getMaxContractAmount())
                 .orderByDesc("p.contract_sign_date");
-        return wrapper;
+        Page<ProjectSearchVo> page = baseMapper.selectPageProjectList(pageQuery.build(), wrapper);
+
+        for (ProjectSearchVo projectSearchVo : page.getRecords()) {
+            //补充咨询机构信息
+            projectSearchVo.setAdvisoryBody(this.getAdvisoryBodyByProjectKey(projectSearchVo.getProjectKey()));
+
+            //补充项目与咨询机构关联信息
+            projectSearchVo.setAdvisoryBodyProject(advisoryBodyProjectMapper.selectById(projectSearchVo.getProjectKey()));
+
+            //关键字标红
+            if (StringUtils.isNotBlank(projectSearchBo.getProjectName())) {
+                projectSearchVo.setProjectName(StringUtils.markInRed(projectSearchVo.getProjectName(), projectSearchBo.getProjectName()));
+            }
+        }
+        return TableDataInfo.build(page);
     }
 
     /**

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

+<?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.dsk.cscec.mapper.FAdsBsiKpiProjTwoMapper">
+
+</mapper>
+