|
|
@@ -18,41 +18,35 @@ package org.springblade.mocha.controller;
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
+import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
|
|
|
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
|
|
|
import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
import io.swagger.annotations.ApiParam;
|
|
|
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
|
|
|
import lombok.AllArgsConstructor;
|
|
|
-
|
|
|
-import javax.servlet.http.HttpServletResponse;
|
|
|
-import javax.validation.Valid;
|
|
|
-
|
|
|
import org.springblade.client.entity.CorpsDesc;
|
|
|
import org.springblade.client.feign.ICorpsDescClient;
|
|
|
+import org.springblade.core.boot.ctrl.BladeController;
|
|
|
import org.springblade.core.excel.util.ExcelUtil;
|
|
|
import org.springblade.core.mp.support.Condition;
|
|
|
import org.springblade.core.mp.support.Query;
|
|
|
-import org.springblade.core.secure.BladeUser;
|
|
|
import org.springblade.core.secure.utils.SecureUtil;
|
|
|
import org.springblade.core.tool.api.R;
|
|
|
import org.springblade.core.tool.utils.Func;
|
|
|
-import org.springblade.mocha.excel.PriceItemExcel;
|
|
|
-import org.springblade.mocha.excel.SalesItemExcel;
|
|
|
-import org.springblade.purchase.sales.entity.Order;
|
|
|
-import org.springframework.web.bind.annotation.*;
|
|
|
-import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import org.springblade.mocha.entity.SalesPolicy;
|
|
|
-import org.springblade.mocha.vo.SalesPolicyVO;
|
|
|
+import org.springblade.mocha.excel.SalesItemExcel;
|
|
|
import org.springblade.mocha.service.ISalesPolicyService;
|
|
|
-import org.springblade.core.boot.ctrl.BladeController;
|
|
|
+import org.springblade.mocha.vo.SalesPolicyVO;
|
|
|
+import org.springframework.web.bind.annotation.*;
|
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
|
|
|
|
+import javax.servlet.http.HttpServletResponse;
|
|
|
+import javax.validation.Valid;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.Arrays;
|
|
|
import java.util.List;
|
|
|
-import java.util.Map;
|
|
|
|
|
|
/**
|
|
|
* 销售政策表 控制器
|
|
|
@@ -67,7 +61,10 @@ import java.util.Map;
|
|
|
public class SalesPolicyController extends BladeController {
|
|
|
|
|
|
private final ISalesPolicyService salesPolicyService;
|
|
|
- private final ICorpsDescClient corpsDescClient;//客户信息
|
|
|
+ /**
|
|
|
+ * 客户信息
|
|
|
+ */
|
|
|
+ private final ICorpsDescClient corpsDescClient;
|
|
|
|
|
|
/**
|
|
|
* 详情
|
|
|
@@ -89,29 +86,29 @@ public class SalesPolicyController extends BladeController {
|
|
|
public R<IPage<SalesPolicy>> list(SalesPolicyVO salesPolicy, Query query) {
|
|
|
QueryWrapper<SalesPolicy> queryWrapper = new QueryWrapper<>();
|
|
|
LambdaQueryWrapper<SalesPolicy> lambdaQueryWrapper = new LambdaQueryWrapper<>();
|
|
|
- lambdaQueryWrapper.eq(SalesPolicy::getIsDeleted,0);
|
|
|
- lambdaQueryWrapper.eq(SalesPolicy::getTenantId,SecureUtil.getTenantId());
|
|
|
- lambdaQueryWrapper.like(Func.isNotEmpty(salesPolicy.getCname()),SalesPolicy::getCname,salesPolicy.getCname());
|
|
|
- lambdaQueryWrapper.like(Func.isNotEmpty(salesPolicy.getBrand()),SalesPolicy::getBrand,salesPolicy.getBrand());
|
|
|
- lambdaQueryWrapper.like(Func.isNotEmpty(salesPolicy.getCorps()),SalesPolicy::getCorps,salesPolicy.getCorps());
|
|
|
- lambdaQueryWrapper.eq(Func.isNotEmpty(salesPolicy.getStatus()),SalesPolicy::getStatus,salesPolicy.getStatus());
|
|
|
- lambdaQueryWrapper.ge(Func.isNotEmpty(salesPolicy.getCreateTimeStart()), SalesPolicy::getCreateTime,salesPolicy.getCreateTimeStart());
|
|
|
- lambdaQueryWrapper.le(Func.isNotEmpty(salesPolicy.getCreateTimeEnd()),SalesPolicy::getCreateTime,salesPolicy.getCreateTimeEnd());
|
|
|
- lambdaQueryWrapper.ge(Func.isNotEmpty(salesPolicy.getDateValidityStart()),SalesPolicy::getStartTime,salesPolicy.getDateValidityStart());
|
|
|
- lambdaQueryWrapper.le(Func.isNotEmpty(salesPolicy.getDateValidityEnd()),SalesPolicy::getEndTime,salesPolicy.getDateValidityEnd());
|
|
|
+ lambdaQueryWrapper.eq(SalesPolicy::getIsDeleted, 0);
|
|
|
+ lambdaQueryWrapper.eq(SalesPolicy::getTenantId, SecureUtil.getTenantId());
|
|
|
+ lambdaQueryWrapper.like(Func.isNotEmpty(salesPolicy.getCname()), SalesPolicy::getCname, salesPolicy.getCname());
|
|
|
+ lambdaQueryWrapper.like(Func.isNotEmpty(salesPolicy.getBrand()), SalesPolicy::getBrand, salesPolicy.getBrand());
|
|
|
+ lambdaQueryWrapper.like(Func.isNotEmpty(salesPolicy.getCorps()), SalesPolicy::getCorps, salesPolicy.getCorps());
|
|
|
+ lambdaQueryWrapper.eq(Func.isNotEmpty(salesPolicy.getStatus()), SalesPolicy::getStatus, salesPolicy.getStatus());
|
|
|
+ lambdaQueryWrapper.ge(Func.isNotEmpty(salesPolicy.getCreateTimeStart()), SalesPolicy::getCreateTime, salesPolicy.getCreateTimeStart());
|
|
|
+ lambdaQueryWrapper.le(Func.isNotEmpty(salesPolicy.getCreateTimeEnd()), SalesPolicy::getCreateTime, salesPolicy.getCreateTimeEnd());
|
|
|
+ lambdaQueryWrapper.ge(Func.isNotEmpty(salesPolicy.getDateValidityStart()), SalesPolicy::getStartTime, salesPolicy.getDateValidityStart());
|
|
|
+ lambdaQueryWrapper.le(Func.isNotEmpty(salesPolicy.getDateValidityEnd()), SalesPolicy::getEndTime, salesPolicy.getDateValidityEnd());
|
|
|
lambdaQueryWrapper.orderByDesc(SalesPolicy::getId);
|
|
|
IPage<SalesPolicy> pages = salesPolicyService.page(Condition.getPage(query), lambdaQueryWrapper);
|
|
|
- if (CollectionUtils.isNotEmpty(pages.getRecords())){
|
|
|
- pages.getRecords().stream().forEach(item ->{
|
|
|
+ if (CollectionUtils.isNotEmpty(pages.getRecords())) {
|
|
|
+ pages.getRecords().forEach(item -> {
|
|
|
//回显代理商中文名
|
|
|
- if(StringUtils.isNotBlank(item.getCorps())){
|
|
|
+ if (StringUtils.isNotBlank(item.getCorps())) {
|
|
|
List<String> list = Arrays.asList(item.getCorps().split(","));
|
|
|
StringBuffer stringBuffer = new StringBuffer();
|
|
|
- if (CollectionUtils.isNotEmpty(list)){
|
|
|
- list.stream().forEach(items ->{
|
|
|
+ if (CollectionUtils.isNotEmpty(list)) {
|
|
|
+ list.forEach(items -> {
|
|
|
R<CorpsDesc> corpMessage = corpsDescClient.getCorpMessage(Long.valueOf(items));
|
|
|
- if (corpMessage.isSuccess() && corpMessage.getData() != null){
|
|
|
- stringBuffer.append(corpMessage.getData().getCname()+",");
|
|
|
+ if (corpMessage.isSuccess() && corpMessage.getData() != null) {
|
|
|
+ stringBuffer.append(corpMessage.getData().getCname()).append(",");
|
|
|
}
|
|
|
});
|
|
|
}
|
|
|
@@ -152,8 +149,8 @@ public class SalesPolicyController extends BladeController {
|
|
|
@ApiOperationSupport(order = 5)
|
|
|
@ApiOperation(value = "修改", notes = "传入salesPolicy")
|
|
|
public R update(@Valid @RequestBody SalesPolicy salesPolicy) {
|
|
|
- if (salesPolicy.getId() == null){
|
|
|
- return R.data(500,"请选择要删除的数据","error");
|
|
|
+ if (salesPolicy.getId() == null) {
|
|
|
+ return R.data(500, "请选择要删除的数据", "error");
|
|
|
}
|
|
|
salesPolicy.setIsDeleted(1);
|
|
|
return R.status(salesPolicyService.updateById(salesPolicy));
|
|
|
@@ -179,6 +176,7 @@ public class SalesPolicyController extends BladeController {
|
|
|
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
|
|
|
return R.status(salesPolicyService.removeByIds(Func.toLongList(ids)));
|
|
|
}
|
|
|
+
|
|
|
/**
|
|
|
* 懒加载获取政策树形结构
|
|
|
*/
|
|
|
@@ -192,18 +190,17 @@ public class SalesPolicyController extends BladeController {
|
|
|
|
|
|
/**
|
|
|
* 导入销售政策明细
|
|
|
- * */
|
|
|
+ */
|
|
|
|
|
|
@PostMapping("/import-sales-policy")
|
|
|
@ApiOperationSupport(order = 12)
|
|
|
@ApiOperation(value = "导入销售政策明细", notes = "传入excel")
|
|
|
public R importSalesPolicy(MultipartFile file) {
|
|
|
List<SalesItemExcel> excelList = ExcelUtil.read(file, SalesItemExcel.class);
|
|
|
- if(CollectionUtils.isEmpty(excelList))
|
|
|
- {
|
|
|
+ if (CollectionUtils.isEmpty(excelList)) {
|
|
|
throw new SecurityException("数据不能为空");
|
|
|
}
|
|
|
- return salesPolicyService.importSalesPolicy(excelList,false);
|
|
|
+ return salesPolicyService.importSalesPolicy(excelList, false);
|
|
|
}
|
|
|
|
|
|
|
|
|
@@ -215,9 +212,8 @@ public class SalesPolicyController extends BladeController {
|
|
|
@ApiOperation(value = "导出模板")
|
|
|
public void exportPrice(HttpServletResponse response) {
|
|
|
List<SalesItemExcel> list = new ArrayList<>();
|
|
|
- ExcelUtil.export(response, "导出模板-销售政策明细", "导入数据表", list, SalesItemExcel.class);
|
|
|
+ ExcelUtil.export(response, "导入模板-销售政策明细", "导入数据表", list, SalesItemExcel.class);
|
|
|
}
|
|
|
|
|
|
|
|
|
-
|
|
|
}
|
sunhz