用款添加根据分外包获取列表

zjugis-business/src/main/java/com/zjugis/business/flow/usemoney/controller/UseMoneyController.java

@@ -60,6 +60,12 @@ public class UseMoneyController extends BaseController {
         return CommonResult.success(useMoneyService.getUseMoneyPage(pageReqVO));
     }
 
+    @GetMapping("/list-contractId")
+    @Operation(summary = "获得用款列表通过分外包ID")
+    public CommonResult<List<UseMoneyRespVO>> getListByContractId(@RequestParam("contractId") String contractId) {
+        return CommonResult.success(useMoneyService.getListByContractId(contractId));
+    }
+
     @GetMapping("/overview")
     @Operation(summary = "获得用款申请概况")
     public CommonResult<UseMoneyOverviewVO> getUseMoneyOverview(@Valid UseMoneyPageReqVO pageReqVO) {

zjugis-business/src/main/java/com/zjugis/business/flow/usemoney/service/UseMoneyService.java

@@ -115,4 +115,6 @@ public interface UseMoneyService {
     List<UseMoneyEarnestRespVO> getExportDataDeptBzj(UseMoneyPageReqVO pageReqVO);
 
     UseMoneyDeptRespVO getDataByDeptId(List<String> deptId);
+
+    List<UseMoneyRespVO> getListByContractId(String contractId);
 }

zjugis-business/src/main/java/com/zjugis/business/flow/usemoney/service/UseMoneyServiceImpl.java

@@ -1038,4 +1038,10 @@ public class UseMoneyServiceImpl implements UseMoneyService {
     public UseMoneyDeptRespVO getDataByDeptId(List<String> deptId) {
         return useMoneyDao.getDataByDeptId(deptId);
     }
+
+    @Override
+    public List<UseMoneyRespVO> getListByContractId(String contractId) {
+        List<UseMoneyDO> result = useMoneyDao.getListByContractId(contractId);
+        return UseMoneyConvert.INSTANCE.convertList(result);
+    }
 }

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

@@ -597,10 +597,9 @@
 
     <select id="returnGroupByDept" resultType="com.zjugis.business.bean.dto.ManageDeptDto">
         select D.ID as deptId,
-        COALESCE(SUM(COALESCE(t3.RETURN_AMOUNT,0)),0) as returnAmount
-        FROM CONTRACT_INVOICE_RELATION t3
-        LEFT JOIN CONTRACT_RETURN_MONEY T2 ON T2.CONTRACT_INVOICE_ID = T3.CONTRACT_INVOICE_ID
-        RIGHT JOIN CONTRACT t1 on t3.CONTRACT_ID = t1.ID and t1.ISVALID = 1 and (t1.FLOW_STATUS = 90 OR t1.FLOW_STATUS = 99)
+        COALESCE(SUM(COALESCE(t2.RETURN_AMOUNT,0)),0) as returnAmount
+        FROM CONTRACT_RETURN_MONEY t2
+        RIGHT JOIN CONTRACT t1 on t2.CONTRACT_ID = t1.ID and t1.ISVALID = 1 and (t1.FLOW_STATUS = 90 OR t1.FLOW_STATUS = 99)
         LEFT JOIN PROJECT pr ON pr.ID = t1.PROJECT_ID
         LEFT JOIN ZJUGIS_OA.SYSTEM_DEPT D ON D.ID = pr.ZRBM_ID
         <where>