|
@@ -29,10 +29,12 @@ import com.sckw.system.api.model.dto.res.UserCacheResDto;
|
|
|
import com.sckw.transport.dao.*;
|
|
import com.sckw.transport.dao.*;
|
|
|
import com.sckw.transport.model.*;
|
|
import com.sckw.transport.model.*;
|
|
|
import com.sckw.transport.model.param.LogisticsOrderQuery;
|
|
import com.sckw.transport.model.param.LogisticsOrderQuery;
|
|
|
|
|
+import com.sckw.transport.model.param.ManagementContractParam;
|
|
|
import com.sckw.transport.model.param.ManagementLogisticsOrderQuery;
|
|
import com.sckw.transport.model.param.ManagementLogisticsOrderQuery;
|
|
|
import com.sckw.transport.model.vo.CarWaybillVO;
|
|
import com.sckw.transport.model.vo.CarWaybillVO;
|
|
|
import com.sckw.transport.model.vo.ManagementLogisticsOrderVO;
|
|
import com.sckw.transport.model.vo.ManagementLogisticsOrderVO;
|
|
|
import com.sckw.transport.model.vo.OrderDetailVO;
|
|
import com.sckw.transport.model.vo.OrderDetailVO;
|
|
|
|
|
+import com.sckw.transport.model.vo.SckwLogisticsOrderVO;
|
|
|
import com.sckw.transport.model.vo.execlVo.ManagementLogisticsOrderExcelVo;
|
|
import com.sckw.transport.model.vo.execlVo.ManagementLogisticsOrderExcelVo;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.dubbo.config.annotation.DubboReference;
|
|
import org.apache.dubbo.config.annotation.DubboReference;
|
|
@@ -631,4 +633,40 @@ public class ManagementLogisticsOrderService {
|
|
|
PageResult result = PageResult.build(orderDto.getPage(), orderDto.getPageSize(), returnList.stream().count(), collect);
|
|
PageResult result = PageResult.build(orderDto.getPage(), orderDto.getPageSize(), returnList.stream().count(), collect);
|
|
|
return HttpResult.ok(result);
|
|
return HttpResult.ok(result);
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
|
|
+ public HttpResult getLogisticsContract(ManagementContractParam contractParam) {
|
|
|
|
|
+ List<Long> contractIds = StringUtils.splitStrToList(contractParam.getContractIds(), Long.class);
|
|
|
|
|
+ List<SckwLogisticsOrderVO> list = logisticsOrderMapper.selectOrderListByContractId(null, null, contractIds);
|
|
|
|
|
+ List<SckwLogisticsOrderVO> returnList = new ArrayList<>();
|
|
|
|
|
+ /**计量单位*/
|
|
|
|
|
+ Map<String, String> dictResDtoMap = commonService.getDictData(DictTypeEnum.UNIT_TYPE.getType());
|
|
|
|
|
+ /**支付方式*/
|
|
|
|
|
+ Map<String, String> tradeTypeDictData = commonService.getDictData(DictTypeEnum.TRADE_TYPE.getType());
|
|
|
|
|
+ /**运价方式*/
|
|
|
|
|
+// Map<String, String> priceDictData = getDictData(DictTypeEnum.PRICE_TYPE.getType());
|
|
|
|
|
+ /**计费方式*/
|
|
|
|
|
+// Map<String, String> chargingDictData = getDictData(DictTypeEnum.CHARGING_TYPE.getType());
|
|
|
|
|
+ /**结算周期*/
|
|
|
|
|
+ Map<String, String> settlementDictData = commonService.getDictData(DictTypeEnum.SETTLEMENT_CYCLE.getType());
|
|
|
|
|
+ /**签约方式*/
|
|
|
|
|
+// Map<String, String> signingWay = getDictData(DictTypeEnum.SIGNING_TYPE.getType());
|
|
|
|
|
+ /**合理损耗*/
|
|
|
|
|
+ Map<String, String> taxRateTypeDictData = commonService.getDictData(DictTypeEnum.TAX_RATE_TYPE.getType());
|
|
|
|
|
+ if (CollectionUtils.isNotEmpty(list)) {
|
|
|
|
|
+ for (SckwLogisticsOrderVO vo : list) {
|
|
|
|
|
+ vo.setPaymentLabel(vo.getPayment() == null ? null : tradeTypeDictData.get(vo.getPayment().toString()));
|
|
|
|
|
+ vo.setStatusLabel(LogisticsOrderEnum.getDestination(vo.getStatus()));
|
|
|
|
|
+ vo.setLossUnitLabel(vo.getLossUnit() == null ? null : taxRateTypeDictData.get(vo.getLossUnit()));
|
|
|
|
|
+ vo.setUnitLabel(vo.getUnit() == null ? null : dictResDtoMap.get(vo.getUnit()));
|
|
|
|
|
+ vo.setGoodsPriceUnitLabel(vo.getGoodsPriceUnit() == null ? null : dictResDtoMap.get(vo.getGoodsPriceUnit()));
|
|
|
|
|
+ vo.setSettlementCycleLabel(vo.getSettlementCycle() == null ? null : settlementDictData.get(vo.getSettlementCycle().toString()));
|
|
|
|
|
+ UserCacheResDto userCacheResDto = remoteSystemService.queryUserCacheById(vo.getCreateBy());
|
|
|
|
|
+ vo.setCreateByName(userCacheResDto == null ? null : userCacheResDto.getName());
|
|
|
|
|
+ }
|
|
|
|
|
+ returnList = list.stream().skip((contractParam.getPage() - 1) * contractParam.getPageSize()).limit(contractParam.getPageSize()).collect(Collectors.toList());
|
|
|
|
|
+ }
|
|
|
|
|
+ PageResult build = PageResult.build(contractParam.getPage(), contractParam.getPageSize(), list.stream().count(), returnList);
|
|
|
|
|
+ return HttpResult.ok(build);
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|