学校修改

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

@@ -67,11 +67,17 @@ public class SchoolTeacherServiceImpl extends ServiceImpl<SchoolTeacherMapper, S
 	public SchoolTeacher saveTeacherMessage(SchoolTeacher schoolTeacher) {
 		SchoolTeacher teacher = baseMapper.selectOne(new QueryWrapper<SchoolTeacher>().eq("id_number", schoolTeacher.getIdNumber()).eq("tenant_id", SecureUtil.getTenantId())
 			.eq("is_deleted", 0));
-		if (teacher == null){
+		if (teacher == null && schoolTeacher.getId() == null){
+			schoolTeacher.setId(null);
 			schoolTeacher.setCreateTime(new Date());
 			schoolTeacher.setCreateUser(SecureUtil.getUserId());
 			schoolTeacher.setTenantId(SecureUtil.getTenantId());
 			baseMapper.insert(schoolTeacher);
+		}else if (teacher == null && schoolTeacher.getId() != null){
+			schoolTeacher.setId(schoolTeacher.getId());
+			schoolTeacher.setUpdateTime(new Date());
+			schoolTeacher.setUpdateUser(SecureUtil.getUserId());
+			baseMapper.updateById(schoolTeacher);
 		}else {
 			schoolTeacher.setId(teacher.getId());
 			schoolTeacher.setUpdateTime(new Date());

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

@@ -88,7 +88,7 @@ public class DeliveryFeesServiceImpl extends ServiceImpl<DeliveryFeesMapper, Del
 	 */
 	public List<DeliveryFees> getDeliveryFeesList(Delivery delivery){
 		List<DeliveryFees> deliveryFeesList = baseMapper.selectList(new QueryWrapper<DeliveryFees>().eq("pid", delivery.getId())
-			.eq("tenant_id", SecureUtil.getTenantId()).eq("is_deleted", 0));
+			.eq("tenant_id", SecureUtil.getTenantId()).eq("is_deleted", 0).orderByAsc("id"));
 		if (CollectionUtils.isNotEmpty(deliveryFeesList)){
 			deliveryFeesList.stream().forEach(item ->{
 				if (item.getItemId() != null){

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

@@ -111,7 +111,7 @@ public class DeliveryItemsServiceImpl extends ServiceImpl<DeliveryItemsMapper, D
 	 */
 	public List<DeliveryItems> getDeliveryItems(Delivery delivery){
 		List<DeliveryItems> deliveryItemsList = baseMapper.selectList(new QueryWrapper<DeliveryItems>().eq("pid", delivery.getId())
-			.eq("tenant_id", SecureUtil.getTenantId()).eq("is_deleted", 0));
+			.eq("tenant_id", SecureUtil.getTenantId()).eq("is_deleted", 0).orderByAsc("id"));
 		if (CollectionUtils.isNotEmpty(deliveryItemsList)){
 			for (DeliveryItems deliveryItems : deliveryItemsList) {
 				if (deliveryItems.getItemId() != null){

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

@@ -221,7 +221,7 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 		selectById.setDeliveryFeesList(deliveryFeesList);
 		//获取发货文件信息
 		List<DeliveryFiles> deliveryFilesList = deliveryFilesService.list(new QueryWrapper<DeliveryFiles>().eq("pid", delivery.getId())
-			.eq("tenant_id", SecureUtil.getTenantId()).eq("is_deleted", 0));
+			.eq("tenant_id", SecureUtil.getTenantId()).eq("is_deleted", 0).orderByAsc("id"));
 		selectById.setDeliveryFilesList(deliveryFilesList);
 		return selectById;
 	}

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/impl/OrderFeesServiceImpl.java

@@ -85,7 +85,7 @@ public class OrderFeesServiceImpl extends ServiceImpl<OrderFeesMapper, OrderFees
 	 */
 	public List<OrderFees> getOrderFees(Order order){
 		List<OrderFees> orderFeesList = baseMapper.selectList(new QueryWrapper<OrderFees>().eq("pid", order.getId())
-			.orderByAsc("fees_type").eq("tenant_id", SecureUtil.getTenantId()).eq("is_deleted", 0).orderByAsc("sort"));
+			.orderByAsc("fees_type").eq("tenant_id", SecureUtil.getTenantId()).eq("is_deleted", 0).orderByAsc("id"));
 		if (CollectionUtils.isNotEmpty(orderFeesList)){
 			orderFeesList.stream().forEach(item ->{
 				if (item.getItemId() != null){

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/impl/OrderItemsServiceImpl.java

@@ -162,10 +162,10 @@ public class OrderItemsServiceImpl extends ServiceImpl<OrderItemsMapper, OrderIt
 		List<OrderItems> orderItemsList = new ArrayList<>();
 		if (CollectionUtils.isEmpty(order.getOrderItemIds())){
 			orderItemsList = baseMapper.selectList(new QueryWrapper<OrderItems>().eq("pid", order.getId())
-				.eq("tenant_id", SecureUtil.getTenantId()).eq("is_deleted", 0).orderByAsc("sort"));
+				.eq("tenant_id", SecureUtil.getTenantId()).eq("is_deleted", 0).orderByAsc("id"));
 		}else {
 			orderItemsList = baseMapper.selectList(new QueryWrapper<OrderItems>().eq("pid", order.getId())
-				.eq("tenant_id", SecureUtil.getTenantId()).eq("is_deleted", 0).in("id", order.getOrderItemIds()).orderByAsc("sort"));
+				.eq("tenant_id", SecureUtil.getTenantId()).eq("is_deleted", 0).in("id", order.getOrderItemIds()).orderByAsc("id"));
 		}
 		if (CollectionUtils.isNotEmpty(orderItemsList)){
 			orderItemsList.stream().forEach(item ->{

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

@@ -287,11 +287,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		orderMessage.setOrderFeesList(orderFeesList);
 		//获取订单文件信息
 		List<OrderFiles> orderFilesList = orderFilesService.list(new QueryWrapper<OrderFiles>().eq("pid", order.getId())
-			.eq("tenant_id", SecureUtil.getTenantId()).eq("status", 0).eq("is_deleted", 0).orderByAsc("sort"));
+			.eq("tenant_id", SecureUtil.getTenantId()).eq("status", 0).eq("is_deleted", 0).orderByAsc("id"));
 		orderMessage.setOrderFilesList(orderFilesList);
 		//获取订单修改日志信息
 		List<OrderModify> orderModifyList = orderModifyService.list(new QueryWrapper<OrderModify>().eq("pid", order.getId())
-			.eq("tenant_id", SecureUtil.getTenantId()).eq("status", 0).eq("is_deleted", 0).orderByAsc("sort"));
+			.eq("tenant_id", SecureUtil.getTenantId()).eq("status", 0).eq("is_deleted", 0).orderByAsc("id"));
 		orderMessage.setOrderModifyList(orderModifyList);
 		return orderMessage;
 	}

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

@@ -30,6 +30,7 @@ import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.school.entity.SalaryItem;
 import org.springblade.system.user.entity.User;
 import org.springblade.system.user.feign.IUserClient;
 import org.springframework.web.bind.annotation.*;
@@ -75,6 +76,7 @@ public class SalaryAccessoryController extends BladeController {
 		LambdaQueryWrapper<SalaryAccessory> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 		lambdaQueryWrapper.eq(SalaryAccessory::getIsDeleted,0);
 		lambdaQueryWrapper.eq(SalaryAccessory::getTenantId,SecureUtil.getTenantId());
+		lambdaQueryWrapper.eq(Func.isNotEmpty(salaryAccessory.getPid()), SalaryAccessory::getPid,salaryAccessory.getPid());
 		lambdaQueryWrapper.orderByDesc(SalaryAccessory::getId);
 		IPage<SalaryAccessory> pages = salaryAccessoryService.page(Condition.getPage(query), lambdaQueryWrapper);
 		if (CollectionUtils.isNotEmpty(pages.getRecords())){

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

@@ -17,6 +17,7 @@
 package org.springblade.school.controller;
 
 import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import io.swagger.annotations.Api;
@@ -79,8 +80,13 @@ public class SalaryItemController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入salaryItem")
 	public R<IPage<SalaryItem>> list(SalaryItem salaryItem, Query query) {
-		salaryItem.setTenantId(SecureUtil.getTenantId());
-		IPage<SalaryItem> pages = salaryItemService.page(Condition.getPage(query), Condition.getQueryWrapper(salaryItem));
+		LambdaQueryWrapper<SalaryItem> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.eq(SalaryItem::getIsDeleted,0);
+		lambdaQueryWrapper.eq(SalaryItem::getTenantId,SecureUtil.getTenantId());
+		lambdaQueryWrapper.eq(Func.isNotEmpty(salaryItem.getPid()),SalaryItem::getPid,salaryItem.getPid());
+		lambdaQueryWrapper.eq(Func.isNotEmpty(salaryItem.getCname()),SalaryItem::getCname,salaryItem.getCname());
+		lambdaQueryWrapper.orderByAsc(SalaryItem::getId);
+		IPage<SalaryItem> pages = salaryItemService.page(Condition.getPage(query), lambdaQueryWrapper);
 		return R.data(pages);
 	}
 

blade-service/blade-school/src/main/java/org/springblade/school/excel/LearningPower.java

@@ -32,6 +32,6 @@ public class LearningPower implements Serializable {
 	/**
 	 * 学习强国
 	 */
-	@ApiModelProperty(value = "扣费金额")
+	@ExcelProperty(value = "扣费金额")
 	private BigDecimal learningPower;
 }

blade-service/blade-school/src/main/java/org/springblade/school/excel/PrepareLessonsExcel.java

@@ -37,6 +37,6 @@ public class PrepareLessonsExcel implements Serializable {
 	/**
 	 * 金额
 	 */
-	@ApiModelProperty(value = "金额")
+	@ExcelProperty(value = "金额")
 	private BigDecimal prepareLessons;
 }

blade-service/blade-school/src/main/java/org/springblade/school/excel/SalaryItemExcel.java

@@ -63,7 +63,7 @@ public class SalaryItemExcel implements Serializable {
 	 * 职级类别
 	 */
 	@ExcelProperty(value = "职级类别")
-	private BigDecimal rankCategory;
+	private String rankCategory;
 	/**
 	 * 职级拨付标准
 	 */

blade-service/blade-school/src/main/java/org/springblade/school/excel/TeamLeaderExcel.java

@@ -37,7 +37,7 @@ public class TeamLeaderExcel implements Serializable {
 	/**
 	 * 金额
 	 */
-	@ApiModelProperty(value = "金额")
+	@ExcelProperty(value = "金额")
 	private BigDecimal teachingResearch;
 
 }

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

@@ -88,12 +88,19 @@ public class SalaryServiceImpl extends ServiceImpl<SalaryMapper, Salary> impleme
 				}
 				SalaryItem item = salaryItemMapper.selectOne(new QueryWrapper<SalaryItem>().eq("pid", salary.getId()).eq("tenant_id", SecureUtil.getTenantId())
 					.eq("id_number", salaryItem.getIdNumber()).eq("is_deleted", 0));
-				if (item == null){
+				if (item == null && salaryItem.getId() == null){
 					salaryItem.setPid(salary.getId());
 					salaryItem.setCreateTime(new Date());
 					salaryItem.setCreateUser(SecureUtil.getUserId());
 					salaryItem.setTenantId(SecureUtil.getTenantId());
 					salaryItemMapper.insert(salaryItem);
+				}else if (item == null && salaryItem.getId() != null){
+					salaryItem.setId(salaryItem.getId());
+					salaryItem.setPid(salary.getId());
+					salaryItem.setUpdateTime(new Date());
+					salaryItem.setUpdateUser(SecureUtil.getUserId());
+					salaryItem.setTenantId(SecureUtil.getTenantId());
+					salaryItemMapper.updateById(salaryItem);
 				}else {
 					salaryItem.setId(item.getId());
 					salaryItem.setPid(salary.getId());