Merge remote-tracking branch 'origin/dev' into dev

blade-common/src/main/java/org/springblade/common/utils/CreateFileUtil.java

@@ -43,7 +43,7 @@ public class CreateFileUtil {
 			}
 
 			// 格式化json字符串
-			jsonString = JsonFormatTool.formatJson(jsonString);
+			// jsonString = JsonFormatTool.formatJson(jsonString);
 
 			// 将格式化后的字符串写入文件
 			Writer write = new OutputStreamWriter(new FileOutputStream(file), "UTF-8");

blade-service-api/blade-deliver-goods-api/src/main/java/org/springblade/deliver/goods/vo/CorpNumberVO.java

@@ -22,13 +22,18 @@ public class CorpNumberVO implements Serializable {
 	@ApiModelProperty(value = "所属公司中文名")
 	private String belongToCorpName;
 	/**
-	 * 发货日期
+	 * 今日发货
 	 */
 	@ApiModelProperty(value = "今日发货")
 	private BigDecimal shipmentsNumber;
 	/**
-	 * 发货量
+	 * 待发货
 	 */
 	@ApiModelProperty(value = "待发货")
 	private BigDecimal waitDeliver;
+	/**
+	 * 已发货
+	 */
+	@ApiModelProperty(value = "已发货")
+	private BigDecimal delivered;
 }

blade-service-api/blade-deliver-goods-api/src/main/java/org/springblade/deliver/goods/vo/DailyNumberVO.java

@@ -16,12 +16,17 @@ import java.math.BigDecimal;
 public class DailyNumberVO implements Serializable {
 	private static final long serialVersionUID = 1L;
 	/**
-	 * 发货日期
+	 * 总发货(月)
+	 */
+	@ApiModelProperty(value = "总发货(月)")
+	private BigDecimal totalShipments;
+	/**
+	 * 今日发货
 	 */
 	@ApiModelProperty(value = "今日发货")
 	private BigDecimal shipmentsNumber;
 	/**
-	 * 发货量
+	 * 待发货
 	 */
 	@ApiModelProperty(value = "待发货")
 	private BigDecimal waitDeliver;

blade-service-api/blade-land-api/src/main/java/org/springblade/land/constant/LandConst.java

@@ -23,7 +23,7 @@ public interface LandConst {
 
 	String LAND_ORDER_FEE = "LAND_ORDER_FEE";
 
-	String ROLE_ADMIN = "管理员";
+	String ROLE_ADMIN = "admin";
 
 	String ROLE_KH = "客户";
 

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-check/src/main/java/org/springblade/check/service/impl/AuditProecessServiceImpl.java

@@ -857,12 +857,17 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, A
 			e.setAuditMsg(auditMsg);
 			if ("ffsq".equals(e.getCheckType())) {
 				this.operationFinanceProcess(e);
-			} else if ("xsqh".equals(e.getCheckType())) {
+			} else if ("xsqh".equals(e.getCheckType()) || "cgqh".equals(e.getCheckType()) || "xstpqh".equals(e.getCheckType())) {
 				this.orderCheckProcess(e);
+			} else if ("xsgz".equals(e.getCheckType()) || "czgz".equals(e.getCheckType()) || "gzgz".equals(e.getCheckType()) || "hqgz".equals(e.getCheckType())) {
+				this.salaryCheck(e);
+			} else if ("dldd".equals(e.getCheckType())) {
+				this.agencyOrderProcess(e);
+			} else if ("ocg".equals(e.getCheckType()) || "oly".equals(e.getCheckType())) {
+				this.officeCheck(e);
 			} else {
-				throw new SecurityException("存在审批类型为空的数据,请联系管理员");
+				this.commonCheck(e);
 			}
-
 		});
 	}
 
