客户档案金额问题处理

hx-admin/pom.xml

@@ -86,10 +86,6 @@
 
         <dependency>
             <groupId>com.fjhx</groupId>
-            <artifactId>hx-jxst</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fjhx</groupId>
             <artifactId>hx-form</artifactId>
         </dependency>
 

hx-sale/src/main/resources/mapper/contract/ContractMapper.xml

@@ -170,40 +170,39 @@
     </select>
 
     <select id="getSalesTotal" resultType="com.fjhx.sale.entity.contract.vo.ContractVo">
-        SELECT
-            SUM( amount ) AS sumAmount,
-            SUM( contractCount ) AS contractCount
-        FROM
-            (
-                SELECT
-                    SUM( amount * rate ) amount,
-                    count(*) contractCount
-                FROM
-                    contract
-                WHERE
-                    buy_corporation_id = #{id}
-                  AND STATUS BETWEEN 0
-                    AND 87
-                  AND is_show != 1
+        SELECT SUM(amount)        AS amount,
+               SUM(amount)        AS amountCNY,
+               SUM(amount)        AS sumAmount,
+               SUM(contractCount) AS contractCount
+        FROM (SELECT SUM(amount * rate) amount,
+                     count(*)           contractCount
+              FROM contract
+              WHERE buy_corporation_id = #{id}
+                AND STATUS BETWEEN 0
+                  AND 87
+                and `status` in (10, 30, 60)
+                AND is_show != 1
 		AND is_change = 0
 		AND del_flag = 0
-                GROUP BY
-                    buy_corporation_id UNION ALL
-                SELECT
-                    SUM( amount * rate ) amount,
-                    count(*) contractCount
-                FROM
-                    sample
-                WHERE
-                    buy_corporation_id = #{id}
-                  AND STATUS BETWEEN 0
-                  AND 87
-                  AND is_show != 1
-                  AND is_change = 0
-                  AND del_flag = 0
-                GROUP BY
-                    buy_corporation_id
-            ) t1
+              GROUP BY
+                  buy_corporation_id
+              UNION ALL
+              SELECT
+                  SUM ( amount * rate ) amount, count (*) contractCount
+              FROM
+                  sample
+              WHERE
+                  buy_corporation_id = #{id}
+                AND STATUS BETWEEN 0
+                AND 87
+                and `status` in (10
+                  , 30
+                  , 60)
+                AND is_show != 1
+                AND is_change = 0
+                AND del_flag = 0
+              GROUP BY
+                  buy_corporation_id) t1
 
     </select>
     <select id="getSalesTotalList" resultType="com.fjhx.sale.entity.contract.vo.ContractVo">
@@ -231,25 +230,18 @@
                             claim_contract cc
                                 LEFT JOIN claim c ON cc.claim_id = c.id
                                 LEFT JOIN bytesailing_account.account_running_water arw ON c.business_id = arw.id
-                        WHERE
-                            cc.contract_id = t1.id
-                    ) AS sumClaimMoney
-                FROM
-                    contract t1
-                WHERE
-                    buy_corporation_id = #{id}
+                        WHERE cc.contract_id = t1.id) AS sumClaimMoney
+                FROM contract t1
+                WHERE buy_corporation_id = #{id}
                   AND STATUS BETWEEN 0
                     AND 87
+                  and `status` in (10, 30, 60)
                   AND is_show != 1
 		AND is_change = 0
-		AND del_flag = 0 UNION ALL
+		AND del_flag = 0
+                UNION ALL
                 SELECT
-                    currency,
-                    sell_corporation_id,
-                    id,
-                    "样品单" AS type,
-                    create_time,
-                    create_user,
+                    currency, sell_corporation_id, id, "样品单" AS type, create_time, create_user,
                     `code`,
                     buy_corporation_id,
                     advance_ratio,
@@ -272,22 +264,22 @@
                     buy_corporation_id = #{id}
                   AND STATUS BETWEEN 0
                   AND 87
+                  and `status` in (10
+                    , 30
+                    , 60)
                   AND is_show != 1
                   AND is_change = 0
-                  AND del_flag = 0
-            ) t1
+                  AND del_flag = 0) t1
     </select>
     <select id="getAmount" resultType="com.fjhx.sale.entity.contract.vo.ContractVo">
-        SELECT
-            SUM(amount) amount,
-            DATE_FORMAT(create_time,'%Y-%m') time
-        FROM
-            contract
-        WHERE
-              buy_corporation_id = #{id}
-                and (DATE_FORMAT(create_time,'%Y-%m') >= #{beginTime} and #{endTime} >= DATE_FORMAT(create_time,'%Y-%m'))
-        GROUP BY
-            TIME
+        SELECT SUM(amount * rate)                amount,
+               SUM(amount * rate)                amountCNY,
+               DATE_FORMAT(create_time, '%Y-%m') `time`
+        FROM contract
+        WHERE buy_corporation_id = #{id}
+          and `status` in (10, 30, 60)
+          and (DATE_FORMAT(create_time, '%Y-%m') >= #{beginTime} and #{endTime} >= DATE_FORMAT(create_time, '%Y-%m'))
+        GROUP BY `time`
     </select>
 
     <select id="contractStatistics" resultType="com.fjhx.sale.entity.sale.vo.SaleQuotationVo">

pom.xml

@@ -28,7 +28,6 @@
         <module>hx-sale</module>
         <module>hx-dingding</module>
         <module>hx-form</module>
-        <module>hx-jxst</module>
     </modules>
 
     <properties>