合同导出修改

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

@@ -67,6 +67,12 @@ public class ProjectController{
         return CommonResult.success(projectService.page(new Page<>(projectDto.getPageNo(),projectDto.getPageSize()), projectDto));
     }
 
+    @GetMapping("/project/page2")
+    public CommonResult<Page<Project>> page2(ProjectDto projectDto) {
+        projectDto.setIsRelContract(1);
+        return CommonResult.success(projectService.page2(new Page<>(projectDto.getPageNo(),projectDto.getPageSize()), projectDto));
+    }
+
     /**
      * 分页查询所有数据-部门
      *

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

@@ -186,16 +186,38 @@
     </select>
 
     <select id="excel" resultType="com.zjugis.business.bean.response.ContractInvoiceExcelResponse">
-        SELECT to_char(INVOICE_DATE,'YYYY-MM-DD') AS invoiceDate,C.NAME as invoiceCompany,U.NICKNAME AS XSRY,D.NAME as ZRBM,T3.FULL_NAME as xmlb,A.FULL_NAME as xzqmc,T2.XMBH,T2.XMMC,T1.CONTRACT_NUMBER,T1.NAME,T.PAY_COMPANY,T.INVOICE_CONTENT,T.INVOICE_AMOUNT,(COALESCE(T.INVOICE_AMOUNT,0) - COALESCE(T5.returnAmount,0)) as unreturnAmount ,T.APPLY_WORKER_NAME,T.PAY_TAX_NUMBER,T.INVOICE_BZ,T.RECEIVE_BANKACCOUNT,T.ELE_INV_RECEIVE_PHONE,T.ELE_INV_RECEIVE_EMAIL,T.CUSTOMER_NAME
-        FROM CONTRACT_INVOICE T
-        LEFT JOIN CONTRACT T1 ON T1.ID=T.CONTRACT_ID
-        LEFT JOIN PROJECT T2 ON T2.ID=T.PROJECT_ID
-        LEFT JOIN PROJECT_TYPE T3 ON T3.ID = T2.PROJECT_TYPE_ID
-        LEFT JOIN ZJUGIS_OA.SYSTEM_AREA A ON A.ID = T2.XZQDM
-        LEFT JOIN ZJUGIS_OA.SYSTEM_COMPANY C ON C.ID = T.INVOICE_COMPANY_ID
-        LEFT JOIN ZJUGIS_OA.SYSTEM_DEPT D ON D.ID = T2.ZRBM_ID
-        LEFT JOIN ZJUGIS_OA.SYSTEM_USERS U ON U.ID = T2.XSRY_ID
-        LEFT JOIN (SELECT count(1) as rc,max(RETURN_DATE) as maxd, min(RETURN_DATE) as mind,CONTRACT_INVOICE_ID,COALESCE(SUM(COALESCE(RETURN_AMOUNT,0)),0) as returnAmount FROM CONTRACT_RETURN_MONEY WHERE ISVALID = 1 GROUP BY CONTRACT_INVOICE_ID) T5 ON T5.CONTRACT_INVOICE_ID=T.ID
+        SELECT
+            to_char( INVOICE_DATE, 'YYYY-MM-DD' ) AS invoiceDate,
+            C.NAME AS invoiceCompany,
+            U.NICKNAME AS XSRY,
+            D.NAME AS ZRBM,
+            T3.FULL_NAME AS xmlb,
+            A.FULL_NAME AS xzqmc,
+            T2.XMBH,
+            T2.XMMC,
+            T1.CONTRACT_NUMBER,
+            T1.NAME,
+            T.PAY_COMPANY,
+            T.INVOICE_CONTENT,
+            CR.INVOICE_AMOUNT,
+            ( COALESCE( CR.INVOICE_AMOUNT, 0 ) - COALESCE( CR.RETURN_AMOUNT, 0 ) ) AS unreturnAmount,
+            T.APPLY_WORKER_NAME,
+            T.PAY_TAX_NUMBER,
+            T.INVOICE_BZ,
+            T.RECEIVE_BANKACCOUNT,
+            T.ELE_INV_RECEIVE_PHONE,
+            T.ELE_INV_RECEIVE_EMAIL,
+            T.CUSTOMER_NAME
+        FROM
+            CONTRACT_INVOICE T
+            LEFT JOIN CONTRACT_INVOICE_RELATION CR ON T.ID = CR.CONTRACT_INVOICE_ID
+            LEFT JOIN CONTRACT T1 ON T1.ID = CR.CONTRACT_ID
+            LEFT JOIN PROJECT T2 ON T2.ID = T1.PROJECT_ID
+            LEFT JOIN PROJECT_TYPE T3 ON T3.ID = T2.PROJECT_TYPE_ID
+            LEFT JOIN ZJUGIS_OA.SYSTEM_AREA A ON A.ID = T2.XZQDM
+            LEFT JOIN ZJUGIS_OA.SYSTEM_COMPANY C ON C.ID = T.INVOICE_COMPANY_ID
+            LEFT JOIN ZJUGIS_OA.SYSTEM_DEPT D ON D.ID = T2.ZRBM_ID
+            LEFT JOIN ZJUGIS_OA.SYSTEM_USERS U ON U.ID = T2.XSRY_ID
         <where>
             T.ISVALID = 1
             <if test="params != null and params.deptIds != null and params.deptIds.size > 0">

zjugis-module-adm/zjugis-module-adm-biz/src/main/java/com/zjugis/module/adm/remote/BusinessClient.java

@@ -22,7 +22,7 @@ public interface BusinessClient {
      *
      * @return 所有数据
      */
-    @GetMapping("/project/page")
+    @GetMapping("/project/page2")
     CommonResult<Page<ProjectVO>> getProjectPage(@SpringQueryMap  ProjectDto projectDto) ;
 
     @GetMapping("/contract/page")