Merge remote-tracking branch 'origin/master'

bonus-modules/bonus-material/src/main/java/com/bonus/material/push/controller/IwsCostPushController.java

@@ -62,9 +62,9 @@ public class IwsCostPushController extends BaseController {
      * @param obj 查询条件
      */
     @GetMapping("/getCostPushCheckList")
-    @ApiOperation("查询费用推送审核列表--分页")
+    @ApiOperation("查询费用推送审核列表--不分页")
     public TableDataInfo getCostPushCheckList(IwsCostPushBean obj) {
-        startPage();
+        //startPage(); 取消分页
         List<IwsCostPushBean> list = iwsCostPushService.getCostPushCheckList(obj);
         return getDataTable(list);
     }

bonus-modules/bonus-material/src/main/java/com/bonus/material/push/service/impl/IwsCostPushServiceImpl.java

@@ -11,6 +11,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
@@ -76,7 +77,7 @@ public class IwsCostPushServiceImpl implements IwsCostPushService {
         // 清除旧的费用计算数据
         // cleanSameMonthOldRecords(record);
 
-        // 插入新的当前月份记录,并生成
+        // 插入新的当前月份记录,并生成id
         iwsCostPushMapper.insertCalcMonthRecord(costDto);
 
         String taskId = costDto.getId();
@@ -143,10 +144,13 @@ public class IwsCostPushServiceImpl implements IwsCostPushService {
                 // 计算费用
                 leaseCostInfo.setLeaseMoney(new BigDecimal(leaseCostInfo.getLeaseDays())
                         .multiply(new BigDecimal(leaseCostInfo.getLeasePrice()))
-                        .multiply(leaseCostInfo.getLeaseNum())
+                        .multiply(leaseCostInfo.getLeaseNum()).setScale(2, RoundingMode.HALF_UP)
                 );
 
             }
+
+            // 删除标记的非期间段数据
+            theMonthAgreementLeaseList.removeIf(IwsCostPushBean::isDelFlag);
             return theMonthAgreementLeaseList;
         }
     }

bonus-modules/bonus-material/src/main/resources/mapper/material/push/IwsCostPushMapper.xml

@@ -98,6 +98,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN slt_agreement_info sai ON bma.agreement_id = sai.agreement_id
         LEFT JOIN ma_type mt ON mt.type_id = sai.type_id
         LEFT JOIN ma_type mt1 ON mt.parent_id = mt1.type_id
-        where bma.agreement_id = #{agreementId}
+        <where>
+            bma.agreement_id = #{agreementId}
+        </where>
     </select>
 </mapper>