@@ -946,9 +951,9 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, A
 		List<AuditProecess> auditProecessList = proecessList.stream().filter(e -> e.getBatchNo() == max).collect(Collectors.toList());
 		//如果最新审批记录 第一级已经操作,就禁止撤回
 		long count = auditProecessList.stream().filter(
-			e -> e.getBatchNo() == max &&
-				e.getLevelId() == 1 &&
-				("A".equals(e.getAuditStatus()) || "B".equals(e.getAuditStatus())))
+				e -> e.getBatchNo() == max &&
+					e.getLevelId() == 1 &&
+					("A".equals(e.getAuditStatus()) || "B".equals(e.getAuditStatus())))
 			.count();
 		if (count > 0) {
 			throw new SecurityException("第一级审批已经开始,禁止撤回");
@@ -1537,7 +1542,7 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, A
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	@GlobalTransactional(rollbackFor = Exception.class,timeoutMills = 12000000)
+	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
 	public void agencyOrderProcess(AuditProecess auditProecess) {
 		//查看最新操作记录,防止重复提交
 		AuditProecess proecessTemp = baseMapper.selectById(auditProecess.getId());

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

@@ -73,9 +73,9 @@ public class CorpsAttnServiceImpl extends ServiceImpl<CorpsAttnMapper, CorpsAttn
 		user.setRealName(attn.getCname());
 		user.setUserType(1);
 		user.setPhone(attn.getTel());
-		user.setRoleId(attn.getRoleId());
-		user.setDeptId(attn.getDeptId());
-		user.setPostId(attn.getPostId());
+		user.setRoleId(corpsAttn.getRoleId());
+		user.setDeptId(corpsAttn.getDeptId());
+		user.setPostId(corpsAttn.getPostId());
 
 		if (ObjectUtil.isNotEmpty(attn.getUserId())) {
 			user.setId(attn.getUserId());

blade-service/blade-client/src/main/java/org/springblade/client/message/service/impl/MessageServiceImpl.java

@@ -28,6 +28,7 @@ import org.springblade.client.message.mapper.MessageMapper;
 import org.springblade.client.message.service.IMessageService;
 import org.springblade.client.vo.MessageVO;
 import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.system.feign.ISysClient;
 import org.springblade.system.user.entity.User;
@@ -131,6 +132,7 @@ public class MessageServiceImpl extends ServiceImpl<MessageMapper, Message> impl
 		readMessageLambdaQueryWrapper
 			.eq(Message::getToUserId, userId)
 			.eq(Message::getIsDeleted, 0)
+			.eq(Message::getTenantId, SecureUtil.getTenantId())
 			.eq(Message::getIsRead, 0);
 		Integer count = baseMapper.selectCount(readMessageLambdaQueryWrapper);
 		//Map map = new HashMap();

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/mapper/DeliveryItemsMapper.java

@@ -81,7 +81,7 @@ public interface DeliveryItemsMapper extends BaseMapper<DeliveryItems> {
 	 * @param billType 订单类型
 	 * @param tenantId 租户id
 	 * @param salesCompany 所属公司
-	 * @param businessDate 发货日期
+	 * @param businessDate 发货日期 null 没有时间限制 0 查询当天 1 查询当月
 	 * @param deliveryStatus 单据状态
 	 * @return
 	 */
@@ -89,7 +89,7 @@ public interface DeliveryItemsMapper extends BaseMapper<DeliveryItems> {
 						   @Param("billType")String billType,
 						   @Param("tenantId")String tenantId,
 						   @Param("salesCompany")Long salesCompany,
-						   @Param("businessDate") Date businessDate,
+						   @Param("businessDate") Integer businessDate,
 						   @Param("deliveryStatus") String deliveryStatus);
 	/**
 	 * 更新生成货款状态

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/mapper/DeliveryItemsMapper.xml

@@ -135,9 +135,12 @@
         <if test="salesCompany != null">
             AND bd.sales_company = #{salesCompany}
         </if>
-        <if test="businessDate != null">
+        <if test="businessDate != null and businessDate == 0">
             AND TO_DAYS(bd.business_date) = TO_DAYS(NOW())
         </if>
+        <if test="businessDate != null and businessDate == 1">
+            AND MONTH(bd.business_date) = MONTH(NOW())
+        </if>
     </select>
     <update id="submitPay" parameterType="long">
         UPDATE business_delivery_items SET is_check = '1' WHERE pid = #{id}

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/service/impl/DeliveryItemsServiceImpl.java

@@ -846,7 +846,9 @@ public class DeliveryItemsServiceImpl extends ServiceImpl<DeliveryItemsMapper, D
 	public DailyNumberVO dailyNumber(DeliveryVO delivery) {
 		DailyNumberVO dailyNumberVo = new DailyNumberVO();
 		//获取今日发货数量
-		dailyNumberVo.setShipmentsNumber(baseMapper.dailyNumber(delivery.getTradeType(),delivery.getBillType(),delivery.getTenantId(),null,new Date(),DeliveryStatusEnum.REVOCATION.getType()));
+		dailyNumberVo.setShipmentsNumber(baseMapper.dailyNumber(delivery.getTradeType(),delivery.getBillType(),delivery.getTenantId(),null,0,DeliveryStatusEnum.REVOCATION.getType()));
+		//获取总发货量(月)
+		dailyNumberVo.setTotalShipments(baseMapper.dailyNumber(delivery.getTradeType(),delivery.getBillType(),delivery.getTenantId(),null,1,DeliveryStatusEnum.REVOCATION.getType()));
 		//获取待发货数量
 		dailyNumberVo.setWaitDeliver(baseMapper.dailyNumber(delivery.getTradeType(),delivery.getBillType(),delivery.getTenantId(),null,null,DeliveryStatusEnum.REPEAL.getType()));
 		return dailyNumberVo;
@@ -862,7 +864,9 @@ public class DeliveryItemsServiceImpl extends ServiceImpl<DeliveryItemsMapper, D
 				CorpNumberVO corpNumberVO = new CorpNumberVO();
 				corpNumberVO.setBelongToCorpName(e.getGoodtypes());
 				//获取今日发货数量
-				corpNumberVO.setShipmentsNumber(baseMapper.dailyNumber(delivery.getTradeType(),delivery.getBillType(),delivery.getTenantId(),e.getId(),new Date(),DeliveryStatusEnum.REVOCATION.getType()));
+				corpNumberVO.setShipmentsNumber(baseMapper.dailyNumber(delivery.getTradeType(),delivery.getBillType(),delivery.getTenantId(),e.getId(),0,DeliveryStatusEnum.REVOCATION.getType()));
+				//获取发货量(月)
+				corpNumberVO.setDelivered(baseMapper.dailyNumber(delivery.getTradeType(),delivery.getBillType(),delivery.getTenantId(),e.getId(),1,DeliveryStatusEnum.REVOCATION.getType()));
 				//获取待发货数量
 				corpNumberVO.setWaitDeliver(baseMapper.dailyNumber(delivery.getTradeType(),delivery.getBillType(),delivery.getTenantId(),e.getId(),null,DeliveryStatusEnum.REPEAL.getType()));
 				list.add(corpNumberVO);

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/blade-land/src/main/java/org/springblade/land/service/impl/TrackLogServiceImpl.java

@@ -146,9 +146,9 @@ public class TrackLogServiceImpl extends ServiceImpl<TrackLogMapper, TrackLog> i
 
 				Map<String, Object> tempMap = new HashMap<>();
 				tempMap.put("location", tempList);
-				tempMap.put("bte", temp.getString("parkAdr"));
-				tempMap.put("ete", temp.getString("parkBte"));
-				tempMap.put("address", temp.getString("parkEte"));
+				tempMap.put("address", temp.getString("parkAdr"));
+				tempMap.put("bte", temp.getString("parkBte"));
+				tempMap.put("ete", temp.getString("parkEte"));
 				tempMap.put("duration", temp.getString("parkMins"));
 				parkArray.add(tempMap);
 			}

blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/excel/SalesItemExcel.java

@@ -4,9 +4,11 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
 import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 
 @Data
 @ColumnWidth(25)
@@ -29,5 +31,15 @@ public class SalesItemExcel implements Serializable {
 
 	@ExcelProperty("特价")
 	private String specialOffer;
+	/**
+	 * 箱体积
+	 */
+	@ExcelProperty(value = "箱体积")
+	private BigDecimal cntrVolumn;
+	/**
+	 * 箱重量
+	 */
+	@ExcelProperty(value = "箱重量")
+	private BigDecimal cartonWeight;
 
 }

blade-service/blade-school/src/main/java/org/springblade/school/controller/SalaryController.java

@@ -81,7 +81,7 @@ public class SalaryController extends BladeController {
 		salary.setTenantId(SecureUtil.getTenantId());
 		LambdaQueryWrapper<Salary> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 		lambdaQueryWrapper.setEntity(salary);
-		lambdaQueryWrapper.orderByDesc(Salary::getAnnual).orderByAsc(Salary::getMoon);
+		lambdaQueryWrapper.orderByDesc(Salary::getAnnual).orderByDesc(Salary::getMoon);
 		IPage<Salary> pages = salaryService.page(Condition.getPage(query), lambdaQueryWrapper);
 		if (CollectionUtils.isNotEmpty(pages.getRecords())){
 			pages.getRecords().stream().forEach(item ->{

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);