20230307 18:05

blade-service-api/blade-school-api/src/main/java/org/springblade/school/entity/Salary.java

@@ -170,7 +170,6 @@ public class Salary implements Serializable {
 	 * 工资金额
 	 */
 		@ApiModelProperty(value = "工资金额")
-		@TableField(exist = false)
 		private BigDecimal amount;
 
 }

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

@@ -194,7 +194,7 @@ public class Claim implements Serializable {
 	private String billQuantity;
 
 	/**
-	 * 状态（待补充）
+	 * 状态 0暂存 1请核 2审核中 3审批通过 5报销完成
 	 */
 	@ApiModelProperty(value = "状态 0暂存 1请核 2审核中 3审批通过 5报销完成")
 	private Integer status;

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

@@ -104,10 +104,10 @@ public class CorpsDescServiceImpl extends ServiceImpl<CorpsDescMapper, CorpsDesc
 			}
 		}
 		corpsDesc.setTenantId(AuthUtil.getTenantId());
-		if (ObjectUtils.isNotNull(corpsDesc.getCname())) {
+		/*if (ObjectUtils.isNotNull(corpsDesc.getCname())) {
 			String cName = corpsDesc.getCname().replaceAll(" ", "");
 			corpsDesc.setCname(cName);
-		}
+		}*/
 		corpsDesc.setIsDeleted(0);
 		if ("234557".equals(AuthUtil.getTenantId())) {
 			IPage<CorpsDescVO> page1 = page.setRecords(baseMapper.selectCorpsDescPageZD(page, corpsDesc));

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

@@ -533,7 +533,11 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 			} else if (DeliveryEnum.REVOCATION.getType().equals(delivery.getDeliveryType())) {
 				Order order = new Order();
 				order.setId(delivery.getOrgId());
-				order.setOrderStatus("待发货");
+				if ("681169".equals(AuthUtil.getTenantId())){
+					order.setOrderStatus("未完成");
+				}else {
+					order.setOrderStatus("待发货");
+				}
 				order.setArrivalTime(null);
 				orderDescClient.updateOrder(order);
 			}
@@ -1050,9 +1054,13 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 		//更新收货单状态为:录入
 		delivery.setDeliveryStatus("录入");
 
-		Order temp = new Order();
+		Order temp = new Order();//销售订单
 		temp.setId(select.getOrgId());
-		temp.setOrderStatus("待发货");
+		if("681169".equals(AuthUtil.getTenantId())){
+			temp.setOrderStatus("未完成");
+		}else {
+			temp.setOrderStatus("待发货");
+		}
 		temp.setDeliverQuantity(BigDecimal.ZERO);
 		orderDescClient.updateOrder(temp);
 

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

@@ -109,16 +109,6 @@ public class SalaryController extends BladeController {
 						item.setUpdateUserName(info.getName());
 					}
 				}
-				//获取工资额
-				LambdaQueryWrapper<SalaryItem> queryWrapper = new LambdaQueryWrapper<>();
-				queryWrapper.eq(SalaryItem::getPid,item.getId());
-				queryWrapper.eq(SalaryItem::getIsDeleted,0);
-				List<SalaryItem> salaryItemList = salaryItemService.list(queryWrapper);
-				if (CollectionUtils.isNotEmpty(salaryItemList)){
-					item.setAmount(salaryItemList.stream().filter(e -> e.getfSalary() != null).map(SalaryItem::getfSalary).reduce(BigDecimal.ZERO,BigDecimal::add));
-				}else {
-					item.setAmount(BigDecimal.ZERO);
-				}
 			});
 		}
 		return R.data(pages);

blade-service/blade-school/src/main/java/org/springblade/school/service/impl/SalaryServiceImpl.java

@@ -114,6 +114,12 @@ public class SalaryServiceImpl extends ServiceImpl<SalaryMapper, Salary> impleme
 		//获取明细
 		List<SalaryItem> salaryItems = salaryItemMapper.selectList(new QueryWrapper<SalaryItem>().eq("pid", salary.getId()).eq("tenant_id", SecureUtil.getTenantId()).eq("is_deleted", 0));
 		salary.setPersonNumber(String.valueOf(salaryItems.size()));
+		//获取工资额
+		if (CollectionUtils.isNotEmpty(salaryItems)){
+			salary.setAmount(salaryItems.stream().filter(e -> e.getfSalary() != null).map(SalaryItem::getfSalary).reduce(BigDecimal.ZERO,BigDecimal::add));
+		}else {
+			salary.setAmount(BigDecimal.ZERO);
+		}
 		baseMapper.updateById(salary);
 		return salary;
 	}