fix

zjugis-business/src/main/java/com/zjugis/business/controller/ContractController.java

@@ -52,12 +52,6 @@ public class ContractController {
         return CommonResult.success(contractService.selectByPrimaryKey(id));
     }
 
-    @GetMapping("/test")
-    public void test(String id,String pid){
-        Contract contract = contractService.selectByPrimaryKey(id);
-        contractService.updateVirtualContract(contract,pid);
-    }
-
     @GetMapping("/contract/process")
     public CommonResult<String> process(String projectId) {
         String url = contractService.process(projectId);

zjugis-business/src/main/java/com/zjugis/business/controller/ProjectCostController.java

@@ -26,7 +26,7 @@ public class ProjectCostController {
     private ProjectCostService projectCostService;
 
     @PostMapping("/project-cost/page-by-month")
-    public CommonResult<Page<ProjectMonthCostResponse>> pageByMonth(@Valid ProjectCostDto projectCostDto ) {
+    public CommonResult<Page<ProjectMonthCostResponse>> pageByMonth(@Valid @RequestBody ProjectCostDto projectCostDto ) {
             return CommonResult.success(projectCostService.pageByMonth(projectCostDto));
     }
 

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

@@ -60,8 +60,8 @@ public class ProjectCostServiceImpl implements ProjectCostService {
         ProjectCostResponse subCost = projectCostMapper.selectSubcontractCost(projectCostDto);
         Map<String, BigDecimal> commonCostMap = commonCostService.getProjectCostMap(projectCostDto.getProjectIds());
         Map<String, BigDecimal> travelCostMap = travelCostService.getProjectCostMap(projectCostDto.getProjectIds());
-        cost.setReimbursementCost(commonCostMap.values().stream().reduce(BigDecimal.ZERO,BigDecimal::add));
-        cost.setTravelCost(travelCostMap.values().stream().reduce(BigDecimal.ZERO,BigDecimal::add));
+        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));
         cost.setSubcontractCost(subCost.getSubcontractCost());
         cost.setOutsourceCost(subCost.getOutsourceCost());
         cost.calcCost();

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

@@ -10,7 +10,7 @@
         NVL(SUM(NVL(PAYMENT_COST, 0)), 0) AS paymentCost
         FROM PROJECT_COST
         WHERE PROJECT_ID in
-        <foreach item="id" index="index" collection="projectIds" open="(" separator="," close=")">
+        <foreach item="id" index="index" collection="params.projectIds" open="(" separator="," close=")">
             #{id}
         </foreach>
         AND ISVALID = 1
@@ -21,7 +21,10 @@
         NVL(SUM(CASE CONTRACT_TYPE WHEN 2 THEN NVL(SUB_AMOUNT,0) END),0) AS subcontractCost,
         NVL(SUM(CASE CONTRACT_TYPE WHEN 3 THEN NVL(SUB_AMOUNT,0) END),0) AS outsourceCost
         FROM V_PROJECT_CONTRACT
-        WHERE PID = #{params.projectId}
+        WHERE PID in
+        <foreach item="id" index="index" collection="params.projectIds" open="(" separator="," close=")">
+            #{id}
+        </foreach>
     </select>
 
     <select id="pageByMonth" resultType="com.zjugis.business.bean.response.ProjectMonthCostResponse">
@@ -29,7 +32,7 @@
         <where>
             P.ISVALID = 1
             AND P.PROJECT_ID in
-            <foreach item="id" index="index" collection="projectIds" open="(" separator="," close=")">
+            <foreach item="id" index="index" collection="params.projectIds" open="(" separator="," close=")">
                 #{id}
             </foreach>
         </where>