DeXun/GEAR-OA
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/hdka/FURNITURE-OA

Browse Source
This commit is contained in:
砂糖
2025-08-30 16:56:33 +08:00
parent b71a93ff29 d2a36465ff
commit 880b29881d
4 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gear-oa/src/main/java/com/gear/oa/mapper/GearPurchasePlanDetailMapper.java
View File

@@ -1,6 +1,7 @@
package com.gear.oa.mapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.gear.oa.domain.GearPurchasePlanDetail;
import com.gear.oa.domain.vo.GearPurchasePlanDetailVo;
@@ -15,5 +16,5 @@ import org.apache.ibatis.annotations.Param;
*/
public interface GearPurchasePlanDetailMapper extends BaseMapperPlus<GearPurchasePlanDetailMapper, GearPurchasePlanDetail, GearPurchasePlanDetailVo> {
Page<GearPurchasePlanDetailVo> selectVoPagePlus(Page<Object> build,@Param("ew") LambdaQueryWrapper<GearPurchasePlanDetail> lqw);
Page<GearPurchasePlanDetailVo> selectVoPagePlus(Page<Object> build,@Param("ew") QueryWrapper<GearPurchasePlanDetail> lqw);
}

21
gear-oa/src/main/java/com/gear/oa/service/impl/GearPurchasePlanDetailServiceImpl.java
View File

@@ -1,6 +1,7 @@
package com.gear.oa.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.gear.common.utils.StringUtils;
import com.gear.common.core.page.TableDataInfo;
import com.gear.common.core.domain.PageQuery;
@@ -44,11 +45,29 @@ public class GearPurchasePlanDetailServiceImpl implements IGearPurchasePlanDetai
*/
@Override
public TableDataInfo<GearPurchasePlanDetailVo> queryPageList(GearPurchasePlanDetailBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<GearPurchasePlanDetail> lqw = buildQueryWrapper(bo);
QueryWrapper<GearPurchasePlanDetail> lqw = buildQueryWrapperPlus(bo);
Page<GearPurchasePlanDetailVo> result = baseMapper.selectVoPagePlus(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
private QueryWrapper<GearPurchasePlanDetail> buildQueryWrapperPlus(GearPurchasePlanDetailBo bo) {
QueryWrapper<GearPurchasePlanDetail> query = Wrappers.query();
query.eq(StringUtils.isNotBlank(bo.getDetailCode()), "d.detail_code", bo.getDetailCode());
query.eq(bo.getSupplierId() != null, "d.supplier_id", bo.getSupplierId());
query.like(bo.getRawMaterialName() != null, "d.raw_material_name", bo.getRawMaterialName());
query.eq(StringUtils.isNotBlank(bo.getOwner()), "d.owner", bo.getOwner());
query.eq(bo.getQuantity()!=null, "d.quantity", bo.getQuantity());
query.eq(StringUtils.isNotBlank(bo.getUnit()), "d.unit", bo.getUnit());
query.eq(bo.getUnitPrice() != null, "d.unit_price", bo.getUnitPrice());
query.eq(bo.getTotalAmount() != null, "d.total_amount", bo.getTotalAmount());
query.eq(StringUtils.isNotBlank(bo.getAnnex()), "d.annex", bo.getAnnex());
query.eq(bo.getStatus() != null, "d.status", bo.getStatus());
// 逻辑删除
query.eq("d.del_flag", 0);
return query;
}
/**
* 查询采购计划明细列表
*/

8
gear-oa/src/main/java/com/gear/oa/service/impl/GearSupplierServiceImpl.java
View File

@@ -54,10 +54,10 @@ public class GearSupplierServiceImpl implements IGearSupplierService {
QueryWrapper<GearSupplier> query = Wrappers.query();
query.like(StringUtils.isNotBlank(bo.getName()), "s.name", bo.getName());
query.like(StringUtils.isNotBlank(bo.getContactPerson()), "s.contact_person", bo.getContactPerson());
query.like(StringUtils.isNotBlank(bo.getPhone()), "s.phone", bo.getPhone());
query.like(StringUtils.isNotBlank(bo.getAddress()), "s.address", bo.getAddress());
query.like(StringUtils.isNotBlank(bo.getRemark()), "s.remark", bo.getRemark());
query.like(bo.getTypeId()!=null, "s.type_id", bo.getTypeId());
query.eq(StringUtils.isNotBlank(bo.getPhone()), "s.phone", bo.getPhone());
query.eq(StringUtils.isNotBlank(bo.getAddress()), "s.address", bo.getAddress());
query.eq(StringUtils.isNotBlank(bo.getRemark()), "s.remark", bo.getRemark());
query.eq(bo.getTypeId()!=null, "s.type_id", bo.getTypeId());
//逻辑删除
query.eq("s.del_flag", 0);
return query;

2
gear-oa/src/main/resources/mapper/oa/GearPurchasePlanDetailMapper.xml
View File

@@ -44,7 +44,7 @@
s.name as supplierName
from gear_purchase_plan_detail d
left join gear_supplier s on d.supplier_id = s.supplier_id and s.del_flag = 0
${ew.getSqlSegment()}
${ew.customSqlSegment}
</select>