1.资产业务所有列表查询SQL修改

2.修复资产selectArchivedPage与selectMyOrderPage接口查询结果重复问题

dao/src/main/resources/mapper/AssetsMapper.xml

@@ -55,7 +55,9 @@
         assets_business_gener,
         allot_type,
         (SELECT production_no FROM assets_production WHERE assets_production.production_no = nodeInfo.business_sub_id) AS statementNo,
+        (SELECT assets_name FROM assets_production WHERE assets_production.production_no = nodeInfo.business_sub_id) AS statementName,
         (SELECT production_no FROM assets_production WHERE assets_production.production_no = nodeInfo.business_min_id) AS reportNo,
+        (SELECT assets_name FROM assets_production WHERE assets_production.production_no = nodeInfo.business_min_id) AS reportName,
         (SELECT production_type FROM assets_production WHERE assets_production.production_no = nodeInfo.business_sub_id) AS productionType,
         clientele_id,
         customer.name AS customerName,
@@ -145,9 +147,11 @@
         allot_type,
         (SELECT production_no FROM assets_production WHERE assets_production.production_no = nodeInfo.business_sub_id) AS statementNo,
         (SELECT production_type FROM assets_production WHERE assets_production.production_no = nodeInfo.business_sub_id) AS productionType,
+        (SELECT assets_name FROM assets_production WHERE assets_production.production_no = nodeInfo.business_sub_id) AS statementName,
         reportInfo.production_no AS reportNo,
         reportInfo.repertory_state AS reportRepertoryState,
         reportInfo.delivery AS reportDelivery,
+        reportInfo.assets_name AS reportName,
         clientele_id,
         customer.name AS customerName,
         bailor,
@@ -163,7 +167,8 @@
         pFund.standard_amount,
         pFund.production_should_amount,
         pFund.real_amount AS productionRealAmount,
-        invoice.real_amount AS invoiceRealAmount,
+        # invoice.real_amount AS invoiceRealAmount,
+        (SELECT SUM(real_amount) FROM finance_invoice WHERE order_fund_id = fund.id AND deleted = 0) AS invoiceRealAmount,
         #查询客户经理
         (SELECT name FROM user WHERE id = assets.client_manager_id) AS clientManagerName,
         #查询项目负责人
@@ -181,7 +186,7 @@
         LEFT JOIN user ON user.id = assets.principal_id
         LEFT JOIN customer_company AS customer ON customer.id = assets.clientele_id
         LEFT JOIN order_fund AS fund ON fund.business_id = assets.id AND business_type = 'ASSET_BUSINESS'
-        LEFT JOIN finance_invoice AS invoice ON invoice.order_fund_id = fund.id
+#         LEFT JOIN finance_invoice AS invoice ON invoice.order_fund_id = fund.id
         #查询当前进行的节点信息
         LEFT JOIN (SELECT nodeInstance.id AS currentNodeId,
         user.name AS handlerName,
@@ -204,7 +209,7 @@
         AND nodeInstance.business_type = 'ASSET_BUSINESS'
         ) AS nodeInfo ON nodeInfo.businessId = assets.id
         LEFT JOIN production_fund AS pFund ON pFund.order_fund_id = fund.id AND pFund.production_no = nodeInfo.business_min_id
-        LEFT JOIN(SELECT production_no,repertory_state,production_type,delivery FROM assets_production) AS reportInfo ON reportInfo.production_no = nodeInfo.business_min_id
+        LEFT JOIN(SELECT production_no,repertory_state,production_type,delivery,assets_name FROM assets_production) AS reportInfo ON reportInfo.production_no = nodeInfo.business_min_id
         WHERE assets.deleted = 0
         AND assets.client_manager_id = #{assetsSelectDTO.clientManagerId}
         #送达状态查询
@@ -237,7 +242,9 @@
         assets_business_gener,
         allot_type,
         (SELECT production_no FROM assets_production WHERE assets_production.production_no = nodeInfo.business_sub_id) AS statementNo,
+        (SELECT assets_name FROM assets_production WHERE assets_production.production_no = nodeInfo.business_sub_id) AS statementName,
         (SELECT production_no FROM assets_production WHERE assets_production.production_no = nodeInfo.business_min_id) AS reportNo,
