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

给租户增加字段

Browse Source
This commit is contained in:
季圣华
2021-08-24 01:01:18 +08:00
parent 81bd163d30
commit e95a687ef3
12 changed files with 169 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
jshERP-boot/src/main/java/com/jsh/erp/controller/DepotHeadController.java
View File

@@ -313,14 +313,7 @@ public class DepotHeadController {
JSONObject result = ExceptionConstants.standardSuccess();
String beanJson = body.getInfo();
String rows = body.getRows();
Long billsNumLimit = Long.parseLong(redisService.getObjectFromSessionByKey(request,"billsNumLimit").toString());
Long count = depotHeadService.countDepotHead(null,null,null,null,null,null,null,null,null,null,null);
if(count>= billsNumLimit) {
throw new BusinessParamCheckingException(ExceptionConstants.DEPOT_HEAD_OVER_LIMIT_FAILED_CODE,
ExceptionConstants.DEPOT_HEAD_OVER_LIMIT_FAILED_MSG);
} else {
depotHeadService.addDepotHeadAndDetail(beanJson,rows, request);
}
depotHeadService.addDepotHeadAndDetail(beanJson, rows, request);
return result;
}

2
jshERP-boot/src/main/java/com/jsh/erp/controller/UserController.java
View File

@@ -123,10 +123,8 @@ public class UserController {
if(tenant!=null) {
Long tenantId = tenant.getTenantId();
Integer userNumLimit = tenant.getUserNumLimit();
Integer billsNumLimit = tenant.getBillsNumLimit();
if(tenantId!=null) {
redisService.storageObjectBySession(token,"userNumLimit",userNumLimit); //用户限制数
redisService.storageObjectBySession(token,"billsNumLimit",billsNumLimit); //单据限制数
}
}
}

20
jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/Tenant.java
View File

