aike/emis-oms2c-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-07-31 07:29:50 +08:00
parent c721e73cfb
commit 1a80e4a3aa
5 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/EmisCustomerAddress.java
View File

@ -72,6 +72,10 @@ public class EmisCustomerAddress extends BaseEntity
private String useSiteCode; private String useSiteCode;
// 默认 1-是 0-否
private String defaultFlag;
private String countryName; private String countryName;
private String provinceName; private String provinceName;
private String cityName; private String cityName;

3
emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/vo/Salesmen.java
View File

@ -24,5 +24,8 @@ public class Salesmen extends BaseEntity {
private String phone; private String phone;
private String ownerSiteCode; private String ownerSiteCode;
private String ownerSiteName; private String ownerSiteName;
private String blDefaultFlag;
private String defaultFlag; private String defaultFlag;
} }

2
emis-oms-biz/src/main/java/com/xdadan/erp/oms/mapper/EmisWaybillMapper.java
View File

@ -42,7 +42,7 @@ public interface EmisWaybillMapper extends BaseMapper<EmisWaybill>
*/ */
public List<Map> selectUserBindSalesmenList(@Param("customerCode") String customerCode, public List<Map> selectUserBindSalesmenList(@Param("customerCode") String customerCode,
@Param("searchValue")String searchValue, @Param("searchValue")String searchValue,
@Param("defaultFlag")String defaultFlag); @Param("blDefaultFlag")String blDefaultFlag);
/** /**

2
emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/impl/EmisWaybillServiceImpl.java
View File

@ -77,7 +77,7 @@ public class EmisWaybillServiceImpl implements IEmisWaybillService
return emisWaybillMapper.selectUserBindSalesmenList( return emisWaybillMapper.selectUserBindSalesmenList(
SecurityUtils.getLoginUser().getUser().getCustomerCode(), SecurityUtils.getLoginUser().getUser().getCustomerCode(),
salesmen.getSearchValue(), salesmen.getSearchValue(),
salesmen.getDefaultFlag() salesmen.getBlDefaultFlag()
); );
} }

6
emis-oms-biz/src/main/resources/mapper/EmisWaybillMapper.xml
View File

@ -547,7 +547,7 @@
b.phonenumber AS phone, b.phonenumber AS phone,
b.owner_site_code AS ownerSiteCode, b.owner_site_code AS ownerSiteCode,
'' AS ownerSiteName, '' AS ownerSiteName,
a.default_flag as defaultFlag a.default_flag as blDefaultFlag
FROM FROM
sys_oms_user_bind_emp a, sys_oms_user_bind_emp a,
sys_user b sys_user b
@ -557,8 +557,8 @@
<if test="searchValue != null and searchValue != ''"> <if test="searchValue != null and searchValue != ''">
and b.emp_name like concat('%', #{searchValue}, '%') and b.emp_name like concat('%', #{searchValue}, '%')
</if> </if>
<if test="defaultFlag != null and defaultFlag != ''"> <if test="blDefaultFlag != null and blDefaultFlag != ''">
and b.default_flag=#{defaultFlag} and b.default_flag=#{blDefaultFlag}
</if> </if>
</select> </select>