+        (SELECT assets_name FROM assets_production WHERE assets_production.production_no = nodeInfo.business_min_id) AS reportName,
         (SELECT production_type FROM assets_production WHERE assets_production.production_no = nodeInfo.business_sub_id) AS productionType,
         clientele_id,
         customer.name AS customerName,
@@ -251,7 +258,8 @@
         fund.real_amount,
         fund.discount,
         pFund.standard_amount,
-        invoice.real_amount AS invoiceRealAmount,
+#         invoice.real_amount AS invoiceRealAmount,
+        (SELECT SUM(real_amount) FROM finance_invoice WHERE order_fund_id = fund.id AND deleted = 0) AS invoiceRealAmount,
         #查询客户经理
         (SELECT name FROM user WHERE id = assets.client_manager_id) AS clientManagerName,
         #查询项目负责人
@@ -291,7 +299,7 @@
         AND nodeInstance.business_type = 'ASSET_BUSINESS'
         ) AS nodeInfo ON nodeInfo.businessId = assets.id
         LEFT JOIN production_fund AS pFund ON pFund.business_id = assets.id AND pFund.production_no = nodeInfo.business_min_id
-        LEFT JOIN finance_invoice AS invoice ON pFund.order_fund_id = fund.id
+#         LEFT JOIN finance_invoice AS invoice ON pFund.order_fund_id = fund.id
         WHERE assets.deleted = 0
         AND nodeInfo.currentNodeCode = 'BUSINESS_ARCHIVING'
         #评估业务类别(业务类型)查询
@@ -334,12 +342,10 @@
         assets.order_id,
         assets_business_gener,
         allot_type,
-        (SELECT production_no
-        FROM assets_production
-        WHERE assets_production.production_no = nodeInfo.business_sub_id) AS statementNo,
-        (SELECT production_no
-        FROM assets_production
-        WHERE assets_production.production_no = nodeInfo.business_min_id) AS reportNo,
+        (SELECT production_no FROM assets_production WHERE assets_production.production_no = nodeInfo.business_sub_id) AS statementNo,
+        (SELECT assets_name FROM assets_production WHERE assets_production.production_no = nodeInfo.business_sub_id) AS statementName,
+        (SELECT production_no FROM assets_production WHERE assets_production.production_no = nodeInfo.business_min_id) AS reportNo,
+        (SELECT assets_name FROM assets_production WHERE assets_production.production_no = nodeInfo.business_min_id) AS reportName,
         clientele_id,
         customer.name AS customerName,
         bailor,
@@ -410,7 +416,7 @@
         SELECT (@i := @i + 1) AS id,
         assets.order_id AS orderId,
         production.production_no AS reportNo,