@@ -11,12 +11,14 @@ public class Tenant {
private Integer userNumLimit;
private Integer billsNumLimit;
private String type;
private Boolean enabled;
private Date createTime;
private Date expireTime;
public Long getId() {
return id;
}
@@ -49,12 +51,12 @@ public class Tenant {
this.userNumLimit = userNumLimit;
}
public Integer getBillsNumLimit() {
return billsNumLimit;
public String getType() {
return type;
}
public void setBillsNumLimit(Integer billsNumLimit) {
this.billsNumLimit = billsNumLimit;
public void setType(String type) {
this.type = type == null ? null : type.trim();
}
public Boolean getEnabled() {
@@ -72,4 +74,12 @@ public class Tenant {
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public Date getExpireTime() {
return expireTime;
}
public void setExpireTime(Date expireTime) {
this.expireTime = expireTime;
}
}

10
jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/TenantEx.java
View File

@@ -4,6 +4,8 @@ public class TenantEx extends Tenant{
private String createTimeStr;
private String expireTimeStr;
public String getCreateTimeStr() {
return createTimeStr;
}
@@ -11,4 +13,12 @@ public class TenantEx extends Tenant{
public void setCreateTimeStr(String createTimeStr) {
this.createTimeStr = createTimeStr;
}
public String getExpireTimeStr() {
return expireTimeStr;
}
public void setExpireTimeStr(String expireTimeStr) {
this.expireTimeStr = expireTimeStr;
}
}

118
jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/TenantExample.java
View File

@@ -355,63 +355,73 @@ public class TenantExample {
return (Criteria) this;
}
public Criteria andBillsNumLimitIsNull() {
addCriterion("bills_num_limit is null");
public Criteria andTypeIsNull() {
addCriterion("type is null");
return (Criteria) this;
}
public Criteria andBillsNumLimitIsNotNull() {
addCriterion("bills_num_limit is not null");
public Criteria andTypeIsNotNull() {
addCriterion("type is not null");
return (Criteria) this;
}
public Criteria andBillsNumLimitEqualTo(Integer value) {
addCriterion("bills_num_limit =", value, "billsNumLimit");
public Criteria andTypeEqualTo(String value) {
addCriterion("type =", value, "type");
return (Criteria) this;
}
public Criteria andBillsNumLimitNotEqualTo(Integer value) {
addCriterion("bills_num_limit <>", value, "billsNumLimit");
public Criteria andTypeNotEqualTo(String value) {
addCriterion("type <>", value, "type");
return (Criteria) this;
}
public Criteria andBillsNumLimitGreaterThan(Integer value) {
addCriterion("bills_num_limit >", value, "billsNumLimit");
public Criteria andTypeGreaterThan(String value) {
addCriterion("type >", value, "type");
return (Criteria) this;
}
public Criteria andBillsNumLimitGreaterThanOrEqualTo(Integer value) {
addCriterion("bills_num_limit >=", value, "billsNumLimit");
public Criteria andTypeGreaterThanOrEqualTo(String value) {
addCriterion("type >=", value, "type");
return (Criteria) this;
}
public Criteria andBillsNumLimitLessThan(Integer value) {
addCriterion("bills_num_limit <", value, "billsNumLimit");
public Criteria andTypeLessThan(String value) {
addCriterion("type <", value, "type");
return (Criteria) this;
}
public Criteria andBillsNumLimitLessThanOrEqualTo(Integer value) {
addCriterion("bills_num_limit <=", value, "billsNumLimit");
public Criteria andTypeLessThanOrEqualTo(String value) {
addCriterion("type <=", value, "type");
return (Criteria) this;
}
public Criteria andBillsNumLimitIn(List<Integer> values) {
addCriterion("bills_num_limit in", values, "billsNumLimit");
public Criteria andTypeLike(String value) {
addCriterion("type like", value, "type");
return (Criteria) this;
}
public Criteria andBillsNumLimitNotIn(List<Integer> values) {
addCriterion("bills_num_limit not in", values, "billsNumLimit");
public Criteria andTypeNotLike(String value) {
addCriterion("type not like", value, "type");
return (Criteria) this;
}
public Criteria andBillsNumLimitBetween(Integer value1, Integer value2) {
addCriterion("bills_num_limit between", value1, value2, "billsNumLimit");
public Criteria andTypeIn(List<String> values) {
addCriterion("type in", values, "type");
return (Criteria) this;
}
public Criteria andBillsNumLimitNotBetween(Integer value1, Integer value2) {
addCriterion("bills_num_limit not between", value1, value2, "billsNumLimit");
public Criteria andTypeNotIn(List<String> values) {
addCriterion("type not in", values, "type");
return (Criteria) this;
}
public Criteria andTypeBetween(String value1, String value2) {
addCriterion("type between", value1, value2, "type");
return (Criteria) this;
}
public Criteria andTypeNotBetween(String value1, String value2) {
addCriterion("type not between", value1, value2, "type");
return (Criteria) this;
}
@@ -534,6 +544,66 @@ public class TenantExample {
addCriterion("create_time not between", value1, value2, "createTime");
return (Criteria) this;
}
public Criteria andExpireTimeIsNull() {
addCriterion("expire_time is null");
return (Criteria) this;
}
public Criteria andExpireTimeIsNotNull() {
addCriterion("expire_time is not null");
return (Criteria) this;
}
public Criteria andExpireTimeEqualTo(Date value) {
addCriterion("expire_time =", value, "expireTime");
return (Criteria) this;
}
public Criteria andExpireTimeNotEqualTo(Date value) {
addCriterion("expire_time <>", value, "expireTime");
return (Criteria) this;
}
public Criteria andExpireTimeGreaterThan(Date value) {
addCriterion("expire_time >", value, "expireTime");
return (Criteria) this;
}
public Criteria andExpireTimeGreaterThanOrEqualTo(Date value) {
addCriterion("expire_time >=", value, "expireTime");
return (Criteria) this;
}
public Criteria andExpireTimeLessThan(Date value) {
addCriterion("expire_time <", value, "expireTime");
return (Criteria) this;
}
public Criteria andExpireTimeLessThanOrEqualTo(Date value) {
addCriterion("expire_time <=", value, "expireTime");
return (Criteria) this;
}
public Criteria andExpireTimeIn(List<Date> values) {
addCriterion("expire_time in", values, "expireTime");
return (Criteria) this;
}
public Criteria andExpireTimeNotIn(List<Date> values) {
addCriterion("expire_time not in", values, "expireTime");
return (Criteria) this;
}
public Criteria andExpireTimeBetween(Date value1, Date value2) {
addCriterion("expire_time between", value1, value2, "expireTime");
return (Criteria) this;
}
public Criteria andExpireTimeNotBetween(Date value1, Date value2) {
addCriterion("expire_time not between", value1, value2, "expireTime");
return (Criteria) this;
}
}
public static class Criteria extends GeneratedCriteria {

10
jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/UserEx.java
View File

@@ -24,8 +24,6 @@ public class UserEx extends User{
private String userNumLimit;
private String billsNumLimit;
public String getOrgAbr() {
return orgAbr;
}
@@ -89,12 +87,4 @@ public class UserEx extends User{
public void setUserNumLimit(String userNumLimit) {
this.userNumLimit = userNumLimit;
}
public String getBillsNumLimit() {
return billsNumLimit;
}
public void setBillsNumLimit(String billsNumLimit) {
this.billsNumLimit = billsNumLimit;
}
}

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

@@ -39,10 +39,6 @@ public class TenantService {
@Value("${tenant.userNumLimit}")
private Integer userNumLimit;
@Value("${tenant.billsNumLimit}")
private Integer billsNumLimit;
public Tenant getTenant(long id)throws Exception {
Tenant result=null;
try{
@@ -71,6 +67,7 @@ public class TenantService {
if (null != list) {
for (TenantEx tenantEx : list) {
tenantEx.setCreateTimeStr(Tools.getCenternTime(tenantEx.getCreateTime()));
tenantEx.setExpireTimeStr(Tools.getCenternTime(tenantEx.getExpireTime()));
}
}
}catch(Exception e){
@@ -97,9 +94,6 @@ public class TenantService {
if(tenant.getUserNumLimit()==null) {
tenant.setUserNumLimit(userNumLimit); //默认用户限制数量
}
if(tenant.getBillsNumLimit()==null) {
tenant.setBillsNumLimit(billsNumLimit); //默认单据限制数量
}
tenant.setCreateTime(new Date());
result=tenantMapper.insertSelective(tenant);
}catch(Exception e){

1
jshERP-boot/src/main/java/com/jsh/erp/service/user/UserService.java
View File

@@ -517,7 +517,6 @@ public class UserService {
tenantObj.put("tenantId", ue.getId());
tenantObj.put("loginName",ue.getLoginName());
tenantObj.put("userNumLimit",ue.getUserNumLimit());
tenantObj.put("billsNumLimit",ue.getBillsNumLimit());
tenantService.insertTenant(tenantObj, request);
logger.info("===============创建租户信息完成===============");
if (result > 0) {