purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

给租户查询接口增加备注查询字段

Browse Source
This commit is contained in:
季圣华
2023-02-09 20:55:07 +08:00
parent dcbafd2f2a
commit 16e38703c7
4 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/TenantMapperEx.java
View File

@@ -12,11 +12,13 @@ public interface TenantMapperEx {
@Param("loginName") String loginName,
@Param("type") String type,
@Param("enabled") String enabled,
@Param("remark") String remark,
@Param("offset") Integer offset,
@Param("rows") Integer rows);
Long countsByTenant(
@Param("loginName") String loginName,
@Param("type") String type,
@Param("enabled") String enabled);
@Param("enabled") String enabled,
@Param("remark") String remark);
}

6
jshERP-boot/src/main/java/com/jsh/erp/service/tenant/TenantComponent.java
View File

@@ -36,7 +36,8 @@ public class TenantComponent implements ICommonQuery {
String loginName = StringUtil.getInfo(search, "loginName");
String type = StringUtil.getInfo(search, "type");
String enabled = StringUtil.getInfo(search, "enabled");
return tenantService.select(loginName, type, enabled, QueryUtils.offset(map), QueryUtils.rows(map));
String remark = StringUtil.getInfo(search, "remark");
return tenantService.select(loginName, type, enabled, remark, QueryUtils.offset(map), QueryUtils.rows(map));
}
@Override
@@ -45,7 +46,8 @@ public class TenantComponent implements ICommonQuery {
String loginName = StringUtil.getInfo(search, "loginName");
String type = StringUtil.getInfo(search, "type");
String enabled = StringUtil.getInfo(search, "enabled");
return tenantService.countTenant(loginName, type, enabled);
String remark = StringUtil.getInfo(search, "remark");
return tenantService.countTenant(loginName, type, enabled, remark);
}
@Override

8
jshERP-boot/src/main/java/com/jsh/erp/service/tenant/TenantService.java
View File

@@ -71,11 +71,11 @@ public class TenantService {
return list;
}
public List<TenantEx> select(String loginName, String type, String enabled, int offset, int rows)throws Exception {
public List<TenantEx> select(String loginName, String type, String enabled, String remark, int offset, int rows)throws Exception {
List<TenantEx> list= new ArrayList<>();
try{
if(BusinessConstants.DEFAULT_MANAGER.equals(userService.getCurrentUser().getLoginName())) {
list = tenantMapperEx.selectByConditionTenant(loginName, type, enabled, offset, rows);
list = tenantMapperEx.selectByConditionTenant(loginName, type, enabled, remark, offset, rows);
if (null != list) {
for (TenantEx tenantEx : list) {
tenantEx.setCreateTimeStr(Tools.getCenternTime(tenantEx.getCreateTime()));
@@ -89,11 +89,11 @@ public class TenantService {
return list;
}
public Long countTenant(String loginName, String type, String enabled)throws Exception {
public Long countTenant(String loginName, String type, String enabled, String remark)throws Exception {
Long result=null;
try{
if(BusinessConstants.DEFAULT_MANAGER.equals(userService.getCurrentUser().getLoginName())) {
result = tenantMapperEx.countsByTenant(loginName, type, enabled);
result = tenantMapperEx.countsByTenant(loginName, type, enabled, remark);
}
}catch(Exception e){
JshException.readFail(logger, e);