陆运修改

Signed-off-by: sunhz <mpcoo@foxmail.com>

blade-service-api/trade-purchase-api/src/main/java/com/trade/purchase/extra/entity/ClaimItem.java

@@ -53,6 +53,11 @@ public class ClaimItem implements Serializable {
 	@ApiModelProperty(value = "父级ID")
 	private Long pid;
 	/**
+	 * 排序
+	 */
+	@ApiModelProperty(value = "排序")
+	private Integer sort;
+	/**
 	 * 日期
 	 */
 	@ApiModelProperty(value = "日期")

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

@@ -147,34 +147,7 @@ public class OrderIndexController extends BladeController {
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "业务统计")
 	public R bizCount(Integer mold) {
-		LambdaQueryWrapper<OrderItem> wrapper = new LambdaQueryWrapper<OrderItem>()
-			.between(OrderItem::getArrivalTime, getTime(true), getTime(false))
-			.eq(OrderItem::getKind, 2)
-			.eq(OrderItem::getIsDeleted, 0)
-			.eq(OrderItem::getTenantId, AuthUtil.getTenantId());
-
-		// 获取角色
-		String userRole = AuthUtil.getUserRole();
-		if (userRole.contains(LandConst.POST_ZJL) || userRole.contains(LandConst.ROLE_ADMIN)) {
-
-		} else if (userRole.contains(LandConst.POST_JL)) {
-			String deptId = AuthUtil.getDeptId();
-			if (StringUtil.isNotBlank(deptId)) {
-				wrapper.in(OrderItem::getSalesmanDept, Arrays.asList(deptId.split(",")));
-			}
-		} else {
-			wrapper.eq(OrderItem::getSalesman, AuthUtil.getUserId());
-		}
-
-		if (mold == 1) {
-			wrapper.eq(OrderItem::getShippingMode, LandConst.MOLD_JZX);
-		} else if (mold == 2) {
-			wrapper.eq(OrderItem::getShippingMode, LandConst.MOLD_SH);
-		} else if (mold == 3) {
-			wrapper.eq(OrderItem::getShippingMode, LandConst.MOLD_TZ);
-		}
-
-		List<OrderItem> itemList = orderItemService.list(wrapper);
+		List<OrderAcctVO> itemList = orderService.getAcctNoPage(getAcctQuery(mold, 0));
 
 		Map<String, Object> data = new HashMap<>();
 		Map<String, Object> table;
@@ -223,6 +196,18 @@ public class OrderIndexController extends BladeController {
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "业务详情")
 	public R bizDetail(Integer mold, Integer status) {
+		return R.data(orderService.getAcctNoPage(getAcctQuery(mold, status)));
+	}
+
+	private String getTime(boolean init) {
+		String date = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
+		if (init) {
+			return date + " 00:00:00";
+		}
+		return date + " 23:59:59";
+	}
+
+	private OrderAcctVO getAcctQuery(Integer mold, Integer status) {
 		OrderAcctVO acctVO = new OrderAcctVO();
 		acctVO.setBeginArrivalTime(getTime(true));
 		acctVO.setEndArrivalTime(getTime(false));
@@ -249,15 +234,7 @@ public class OrderIndexController extends BladeController {
 			acctVO.setShippingMode(LandConst.MOLD_TZ);
 		}
 
-		return R.data(orderService.getAcctNoPage(acctVO));
-	}
-
-	private String getTime(boolean init) {
-		String date = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
-		if (init) {
-			return date + " 00:00:00";
-		}
-		return date + " 23:59:59";
+		return acctVO;
 	}
 
 }

blade-service/blade-land/src/main/java/org/springblade/land/mapper/OrderMapper.java

@@ -50,6 +50,6 @@ public interface OrderMapper extends BaseMapper<Order> {
 	 * @param acctVO
 	 * @return
 	 */
-	List<OrderAcctVO> selectAcct(IPage<OrderAcctVO> page, @Param("acct") OrderAcctVO acctVO);
+	List<OrderAcctVO> selectAcctList(IPage<OrderAcctVO> page, @Param("acct") OrderAcctVO acctVO);
 
 }

blade-service/blade-land/src/main/java/org/springblade/land/mapper/OrderMapper.xml

@@ -24,11 +24,16 @@
         select * from land_order where is_deleted = 0
     </select>
 
-    <select id="selectAcct" resultType="org.springblade.land.vo.OrderAcctVO">
+    <select id="selectAcctList" resultType="org.springblade.land.vo.OrderAcctVO">
         select t1.id as orderId,
                t2.id as itemId,
+               t1.corp_id as corpId,
                t3.cname as corpName,
                t3.short_name as corpShortName,
+               t1.salesman,
+               t1.salesman_dept as salesmanDept,
+               t1.create_user as createUser,
+               t1.admin_profiles as adminProfiles,
                t2.arrival_time as arrivalTime,
                t5.name as salesmanName,
                t1.address_detail as addressDetail,
@@ -36,6 +41,7 @@
                t1.bill_no as billNo,
                t1.station,
                concat(t2.ctn_type, '×', sum(t2.ctn_quantity)) as ctnDetail,
+               t2.fleet_id as fleetId,
                t4.cname as fleetName,
                t4.short_name as fleetShortName,
                t2.plate_no,

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

@@ -302,6 +302,8 @@ public class OrderItemServiceImpl extends ServiceImpl<OrderItemMapper, OrderItem
 	public boolean send(OrderItem orderItem) {
 		OrderItem item = new OrderItem();
 		item.setId(orderItem.getId());
+		item.setFleetId(orderItem.getFleetId());
+		item.setLandAmountC(orderItem.getLandAmountC());
 		item.setVehicleId(orderItem.getVehicleId());
 		item.setPlateNo(orderItem.getPlateNo());
 		item.setDriverId(orderItem.getDriverId());

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

@@ -363,7 +363,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	@Override
 	public IPage<OrderAcctVO> getAcct(IPage<OrderAcctVO> page, OrderAcctVO acctVO) {
 		acctVO.setTenantId(AuthUtil.getTenantId());
-		List<OrderAcctVO> acctList = baseMapper.selectAcct(page, acctVO);
+		List<OrderAcctVO> acctList = baseMapper.selectAcctList(page, acctVO);
 		calculateAcct(acctList);
 		return page.setRecords(acctList);
 	}
@@ -371,7 +371,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	@Override
 	public List<OrderAcctVO> getAcctNoPage(OrderAcctVO acctVO) {
 		acctVO.setTenantId(AuthUtil.getTenantId());
-		List<OrderAcctVO> acctList = baseMapper.selectAcct(null, acctVO);
+		List<OrderAcctVO> acctList = baseMapper.selectAcctList(null, acctVO);
 		calculateAcct(acctList);
 		return acctList;
 	}

blade-service/trade-finance/src/main/java/org/springblade/finance/service/impl/AccServiceImpl.java

@@ -127,30 +127,6 @@ public class AccServiceImpl extends ServiceImpl<AccMapper, Acc> implements IAccS
 	@GlobalTransactional(rollbackFor = Exception.class)
 	public boolean removeAcc(List<Long> idList) {
 		idList.forEach(id -> {
-			Acc acc = baseMapper.selectById(id);
-			if (acc.getSrcType() == 1) {
-				OrderItems client = orderItemsClient.getById(acc.getSrcFeesId());
-				if (client == null) {
-					throw new SecurityException("未查到原单据的商品明细,无法修改状态");
-				}
-				client.setSubmitPay(0);
-				R submit = orderItemsClient.submit(client);
-				if (!submit.isSuccess()) {
-					throw new SecurityException("修改原单据的商品明细错误");
-				}
-			} else if (acc.getSrcType() == 2) {
-				OrderFees client = orderFeesClient.getById(acc.getSrcFeesId());
-				if (client == null) {
-					throw new SecurityException("未查到原单据的费用明细,无法修改状态");
-				}
-				client.setIsCheck(0);
-				client.setSubmitPay(0);
-				R submit = orderFeesClient.submit(client);
-				if (!submit.isSuccess()) {
-					throw new SecurityException("修改原单据的费用明细错误");
-				}
-			}
-
 			baseMapper.deleteById(id);
 		});
 		return true;

blade-service/trade-finance/src/main/java/org/springblade/finance/service/impl/ItemsServiceImpl.java

@@ -58,30 +58,6 @@ public class ItemsServiceImpl extends ServiceImpl<ItemsMapper, Items> implements
 	@GlobalTransactional(rollbackFor = Exception.class)
 	public boolean removeItems(List<Long> idList) {
 		idList.forEach(id -> {
-			Items items = baseMapper.selectById(id);
-			if (items.getSrcType() == 1) {
-				OrderItems client = orderItemsClient.getById(items.getSrcFeesId());
-				if (client == null) {
-					throw new SecurityException("未查到原单据的商品明细,无法修改状态");
-				}
-				client.setSubmitPay(0);
-				R submit = orderItemsClient.submit(client);
-				if (!submit.isSuccess()) {
-					throw new SecurityException("修改原单据的商品明细错误");
-				}
-			} else if (items.getSrcType() == 2) {
-				OrderFees client = orderFeesClient.getById(items.getSrcFeesId());
-				if (client == null) {
-					throw new SecurityException("未查到原单据的费用明细,无法修改状态");
-				}
-				client.setIsCheck(0);
-				client.setSubmitPay(0);
-				R submit = orderFeesClient.submit(client);
-				if (!submit.isSuccess()) {
-					throw new SecurityException("修改原单据的费用明细错误");
-				}
-			}
-
 			baseMapper.deleteById(id);
 		});
 		return true;

blade-service/trade-purchase/src/main/java/com/trade/purchase/extra/service/impl/ClaimServiceImpl.java

@@ -116,9 +116,11 @@ public class ClaimServiceImpl extends ServiceImpl<ClaimMapper, Claim> implements
 		long claimId = claim.getId();
 		BigDecimal totalAmount = BigDecimal.ZERO;
 		List<ClaimItem> itemList = claim.getItemList();
+		int i = 1;
 		for (ClaimItem item : itemList) {
 			totalAmount = totalAmount.add(item.getAmount());
 
+			item.setSort(i);
 			if (ObjectUtil.isEmpty(item.getId())) {
 				item.setPid(claimId);
 				item.setTenantId(AuthUtil.getTenantId());
@@ -130,6 +132,7 @@ public class ClaimServiceImpl extends ServiceImpl<ClaimMapper, Claim> implements
 				item.setUpdateTime(new Date());
 				claimItemMapper.updateById(item);
 			}
+			i ++;
 		}
 
 		claim.setTotalAmount(totalAmount);