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

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

@@ -42,6 +42,7 @@ import javax.validation.Valid;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 控制器
@@ -76,11 +77,11 @@ public class BasicCorpsProfitChangeController extends BladeController {
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入basicCorpsProfitChange")
-	public R<IPage<BasicCorpsProfitChange>> list(BasicCorpsProfitChange basicCorpsProfitChange, Query query) {
+	public R<List<BasicCorpsProfitChange>> list(BasicCorpsProfitChange basicCorpsProfitChange) {
 		//basicCorpsProfitChange.setTenantId(AuthUtil.getTenantId());
 		basicCorpsProfitChange.setIsDeleted(0);
-		IPage<BasicCorpsProfitChange> pages = basicCorpsProfitChangeService.page(Condition.getPage(query), Condition.getQueryWrapper(basicCorpsProfitChange));
-		return R.data(pages);
+		List<BasicCorpsProfitChange> list = basicCorpsProfitChangeService.list(Condition.getQueryWrapper(basicCorpsProfitChange));
+		return R.data(list);
 	}
 
 

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

@@ -809,10 +809,10 @@ public class SchoolTeacherServiceImpl extends ServiceImpl<SchoolTeacherMapper, S
 					continue;
 				} else {
 					teacher.setId(teacher.getId());
-					teacher.setIsDeleted(schoolTeacher.getIsDeleted());
+					teacher.setStatus(schoolTeacher.getIsDeleted());
 					teacher.setUpdateUser(SecureUtil.getUserId());
 					teacher.setUpdateTime(new Date());
-					baseMapper.updateByIsDeleted(teacher);
+					baseMapper.updateById(teacher);
 				}
 			}
 		}

blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/controller/BusinessPointsItemController.java

@@ -38,6 +38,8 @@ import org.springblade.mocha.vo.BusinessPointsItemVO;
 import org.springblade.mocha.service.IBusinessPointsItemService;
 import org.springblade.core.boot.ctrl.BladeController;
 
+import java.util.List;
+
 /**
  * 积分明细表 控制器
  *
@@ -70,18 +72,18 @@ public class BusinessPointsItemController extends BladeController {
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入businessPointsItem")
-	public R<IPage<BusinessPointsItem>> list(BusinessPointsItem businessPointsItem, Query query) {
+	public R<List<BusinessPointsItem>> list(BusinessPointsItem businessPointsItem) {
 		businessPointsItem.setTenantId(SecureUtil.getTenantId());
-		IPage<BusinessPointsItem> pages = businessPointsItemService.page(Condition.getPage(query), Condition.getQueryWrapper(businessPointsItem));
-		if (CollectionUtils.isNotEmpty(pages.getRecords())){
-			pages.getRecords().stream().forEach(item ->{
+		List<BusinessPointsItem> list = businessPointsItemService.list(Condition.getQueryWrapper(businessPointsItem));
+		if (CollectionUtils.isNotEmpty(list)){
+			list.forEach(item ->{
 				R<User> user = userClient.userInfoById(item.getCreateUser());
 				if (user.isSuccess() && user.getData() != null){
 					item.setCreateUserName(user.getData().getName());
 				}
 			});
 		}
-		return R.data(pages);
+		return R.data(list);
 	}
 
 	/**

blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/controller/SalesPolicyController.java

@@ -161,7 +161,6 @@ public class SalesPolicyController extends BladeController {
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入salesPolicy")
 	public R submit(@Valid @RequestBody SalesPolicy salesPolicy) {
-		salesPolicy.setAuditStatus(salesPolicy.getStatus());
 		return salesPolicyService.saveSalesPolicy(salesPolicy);
 	}
 

blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/service/impl/SalesPolicyServiceImpl.java

@@ -367,6 +367,9 @@ public class SalesPolicyServiceImpl extends ServiceImpl<SalesPolicyMapper, Sales
 				throw new RuntimeException("删除审批流数据失败");
 			}
 		}
+		salesPolicy.setAuditStatus(2);
+		salesPolicy.setTenantId(AuthUtil.getTenantId());
+		baseMapper.updateById(salesPolicy);
 	}
 
 	/**
@@ -386,6 +389,7 @@ public class SalesPolicyServiceImpl extends ServiceImpl<SalesPolicyMapper, Sales
 			throw new SecurityException("订单已审批通过请勿重复审批");
 		}
 		salesPolicy.setAuditStatus(0);
+		salesPolicy.setStatus(0);
 		baseMapper.updateById(salesPolicy);
 	}
 

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

@@ -693,7 +693,7 @@ ORDER BY
         SELECT
             bgd.brand AS brand,
             bo.saleman AS salesName,
-            DATE_FORMAT( bo.create_time, '%Y-%m' ) AS careteTime,
+            bo.create_time AS careteTime,
             bgd.size AS specs,
             SUM( boi.Actual_quantity ) AS quantity,
             zboi.price_type AS priceType