陆运修改

blade-service-api/blade-client-api/src/main/java/org/springblade/client/entity/CorpsAttn.java

@@ -148,4 +148,7 @@ public class CorpsAttn implements Serializable {
 	@TableField(exist = false)
 	private String roleId;
 
+	@TableField(exist = false)
+	private String postId;
+
 }

blade-service-api/blade-client-api/src/main/java/org/springblade/client/entity/LandDriver.java

@@ -171,4 +171,7 @@ public class LandDriver implements Serializable {
 	@TableField(exist = false)
 	private String roleId;
 
+	@TableField(exist = false)
+	private String postId;
+
 }

blade-service-api/blade-land-api/src/main/java/org/springblade/land/entity/Order.java

@@ -193,6 +193,9 @@ public class Order implements Serializable {
 	private Integer isDeleted;
 
 	@TableField(exist = false)
+	private List<OrderItem> itemList;
+
+	@TableField(exist = false)
 	private List<OrderItem> orderItemList;
 
 	@TableField(exist = false)

blade-service/blade-client/src/main/java/org/springblade/client/corps/controller/CorpsAttnController.java

@@ -129,7 +129,7 @@ public class CorpsAttnController extends BladeController {
 	/**
 	 * 获取登录用户客户ID
 	 */
-	@PostMapping("/get-corp")
+	@GetMapping("/get-corp")
 	@ApiOperationSupport(order = 10)
 	@ApiOperation(value = "获取登录用户客户ID")
 	public R getCorp() {

blade-service/blade-client/src/main/java/org/springblade/client/corps/service/impl/CorpsAttnServiceImpl.java

@@ -75,6 +75,7 @@ public class CorpsAttnServiceImpl extends ServiceImpl<CorpsAttnMapper, CorpsAttn
 		user.setPhone(attn.getTel());
 		user.setRoleId(attn.getRoleId());
 		user.setDeptId(attn.getDeptId());
+		user.setPostId(attn.getPostId());
 
 		if (ObjectUtil.isNotEmpty(attn.getUserId())) {
 			user.setId(attn.getUserId());

blade-service/blade-client/src/main/java/org/springblade/client/land/controller/LandDriverController.java

@@ -38,10 +38,12 @@ import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.CollectionUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.core.tool.utils.StringUtil;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
@@ -163,14 +165,28 @@ public class LandDriverController extends BladeController {
 	}
 
 	/**
-	 * 导出模板
+	 * 导入模板
 	 */
-	@GetMapping("/export-template")
-	@ApiOperationSupport(order = 9)
-	@ApiOperation(value = "导出模板")
-	public void exportPrice(HttpServletResponse response) {
+	@GetMapping("/import-template")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "导入模板")
+	public void importTemplate(HttpServletResponse response) {
 		List<DriverExcel> list = new ArrayList<>();
-		ExcelUtil.export(response, "导出模板-陆运司机", "导入数据表", list, DriverExcel.class);
+		ExcelUtil.export(response, "导入模板-陆运司机", "导入数据表", list, DriverExcel.class);
+	}
+
+	/**
+	 * 导入数据
+	 */
+	@PostMapping("/import-data")
+	@ApiOperationSupport(order = 8)
+	@ApiOperation(value = "导入数据", notes = "传入excel")
+	public R importUser(MultipartFile file) {
+		List<DriverExcel> excelList = ExcelUtil.read(file, DriverExcel.class);
+		if (CollectionUtil.isEmpty(excelList)) {
+			throw new SecurityException("数据不能为空");
+		}
+		return landDriverService.importData(excelList, false);
 	}
 
 

blade-service/blade-client/src/main/java/org/springblade/client/land/controller/LandVehicleController.java

@@ -222,14 +222,14 @@ public class LandVehicleController extends BladeController {
 	}
 
 	/**
-	 * 导出模板
+	 * 导入模板
 	 */
-	@GetMapping("/export-template")
+	@GetMapping("/import-template")
 	@ApiOperationSupport(order = 9)
-	@ApiOperation(value = "导出模板")
-	public void exportPrice(HttpServletResponse response) {
+	@ApiOperation(value = "导入模板")
+	public void importTemplate(HttpServletResponse response) {
 		List<VehicleExcel> list = new ArrayList<>();
-		ExcelUtil.export(response, "导出模板-陆运车辆", "导入数据表", list, VehicleExcel.class);
+		ExcelUtil.export(response, "导入模板-陆运车辆", "导入数据表", list, VehicleExcel.class);
 	}
 
 }

blade-service/blade-client/src/main/java/org/springblade/client/land/service/ILandDriverService.java

@@ -19,6 +19,7 @@ package org.springblade.client.land.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.springblade.client.entity.LandDriver;
+import org.springblade.client.land.excel.DriverExcel;
 import org.springblade.client.vo.LandDriverVO;
 import org.springblade.core.tool.api.R;
 
@@ -65,4 +66,13 @@ public interface ILandDriverService extends IService<LandDriver> {
 	 */
 	R createUser(LandDriver landDriver);
 
+	/**
+	 * 导入数据
+	 *
+	 * @param data
+	 * @param
+	 * @return
+	 */
+	R importData(List<DriverExcel> data, Boolean isCovered);
+
 }

blade-service/blade-client/src/main/java/org/springblade/client/land/service/impl/LandDriverServiceImpl.java

@@ -23,8 +23,11 @@ import io.seata.spring.annotation.GlobalTransactional;
 import lombok.AllArgsConstructor;
 import org.springblade.client.common.mapper.CommonFileMapper;
 import org.springblade.client.constant.LandConstant;
+import org.springblade.client.corps.mapper.CorpsDescMapper;
 import org.springblade.client.entity.CommonFile;
+import org.springblade.client.entity.CorpsDesc;
 import org.springblade.client.entity.LandDriver;
+import org.springblade.client.land.excel.DriverExcel;
 import org.springblade.client.land.mapper.LandDriverMapper;
 import org.springblade.client.land.service.ILandDriverService;
 import org.springblade.client.vo.LandDriverVO;
@@ -32,6 +35,7 @@ import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.ObjectUtil;
+import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.system.user.entity.User;
 import org.springblade.system.user.feign.IUserClient;
 import org.springframework.stereotype.Service;
@@ -52,6 +56,8 @@ public class LandDriverServiceImpl extends ServiceImpl<LandDriverMapper, LandDri
 
 	private final CommonFileMapper commonFileMapper;
 
+	private final CorpsDescMapper corpsDescMapper;
+
 	private final IUserClient userClient;
 
 	@Override
@@ -123,6 +129,7 @@ public class LandDriverServiceImpl extends ServiceImpl<LandDriverMapper, LandDri
 		user.setPhone(driver.getTel());
 		user.setRoleId(landDriver.getRoleId());
 		user.setDeptId(landDriver.getDeptId());
+		user.setPostId(landDriver.getPostId());
 
 		if (ObjectUtil.isNotEmpty(driver.getUserId())) {
 			user.setId(driver.getUserId());
@@ -148,4 +155,40 @@ public class LandDriverServiceImpl extends ServiceImpl<LandDriverMapper, LandDri
 		return R.success("操作成功");
 	}
 
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public R importData(List<DriverExcel> data, Boolean isCovered) {
+		for (int i = 0; i < data.size(); i++) {
+			DriverExcel excel = data.get(i);
+
+			if (StringUtil.isBlank(excel.getName())) {
+				return R.fail("第" + (i + 1) + "行数据异常，司机姓名不能为空");
+			}
+
+			Integer count = baseMapper.selectCount(new LambdaQueryWrapper<LandDriver>()
+				.eq(LandDriver::getName, excel.getName())
+				.eq(LandDriver::getTenantId, AuthUtil.getTenantId())
+				.eq(LandDriver::getIsDeleted, 0)
+			);
+			if (count > 0) {
+				return R.fail("第" + (i + 1) + "行数据异常，司机姓名已存在");
+			}
+
+			Long fleetId = null;
+			if (StringUtil.isNotBlank(excel.getFleetName())) {
+				CorpsDesc fleet = corpsDescMapper.selectOne(new LambdaQueryWrapper<CorpsDesc>()
+					.eq(CorpsDesc::getCname, excel.getFleetName())
+					.like(CorpsDesc::getCorpType, "CD")
+					.eq(CorpsDesc::getTenantId, AuthUtil.getTenantId())
+					.eq(CorpsDesc::getIsDeleted, 0)
+				);
+				if (ObjectUtil.isEmpty(fleet)) {
+					return R.fail("第" + (i + 1) + "行数据异常，所属车队不存在");
+				}
+				fleetId = fleet.getId();
+			}
+		}
+		return R.success("ok");
+	}
+
 }

blade-service/blade-land/src/main/java/org/springblade/land/service/impl/OrderItemServiceImpl.java

@@ -188,6 +188,13 @@ public class OrderItemServiceImpl extends ServiceImpl<OrderItemMapper, OrderItem
 		OrderItem item = new OrderItem();
 		item.setId(orderItem.getId());
 		item.setFleetId(orderItem.getFleetId());
+		item.setLandAmountC(orderItem.getLandAmountC());
+		item.setOneFeeD(orderItem.getOneFeeD());
+		item.setTwoFeeD(orderItem.getTwoFeeD());
+		item.setThreeFeeD(orderItem.getThreeFeeD());
+		item.setFourFeeD(orderItem.getFourFeeD());
+		item.setFiveFeeD(orderItem.getFiveFeeD());
+		item.setFeeRemarksD(orderItem.getFeeRemarksD());
 		item.setStatus(1);
 		item.setDispatchTime(new Date());
 		item.setUpdateUser(AuthUtil.getUserId());
@@ -212,6 +219,13 @@ public class OrderItemServiceImpl extends ServiceImpl<OrderItemMapper, OrderItem
 			OrderItem item = new OrderItem();
 			item.setId(id);
 			item.setFleetId(orderItem.getFleetId());
+			item.setLandAmountC(orderItem.getLandAmountC());
+			item.setOneFeeD(orderItem.getOneFeeD());
+			item.setTwoFeeD(orderItem.getTwoFeeD());
+			item.setThreeFeeD(orderItem.getThreeFeeD());
+			item.setFourFeeD(orderItem.getFourFeeD());
+			item.setFiveFeeD(orderItem.getFiveFeeD());
+			item.setFeeRemarksD(orderItem.getFeeRemarksD());
 			item.setStatus(1);
 			item.setDispatchTime(new Date());
 			item.setUpdateUser(AuthUtil.getUserId());
@@ -252,6 +266,13 @@ public class OrderItemServiceImpl extends ServiceImpl<OrderItemMapper, OrderItem
 	public OrderItem cancelDispatch(Long id) {
 		baseMapper.update(null, new LambdaUpdateWrapper<OrderItem>()
 			.set(OrderItem::getFleetId, null)
+			.set(OrderItem::getLandAmountC, "0.00")
+			.set(OrderItem::getOneFeeD, "0.00")
+			.set(OrderItem::getTwoFeeD, "0.00")
+			.set(OrderItem::getThreeFeeD, "0.00")
+			.set(OrderItem::getFourFeeD, "0.00")
+			.set(OrderItem::getFiveFeeD, "0.00")
+			.set(OrderItem::getFeeRemarksD, null)
 			.set(OrderItem::getStatus, 0)
 			.set(OrderItem::getDispatchTime, null)
 			.set(OrderItem::getUpdateUser, AuthUtil.getUserId())
@@ -322,9 +343,15 @@ public class OrderItemServiceImpl extends ServiceImpl<OrderItemMapper, OrderItem
 	public boolean accept(OrderItem orderItem) {
 		OrderItem item = new OrderItem();
 		item.setId(orderItem.getId());
-		item.setStatus(3);
-		item.setDriverRemarks(orderItem.getDriverRemarks());
 		item.setCtnNo(orderItem.getCtnNo());
+		item.setDriverRemarks(orderItem.getDriverRemarks());
+		item.setOneFeeC(orderItem.getOneFeeC());
+		item.setTwoFeeC(orderItem.getTwoFeeC());
+		item.setThreeFeeC(orderItem.getThreeFeeC());
+		item.setFourFeeC(orderItem.getFourFeeC());
+		item.setFiveFeeC(orderItem.getFiveFeeC());
+		item.setFeeRemarksC(orderItem.getFeeRemarksC());
+		item.setStatus(3);
 		item.setAcceptTime(new Date());
 		item.setUpdateUser(AuthUtil.getUserId());
 		item.setUpdateTime(new Date());
@@ -340,6 +367,12 @@ public class OrderItemServiceImpl extends ServiceImpl<OrderItemMapper, OrderItem
 		baseMapper.update(null, new LambdaUpdateWrapper<OrderItem>()
 			.set(OrderItem::getCtnNo, null)
 			.set(OrderItem::getDriverRemarks, null)
+			.set(OrderItem::getOneFeeC, "0.00")
+			.set(OrderItem::getTwoFeeC, "0.00")
+			.set(OrderItem::getThreeFeeC, "0.00")
+			.set(OrderItem::getFourFeeC, "0.00")
+			.set(OrderItem::getFiveFeeC, "0.00")
+			.set(OrderItem::getFeeRemarksC, null)
 			.set(OrderItem::getStatus, 2)
 			.set(OrderItem::getAcceptTime, null)
 			.set(OrderItem::getUpdateUser, AuthUtil.getUserId())
@@ -375,6 +408,7 @@ public class OrderItemServiceImpl extends ServiceImpl<OrderItemMapper, OrderItem
 				file.setSource(LandConstant.ORDER_ITEM);
 			}
 		});
+		commonFileClient.saveList(fileList);
 		return true;
 	}
 

blade-service/blade-land/src/main/java/org/springblade/land/service/impl/OrderServiceImpl.java

@@ -94,9 +94,15 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			}
 		}
 
+		List<OrderItem> itemList = orderItemMapper.selectList(new LambdaQueryWrapper<OrderItem>()
+			.eq(OrderItem::getOrderId, order.getId())
+			.eq(OrderItem::getKind, 1)
+			.eq(OrderItem::getIsDeleted, 0));
+		detail.setItemList(itemList);
+
 		List<OrderItem> orderItemList = orderItemMapper.selectList(new LambdaQueryWrapper<OrderItem>()
 			.eq(OrderItem::getOrderId, order.getId())
-			.eq(OrderItem::getKind, order.getKind())
+			.eq(OrderItem::getKind, 2)
 			.eq(OrderItem::getIsDeleted, 0)
 		);
 		orderItemList.forEach(orderItem -> {
@@ -109,7 +115,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
 			if (ObjectUtil.isNotEmpty(orderItem.getDriverId())) {
 				LandDriver driver = landDriverClient.getDriver(orderItem.getDriverId());
-				orderItem.setDriverName(driver.getName());
+				if (ObjectUtil.isNotEmpty(driver)) {
+					orderItem.setDriverName(driver.getName());
+				}
 			}
 		});
 		detail.setOrderItemList(orderItemList);
@@ -361,7 +369,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		}
 
 		long orderId = order.getId();
