diff --git a/jshERP-boot/docs/jsh_erp.sql b/jshERP-boot/docs/jsh_erp.sql index fb266763..0bf2bc93 100644 --- a/jshERP-boot/docs/jsh_erp.sql +++ b/jshERP-boot/docs/jsh_erp.sql @@ -823,6 +823,7 @@ CREATE TABLE `jsh_tenant` ( `login_name` varchar(255) DEFAULT NULL COMMENT '登录名', `user_num_limit` int(11) DEFAULT NULL COMMENT '用户数量限制', `bills_num_limit` int(11) DEFAULT NULL COMMENT '单据数量限制', + `enabled` bit(1) DEFAULT 1 COMMENT '启用 0-禁用 1-启用', `create_time` datetime DEFAULT NULL COMMENT '创建时间', PRIMARY KEY (`id`) ) ENGINE=InnoDB AUTO_INCREMENT=21 DEFAULT CHARSET=utf8 COMMENT='租户'; @@ -830,7 +831,7 @@ CREATE TABLE `jsh_tenant` ( -- ---------------------------- -- Records of jsh_tenant -- ---------------------------- -INSERT INTO `jsh_tenant` VALUES ('13', '63', 'jsh', '20', '2000', '2021-02-17 23:19:17'); +INSERT INTO `jsh_tenant` VALUES ('13', '63', 'jsh', '20', '2000', 1, '2021-02-17 23:19:17'); -- ---------------------------- -- Table structure for jsh_unit diff --git a/jshERP-boot/docs/数据库更新记录-首次安装请勿使用.txt b/jshERP-boot/docs/数据库更新记录-首次安装请勿使用.txt index 6265ba3f..7e3876bd 100644 --- a/jshERP-boot/docs/数据库更新记录-首次安装请勿使用.txt +++ b/jshERP-boot/docs/数据库更新记录-首次安装请勿使用.txt @@ -1118,4 +1118,11 @@ alter table jsh_account_head add discount_money decimal(24,6) DEFAULT NULL COMME -- by jishenghua -- 给商品表增加附件名称字段 -- -------------------------------------------------------- -alter table jsh_material add img_name varchar(500) DEFAULT NULL COMMENT '图片名称' after remark; \ No newline at end of file +alter table jsh_material add img_name varchar(500) DEFAULT NULL COMMENT '图片名称' after remark; + +-- -------------------------------------------------------- +-- 时间 2021年7月6日 +-- by jishenghua +-- 给租户表增加字段enabled +-- -------------------------------------------------------- +alter table jsh_tenant add enabled bit(1) DEFAULT 1 COMMENT '启用 0-禁用 1-启用' after bills_num_limit; \ No newline at end of file diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/TenantController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/TenantController.java new file mode 100644 index 00000000..35dc6364 --- /dev/null +++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/TenantController.java @@ -0,0 +1,65 @@ +package com.jsh.erp.controller; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.jsh.erp.constants.BusinessConstants; +import com.jsh.erp.constants.ExceptionConstants; +import com.jsh.erp.datasource.entities.Tenant; +import com.jsh.erp.datasource.entities.User; +import com.jsh.erp.datasource.entities.UserEx; +import com.jsh.erp.datasource.vo.TreeNodeEx; +import com.jsh.erp.exception.BusinessParamCheckingException; +import com.jsh.erp.service.log.LogService; +import com.jsh.erp.service.redis.RedisService; +import com.jsh.erp.service.tenant.TenantService; +import com.jsh.erp.service.user.UserService; +import com.jsh.erp.utils.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; + +import static com.jsh.erp.utils.ResponseJsonUtil.returnJson; + +/** + * @author ji_sheng_hua 华夏erp + */ +@RestController +@RequestMapping(value = "/tenant") +public class TenantController { + private Logger logger = LoggerFactory.getLogger(TenantController.class); + + @Resource + private TenantService tenantService; + + /** + * 批量设置状态-启用或者禁用 + * @param jsonObject + * @param request + * @return + */ + @PostMapping(value = "/batchSetStatus") + public String batchSetStatus(@RequestBody JSONObject jsonObject, + HttpServletRequest request)throws Exception { + Boolean status = jsonObject.getBoolean("status"); + String ids = jsonObject.getString("ids"); + Map objectMap = new HashMap<>(); + int res = tenantService.batchSetStatus(status, ids); + if(res > 0) { + return returnJson(objectMap, ErpInfo.OK.name, ErpInfo.OK.code); + } else { + return returnJson(objectMap, ErpInfo.ERROR.name, ErpInfo.ERROR.code); + } + } +} diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/UserController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/UserController.java index 4c76fb5e..12411aa4 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/controller/UserController.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/UserController.java @@ -107,6 +107,9 @@ public class UserController { case ExceptionCodeConstants.UserExceptionCode.USER_ACCESS_EXCEPTION: msgTip = "access service error"; break; + case ExceptionCodeConstants.UserExceptionCode.BLACK_TENANT: + msgTip = "tenant is black"; + break; case ExceptionCodeConstants.UserExceptionCode.USER_CONDITION_FIT: msgTip = "user can login"; //验证通过 ，可以登录，放入session，记录登录日志 diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/Tenant.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/Tenant.java index bbcd85f5..d33818f2 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/Tenant.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/Tenant.java @@ -1,197 +1,75 @@ -package com.jsh.erp.datasource.entities; - -import java.util.Date; - -public class Tenant { - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_tenant.id - * - * @mbggenerated - */ - private Long id; - - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_tenant.tenant_id - * - * @mbggenerated - */ - private Long tenantId; - - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_tenant.login_name - * - * @mbggenerated - */ - private String loginName; - - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_tenant.user_num_limit - * - * @mbggenerated - */ - private Integer userNumLimit; - - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_tenant.bills_num_limit - * - * @mbggenerated - */ - private Integer billsNumLimit; - - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database column jsh_tenant.create_time - * - * @mbggenerated - */ - private Date createTime; - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_tenant.id - * - * @return the value of jsh_tenant.id - * - * @mbggenerated - */ - public Long getId() { - return id; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_tenant.id - * - * @param id the value for jsh_tenant.id - * - * @mbggenerated - */ - public void setId(Long id) { - this.id = id; - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_tenant.tenant_id - * - * @return the value of jsh_tenant.tenant_id - * - * @mbggenerated - */ - public Long getTenantId() { - return tenantId; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_tenant.tenant_id - * - * @param tenantId the value for jsh_tenant.tenant_id - * - * @mbggenerated - */ - public void setTenantId(Long tenantId) { - this.tenantId = tenantId; - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_tenant.login_name - * - * @return the value of jsh_tenant.login_name - * - * @mbggenerated - */ - public String getLoginName() { - return loginName; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_tenant.login_name - * - * @param loginName the value for jsh_tenant.login_name - * - * @mbggenerated - */ - public void setLoginName(String loginName) { - this.loginName = loginName == null ? null : loginName.trim(); - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_tenant.user_num_limit - * - * @return the value of jsh_tenant.user_num_limit - * - * @mbggenerated - */ - public Integer getUserNumLimit() { - return userNumLimit; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_tenant.user_num_limit - * - * @param userNumLimit the value for jsh_tenant.user_num_limit - * - * @mbggenerated - */ - public void setUserNumLimit(Integer userNumLimit) { - this.userNumLimit = userNumLimit; - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_tenant.bills_num_limit - * - * @return the value of jsh_tenant.bills_num_limit - * - * @mbggenerated - */ - public Integer getBillsNumLimit() { - return billsNumLimit; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_tenant.bills_num_limit - * - * @param billsNumLimit the value for jsh_tenant.bills_num_limit - * - * @mbggenerated - */ - public void setBillsNumLimit(Integer billsNumLimit) { - this.billsNumLimit = billsNumLimit; - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column jsh_tenant.create_time - * - * @return the value of jsh_tenant.create_time - * - * @mbggenerated - */ - public Date getCreateTime() { - return createTime; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column jsh_tenant.create_time - * - * @param createTime the value for jsh_tenant.create_time - * - * @mbggenerated - */ - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } +package com.jsh.erp.datasource.entities; + +import java.util.Date; + +public class Tenant { + private Long id; + + private Long tenantId; + + private String loginName; + + private Integer userNumLimit; + + private Integer billsNumLimit; + + private Boolean enabled; + + private Date createTime; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getTenantId() { + return tenantId; + } + + public void setTenantId(Long tenantId) { + this.tenantId = tenantId; + } + + public String getLoginName() { + return loginName; + } + + public void setLoginName(String loginName) { + this.loginName = loginName == null ? null : loginName.trim(); + } + + public Integer getUserNumLimit() { + return userNumLimit; + } + + public void setUserNumLimit(Integer userNumLimit) { + this.userNumLimit = userNumLimit; + } + + public Integer getBillsNumLimit() { + return billsNumLimit; + } + + public void setBillsNumLimit(Integer billsNumLimit) { + this.billsNumLimit = billsNumLimit; + } + + public Boolean getEnabled() { + return enabled; + } + + public void setEnabled(Boolean enabled) { + this.enabled = enabled; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } } \ No newline at end of file diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/TenantExample.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/TenantExample.java index c196986b..65e82872 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/TenantExample.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/TenantExample.java @@ -1,673 +1,630 @@ -package com.jsh.erp.datasource.entities; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -public class TenantExample { - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table jsh_tenant - * - * @mbggenerated - */ - protected String orderByClause; - - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table jsh_tenant - * - * @mbggenerated - */ - protected boolean distinct; - - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table jsh_tenant - * - * @mbggenerated - */ - protected List oredCriteria; - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_tenant - * - * @mbggenerated - */ - public TenantExample() { - oredCriteria = new ArrayList(); - } - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_tenant - * - * @mbggenerated - */ - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_tenant - * - * @mbggenerated - */ - public String getOrderByClause() { - return orderByClause; - } - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_tenant - * - * @mbggenerated - */ - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_tenant - * - * @mbggenerated - */ - public boolean isDistinct() { - return distinct; - } - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_tenant - * - * @mbggenerated - */ - public List getOredCriteria() { - return oredCriteria; - } - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_tenant - * - * @mbggenerated - */ - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_tenant - * - * @mbggenerated - */ - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_tenant - * - * @mbggenerated - */ - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_tenant - * - * @mbggenerated - */ - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_tenant - * - * @mbggenerated - */ - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - /** - * This class was generated by MyBatis Generator. - * This class corresponds to the database table jsh_tenant - * - * @mbggenerated - */ - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andIdIsNull() { - addCriterion("id is null"); - return (Criteria) this; - } - - public Criteria andIdIsNotNull() { - addCriterion("id is not null"); - return (Criteria) this; - } - - public Criteria andIdEqualTo(Long value) { - addCriterion("id =", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotEqualTo(Long value) { - addCriterion("id <>", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThan(Long value) { - addCriterion("id >", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThanOrEqualTo(Long value) { - addCriterion("id >=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThan(Long value) { - addCriterion("id <", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThanOrEqualTo(Long value) { - addCriterion("id <=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdIn(List values) { - addCriterion("id in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdNotIn(List values) { - addCriterion("id not in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdBetween(Long value1, Long value2) { - addCriterion("id between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andIdNotBetween(Long value1, Long value2) { - addCriterion("id not between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andTenantIdIsNull() { - addCriterion("tenant_id is null"); - return (Criteria) this; - } - - public Criteria andTenantIdIsNotNull() { - addCriterion("tenant_id is not null"); - return (Criteria) this; - } - - public Criteria andTenantIdEqualTo(Long value) { - addCriterion("tenant_id =", value, "tenantId"); - return (Criteria) this; - } - - public Criteria andTenantIdNotEqualTo(Long value) { - addCriterion("tenant_id <>", value, "tenantId"); - return (Criteria) this; - } - - public Criteria andTenantIdGreaterThan(Long value) { - addCriterion("tenant_id >", value, "tenantId"); - return (Criteria) this; - } - - public Criteria andTenantIdGreaterThanOrEqualTo(Long value) { - addCriterion("tenant_id >=", value, "tenantId"); - return (Criteria) this; - } - - public Criteria andTenantIdLessThan(Long value) { - addCriterion("tenant_id <", value, "tenantId"); - return (Criteria) this; - } - - public Criteria andTenantIdLessThanOrEqualTo(Long value) { - addCriterion("tenant_id <=", value, "tenantId"); - return (Criteria) this; - } - - public Criteria andTenantIdIn(List values) { - addCriterion("tenant_id in", values, "tenantId"); - return (Criteria) this; - } - - public Criteria andTenantIdNotIn(List values) { - addCriterion("tenant_id not in", values, "tenantId"); - return (Criteria) this; - } - - public Criteria andTenantIdBetween(Long value1, Long value2) { - addCriterion("tenant_id between", value1, value2, "tenantId"); - return (Criteria) this; - } - - public Criteria andTenantIdNotBetween(Long value1, Long value2) { - addCriterion("tenant_id not between", value1, value2, "tenantId"); - return (Criteria) this; - } - - public Criteria andLoginNameIsNull() { - addCriterion("login_name is null"); - return (Criteria) this; - } - - public Criteria andLoginNameIsNotNull() { - addCriterion("login_name is not null"); - return (Criteria) this; - } - - public Criteria andLoginNameEqualTo(String value) { - addCriterion("login_name =", value, "loginName"); - return (Criteria) this; - } - - public Criteria andLoginNameNotEqualTo(String value) { - addCriterion("login_name <>", value, "loginName"); - return (Criteria) this; - } - - public Criteria andLoginNameGreaterThan(String value) { - addCriterion("login_name >", value, "loginName"); - return (Criteria) this; - } - - public Criteria andLoginNameGreaterThanOrEqualTo(String value) { - addCriterion("login_name >=", value, "loginName"); - return (Criteria) this; - } - - public Criteria andLoginNameLessThan(String value) { - addCriterion("login_name <", value, "loginName"); - return (Criteria) this; - } - - public Criteria andLoginNameLessThanOrEqualTo(String value) { - addCriterion("login_name <=", value, "loginName"); - return (Criteria) this; - } - - public Criteria andLoginNameLike(String value) { - addCriterion("login_name like", value, "loginName"); - return (Criteria) this; - } - - public Criteria andLoginNameNotLike(String value) { - addCriterion("login_name not like", value, "loginName"); - return (Criteria) this; - } - - public Criteria andLoginNameIn(List values) { - addCriterion("login_name in", values, "loginName"); - return (Criteria) this; - } - - public Criteria andLoginNameNotIn(List values) { - addCriterion("login_name not in", values, "loginName"); - return (Criteria) this; - } - - public Criteria andLoginNameBetween(String value1, String value2) { - addCriterion("login_name between", value1, value2, "loginName"); - return (Criteria) this; - } - - public Criteria andLoginNameNotBetween(String value1, String value2) { - addCriterion("login_name not between", value1, value2, "loginName"); - return (Criteria) this; - } - - public Criteria andUserNumLimitIsNull() { - addCriterion("user_num_limit is null"); - return (Criteria) this; - } - - public Criteria andUserNumLimitIsNotNull() { - addCriterion("user_num_limit is not null"); - return (Criteria) this; - } - - public Criteria andUserNumLimitEqualTo(Integer value) { - addCriterion("user_num_limit =", value, "userNumLimit"); - return (Criteria) this; - } - - public Criteria andUserNumLimitNotEqualTo(Integer value) { - addCriterion("user_num_limit <>", value, "userNumLimit"); - return (Criteria) this; - } - - public Criteria andUserNumLimitGreaterThan(Integer value) { - addCriterion("user_num_limit >", value, "userNumLimit"); - return (Criteria) this; - } - - public Criteria andUserNumLimitGreaterThanOrEqualTo(Integer value) { - addCriterion("user_num_limit >=", value, "userNumLimit"); - return (Criteria) this; - } - - public Criteria andUserNumLimitLessThan(Integer value) { - addCriterion("user_num_limit <", value, "userNumLimit"); - return (Criteria) this; - } - - public Criteria andUserNumLimitLessThanOrEqualTo(Integer value) { - addCriterion("user_num_limit <=", value, "userNumLimit"); - return (Criteria) this; - } - - public Criteria andUserNumLimitIn(List values) { - addCriterion("user_num_limit in", values, "userNumLimit"); - return (Criteria) this; - } - - public Criteria andUserNumLimitNotIn(List values) { - addCriterion("user_num_limit not in", values, "userNumLimit"); - return (Criteria) this; - } - - public Criteria andUserNumLimitBetween(Integer value1, Integer value2) { - addCriterion("user_num_limit between", value1, value2, "userNumLimit"); - return (Criteria) this; - } - - public Criteria andUserNumLimitNotBetween(Integer value1, Integer value2) { - addCriterion("user_num_limit not between", value1, value2, "userNumLimit"); - return (Criteria) this; - } - - public Criteria andBillsNumLimitIsNull() { - addCriterion("bills_num_limit is null"); - return (Criteria) this; - } - - public Criteria andBillsNumLimitIsNotNull() { - addCriterion("bills_num_limit is not null"); - return (Criteria) this; - } - - public Criteria andBillsNumLimitEqualTo(Integer value) { - addCriterion("bills_num_limit =", value, "billsNumLimit"); - return (Criteria) this; - } - - public Criteria andBillsNumLimitNotEqualTo(Integer value) { - addCriterion("bills_num_limit <>", value, "billsNumLimit"); - return (Criteria) this; - } - - public Criteria andBillsNumLimitGreaterThan(Integer value) { - addCriterion("bills_num_limit >", value, "billsNumLimit"); - return (Criteria) this; - } - - public Criteria andBillsNumLimitGreaterThanOrEqualTo(Integer value) { - addCriterion("bills_num_limit >=", value, "billsNumLimit"); - return (Criteria) this; - } - - public Criteria andBillsNumLimitLessThan(Integer value) { - addCriterion("bills_num_limit <", value, "billsNumLimit"); - return (Criteria) this; - } - - public Criteria andBillsNumLimitLessThanOrEqualTo(Integer value) { - addCriterion("bills_num_limit <=", value, "billsNumLimit"); - return (Criteria) this; - } - - public Criteria andBillsNumLimitIn(List values) { - addCriterion("bills_num_limit in", values, "billsNumLimit"); - return (Criteria) this; - } - - public Criteria andBillsNumLimitNotIn(List values) { - addCriterion("bills_num_limit not in", values, "billsNumLimit"); - return (Criteria) this; - } - - public Criteria andBillsNumLimitBetween(Integer value1, Integer value2) { - addCriterion("bills_num_limit between", value1, value2, "billsNumLimit"); - return (Criteria) this; - } - - public Criteria andBillsNumLimitNotBetween(Integer value1, Integer value2) { - addCriterion("bills_num_limit not between", value1, value2, "billsNumLimit"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNull() { - addCriterion("create_time is null"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNotNull() { - addCriterion("create_time is not null"); - return (Criteria) this; - } - - public Criteria andCreateTimeEqualTo(Date value) { - addCriterion("create_time =", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotEqualTo(Date value) { - addCriterion("create_time <>", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThan(Date value) { - addCriterion("create_time >", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { - addCriterion("create_time >=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThan(Date value) { - addCriterion("create_time <", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThanOrEqualTo(Date value) { - addCriterion("create_time <=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeIn(List values) { - addCriterion("create_time in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotIn(List values) { - addCriterion("create_time not in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeBetween(Date value1, Date value2) { - addCriterion("create_time between", value1, value2, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotBetween(Date value1, Date value2) { - addCriterion("create_time not between", value1, value2, "createTime"); - return (Criteria) this; - } - } - - /** - * This class was generated by MyBatis Generator. - * This class corresponds to the database table jsh_tenant - * - * @mbggenerated do_not_delete_during_merge - */ - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - /** - * This class was generated by MyBatis Generator. - * This class corresponds to the database table jsh_tenant - * - * @mbggenerated - */ - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } +package com.jsh.erp.datasource.entities; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class TenantExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public TenantExample() { + oredCriteria = new ArrayList<>(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + oredCriteria.add(criteria); + } + return criteria; + } + + protected Criteria createCriteriaInternal() { + Criteria criteria = new Criteria(); + return criteria; + } + + public void clear() { + oredCriteria.clear(); + orderByClause = null; + distinct = false; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList<>(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + criteria.add(new Criterion(condition)); + } + + protected void addCriterion(String condition, Object value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value)); + } + + protected void addCriterion(String condition, Object value1, Object value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value1, value2)); + } + + public Criteria andIdIsNull() { + addCriterion("id is null"); + return (Criteria) this; + } + + public Criteria andIdIsNotNull() { + addCriterion("id is not null"); + return (Criteria) this; + } + + public Criteria andIdEqualTo(Long value) { + addCriterion("id =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(Long value) { + addCriterion("id <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(Long value) { + addCriterion("id >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(Long value) { + addCriterion("id >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(Long value) { + addCriterion("id <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(Long value) { + addCriterion("id <=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdBetween(Long value1, Long value2) { + addCriterion("id between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(Long value1, Long value2) { + addCriterion("id not between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andTenantIdIsNull() { + addCriterion("tenant_id is null"); + return (Criteria) this; + } + + public Criteria andTenantIdIsNotNull() { + addCriterion("tenant_id is not null"); + return (Criteria) this; + } + + public Criteria andTenantIdEqualTo(Long value) { + addCriterion("tenant_id =", value, "tenantId"); + return (Criteria) this; + } + + public Criteria andTenantIdNotEqualTo(Long value) { + addCriterion("tenant_id <>", value, "tenantId"); + return (Criteria) this; + } + + public Criteria andTenantIdGreaterThan(Long value) { + addCriterion("tenant_id >", value, "tenantId"); + return (Criteria) this; + } + + public Criteria andTenantIdGreaterThanOrEqualTo(Long value) { + addCriterion("tenant_id >=", value, "tenantId"); + return (Criteria) this; + } + + public Criteria andTenantIdLessThan(Long value) { + addCriterion("tenant_id <", value, "tenantId"); + return (Criteria) this; + } + + public Criteria andTenantIdLessThanOrEqualTo(Long value) { + addCriterion("tenant_id <=", value, "tenantId"); + return (Criteria) this; + } + + public Criteria andTenantIdIn(List values) { + addCriterion("tenant_id in", values, "tenantId"); + return (Criteria) this; + } + + public Criteria andTenantIdNotIn(List values) { + addCriterion("tenant_id not in", values, "tenantId"); + return (Criteria) this; + } + + public Criteria andTenantIdBetween(Long value1, Long value2) { + addCriterion("tenant_id between", value1, value2, "tenantId"); + return (Criteria) this; + } + + public Criteria andTenantIdNotBetween(Long value1, Long value2) { + addCriterion("tenant_id not between", value1, value2, "tenantId"); + return (Criteria) this; + } + + public Criteria andLoginNameIsNull() { + addCriterion("login_name is null"); + return (Criteria) this; + } + + public Criteria andLoginNameIsNotNull() { + addCriterion("login_name is not null"); + return (Criteria) this; + } + + public Criteria andLoginNameEqualTo(String value) { + addCriterion("login_name =", value, "loginName"); + return (Criteria) this; + } + + public Criteria andLoginNameNotEqualTo(String value) { + addCriterion("login_name <>", value, "loginName"); + return (Criteria) this; + } + + public Criteria andLoginNameGreaterThan(String value) { + addCriterion("login_name >", value, "loginName"); + return (Criteria) this; + } + + public Criteria andLoginNameGreaterThanOrEqualTo(String value) { + addCriterion("login_name >=", value, "loginName"); + return (Criteria) this; + } + + public Criteria andLoginNameLessThan(String value) { + addCriterion("login_name <", value, "loginName"); + return (Criteria) this; + } + + public Criteria andLoginNameLessThanOrEqualTo(String value) { + addCriterion("login_name <=", value, "loginName"); + return (Criteria) this; + } + + public Criteria andLoginNameLike(String value) { + addCriterion("login_name like", value, "loginName"); + return (Criteria) this; + } + + public Criteria andLoginNameNotLike(String value) { + addCriterion("login_name not like", value, "loginName"); + return (Criteria) this; + } + + public Criteria andLoginNameIn(List values) { + addCriterion("login_name in", values, "loginName"); + return (Criteria) this; + } + + public Criteria andLoginNameNotIn(List values) { + addCriterion("login_name not in", values, "loginName"); + return (Criteria) this; + } + + public Criteria andLoginNameBetween(String value1, String value2) { + addCriterion("login_name between", value1, value2, "loginName"); + return (Criteria) this; + } + + public Criteria andLoginNameNotBetween(String value1, String value2) { + addCriterion("login_name not between", value1, value2, "loginName"); + return (Criteria) this; + } + + public Criteria andUserNumLimitIsNull() { + addCriterion("user_num_limit is null"); + return (Criteria) this; + } + + public Criteria andUserNumLimitIsNotNull() { + addCriterion("user_num_limit is not null"); + return (Criteria) this; + } + + public Criteria andUserNumLimitEqualTo(Integer value) { + addCriterion("user_num_limit =", value, "userNumLimit"); + return (Criteria) this; + } + + public Criteria andUserNumLimitNotEqualTo(Integer value) { + addCriterion("user_num_limit <>", value, "userNumLimit"); + return (Criteria) this; + } + + public Criteria andUserNumLimitGreaterThan(Integer value) { + addCriterion("user_num_limit >", value, "userNumLimit"); + return (Criteria) this; + } + + public Criteria andUserNumLimitGreaterThanOrEqualTo(Integer value) { + addCriterion("user_num_limit >=", value, "userNumLimit"); + return (Criteria) this; + } + + public Criteria andUserNumLimitLessThan(Integer value) { + addCriterion("user_num_limit <", value, "userNumLimit"); + return (Criteria) this; + } + + public Criteria andUserNumLimitLessThanOrEqualTo(Integer value) { + addCriterion("user_num_limit <=", value, "userNumLimit"); + return (Criteria) this; + } + + public Criteria andUserNumLimitIn(List values) { + addCriterion("user_num_limit in", values, "userNumLimit"); + return (Criteria) this; + } + + public Criteria andUserNumLimitNotIn(List values) { + addCriterion("user_num_limit not in", values, "userNumLimit"); + return (Criteria) this; + } + + public Criteria andUserNumLimitBetween(Integer value1, Integer value2) { + addCriterion("user_num_limit between", value1, value2, "userNumLimit"); + return (Criteria) this; + } + + public Criteria andUserNumLimitNotBetween(Integer value1, Integer value2) { + addCriterion("user_num_limit not between", value1, value2, "userNumLimit"); + return (Criteria) this; + } + + public Criteria andBillsNumLimitIsNull() { + addCriterion("bills_num_limit is null"); + return (Criteria) this; + } + + public Criteria andBillsNumLimitIsNotNull() { + addCriterion("bills_num_limit is not null"); + return (Criteria) this; + } + + public Criteria andBillsNumLimitEqualTo(Integer value) { + addCriterion("bills_num_limit =", value, "billsNumLimit"); + return (Criteria) this; + } + + public Criteria andBillsNumLimitNotEqualTo(Integer value) { + addCriterion("bills_num_limit <>", value, "billsNumLimit"); + return (Criteria) this; + } + + public Criteria andBillsNumLimitGreaterThan(Integer value) { + addCriterion("bills_num_limit >", value, "billsNumLimit"); + return (Criteria) this; + } + + public Criteria andBillsNumLimitGreaterThanOrEqualTo(Integer value) { + addCriterion("bills_num_limit >=", value, "billsNumLimit"); + return (Criteria) this; + } + + public Criteria andBillsNumLimitLessThan(Integer value) { + addCriterion("bills_num_limit <", value, "billsNumLimit"); + return (Criteria) this; + } + + public Criteria andBillsNumLimitLessThanOrEqualTo(Integer value) { + addCriterion("bills_num_limit <=", value, "billsNumLimit"); + return (Criteria) this; + } + + public Criteria andBillsNumLimitIn(List values) { + addCriterion("bills_num_limit in", values, "billsNumLimit"); + return (Criteria) this; + } + + public Criteria andBillsNumLimitNotIn(List values) { + addCriterion("bills_num_limit not in", values, "billsNumLimit"); + return (Criteria) this; + } + + public Criteria andBillsNumLimitBetween(Integer value1, Integer value2) { + addCriterion("bills_num_limit between", value1, value2, "billsNumLimit"); + return (Criteria) this; + } + + public Criteria andBillsNumLimitNotBetween(Integer value1, Integer value2) { + addCriterion("bills_num_limit not between", value1, value2, "billsNumLimit"); + return (Criteria) this; + } + + public Criteria andEnabledIsNull() { + addCriterion("enabled is null"); + return (Criteria) this; + } + + public Criteria andEnabledIsNotNull() { + addCriterion("enabled is not null"); + return (Criteria) this; + } + + public Criteria andEnabledEqualTo(Boolean value) { + addCriterion("enabled =", value, "enabled"); + return (Criteria) this; + } + + public Criteria andEnabledNotEqualTo(Boolean value) { + addCriterion("enabled <>", value, "enabled"); + return (Criteria) this; + } + + public Criteria andEnabledGreaterThan(Boolean value) { + addCriterion("enabled >", value, "enabled"); + return (Criteria) this; + } + + public Criteria andEnabledGreaterThanOrEqualTo(Boolean value) { + addCriterion("enabled >=", value, "enabled"); + return (Criteria) this; + } + + public Criteria andEnabledLessThan(Boolean value) { + addCriterion("enabled <", value, "enabled"); + return (Criteria) this; + } + + public Criteria andEnabledLessThanOrEqualTo(Boolean value) { + addCriterion("enabled <=", value, "enabled"); + return (Criteria) this; + } + + public Criteria andEnabledIn(List values) { + addCriterion("enabled in", values, "enabled"); + return (Criteria) this; + } + + public Criteria andEnabledNotIn(List values) { + addCriterion("enabled not in", values, "enabled"); + return (Criteria) this; + } + + public Criteria andEnabledBetween(Boolean value1, Boolean value2) { + addCriterion("enabled between", value1, value2, "enabled"); + return (Criteria) this; + } + + public Criteria andEnabledNotBetween(Boolean value1, Boolean value2) { + addCriterion("enabled not between", value1, value2, "enabled"); + return (Criteria) this; + } + + public Criteria andCreateTimeIsNull() { + addCriterion("create_time is null"); + return (Criteria) this; + } + + public Criteria andCreateTimeIsNotNull() { + addCriterion("create_time is not null"); + return (Criteria) this; + } + + public Criteria andCreateTimeEqualTo(Date value) { + addCriterion("create_time =", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotEqualTo(Date value) { + addCriterion("create_time <>", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThan(Date value) { + addCriterion("create_time >", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { + addCriterion("create_time >=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThan(Date value) { + addCriterion("create_time <", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThanOrEqualTo(Date value) { + addCriterion("create_time <=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeIn(List values) { + addCriterion("create_time in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotIn(List values) { + addCriterion("create_time not in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeBetween(Date value1, Date value2) { + addCriterion("create_time between", value1, value2, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotBetween(Date value1, Date value2) { + addCriterion("create_time not between", value1, value2, "createTime"); + return (Criteria) this; + } + } + + public static class Criteria extends GeneratedCriteria { + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } } \ No newline at end of file diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/TenantMapper.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/TenantMapper.java index 04069777..796e4b38 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/TenantMapper.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/TenantMapper.java @@ -1,96 +1,30 @@ -package com.jsh.erp.datasource.mappers; - -import com.jsh.erp.datasource.entities.Tenant; -import com.jsh.erp.datasource.entities.TenantExample; -import java.util.List; -import org.apache.ibatis.annotations.Param; - -public interface TenantMapper { - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_tenant - * - * @mbggenerated - */ - int countByExample(TenantExample example); - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_tenant - * - * @mbggenerated - */ - int deleteByExample(TenantExample example); - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_tenant - * - * @mbggenerated - */ - int deleteByPrimaryKey(Long id); - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_tenant - * - * @mbggenerated - */ - int insert(Tenant record); - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_tenant - * - * @mbggenerated - */ - int insertSelective(Tenant record); - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_tenant - * - * @mbggenerated - */ - List selectByExample(TenantExample example); - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_tenant - * - * @mbggenerated - */ - Tenant selectByPrimaryKey(Long id); - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_tenant - * - * @mbggenerated - */ - int updateByExampleSelective(@Param("record") Tenant record, @Param("example") TenantExample example); - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_tenant - * - * @mbggenerated - */ - int updateByExample(@Param("record") Tenant record, @Param("example") TenantExample example); - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_tenant - * - * @mbggenerated - */ - int updateByPrimaryKeySelective(Tenant record); - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_tenant - * - * @mbggenerated - */ - int updateByPrimaryKey(Tenant record); +package com.jsh.erp.datasource.mappers; + +import com.jsh.erp.datasource.entities.Tenant; +import com.jsh.erp.datasource.entities.TenantExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface TenantMapper { + long countByExample(TenantExample example); + + int deleteByExample(TenantExample example); + + int deleteByPrimaryKey(Long id); + + int insert(Tenant record); + + int insertSelective(Tenant record); + + List selectByExample(TenantExample example); + + Tenant selectByPrimaryKey(Long id); + + int updateByExampleSelective(@Param("record") Tenant record, @Param("example") TenantExample example); + + int updateByExample(@Param("record") Tenant record, @Param("example") TenantExample example); + + int updateByPrimaryKeySelective(Tenant record); + + int updateByPrimaryKey(Tenant record); } \ No newline at end of file diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java index dceb9e4b..2debf9b8 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java @@ -264,17 +264,22 @@ public class DepotHeadService { } } } - /**删除单据子表数据*/ - try { - depotItemMapperEx.batchDeleteDepotItemByDepotHeadIds(new Long[]{id}); - //更新当前库存 - List list = depotItemService.getListByHeaderId(id); - for (DepotItem depotItem : list) { - Long tenantId = redisService.getTenantId(request); - depotItemService.updateCurrentStock(depotItem, tenantId); + //对于零售出库单据，更新会员的预收款信息 + if (BusinessConstants.DEPOTHEAD_TYPE_OUT.equals(depotHead.getType()) + && BusinessConstants.SUB_TYPE_TRANSFER.equals(depotHead.getSubType())){ + if(BusinessConstants.PAY_TYPE_PREPAID.equals(depotHead.getPayType())) { + if (depotHead.getOrganId() != null) { + supplierService.updateAdvanceIn(depotHead.getOrganId(), depotHead.getTotalPrice().abs()); + } } - } catch (Exception e) { - JshException.writeFail(logger, e); + } + /**删除单据子表数据*/ + depotItemMapperEx.batchDeleteDepotItemByDepotHeadIds(new Long[]{id}); + //更新当前库存 + List list = depotItemService.getListByHeaderId(id); + for (DepotItem depotItem : list) { + Long tenantId = redisService.getTenantId(request); + depotItemService.updateCurrentStock(depotItem, tenantId); } /**删除单据主表信息*/ batchDeleteDepotHeadByIds(id.toString()); diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/tenant/TenantService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/tenant/TenantService.java index 968e331e..81ec4330 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/tenant/TenantService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/tenant/TenantService.java @@ -8,6 +8,7 @@ import com.jsh.erp.datasource.mappers.TenantMapper; import com.jsh.erp.datasource.mappers.TenantMapperEx; import com.jsh.erp.exception.BusinessRunTimeException; import com.jsh.erp.exception.JshException; +import com.jsh.erp.service.log.LogService; import com.jsh.erp.utils.StringUtil; import com.jsh.erp.utils.Tools; import org.slf4j.Logger; @@ -15,6 +16,8 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; @@ -30,6 +33,9 @@ public class TenantService { @Resource private TenantMapperEx tenantMapperEx; + @Resource + private LogService logService; + @Value("${tenant.userNumLimit}") private Integer userNumLimit; @@ -161,4 +167,28 @@ public class TenantService { } return tenant; } + + public int batchSetStatus(Boolean status, String ids)throws Exception { + int result=0; + try{ + String statusStr =""; + if(status) { + statusStr ="批量启用"; + } else { + statusStr ="批量禁用"; + } + logService.insertLog("用户", + new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_EDIT).append(ids).append("-").append(statusStr).toString(), + ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest()); + List idList = StringUtil.strToLongList(ids); + Tenant tenant = new Tenant(); + tenant.setEnabled(status); + TenantExample example = new TenantExample(); + example.createCriteria().andIdIn(idList); + result = tenantMapper.updateByExampleSelective(tenant, example); + }catch(Exception e){ + JshException.writeFail(logger, e); + } + return result; + } } diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/user/UserService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/user/UserService.java index e122c378..01591954 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/user/UserService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/user/UserService.java @@ -295,6 +295,11 @@ public class UserService { if(list.get(0).getStatus()!=0) { return ExceptionCodeConstants.UserExceptionCode.BLACK_USER; } + Long tenantId = list.get(0).getTenantId(); + Tenant tenant = tenantService.getTenantByTenantId(tenantId); + if(tenant!=null && tenant.getEnabled()!=null && !tenant.getEnabled()) { + return ExceptionCodeConstants.UserExceptionCode.BLACK_TENANT; + } } } catch (Exception e) { logger.error(">>>>>>>>访问验证用户姓名是否存在后台信息异常", e); diff --git a/jshERP-boot/src/main/java/com/jsh/erp/utils/ExceptionCodeConstants.java b/jshERP-boot/src/main/java/com/jsh/erp/utils/ExceptionCodeConstants.java index 9c235d8c..c19f6962 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/utils/ExceptionCodeConstants.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/utils/ExceptionCodeConstants.java @@ -16,7 +16,7 @@ public interface ExceptionCodeConstants { public static final int USER_PASSWORD_ERROR = 2; /** - * 被加入黑名单 + * 用户被加入黑名单 */ public static final int BLACK_USER = 3; @@ -29,5 +29,10 @@ public interface ExceptionCodeConstants { * 访问数据库异常 */ public static final int USER_ACCESS_EXCEPTION = 5; + + /** + * 租户被加入黑名单 + */ + public static final int BLACK_TENANT = 6; } } diff --git a/jshERP-boot/src/main/resources/mapper_xml/TenantMapper.xml b/jshERP-boot/src/main/resources/mapper_xml/TenantMapper.xml index b941f938..ab379011 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/TenantMapper.xml +++ b/jshERP-boot/src/main/resources/mapper_xml/TenantMapper.xml @@ -1,288 +1,243 @@ - - - - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - id, tenant_id, login_name, user_num_limit, bills_num_limit, create_time - - - - - - delete from jsh_tenant - where id = #{id,jdbcType=BIGINT} - - - - delete from jsh_tenant - - - - - - - insert into jsh_tenant (id, tenant_id, login_name, - user_num_limit, bills_num_limit, create_time - ) - values (#{id,jdbcType=BIGINT}, #{tenantId,jdbcType=BIGINT}, #{loginName,jdbcType=VARCHAR}, - #{userNumLimit,jdbcType=INTEGER}, #{billsNumLimit,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP} - ) - - - - insert into jsh_tenant - - - id, - - - tenant_id, - - - login_name, - - - user_num_limit, - - - bills_num_limit, - - - create_time, - - - - - #{id,jdbcType=BIGINT}, - - - #{tenantId,jdbcType=BIGINT}, - - - #{loginName,jdbcType=VARCHAR}, - - - #{userNumLimit,jdbcType=INTEGER}, - - - #{billsNumLimit,jdbcType=INTEGER}, - - - #{createTime,jdbcType=TIMESTAMP}, - - - - - - - update jsh_tenant - - - id = #{record.id,jdbcType=BIGINT}, - - - tenant_id = #{record.tenantId,jdbcType=BIGINT}, - - - login_name = #{record.loginName,jdbcType=VARCHAR}, - - - user_num_limit = #{record.userNumLimit,jdbcType=INTEGER}, - - - bills_num_limit = #{record.billsNumLimit,jdbcType=INTEGER}, - - - create_time = #{record.createTime,jdbcType=TIMESTAMP}, - - - - - - - - - update jsh_tenant - set id = #{record.id,jdbcType=BIGINT}, - tenant_id = #{record.tenantId,jdbcType=BIGINT}, - login_name = #{record.loginName,jdbcType=VARCHAR}, - user_num_limit = #{record.userNumLimit,jdbcType=INTEGER}, - bills_num_limit = #{record.billsNumLimit,jdbcType=INTEGER}, - create_time = #{record.createTime,jdbcType=TIMESTAMP} - - - - - - - update jsh_tenant - - - tenant_id = #{tenantId,jdbcType=BIGINT}, - - - login_name = #{loginName,jdbcType=VARCHAR}, - - - user_num_limit = #{userNumLimit,jdbcType=INTEGER}, - - - bills_num_limit = #{billsNumLimit,jdbcType=INTEGER}, - - - create_time = #{createTime,jdbcType=TIMESTAMP}, - - - where id = #{id,jdbcType=BIGINT} - - - - update jsh_tenant - set tenant_id = #{tenantId,jdbcType=BIGINT}, - login_name = #{loginName,jdbcType=VARCHAR}, - user_num_limit = #{userNumLimit,jdbcType=INTEGER}, - bills_num_limit = #{billsNumLimit,jdbcType=INTEGER}, - create_time = #{createTime,jdbcType=TIMESTAMP} - where id = #{id,jdbcType=BIGINT} - + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, tenant_id, login_name, user_num_limit, bills_num_limit, enabled, create_time + + + + + delete from jsh_tenant + where id = #{id,jdbcType=BIGINT} + + + delete from jsh_tenant + + + + + + insert into jsh_tenant (id, tenant_id, login_name, + user_num_limit, bills_num_limit, enabled, + create_time) + values (#{id,jdbcType=BIGINT}, #{tenantId,jdbcType=BIGINT}, #{loginName,jdbcType=VARCHAR}, + #{userNumLimit,jdbcType=INTEGER}, #{billsNumLimit,jdbcType=INTEGER}, #{enabled,jdbcType=BIT}, + #{createTime,jdbcType=TIMESTAMP}) + + + insert into jsh_tenant + + + id, + + + tenant_id, + + + login_name, + + + user_num_limit, + + + bills_num_limit, + + + enabled, + + + create_time, + + + + + #{id,jdbcType=BIGINT}, + + + #{tenantId,jdbcType=BIGINT}, + + + #{loginName,jdbcType=VARCHAR}, + + + #{userNumLimit,jdbcType=INTEGER}, + + + #{billsNumLimit,jdbcType=INTEGER}, + + + #{enabled,jdbcType=BIT}, + + + #{createTime,jdbcType=TIMESTAMP}, + + + + + + update jsh_tenant + + + id = #{record.id,jdbcType=BIGINT}, + + + tenant_id = #{record.tenantId,jdbcType=BIGINT}, + + + login_name = #{record.loginName,jdbcType=VARCHAR}, + + + user_num_limit = #{record.userNumLimit,jdbcType=INTEGER}, + + + bills_num_limit = #{record.billsNumLimit,jdbcType=INTEGER}, + + + enabled = #{record.enabled,jdbcType=BIT}, + + + create_time = #{record.createTime,jdbcType=TIMESTAMP}, + + + + + + + + update jsh_tenant + set id = #{record.id,jdbcType=BIGINT}, + tenant_id = #{record.tenantId,jdbcType=BIGINT}, + login_name = #{record.loginName,jdbcType=VARCHAR}, + user_num_limit = #{record.userNumLimit,jdbcType=INTEGER}, + bills_num_limit = #{record.billsNumLimit,jdbcType=INTEGER}, + enabled = #{record.enabled,jdbcType=BIT}, + create_time = #{record.createTime,jdbcType=TIMESTAMP} + + + + + + update jsh_tenant + + + tenant_id = #{tenantId,jdbcType=BIGINT}, + + + login_name = #{loginName,jdbcType=VARCHAR}, + + + user_num_limit = #{userNumLimit,jdbcType=INTEGER}, + + + bills_num_limit = #{billsNumLimit,jdbcType=INTEGER}, + + + enabled = #{enabled,jdbcType=BIT}, + + + create_time = #{createTime,jdbcType=TIMESTAMP}, + + + where id = #{id,jdbcType=BIGINT} + + + update jsh_tenant + set tenant_id = #{tenantId,jdbcType=BIGINT}, + login_name = #{loginName,jdbcType=VARCHAR}, + user_num_limit = #{userNumLimit,jdbcType=INTEGER}, + bills_num_limit = #{billsNumLimit,jdbcType=INTEGER}, + enabled = #{enabled,jdbcType=BIT}, + create_time = #{createTime,jdbcType=TIMESTAMP} + where id = #{id,jdbcType=BIGINT} + \ No newline at end of file