feat(all): 服务商成本维护

1 增加批量新增司机

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAddvaluePackageServiceImpl.java

@@ -69,7 +69,7 @@ public class DistributionAddvaluePackageServiceImpl extends BaseServiceImpl<Dist
 	public Map<String, String> findMapByPackageCode(Set<String> collect1) {
 		Map<String, String> result = new HashMap<>();
 		List<DistributionAddvaluePackageEntity> list = this.list(Wrappers.<DistributionAddvaluePackageEntity>lambdaQuery()
-			.select(DistributionAddvaluePackageEntity::getAddvalueDetailId)
+			.select(DistributionAddvaluePackageEntity::getAddvalueDetailId, DistributionAddvaluePackageEntity::getOrderPackageCode)
 			.in(DistributionAddvaluePackageEntity::getOrderPackageCode, collect1));
 		if (CollUtil.isNotEmpty(list)) {
 			// 转map

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/feign/ExpenseDispatchClient.java

@@ -76,6 +76,7 @@ public class ExpenseDispatchClient implements IExpenseDispatchClient {
 				Wrappers.<ExpenseDispatchTrainDetailEntity>lambdaUpdate()
 					.eq(ExpenseDispatchTrainDetailEntity::getId, trainDetailEntity.getId()));
 		}else{
+			entity.setSettlementStatus("未结算");
 			trainDetailService.save(entity);
 		}
 	}

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/ExpenseDispatchPriceServiceMapper.java

@@ -40,7 +40,7 @@ public interface ExpenseDispatchPriceServiceMapper extends BaseMapper<ExpenseDis
 	 * @param expenseDispatchPriceService
 	 * @return
 	 */
-	List<ExpenseDispatchPriceServiceVO> selectExpenseDispatchPriceServicePage(IPage page, ExpenseDispatchPriceServiceVO expenseDispatchPriceService);
+	List<ExpenseDispatchPriceServiceVO> selectExpenseDispatchPriceServicePage(@Param("page") IPage page, @Param("expenseDispatchPriceService") ExpenseDispatchPriceServiceVO expenseDispatchPriceService);
 
 
 	/**

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/ExpenseDispatchPriceServiceMapper.xml

@@ -11,6 +11,15 @@
         select t.*,t1.template_name as templateName from logpm_expense_dispatch_price_service t
         left join logpm_expense_dispatch_price_template t1 on t.template_id = t1.id
         where t.is_deleted = 0 and t1.is_deleted = 0
+        <if test="expenseDispatchPriceService.templateName != null and expenseDispatchPriceService.templateName != ''">
+            and t1.template_name like concat('%',#{expenseDispatchPriceService.templateName},'%')
+        </if>
+        <if test="expenseDispatchPriceService.driverName != null and expenseDispatchPriceService.driverName != ''">
+            and t.driver_name like concat('%',#{expenseDispatchPriceService.driverName},'%')
+        </if>
+        <if test="expenseDispatchPriceService.warehouseName != null and expenseDispatchPriceService.warehouseName != null">
+            and t.warehouse_name like concat('%',#{expenseDispatchPriceService.warehouseName},'%')
+        </if>
     </select>
 
 

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/ExpenseDispatchPriceTemplateMapper.xml

@@ -14,11 +14,8 @@
             <if test="vo.warehouseName != null and vo.warehouseName != ''">
                 and warehouse_name like concat('%',#{vo.warehouseName},'%')
             </if>
-            <if test="query.updateTimeStart != null and query.updateTimeStart != '' ">
-                and update_time >= #{query.updateTimeStart}
-            </if>
-            <if test="query.updateTimeEnd != null and query.updateTimeEnd != '' ">
-                and update_time <![CDATA[ <=  ]]> #{query.updateTimeEnd}
+            <if test="vo.templateName != null and vo.templateName != ''">
+                and template_name like concat('%',#{vo.templateName},'%')
             </if>
         </where>
     </select>

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/ExpenseDispatchTrainDetailMapper.xml

@@ -11,7 +11,10 @@
         select * from logpm_expense_dispatch_train_detail
         where is_deleted = 0
         <if test="expenseDispatchTrainDetail.destinationWarehouse != null and expenseDispatchTrainDetail.destinationWarehouse != ''">
-           and destination_warehouse = #{expenseDispatchTrainDetail.destinationWarehouse}
+           and destination_warehouse in
+            <foreach collection="expenseDispatchTrainDetail.destinationWarehouse.split(',')" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
         </if>
         <if test="expenseDispatchTrainDetail.settlementStatus != null and expenseDispatchTrainDetail.settlementStatus != ''">
            and settlement_status = #{expenseDispatchTrainDetail.settlementStatus}

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/ExpenseDispatchWarehouseMonthMapper.xml

@@ -11,7 +11,10 @@
         select * from logpm_expense_dispatch_warehouse_month
         <where>
             <if test="expenseDispatchWarehouseMonth.destinationWarehouse != null and expenseDispatchWarehouseMonth.destinationWarehouse != ''">
-                and destination_warehouse = #{expenseDispatchWarehouseMonth.destinationWarehouse}
+                and destination_warehouse in
+                <foreach collection="expenseDispatchWarehouseMonth.destinationWarehouse.split(',')" item="item" separator="," open="(" close=")">
+                    #{item}
+                </foreach>
             </if>
             <if test="expenseDispatchWarehouseMonth.settlementYear != null and expenseDispatchWarehouseMonth.settlementYear != ''">
                 and settlement_year = #{expenseDispatchWarehouseMonth.settlementYear}