-		order.getOrderItemList().forEach(item -> {
+		order.getItemList().forEach(item -> {
 			if (ObjectUtil.isEmpty(item.getId())) {
 				item.setOrderId(orderId);
 				item.setKind(1);

blade-service/trade-purchase/src/main/java/com/trade/purchase/dealer/PurchaseDealerOrderController.java

@@ -32,6 +32,7 @@ import org.springblade.client.vo.GoodsDescVO;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.CollectionUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.system.user.entity.User;
 import org.springblade.system.user.feign.IUserClient;
@@ -94,16 +95,19 @@ public class PurchaseDealerOrderController extends BladeController {
 				orderMessage.getData().setCreateUserName(user.getData().getName());
 			}
 
-			orderMessage.getData().getOrderItemsList().forEach(e->{
-				R<User> user2 = userClient.userInfoById(e.getUpdateUser());
-				if (user2.isSuccess() && user2.getData() != null){
-					e.setUpdateUserName(user2.getData().getName());
-				}
-				R<User> user3 = userClient.userInfoById(e.getCreateUser());
-				if (user3.isSuccess() && user3.getData() != null){
-					e.setCreateUserName(user3.getData().getName());
-				}
-			});
+			List<OrderItems> orderItemsList = orderMessage.getData().getOrderItemsList();
+			if (CollectionUtil.isNotEmpty(orderItemsList)) {
+				orderItemsList.forEach(e->{
+					R<User> user2 = userClient.userInfoById(e.getUpdateUser());
+					if (user2.isSuccess() && user2.getData() != null){
+						e.setUpdateUserName(user2.getData().getName());
+					}
+					R<User> user3 = userClient.userInfoById(e.getCreateUser());
+					if (user3.isSuccess() && user3.getData() != null){
+						e.setCreateUserName(user3.getData().getName());
+					}
+				});
+			}
 		}
 
 

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/controller/PurchaseOrderController.java

@@ -36,6 +36,7 @@ import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.CollectionUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.system.user.entity.User;
@@ -96,16 +97,19 @@ public class PurchaseOrderController extends BladeController {
 				orderMessage.getData().setCreateUserName(user.getData().getName());
 			}
 
-			orderMessage.getData().getOrderItemsList().forEach(e->{
-				R<User> user2 = userClient.userInfoById(e.getUpdateUser());
-				if (user2.isSuccess() && user2.getData() != null){
-					e.setUpdateUserName(user2.getData().getName());
-				}
-				R<User> user3 = userClient.userInfoById(e.getCreateUser());
-				if (user3.isSuccess() && user3.getData() != null){
-					e.setCreateUserName(user3.getData().getName());
-				}
-			});
+			List<OrderItems> orderItemsList = orderMessage.getData().getOrderItemsList();
+			if (CollectionUtil.isNotEmpty(orderItemsList)) {
+				orderItemsList.forEach(e->{
+					R<User> user2 = userClient.userInfoById(e.getUpdateUser());
+					if (user2.isSuccess() && user2.getData() != null){
+						e.setUpdateUserName(user2.getData().getName());
+					}
+					R<User> user3 = userClient.userInfoById(e.getCreateUser());
+					if (user3.isSuccess() && user3.getData() != null){
+						e.setCreateUserName(user3.getData().getName());
+					}
+				});
+			}
 		}