项目成本计算途径改变

zjugis-business/src/main/java/com/zjugis/business/service/impl/ProjectCostServiceImpl.java

@@ -67,18 +67,18 @@ public class ProjectCostServiceImpl implements ProjectCostService {
     @Override
     public ProjectCostResponse calculateSum(ProjectCostDto projectCostDto) {
         ProjectCostResponse cost = projectCostMapper.calculate(projectCostDto);
-        List<ContractSubCostDto> subCostList = contractSubService.selectSubCostByProjectIds(projectCostDto.getProjectIds());
-        Map<String, BigDecimal> commonCostMap = commonCostService.getProjectCostMap(projectCostDto.getProjectIds());
-        Map<String, BigDecimal> travelCostMap = travelCostService.getProjectCostMap(projectCostDto.getProjectIds());
-        cost.setReimbursementCost(commonCostMap == null ? BigDecimal.ZERO: commonCostMap.values().stream().reduce(BigDecimal.ZERO,BigDecimal::add));
-        cost.setTravelCost(travelCostMap == null ? BigDecimal.ZERO:travelCostMap.values().stream().reduce(BigDecimal.ZERO,BigDecimal::add));
-        if(subCostList != null){
-            BigDecimal subCost = subCostList.stream().filter(item -> item.getContractType() != null && item.getContractType() == 1).map(ContractSubCostDto::getSubCost).reduce(BigDecimal.ZERO, BigDecimal::add);
-            BigDecimal outCost = subCostList.stream().filter(item -> item.getContractType() != null && item.getContractType() == 2).map(ContractSubCostDto::getOutCost).reduce(BigDecimal.ZERO, BigDecimal::add);
-            cost.setSubcontractCost(subCost);
-            cost.setOutsourceCost(outCost);
-        }
-        cost.calcCost();
+//        List<ContractSubCostDto> subCostList = contractSubService.selectSubCostByProjectIds(projectCostDto.getProjectIds());
+//        Map<String, BigDecimal> commonCostMap = commonCostService.getProjectCostMap(projectCostDto.getProjectIds());
+//        Map<String, BigDecimal> travelCostMap = travelCostService.getProjectCostMap(projectCostDto.getProjectIds());
+//        cost.setReimbursementCost(commonCostMap == null ? BigDecimal.ZERO: commonCostMap.values().stream().reduce(BigDecimal.ZERO,BigDecimal::add));
+//        cost.setTravelCost(travelCostMap == null ? BigDecimal.ZERO:travelCostMap.values().stream().reduce(BigDecimal.ZERO,BigDecimal::add));
+//        if(subCostList != null){
+//            BigDecimal subCost = subCostList.stream().filter(item -> item.getContractType() != null && item.getContractType() == 1).map(ContractSubCostDto::getSubCost).reduce(BigDecimal.ZERO, BigDecimal::add);
+//            BigDecimal outCost = subCostList.stream().filter(item -> item.getContractType() != null && item.getContractType() == 2).map(ContractSubCostDto::getOutCost).reduce(BigDecimal.ZERO, BigDecimal::add);
+//            cost.setSubcontractCost(subCost);
+//            cost.setOutsourceCost(outCost);
+//        }
+//        cost.calcCost();
         return cost;
     }
 

zjugis-business/src/main/resources/mapper/oracle/ProjectCostMapper.xml

@@ -16,17 +16,17 @@
 
     <select id="calculate" resultType="com.zjugis.business.bean.response.ProjectCostResponse">
         SELECT
-        NVL(SUM(NVL(VEHICLE_COST, 0)), 0) AS vehicleCost,
-        NVL(SUM(NVL(LABOR_COST, 0)), 0) AS laborCost,
+        NVL(SUM(NVL(PROJECT_COST, 0)), 0) AS cost,
         NVL(SUM(NVL(TRAVEL_COST, 0)), 0) AS travelCost,
         NVL(SUM(NVL(REIMBURSEMENT_COST, 0)), 0) AS reimbursementCost,
+        NVL(SUM(NVL(SUBCONTRACT_COST, 0)), 0) AS subcontractCost,
+        NVL(SUM(NVL(OUTSOURCE_COST, 0)), 0) AS outsourceCost,
         NVL(SUM(NVL(PAYMENT_COST, 0)), 0) AS paymentCost
-        FROM PROJECT_COST
+        FROM PROJECT_AMOUNT
         WHERE PROJECT_ID in
         <foreach item="id" index="index" collection="params.projectIds" open="(" separator="," close=")">
             #{id}
         </foreach>
-        AND ISVALID = 1
     </select>
 
     <select id="pageByMonth" resultType="com.zjugis.business.bean.response.ProjectMonthCostResponse">