From b2d360d9113b6955287108ca9e90d76a1f3c1419 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期日, 29 九月 2024 15:05:11 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia
---
server/service/src/main/java/com/doumee/service/business/impl/CategorySegServiceImpl.java | 35 +++++++++++++++++++++++++++++------
1 files changed, 29 insertions(+), 6 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/CategorySegServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/CategorySegServiceImpl.java
index 90c31e7..a5a95be 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/CategorySegServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/CategorySegServiceImpl.java
@@ -1,10 +1,13 @@
package com.doumee.service.business.impl;
+import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.CategorySegMapper;
import com.doumee.dao.business.model.CategorySeg;
+import com.doumee.dao.business.model.Segments;
+import com.doumee.dao.business.vo.UnitCodeVo;
import com.doumee.service.business.CategorySegService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -24,6 +27,8 @@
@Service
public class CategorySegServiceImpl implements CategorySegService {
+ @Autowired
+ private SystemDictDataBiz systemDictDataBiz;
@Autowired
private CategorySegMapper categorySegMapper;
@@ -88,6 +93,9 @@
public PageData<CategorySeg> findPage(PageWrap<CategorySeg> pageWrap) {
IPage<CategorySeg> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
QueryWrapper<CategorySeg> queryWrapper = new QueryWrapper<>();
+ queryWrapper.select("category_seg.*," +
+ "(select b.name from shop b where b.code = category_seg.scode limit 1 ) as sname," +
+ "(select b.name from shop b where b.code = category_seg.org_id limit 1 ) as orgName");
Utils.MP.blankToNull(pageWrap.getModel());
if (pageWrap.getModel().getId() != null) {
queryWrapper.lambda().eq(CategorySeg::getId, pageWrap.getModel().getId());
@@ -125,13 +133,13 @@
queryWrapper.lambda().eq(CategorySeg::getSegId3, pageWrap.getModel().getSegId3());
}
if (pageWrap.getModel().getSegName() != null) {
- queryWrapper.lambda().eq(CategorySeg::getSegName, pageWrap.getModel().getSegName());
+ queryWrapper.lambda().like(CategorySeg::getSegName, pageWrap.getModel().getSegName());
}
if (pageWrap.getModel().getSegName2() != null) {
- queryWrapper.lambda().eq(CategorySeg::getSegName2, pageWrap.getModel().getSegName2());
+ queryWrapper.lambda().like(CategorySeg::getSegName2, pageWrap.getModel().getSegName2());
}
if (pageWrap.getModel().getSegName3() != null) {
- queryWrapper.lambda().eq(CategorySeg::getSegName3, pageWrap.getModel().getSegName3());
+ queryWrapper.lambda().like(CategorySeg::getSegName3, pageWrap.getModel().getSegName3());
}
if (pageWrap.getModel().getSyncDate() != null) {
queryWrapper.lambda().ge(CategorySeg::getSyncDate, Utils.Date.getStart(pageWrap.getModel().getSyncDate()));
@@ -144,10 +152,16 @@
queryWrapper.lambda().eq(CategorySeg::getShipToAddress, pageWrap.getModel().getShipToAddress());
}
if (pageWrap.getModel().getShipToPerson() != null) {
- queryWrapper.lambda().eq(CategorySeg::getShipToPerson, pageWrap.getModel().getShipToPerson());
+ queryWrapper.lambda().like(CategorySeg::getShipToPerson, pageWrap.getModel().getShipToPerson());
}
if (pageWrap.getModel().getShipToPhone() != null) {
- queryWrapper.lambda().eq(CategorySeg::getShipToPhone, pageWrap.getModel().getShipToPhone());
+ queryWrapper.lambda().like(CategorySeg::getShipToPhone, pageWrap.getModel().getShipToPhone());
+ }
+ if (pageWrap.getModel().getScode() != null) {
+ queryWrapper.lambda().eq(CategorySeg::getScode, pageWrap.getModel().getScode());
+ }
+ if (pageWrap.getModel().getOrgId() != null) {
+ queryWrapper.lambda().eq(CategorySeg::getOrgId, pageWrap.getModel().getOrgId());
}
for(PageWrap.SortData sortData: pageWrap.getSorts()) {
if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
@@ -156,7 +170,16 @@
queryWrapper.orderByAsc(sortData.getProperty());
}
}
- return PageData.from(categorySegMapper.selectPage(page, queryWrapper));
+ queryWrapper.lambda().orderByAsc(CategorySeg::getScode);
+ PageData<CategorySeg> pagedata =PageData.from(categorySegMapper.selectPage(page, queryWrapper));
+ if(pagedata!=null && pagedata.getRecords()!=null && pagedata.getRecords().size()>0){
+ List<UnitCodeVo> unitCodeVoList =systemDictDataBiz.getUnitList();
+ for(CategorySeg model : pagedata.getRecords()){
+ model.setUnitName(systemDictDataBiz.getUnitName(model.getUnitCode(),unitCodeVoList));
+ }
+
+ }
+ return pagedata;
}
@Override
--
Gitblit v1.9.3