1.大中型归档修改为未认领实收款也可以归档

2.大中型产品包查询新增返回字段订单应收款
3.资产市场人员提成申报列表返回字段新增送达状态

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

@@ -471,10 +471,11 @@
         cc1.name AS clienteleName,
         cc2.name AS clienteleSubName,
         ap.production_no AS reportNo,
-        ap.created
+        ap.created,
+        ap.delivery
         FROM
         assets
-        LEFT JOIN ( SELECT id, business_id, production_no, create_production_date, created FROM assets_production WHERE production_type!='STATEMENT' AND deleted = 0 ) ap ON assets.id = ap.business_id
+        LEFT JOIN ( SELECT id, business_id, production_no, create_production_date, delivery,created FROM assets_production WHERE production_type!='STATEMENT' AND deleted = 0 ) ap ON assets.id = ap.business_id
         LEFT JOIN `user` u ON u.id = assets.client_manager_id
         LEFT JOIN `user` u1 ON u1.id = assets.principal_id
         LEFT JOIN customer_company cc1 ON cc1.id = assets.clientele_id

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

@@ -300,10 +300,12 @@
             mp.repertory_out_time,
             mp.if_save_file,
             mp.save_file_date,
-            mp.delivery
+            mp.delivery,
+            `of`.should_amount AS orderShouldAmount
         FROM
             major_production mp
                 LEFT JOIN ( SELECT id, business_id, production_no, real_amount, production_type FROM production_fund WHERE business_type = 'MAJOR_BUSINESS' AND deleted = 0 ) pf ON ( mp.major_id = pf.business_id AND mp.report_no = pf.production_no AND mp.production = pf.production_type )
+        LEFT JOIN (SELECT business_id,should_amount FROM order_fund WHERE business_type = 'MAJOR_BUSINESS' AND deleted = 0) AS `of` ON mp.major_id = `of`.business_id
         WHERE
             mp.major_id = #{majorId} and mp.deleted = 0
 
@@ -373,7 +375,7 @@
           and  wtr.handler_id =#{todoVO.handlerId}
           AND wnt.deleted = 0
           AND wtr.deleted = 0
-          and pf.real_amount is not null
+#           and pf.real_amount is not null
         <if test="keyword!=null and keyword!='' ">
             and (
             mp.name like concat('%',#{keyword},'%')

domain/src/main/java/com/dayou/dto/ProductionDTO.java

@@ -125,4 +125,9 @@ public class ProductionDTO {
      */
     private String limitDate;
 
+    /**
+     * 订单应收款
+     */
+    private BigDecimal orderShouldAmount;
+
 }

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

@@ -240,4 +240,10 @@ public class MajorProduction extends BaseEntity {
     private Boolean ifReverse;
     @TableField(exist = false)
     private String statementNo;
+
+    /**
+     * 订单应收款
+     */
+    private BigDecimal orderShouldAmount;
+
 }

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

@@ -233,7 +233,10 @@ public class MajorTarget extends BaseEntity {
      */
     private String useRightType;
 
-
+    /**
+     * 自定义其他评估方法
+     */
+    private String definedEvaluationMethod;
 
 
 }

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

@@ -122,4 +122,9 @@ public class CommissionDeclareVO {
      */
     private Double definedLowLimitAmount;
 
+    /**
+     * 产品送达状态
+     */
+    private Boolean delivery;
+
 }

sql/update_sql.sql

@@ -551,4 +551,11 @@ ALTER TABLE assets_evaluation_target MODIFY choice_evaluation_method_id JSON NOT
   以上SQL已同步到测试环境
   同步日期：2024-07-03
   操作人：苟耕铨
- */
+ */
+
+/**
+  日期：2024-07-09
+  修改人:苟耕铨
+ */
+# major_target表修改
+ALTER TABLE `major_target` ADD defined_evaluation_method VARCHAR(128) NULL COMMENT '自定义其他评估方法';