-        name AS orderName,
+        production.assets_name AS orderName,
         purpose.purpose_name AS purposeName,
         method.method_name AS methodName,
         (SELECT instance.created
@@ -489,7 +495,7 @@
         SELECT (@i := @i + 1) AS id,
         assets.order_id AS orderId,
         production.production_no AS reportNo,
-        name AS orderName,
+        production.assets_name AS orderName,
         purpose.purpose_name AS purposeName,
         method.method_name AS methodName,
         (SELECT instance.created

dao/src/main/resources/mapper/AssetsProductionMapper.xml

@@ -135,18 +135,24 @@
             AND production_no = #{statementNo}
         </if>
         <if test="(statementNo != null and statementNo != '') and (reportNos != null and reportNos.size() > 0) ">
-            OR
+            OR production_no IN
+            <foreach collection="reportNos" index="index" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
         </if>
         <if test="(statementNo == null or statementNo == '') and (reportNos != null and reportNos.size() > 0) ">
 #             OR
-            AND
-        </if>
-        <if test="reportNos != null and reportNos.size() > 0">
-            production_no IN
+            AND production_no IN
             <foreach collection="reportNos" index="index" item="item" open="(" separator="," close=")">
                 #{item}
             </foreach>
         </if>
+<!--        <if test="reportNos != null and reportNos.size() > 0">-->
+<!--            production_no IN-->
+<!--            <foreach collection="reportNos" index="index" item="item" open="(" separator="," close=")">-->
+<!--                #{item}-->
+<!--            </foreach>-->
+<!--        </if>-->
         AND create_production_date IS NOT NULL
         AND deleted = 0
     </select>

dao/src/main/resources/mapper/CommissionDeclareMapper.xml

@@ -342,13 +342,18 @@
         SELECT
         IFNULL(
         cd.id,
-        ( SELECT id FROM commission_declare WHERE deleted = 0 AND business_id = assets.businessId AND production_id IS NULL AND declare_user_id =#{evaluateUserId} )) id,
+        ( SELECT id FROM commission_declare WHERE deleted = 0 AND business_id = assets.businessId AND production_id IS
+        NULL AND declare_user_id =#{evaluateUserId} AND business_type ='COMMISSION_DECLARE_ASSET_EVALUATE')) id,
         IFNULL(
         cd.commission_rate_id,
-        ( SELECT commission_rate_id FROM commission_declare WHERE deleted = 0 AND business_id = assets.businessId AND production_id IS NULL AND declare_user_id =#{evaluateUserId} )) commission_rate_id,
+        ( SELECT commission_rate_id FROM commission_declare WHERE deleted = 0 AND business_id = assets.businessId AND
+        production_id IS NULL AND declare_user_id =#{evaluateUserId} AND business_type
+        ='COMMISSION_DECLARE_ASSET_EVALUATE')) commission_rate_id,
         IFNULL(
         cd.declare_result,
-        ( SELECT declare_result FROM commission_declare WHERE deleted = 0 AND business_id = assets.businessId AND production_id IS NULL AND declare_user_id =#{evaluateUserId} )) declare_result,
+        ( SELECT declare_result FROM commission_declare WHERE deleted = 0 AND business_id = assets.businessId AND
+        production_id IS NULL AND declare_user_id =#{evaluateUserId} AND business_type
+        ='COMMISSION_DECLARE_ASSET_EVALUATE')) declare_result,
         assets.*
         FROM
         (
@@ -435,9 +440,15 @@
         FROM
         (
         SELECT
-        IFNULL( cd.id,( SELECT id FROM commission_declare WHERE deleted = 0 AND business_id = assets.businessId AND production_id IS NULL and declare_user_id =#{marketUserId}) ) id,
-        IFNULL( cd.commission_rate_id,( SELECT commission_rate_id FROM commission_declare WHERE deleted = 0 AND business_id = assets.businessId AND production_id IS NULL and declare_user_id =#{marketUserId} ) ) commission_rate_id,
-        IFNULL( cd.declare_result,( SELECT declare_result FROM commission_declare WHERE deleted = 0 AND business_id = assets.businessId AND production_id IS NULL and declare_user_id =#{marketUserId}) ) declare_result,
+        IFNULL( cd.id,( SELECT id FROM commission_declare WHERE deleted = 0 AND business_id = assets.businessId AND
+        production_id IS NULL and declare_user_id =#{marketUserId}) AND business_type
+        ='COMMISSION_DECLARE_ASSET_MARKET') id,
+        IFNULL( cd.commission_rate_id,( SELECT commission_rate_id FROM commission_declare WHERE deleted = 0 AND
+        business_id = assets.businessId AND production_id IS NULL and declare_user_id =#{marketUserId} AND business_type
+        ='COMMISSION_DECLARE_ASSET_MARKET') ) commission_rate_id,
+        IFNULL( cd.declare_result,( SELECT declare_result FROM commission_declare WHERE deleted = 0 AND business_id =
+        assets.businessId AND production_id IS NULL and declare_user_id =#{marketUserId} AND business_type
+        ='COMMISSION_DECLARE_ASSET_MARKET') ) declare_result,
         assets.*
         FROM
         (

dao/src/main/resources/mapper/FinanceRealFundMapper.xml

@@ -776,7 +776,7 @@
         INNER JOIN ( SELECT id, order_fund_id, business_id, production_no FROM production_fund WHERE business_type =
         'ASSET_BUSINESS' AND deleted = 0 ) pf ON ( pf.id = fc.production_fund_id AND pf.order_fund_id = fc.order_fund_id
         )
-        INNER JOIN ( SELECT id, business_id, project_name, production_no, production_type, save_file_date, created FROM
+        INNER JOIN ( SELECT id, business_id, assets_name, production_no, production_type, save_file_date, created FROM
         assets_production
         WHERE deleted = 0 AND save_file_date IS NOT NULL ) ap ON ap.production_no = pf.production_no
         LEFT JOIN assets a ON a.id = ap.business_id
@@ -814,7 +814,7 @@
             ap.production_no AS reportNo,
             IF
             ( fc.claim_datetime > ap.save_file_date, fc.claim_datetime, ap.save_file_date ) AS settleDate,
-            ap.project_name AS name,
+            ap.assets_name AS name,
             ap.created,
             dd.NAME AS businessCate,
             bcr.min_ratio AS ratio,
@@ -857,7 +857,7 @@
                   AND created <= #{vo.endDate}
             ) fc
                 INNER JOIN ( SELECT id, order_fund_id, business_id, production_no FROM production_fund WHERE business_type = 'ASSET_BUSINESS' AND deleted = 0 ) pf ON ( pf.id = fc.production_fund_id AND pf.order_fund_id = fc.order_fund_id )
-                INNER JOIN ( SELECT id, business_id, project_name, production_no, production_type, save_file_date, created FROM assets_production WHERE deleted = 0 AND save_file_date IS NOT NULL ) ap ON ap.production_no = pf.production_no
+                INNER JOIN ( SELECT id, business_id, assets_name, production_no, production_type, save_file_date, created FROM assets_production WHERE deleted = 0 AND save_file_date IS NOT NULL ) ap ON ap.production_no = pf.production_no
                 LEFT JOIN assets a ON a.id = ap.business_id
                 INNER JOIN ( SELECT id, business_id, production_id, commission_rate_id, ratio,defined_low_limit_amount FROM commission_declare WHERE business_type = 'COMMISSION_DECLARE_ASSET_EVALUATE' AND deleted = 0 AND declare_result = '审核通过' ) cd ON (
                 cd.business_id = a.id
@@ -908,7 +908,7 @@
                             ON (pf.id = fc.production_fund_id AND pf.order_fund_id = fc.order_fund_id)
                  INNER JOIN (SELECT id,
                                     business_id,
-                                    project_name,
+                                    assets_name,
                                     production_no,
                                     production_type,
                                     save_file_date,
@@ -943,7 +943,7 @@
         ap.production_no AS reportNo,
         IF
         ( fc.claim_datetime > ap.save_file_date, fc.claim_datetime, ap.save_file_date ) AS settleDate,
-        ap.project_name AS name,
+        ap.assets_name AS name,
         ap.created,
         dd.NAME AS businessCate,
         ROUND(bcr.min_ratio,2) AS ratio,
@@ -986,7 +986,7 @@
         AND created <= #{vo.endDate}
         ) fc
         INNER JOIN ( SELECT id, order_fund_id, business_id, production_no FROM production_fund WHERE business_type = 'ASSET_BUSINESS' AND deleted = 0 ) pf ON ( pf.id = fc.production_fund_id AND pf.order_fund_id = fc.order_fund_id )
-        INNER JOIN ( SELECT id, business_id, project_name, production_no, production_type, save_file_date, created FROM assets_production WHERE deleted = 0 AND save_file_date IS NOT NULL ) ap ON ap.production_no = pf.production_no
+        INNER JOIN ( SELECT id, business_id, assets_name, production_no, production_type, save_file_date, created FROM assets_production WHERE deleted = 0 AND save_file_date IS NOT NULL ) ap ON ap.production_no = pf.production_no
         LEFT JOIN assets a ON a.id = ap.business_id
         INNER JOIN ( SELECT id, business_id, production_id, commission_rate_id, ratio, defined_low_limit_amount FROM commission_declare WHERE business_type = 'COMMISSION_DECLARE_ASSET_EVALUATE' AND deleted = 0 AND declare_result = '审核通过' ) cd ON (
         cd.business_id = a.id
@@ -1028,7 +1028,7 @@
         AND created <= #{vo.endDate}
         ) fc
         INNER JOIN ( SELECT id, order_fund_id, business_id, production_no FROM production_fund WHERE business_type = 'ASSET_BUSINESS' AND deleted = 0 ) pf ON ( pf.id = fc.production_fund_id AND pf.order_fund_id = fc.order_fund_id )
-        INNER JOIN ( SELECT id, business_id, project_name, production_no, production_type, save_file_date, created FROM assets_production WHERE deleted = 0 AND delivery = TRUE ) ap ON ap.production_no = pf.production_no
+        INNER JOIN ( SELECT id, business_id, assets_name, production_no, production_type, save_file_date, created FROM assets_production WHERE deleted = 0 AND delivery = TRUE ) ap ON ap.production_no = pf.production_no
         LEFT JOIN assets a ON a.id = ap.business_id
         INNER JOIN ( SELECT id, business_id, production_id, commission_rate_id FROM commission_declare WHERE business_type = 'COMMISSION_DECLARE_ASSET_MARKET' AND deleted = 0 AND declare_result = '审核通过' ) cd ON (
         cd.business_id = a.id
@@ -1057,7 +1057,7 @@
             ap.production_no AS reportNo,
             IF
             ( fc.claim_datetime > ap.save_file_date, fc.claim_datetime, ap.save_file_date ) AS settleDate,
-            ap.project_name AS name,
+            ap.assets_name AS name,
             ap.created,
             dd.NAME AS businessCate,
             bcr.min_ratio AS ratio,
@@ -1094,7 +1094,7 @@
                   AND created <= #{vo.endDate}
             ) fc
                 INNER JOIN ( SELECT id, order_fund_id, business_id, production_no FROM production_fund WHERE business_type = 'ASSET_BUSINESS' AND deleted = 0 ) pf ON ( pf.id = fc.production_fund_id AND pf.order_fund_id = fc.order_fund_id )
-                INNER JOIN ( SELECT id, business_id, project_name, production_no, production_type, save_file_date, created FROM assets_production WHERE deleted = 0 AND delivery = TRUE ) ap ON ap.production_no = pf.production_no
+                INNER JOIN ( SELECT id, business_id, assets_name, production_no, production_type, save_file_date, created FROM assets_production WHERE deleted = 0 AND delivery = TRUE ) ap ON ap.production_no = pf.production_no
                 LEFT JOIN assets a ON a.id = ap.business_id
                 INNER JOIN ( SELECT id, business_id, production_id, commission_rate_id FROM commission_declare WHERE business_type = 'COMMISSION_DECLARE_ASSET_MARKET' AND deleted = 0 AND declare_result = '审核通过' ) cd ON (
                 cd.business_id = a.id
@@ -1142,7 +1142,7 @@
                             ON (pf.id = fc.production_fund_id AND pf.order_fund_id = fc.order_fund_id)
                  INNER JOIN (SELECT id,
                                     business_id,
-                                    project_name,
+                                    assets_name,
                                     production_no,
                                     production_type,
                                     save_file_date,
@@ -1178,7 +1178,7 @@
         ap.production_no AS reportNo,
         IF
         ( fc.claim_datetime > ap.save_file_date, fc.claim_datetime, ap.save_file_date ) AS settleDate,
-        ap.project_name AS name,
+        ap.assets_name AS name,
         ap.created,
         dd.`name` AS businessCate,
         ROUND(bcr.min_ratio,2) AS ratio,
@@ -1218,7 +1218,7 @@
         INNER JOIN ( SELECT id, order_fund_id, business_id, production_no FROM production_fund WHERE business_type =
         'ASSET_BUSINESS' AND deleted = 0 ) pf ON ( pf.id = fc.production_fund_id AND pf.order_fund_id = fc.order_fund_id
         )
-        INNER JOIN ( SELECT id, business_id, project_name, production_no, production_type, save_file_date, created FROM
+        INNER JOIN ( SELECT id, business_id, assets_name, production_no, production_type, save_file_date, created FROM
         assets_production WHERE deleted = 0 AND delivery = true ) ap ON ap.production_no = pf.production_no
         LEFT JOIN assets a ON a.id = ap.business_id
         INNER JOIN ( SELECT id, business_id, production_id, commission_rate_id FROM commission_declare WHERE
@@ -1262,7 +1262,7 @@
         business_id,
         production_no,
         ( CASE production_type WHEN 'STATEMENT' THEN '意见书' WHEN 'REPORT' THEN '评估报告' WHEN 'LETTER' THEN '意见函' WHEN 'CONSULT' THEN '咨询报告' ELSE '' END ) productionType,
-        project_name,
+        assets_name,
         evaluate_amount,
         repertory_out_time
         FROM
@@ -1321,7 +1321,7 @@
         ap.save_file_date,
         IF
         ( fc.claim_datetime > ap.delivery_date, fc.claim_datetime, ap.delivery_date ) AS settleDate,
-        ap.project_name,
+        ap.assets_name,
         a.bailor,
         ap.evaluate_amount,
         u.name AS principal,
@@ -1364,7 +1364,7 @@
         INNER JOIN ( SELECT id, order_fund_id, business_id, production_no FROM production_fund WHERE business_type =
         'ASSET_BUSINESS' AND deleted = 0 ) pf ON ( pf.id = fc.production_fund_id AND pf.order_fund_id = fc.order_fund_id
         )
-        INNER JOIN ( SELECT id, business_id, project_name, production_no, production_type, evaluate_amount,
+        INNER JOIN ( SELECT id, business_id, assets_name, production_no, production_type, evaluate_amount,
         delivery_date, save_file_date FROM assets_production WHERE deleted = 0 AND delivery = true ) ap ON ap.production_no =
         pf.production_no
         LEFT JOIN assets a ON a.id = ap.business_id
@@ -1411,7 +1411,7 @@
         ap.save_file_date,
         IF
         ( fc.claim_datetime > ap.save_file_date, fc.claim_datetime, ap.save_file_date ) AS settleDate,
-        ap.project_name,
+        ap.assets_name,
         a.bailor,
         ap.evaluate_amount,
         u.name AS principal,
@@ -1451,7 +1451,7 @@
         AND created <= #{settleVO.endDate}
         ) fc
         INNER JOIN ( SELECT id, order_fund_id, business_id, production_no FROM production_fund WHERE business_type = 'ASSET_BUSINESS' AND deleted = 0 ) pf ON ( pf.id = fc.production_fund_id AND pf.order_fund_id = fc.order_fund_id )
-        INNER JOIN ( SELECT id, business_id, project_name, production_no, production_type, evaluate_amount, save_file_date FROM assets_production WHERE deleted = 0 AND save_file_date IS NOT NULL ) ap ON ap.production_no = pf.production_no
+        INNER JOIN ( SELECT id, business_id, assets_name, production_no, production_type, evaluate_amount, save_file_date FROM assets_production WHERE deleted = 0 AND save_file_date IS NOT NULL ) ap ON ap.production_no = pf.production_no
         LEFT JOIN assets a ON a.id = ap.business_id
         LEFT JOIN user u ON u.id = a.principal_id
         LEFT JOIN user u1 ON u1.id = a.client_manager_id

dao/src/main/resources/mapper/WorkTaskRecordMapper.xml

@@ -521,6 +521,8 @@
         node.code AS nodeCode,
         log.created AS finishTime,
         instance.business_sub_id AS statementNo,
+        (SELECT assets_name FROM assets_production WHERE assets_production.production_no = instance.business_sub_id) AS statementName,
+        (SELECT assets_name FROM assets_production WHERE assets_production.production_no = instance.business_min_id) AS reportName,
         instance.business_min_id    AS reportNo,
         instance.state AS instanceState,
         instance.id AS instanceId,

domain/src/main/java/com/dayou/entity/AssetsProduction.java

@@ -171,11 +171,6 @@ public class AssetsProduction extends BaseEntity {
     private String qrCode;
 
     /**
-     * 项目名称_产品
-     */
-    private String projectName;
-
-    /**
      * 送达日期
      */
     @ImportCell

domain/src/main/java/com/dayou/vo/AssetsTaskDoneVO.java

@@ -92,4 +92,14 @@ public class AssetsTaskDoneVO {
      */
     private Long instanceId;
 
+    /**
+     * 意见书项目名称
+     */
+    private String statementName;
+
+    /**
+     * 报告项目名称
+     */
+    private String reportName;
+
 }

domain/src/main/java/com/dayou/vo/AssetsVO.java

@@ -189,4 +189,14 @@ public class AssetsVO extends Assets {
      * 报告送达状态
      */
     private Boolean reportDelivery;
+
+    /**
+     * 意见书项目名称
+     */
+    private String statementName;
+
+    /**
+     * 报告项目名称
+     */
+    private String reportName;
 }

sql/update_sql.sql

@@ -527,4 +527,12 @@ ALTER TABLE assets_production ADD COLUMN project_name VARCHAR(255) NULL COMMENT
   修改人:苟耕铨
  */
 # 表assets_production新增字段delivery_date
-ALTER TABLE assets_production ADD COLUMN delivery_date DATETIME NULL COMMENT '送达日期';
+ALTER TABLE assets_production ADD COLUMN delivery_date DATETIME NULL COMMENT '送达日期';
+
+
+/**
+  日期：2024-06-18
+  修改人:苟耕铨
+ */
+ALTER TABLE assets_production DROP project_name;
+ALTER TABLE finance_invoice ADD COLUMN production_fund_id BIGINT(20) NULL COMMENT '产品收款信息id';