open_platform/ss-common-supplier
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

7/19

Browse Source
This commit is contained in:
wangpengfei
2024-07-19 09:21:40 +08:00
parent 22d709fdc4
commit 1f12e84942
3 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/com/yxt/supplier/biz/supplierinfo/SupplierInfoService.java
View File

@@ -93,21 +93,21 @@ public class SupplierInfoService extends MybatisBaseService<SupplierInfoMapper,
return rb.success().setData(p); return rb.success().setData(p);
} }
if (StringUtils.isNotBlank(query.getSupplierName())){ if (StringUtils.isNotBlank(query.getSupplierName())){
qw.like("supplierName",query.getSupplierName()); qw.like("a.supplierName",query.getSupplierName());
} }
if (StringUtils.isNotBlank(query.getSupplierTypeName())){ if (StringUtils.isNotBlank(query.getSupplierTypeName())){
qw.like("supplierTypeName",query.getSupplierTypeName()); qw.like("a.supplierTypeName",query.getSupplierTypeName());
} }
if (StringUtils.isNotBlank(query.getContactTelePhone())){ if (StringUtils.isNotBlank(query.getContactTelePhone())){
qw.like("contactTelePhone",query.getContactTelePhone()); qw.like("a.contactTelePhone",query.getContactTelePhone());
} }
if (StringUtils.isNotBlank(query.getContactName())){ if (StringUtils.isNotBlank(query.getContactName())){
qw.like("contactName",query.getContactName()); qw.like("a.contactName",query.getContactName());
} }
if (StringUtils.isNotBlank(query.getOtherQuery())){ if (StringUtils.isNotBlank(query.getOtherQuery())){
qw.and(wrapper -> wrapper.like("supplierName", query.getOtherQuery()).or().like("supplierPY", query.getOtherQuery()).or().like("contactTelePhone",query.getOtherQuery())); qw.and(wrapper -> wrapper.like("a.supplierName", query.getOtherQuery()).or().like("a.supplierPY", query.getOtherQuery()).or().like("contactTelePhone",query.getOtherQuery()));
} }
qw.eq("isDelete",0); qw.eq("a.isDelete",0);
IPage<SupplierInfo> page = PagerUtil.queryToPage(pq); IPage<SupplierInfo> page = PagerUtil.queryToPage(pq);
IPage<SupplierInfoVo> pagging = baseMapper.selectPageVo(page, qw); IPage<SupplierInfoVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<SupplierInfoVo> p = PagerUtil.pageToVo(pagging, null); PagerVo<SupplierInfoVo> p = PagerUtil.pageToVo(pagging, null);
@@ -151,8 +151,7 @@ public class SupplierInfoService extends MybatisBaseService<SupplierInfoMapper,
SupplierInfo entity = new SupplierInfo(); SupplierInfo entity = new SupplierInfo();
BeanUtil.copyProperties(dto, entity, "id", "sid"); BeanUtil.copyProperties(dto, entity, "id", "sid");
entity.setCreateBySid(dto.getUserSid()); entity.setCreateBySid(dto.getUserSid());
entity.setCreateOrgSid(dto.getOrgPath()); entity.setCreateOrgSid(dto.getUseOrgSid());
entity.setUseOrgSid(dto.getOrgPath());
baseMapper.insert(entity); baseMapper.insert(entity);
return entity.getSid(); return entity.getSid();
} }

2
src/main/java/com/yxt/supplier/biz/suppliertype/SupplierTypeMapper.java
View File

@@ -64,6 +64,6 @@ public interface SupplierTypeMapper extends BaseMapper<SupplierType> {
@Select("SELECT COUNT(*) FROM supplier_type WHERE supplierTypeCode = #{supplierTypeCode} AND useOrgSid = #{useOrgSid} AND sid != #{dtoSid}") @Select("SELECT COUNT(*) FROM supplier_type WHERE supplierTypeCode = #{supplierTypeCode} AND useOrgSid = #{useOrgSid} AND sid != #{dtoSid}")
int checkUpdateCode(@Param("supplierTypeCode") String supplierTypeCode,@Param("useOrgSid") String useOrgSid,@Param("dtoSid") String dtoSid); int checkUpdateCode(@Param("supplierTypeCode") String supplierTypeCode,@Param("useOrgSid") String useOrgSid,@Param("dtoSid") String dtoSid);
@Select("select * from supplier_type where useOrgSid = #{useOrgSid} and isDelete = '0'") @Select("select * from supplier_type a LEFT JOIN ss_user.sys_organization as s ON a.useOrgSid = s.sid where s.orgSidPath like concat('%',#{orgPath},'%') and a.isDelete = '0'")
List<SupplierTypeDown> selSupplierType(String useOrgSid); List<SupplierTypeDown> selSupplierType(String useOrgSid);
} }

3
src/main/java/com/yxt/supplier/biz/suppliertype/SupplierTypeService.java
View File

@@ -110,8 +110,7 @@ public class SupplierTypeService extends MybatisBaseService<SupplierTypeMapper,
SupplierType entity = new SupplierType(); SupplierType entity = new SupplierType();
BeanUtil.copyProperties(dto, entity, "id", "sid"); BeanUtil.copyProperties(dto, entity, "id", "sid");
entity.setCreateBySid(dto.getUserSid()); entity.setCreateBySid(dto.getUserSid());
entity.setCreateOrgSid(dto.getOrgPath()); entity.setCreateOrgSid(dto.getUseOrgSid());
entity.setUseOrgSid(dto.getOrgPath());
baseMapper.insert(entity); baseMapper.insert(entity);
} }