费用率

src/main/java/com/qs/serve/modules/bir/entity/vo/BirRoiCostItemVo.java

@@ -52,7 +52,7 @@ public class BirRoiCostItemVo {
     private BigDecimal returnAmt;
 
     /**
-     * 发货金额(原发货金额+预估金额)
+     * 发货金额(原发货金额)
      */
     private BigDecimal dispatchAmt;
 

src/main/java/com/qs/serve/modules/bir/service/impl/BirBaseActivityServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qs.serve.common.model.dto.DateSplitDTO;
 import com.qs.serve.common.util.Assert;
+import com.qs.serve.common.util.CollectionUtil;
 import com.qs.serve.common.util.DateSplitUtil;
 import com.qs.serve.modules.sys.mapper.SysUserMapper;
 import com.qs.serve.modules.tbs.entity.TbsActivity;
@@ -133,7 +134,7 @@ public class BirBaseActivityServiceImpl extends ServiceImpl<BirBaseActivityMappe
                     baseActivity.setMonthDays(currItemDays);
                     baseActivity.setCostPassFlag(activity.getCostPassFlag());
                     baseActivity.setTotalDays(currentActDays);
-                    baseActivity.setApplyStatus(costApply.getChargeState());
+                    baseActivity.setApplyStatus(activity.getFinishedFlag());
                     birBaseActivities.add(baseActivity);
                 }
             }else if (dateSplitList.size()==1){
@@ -169,7 +170,7 @@ public class BirBaseActivityServiceImpl extends ServiceImpl<BirBaseActivityMappe
                 baseActivity.setMonthDays(currItemDaysOne);
                 baseActivity.setCostPassFlag(activity.getCostPassFlag());
                 baseActivity.setTotalDays(currentActDays);
-                baseActivity.setApplyStatus(costApply.getChargeState());
+                baseActivity.setApplyStatus(activity.getFinishedFlag());
                 birBaseActivities.add(baseActivity);
             }else {
                 Assert.throwEx("dateSplitList is empty");
@@ -178,8 +179,9 @@ public class BirBaseActivityServiceImpl extends ServiceImpl<BirBaseActivityMappe
 
         }
         //保存
-
+//        for(List<BirBaseActivity> list : CollectionUtil.createList(birBaseActivities,500)){
         this.saveBatch(birBaseActivities);
+//        }
     }
 
 }

src/main/java/com/qs/serve/modules/bir/service/impl/BirRoiRateServiceImpl.java

@@ -173,11 +173,10 @@ public class BirRoiRateServiceImpl extends ServiceImpl<BirRoiRateMapper,BirRoiRa
         }
         for (BirRoiCostItemVo costItemVo : costItemVoList) {
             costItemVo.setDispatchAmt(BigDecimal.ZERO);
-            costItemVo.setDispatchAmt(costItemVo.getPreAmt());
             if(dispatchSumVos!=null){
                 for (ErpDispatchSumVo dispatchSumVo : dispatchSumVos) {
                     if(dispatchSumVo.getYearMonth().equals(costItemVo.getYearMonth())){
-                        // 预估金额(后追加功能，发货金额=原发货金额+预估金额)
+                        // 发货金额=原发货金额)
                         costItemVo.setDispatchAmt(dispatchSumVo.getDispatchSumCost());
                         break;
                     }

src/main/resources/mapper/bir/BirBaseActivityMapper.xml

@@ -91,14 +91,14 @@
             on `tbs_activity`.cost_apply_id = `tbs_cost_apply`.id
         where
             tbs_activity.del_flag = 0
-            and tbs_cost_apply.charge_state in (1,2,3)
+            and tbs_cost_apply.charge_state !=0
             and (
                 bir_base_activity.activity_id is null
                 or bir_base_activity.activity_total_amt != tbs_activity.total_amount
                 or bir_base_activity.activity_used_amt != tbs_activity.used_amount
                 or bir_base_activity.activity_start_date != tbs_activity.pre_start_date
                 or bir_base_activity.activity_end_date != tbs_activity.pre_end_date
-                or bir_base_activity.apply_status != `tbs_cost_apply`.charge_state
+                or bir_base_activity.apply_status != `tbs_activity`.finished_flag
         )
             and (
                 (tbs_activity.act_start_date between #{startDate} and #{endDate})

src/main/resources/mapper/bir/BirRoiRateMapper.xml

@@ -54,11 +54,10 @@
         sum(bir_base_activity.verification_amt) as check_amt,
         sum(bir_base_activity.pre_act_quantity) as pre_amt
         FROM
-        `bir_base_activity` left join `tbs_cost_apply` on `bir_base_activity`.cost_apply_id = `tbs_cost_apply`.id
+        `bir_base_activity`
         <where>
-             tbs_cost_apply.charge_state in (1,2)
+            bir_base_activity.apply_status = 0
             and bir_base_activity.del_flag = '0'
-            and `tbs_cost_apply`.del_flag = '0'
             and bir_base_activity.key_num &gt;= #{query.startMonthNum}
             and bir_base_activity.key_num &lt;= #{query.endMonthNum}
             <if test="query.supplierId!=null and query.supplierId!=''">
@@ -96,11 +95,10 @@
             sum(bir_base_activity.verification_amt) as check_amt,
             sum(bir_base_activity.pre_act_quantity) as pre_amt
         FROM
-            `bir_base_activity` left join `tbs_cost_apply` on `bir_base_activity`.cost_apply_id = `tbs_cost_apply`.id
+            `bir_base_activity`
         <where>
-             tbs_cost_apply.charge_state = 3
+            bir_base_activity.apply_status = 1
             and bir_base_activity.del_flag = '0'
-            and `tbs_cost_apply`.del_flag = '0'
             and bir_base_activity.key_num &gt;= #{query.startMonthNum}
             and bir_base_activity.key_num &lt;= #{query.endMonthNum}
             <if test="query.supplierId!=null and query.supplierId!=''">