From 5039b309b1d596ba7987d9b4a8f6856bdbec6665 Mon Sep 17 00:00:00 2001
From: chuang <994001556@qq.com>
Date: Thu, 9 Mar 2023 16:15:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E6=AE=B5=E7=AE=A1=E7=90=86=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=E6=94=B6=E7=9B=8A=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../contractMobile/ContractMobileVO.java      |  44 ++++-
 .../impl/ContractMobileServiceImpl.java       |   1 +
 .../impl/PurchaseorderitemServiceImpl.java    |   1 +
 .../contractMobile/ContractMobileMapper.xml   | 166 ++++++++++++++----
 4 files changed, 178 insertions(+), 34 deletions(-)

diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/contractMobile/model/contractMobile/ContractMobileVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/contractMobile/model/contractMobile/ContractMobileVO.java
index cb93b5d6..f154f97b 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/contractMobile/model/contractMobile/ContractMobileVO.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/contractMobile/model/contractMobile/ContractMobileVO.java
@@ -81,6 +81,7 @@ public class ContractMobileVO {
     @TableField("NAME")
     private String cName;
 
+    /**金额 **/
     @TableField("AMOUNT")
     private BigDecimal amount;
 
@@ -92,7 +93,7 @@ public class ContractMobileVO {
 
     @TableField("STATUS")
     private String status;
-
+    /*开标日期*/
     @TableField("BID_OPENING_DATE")
     private Date bidOpeningDate;
 
@@ -113,7 +114,7 @@ public class ContractMobileVO {
 
     @TableField("SIGNING_DATE")
     private Date signingDate;
-
+/*截止日期*/
     @TableField("END_DATE")
     private Date endDate;
 
@@ -169,4 +170,43 @@ public class ContractMobileVO {
     /** 倒运 **/
     private BigDecimal cheapNum;
 
+
+
+    /**垫资金额**/
+    private BigDecimal amountDeposit;
+    /**逾期利息**/
+    private BigDecimal overdueInterest;
+    /**净利润**/
+    private BigDecimal netMargin;
+    /**销售金额**/
+    private BigDecimal salesAmount;
+    /**发票金额**/
+    private BigDecimal invoiceAmount;
+    /**回款金额**/
+    private BigDecimal collectedAmount;
+    /**贸易采购金额**/
+    private BigDecimal tradePurchaseAmount;
+    /**贸易发票金额**/
+    private BigDecimal tradeInvoiceAmount;
+    /**贸易付款金额**/
+    private BigDecimal tradePaymentAmount;
+    /**自加工成本金额**/
+    private BigDecimal machineCostAmount;
+    /**自加工发票金额**/
+    private BigDecimal machinePurchaseAmount;
+    /**自加工付款金额**/
+    private BigDecimal machinePaymentAmount;
+    /**委外成本金额**/
+    private BigDecimal outsourceCostAmount;
+    /**委外发票金额**/
+    private BigDecimal outsourcePurchaseAmount;
+    /**委外付款金额**/
+    private BigDecimal outsourcePaymentAmount;
+    /**倒运成本金额**/
+    private BigDecimal cheapCostAmount;
+    /**倒运发票金额**/
+    private BigDecimal cheapPurchaseAmount;
+    /**倒运付款金额**/
+    private BigDecimal cheapPaymentAmount;
+
 }
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/contractMobile/service/impl/ContractMobileServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/contractMobile/service/impl/ContractMobileServiceImpl.java
index 1eead386..9718767d 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/contractMobile/service/impl/ContractMobileServiceImpl.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/contractMobile/service/impl/ContractMobileServiceImpl.java
@@ -64,6 +64,7 @@ public class ContractMobileServiceImpl extends ServiceImpl<ContractMobileMapper,
 //        }
         if ((total > 0 && AllIdList.size() > 0) || total == 0) {
             Page<ContractMobileVO> page = new Page<>(contractMobilePagination.getCurrentPage(), contractMobilePagination.getPageSize());
+            page.setOptimizeCountSql(false);
             IPage<ContractMobileVO> userIPage = contractMobileMapper.getMobileDate(page, contractMobileQueryWrapper);
 //            IPage<ContractMobileEntity> userIPage = this.page(page, contractMobileQueryWrapper);
             return contractMobilePagination.setData(userIPage.getRecords(), userIPage.getTotal());
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java
index 0bae3197..7450502c 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java
@@ -412,6 +412,7 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
             HttpHeaders headers = null;
             ByteArrayOutputStream out=null;
             ExportPdf exportPdf = new ExportPdf();
+
             //渲染模板参数
 //        pdf模板
             Map map=orderMap;
diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/contractMobile/ContractMobileMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/contractMobile/ContractMobileMapper.xml
index adbcdbc0..b091734d 100644
--- a/SC-boot/linkage-scm/src/main/resources/mapper/contractMobile/ContractMobileMapper.xml
+++ b/SC-boot/linkage-scm/src/main/resources/mapper/contractMobile/ContractMobileMapper.xml
@@ -62,6 +62,24 @@
         <result column="EXCHANGE_RATE" property="exchangeRate"/>
         <result column="BANK_NO" property="bankNo"/>
         <result column="TAX_NO" property="taxNo"/>
+        <result column="amountDeposit" property="amountDeposit"/>
+        <result column="overdueInterest" property="overdueInterest"/>
+        <result column="netMargin" property="netMargin"/>
+        <result column="salesAmount" property="salesAmount"/>
+        <result column="invoiceAmount" property="invoiceAmount"/>
+        <result column="collectedAmount" property="collectedAmount"/>
+        <result column="tradePurchaseAmount" property="tradePurchaseAmount"/>
+        <result column="tradeInvoiceAmount" property="tradeInvoiceAmount"/>
+        <result column="tradePaymentAmount" property="tradePaymentAmount"/>
+        <result column="machineCostAmount" property="machineCostAmount"/>
+        <result column="machinePurchaseAmount" property="machinePurchaseAmount"/>
+        <result column="machinePaymentAmount" property="machinePaymentAmount"/>
+        <result column="outsourceCostAmount" property="outsourceCostAmount"/>
+        <result column="outsourcePurchaseAmount" property="outsourcePurchaseAmount"/>
+        <result column="outsourcePaymentAmount" property="outsourcePaymentAmount"/>
+        <result column="cheapCostAmount" property="cheapCostAmount"/>
+        <result column="cheapPurchaseAmount" property="cheapPurchaseAmount"/>
+        <result column="cheapPaymentAmount" property="cheapPaymentAmount"/>
     </resultMap>
 
     <select id="getMobileDate" resultMap="contractMobileDate">
@@ -75,42 +93,126 @@
                     concat(
                             round( IFNULL( IFNULL( SUM( b.settlement ), 0 )/ IFNULL( a.num, 0 ) * 100, 0 ), 2 ),
                             '%'
-                        ) schedule,
+                        ) SCHEDULE,
                     IFNULL( a.num, 0 ) contractNum,
-                    IFNULL( SUM( b.settlement ), 0 ) sellNum,
-                    IFNULL( SUM( c.settlement ), 0 ) purchaseNum,
-                    IFNULL( SUM( d.settlement ), 0 ) machineNum,
-                    IFNULL( SUM( e.settlement ), 0 ) outsourceNum,
-                    IFNULL( SUM( f.settlement ), 0 ) cheapNum
+                    ROUND( IFNULL( b3.sales_price * IFNULL( SUM( b3.settlement ), 0 ), 0 ), 6 ) amountDeposit,
+                    ROUND((
+                              CASE
+
+                                  WHEN timestampdiff(
+                                           DAY,
+						DATE (
+						NOW()),
+                                               DATE_ADD( a.end_date, INTERVAL a.collection_cycle DAY ))> 0 THEN
+                                      0 ELSE (
+                                                         IFNULL( c2.sales_price * IFNULL( SUM( c2.settlement ), 0 ), 0 )+ IFNULL( d2.sales_price * IFNULL( SUM( d2.settlement ), 0 ), 0 )+ IFNULL( e2.sales_price * IFNULL( SUM( e2.settlement ), 0 ), 0 )+ IFNULL( f2.sales_price * IFNULL( SUM( f2.settlement ), 0 ), 0 )- IFNULL( b2.sales_price * IFNULL( SUM( b2.settlement ), 0 ), 0 ))* IFNULL( a.overdue, 0 )
+                                  END
+                              ),
+                          6
+                        ) overdueInterest,
+                    ROUND((
+                                  IFNULL( b.sales_price * IFNULL( SUM( b.settlement ), 0 ), 0 )- IFNULL( c.sales_price * IFNULL( SUM( c.settlement ), 0 ), 0 )-(
+                                      IFNULL( d.sales_price * IFNULL( SUM( d.settlement ), 0 ), 0 )+ IFNULL( e.sales_price * IFNULL( SUM( e.settlement ), 0 ), 0 )+ IFNULL( f.sales_price * IFNULL( SUM( f.settlement ), 0 ), 0 ))),
+                          6
+                        ) netMargin,
+                    ROUND( IFNULL( SUM( b.settlement ), 0 ), 6 ) sellNum,
+                    ROUND( IFNULL( b.sales_price * IFNULL( SUM( b.settlement ), 0 ), 0 ), 6 ) salesAmount,
+                    ROUND( IFNULL( b1.sales_price * IFNULL( SUM( b1.settlement ), 0 ), 0 ), 6 ) invoiceAmount,
+                    ROUND( IFNULL( b2.sales_price * IFNULL( SUM( b2.settlement ), 0 ), 0 ), 6 ) collectedAmount,
+                    ROUND( IFNULL( SUM( c.settlement ), 0 ), 6 ) purchaseNum,
+                    ROUND( IFNULL( c.sales_price * IFNULL( SUM( c.settlement ), 0 ), 0 ), 6 ) tradePurchaseAmount,
+                    ROUND( IFNULL( c1.sales_price * IFNULL( SUM( c1.settlement ), 0 ), 0 ), 6 ) tradeInvoiceAmount,
+                    ROUND( IFNULL( c2.sales_price * IFNULL( SUM( c2.settlement ), 0 ), 0 ), 6 ) tradePaymentAmount,
+                    ROUND( IFNULL( SUM( d.settlement ), 0 ), 6 ) machineNum,
+                    ROUND( IFNULL( d.sales_price * IFNULL( SUM( d.settlement ), 0 ), 0 ), 6 ) machineCostAmount,
+                    ROUND( IFNULL( d1.sales_price * IFNULL( SUM( d1.settlement ), 0 ), 0 ), 6 ) machinePurchaseAmount,
+                    ROUND( IFNULL( d2.sales_price * IFNULL( SUM( d2.settlement ), 0 ), 0 ), 6 ) machinePaymentAmount,
+                    ROUND( IFNULL( SUM( e.settlement ), 0 ), 6 ) outsourceNum,
+                    ROUND( IFNULL( e.sales_price * IFNULL( SUM( e.settlement ), 0 ), 0 ), 6 ) outsourceCostAmount,
+                    ROUND( IFNULL( e1.sales_price * IFNULL( SUM( e1.settlement ), 0 ), 0 ), 6 ) outsourcePurchaseAmount,
+                    ROUND( IFNULL( e2.sales_price * IFNULL( SUM( e2.settlement ), 0 ), 0 ), 6 ) outsourcePaymentAmount,
+                    ROUND( IFNULL( SUM( f.settlement ), 0 ), 6 ) cheapNum,
+                    ROUND( IFNULL( f.sales_price * IFNULL( SUM( f.settlement ), 0 ), 0 ), 6 ) cheapCostAmount,
+                    ROUND( IFNULL( f1.sales_price * IFNULL( SUM( f1.settlement ), 0 ), 0 ), 6 ) cheapPurchaseAmount,
+                    ROUND( IFNULL( f2.sales_price * IFNULL( SUM( f2.settlement ), 0 ), 0 ), 6 ) cheapPaymentAmount
                 FROM
                     jg_contract a
                         LEFT JOIN jg_poundlist b ON a.id = b.sales_id
-                        AND b.sales_status != '99'
-		OR ISNULL( b.sales_status )
-		AND b.sales_status != '0'
-		OR ISNULL( b.sales_status )
-		AND b.pound_status = '0'
-		LEFT JOIN jg_poundlist c ON a.id = c.sales_id
-                    AND c.pound_status = '0'
-                    AND c.pound_type = '0'
-                    AND c.purchase_status = '2'
-                    OR c.purchase_status = '3'
-                    LEFT JOIN jg_poundlist d ON a.id = d.sales_id
-                    AND d.pound_status = '0'
-                    AND d.pound_type = '1'
-                    AND d.purchase_status = '2'
-                    OR d.purchase_status = '3'
-                    LEFT JOIN jg_poundlist e ON a.id = e.sales_id
-                    AND e.pound_status = '0'
-                    AND e.pound_type = '2'
-                    AND e.purchase_status = '2'
-                    OR e.purchase_status = '3'
-                    LEFT JOIN jg_poundlist f ON a.id = f.sales_id
-                    AND f.pound_status = '0'
-                    AND f.pound_type = '3'
-                    AND f.purchase_status = '2'
-                    OR f.purchase_status = '3'
-                    LEFT JOIN jg_customer g ON a.CODE = g.id
+                        AND ( b.sales_status != '99' OR ISNULL( b.sales_status ) )
+                        AND ( b.sales_status != '0' OR ISNULL( b.sales_status ) )
+                        AND b.pound_status = '0'
+                        LEFT JOIN jg_poundlist b3 ON a.id = b3.sales_id
+                        AND ( b3.sales_status != '99' OR ISNULL( b3.sales_status ) )
+                        AND ( b3.sales_status != '0' OR ISNULL( b3.sales_status ) )
+                        AND b3.pound_status = '0'
+                        AND b3.advance = '1'
+                        LEFT JOIN jg_poundlist b1 ON a.id = b1.sales_id
+                        AND ( b1.sales_status != '99' OR ISNULL( b1.sales_status ) )
+                        AND ( b1.sales_status != '0' OR ISNULL( b1.sales_status ) )
+                        AND b1.pound_status = '0'
+                        AND b1.is_expense = '1'
+                        LEFT JOIN jg_poundlist b2 ON a.id = b2.sales_id
+                        AND ( b2.sales_status != '99' OR ISNULL( b2.sales_status ) )
+                        AND ( b2.sales_status != '0' OR ISNULL( b2.sales_status ) )
+                        AND b2.pound_status = '0'
+                        AND b2.is_collection = '1'
+                        LEFT JOIN jg_poundlist c ON a.id = c.sales_id
+                        AND c.pound_status = '0'
+                        AND c.pound_type = '0'
+                        AND ( c.purchase_status = '2' OR c.purchase_status = '3' )
+                        LEFT JOIN jg_poundlist c1 ON a.id = c1.sales_id
+                        AND c1.pound_status = '0'
+                        AND c1.pound_type = '0'
+                        AND ( c1.purchase_status = '2' OR c1.purchase_status = '3' )
+                        AND c1.is_Invoicing = '1'
+                        LEFT JOIN jg_poundlist c2 ON a.id = c2.sales_id
+                        AND c2.pound_status = '0'
+                        AND c2.pound_type = '0'
+                        AND ( c2.purchase_status = '2' OR c2.purchase_status = '3' )
+                        AND c2.is_pay = '1'
+                        LEFT JOIN jg_poundlist d ON a.id = d.sales_id
+                        AND d.pound_status = '0'
+                        AND d.pound_type = '1'
+                        AND ( d.purchase_status = '2' OR d.purchase_status = '3' )
+                        LEFT JOIN jg_poundlist d1 ON a.id = d1.sales_id
+                        AND d1.pound_status = '0'
+                        AND d1.pound_type = '1'
+                        AND ( d1.purchase_status = '2' OR d1.purchase_status = '3' )
+                        AND d1.is_Invoicing = '1'
+                        LEFT JOIN jg_poundlist d2 ON a.id = d2.sales_id
+                        AND d2.pound_status = '0'
+                        AND d2.pound_type = '1'
+                        AND ( d2.purchase_status = '2' OR d2.purchase_status = '3' )
+                        AND d2.is_pay = '1'
+                        LEFT JOIN jg_poundlist e ON a.id = e.sales_id
+                        AND e.pound_status = '0'
+                        AND e.pound_type = '2'
+                        AND ( e.purchase_status = '2' OR e.purchase_status = '3' )
+                        LEFT JOIN jg_poundlist e1 ON a.id = e1.sales_id
+                        AND e1.pound_status = '0'
+                        AND e1.pound_type = '1'
+                        AND ( e1.purchase_status = '2' OR e1.purchase_status = '3' )
+                        AND e1.is_Invoicing = '1'
+                        LEFT JOIN jg_poundlist e2 ON a.id = e2.sales_id
+                        AND e2.pound_status = '0'
+                        AND e2.pound_type = '1'
+                        AND ( e2.purchase_status = '2' OR e2.purchase_status = '3' )
+                        AND e2.is_pay = '1'
+                        LEFT JOIN jg_poundlist f ON a.id = f.sales_id
+                        AND f.pound_status = '0'
+                        AND f.pound_type = '3'
+                        AND ( f.purchase_status = '2' OR f.purchase_status = '3' )
+                        LEFT JOIN jg_customer g ON a.CODE = g.id
+                        LEFT JOIN jg_poundlist f1 ON a.id = f1.sales_id
+                        AND f1.pound_status = '0'
+                        AND f1.pound_type = '1'
+                        AND ( f1.purchase_status = '2' OR f1.purchase_status = '3' )
+                        AND f1.is_Invoicing = '1'
+                        LEFT JOIN jg_poundlist f2 ON a.id = f2.sales_id
+                        AND f2.pound_status = '0'
+                        AND f2.pound_type = '1'
+                        AND ( f2.purchase_status = '2' OR f2.purchase_status = '3' )
+                        AND f2.is_pay = '1'
                 WHERE
                     a.contract_type = '1'
                 GROUP BY