diff --git a/erp_web/pages/manage/organization.html b/erp_web/pages/manage/organization.html new file mode 100644 index 00000000..4d39e0fe --- /dev/null +++ b/erp_web/pages/manage/organization.html @@ -0,0 +1,310 @@ + + + + 机构管理 + + + + + + + + + + + + + + + + + + +
+ +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
上级机构 + + + + +
全称 + + +
简称 + +
状态 + +
编号 + +
序号 + +
开创时间 + +
停业时间 + +
备注 + +
+
+
+
+ 保存 + 取消 +
+
+
+ + + + \ No newline at end of file diff --git a/erp_web/pages/manage/organization_forselect.html b/erp_web/pages/manage/organization_forselect.html new file mode 100644 index 00000000..0d889a92 --- /dev/null +++ b/erp_web/pages/manage/organization_forselect.html @@ -0,0 +1,45 @@ + + + + 机构选择 + + + + + + + + + + + + + + +
+ +
+ + + + \ No newline at end of file diff --git a/sql/jsh_erp.sql b/sql/jsh_erp.sql index 97e28403..823b5684 100644 --- a/sql/jsh_erp.sql +++ b/sql/jsh_erp.sql @@ -1253,3 +1253,59 @@ where Id = 5; -- ---------------------------- alter table jsh_depot add principal bigint(20) DEFAULT null COMMENT '负责人'; +-- ---------------------------- +-- 时间：2019年3月6日 +-- version：1.0.5 +-- 此次更新 +-- 1、添加机构表 +-- 2、添加机构用户关系表 +-- 特别提醒：之后的sql都是在之前基础上迭代，可以对已存在的系统进行数据保留更新 +-- ---------------------------- +-- ---------------------------- +-- 添加机构表 +-- ---------------------------- +DROP TABLE IF EXISTS `jsh_organization`; +CREATE TABLE `jsh_organization` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键', + `org_no` varchar(20) DEFAULT NULL COMMENT '机构编号', + `org_full_name` varchar(500) DEFAULT NULL COMMENT '机构全称', + `org_abr` varchar(20) DEFAULT NULL COMMENT '机构简称', + `org_tpcd` varchar(9) DEFAULT NULL COMMENT '机构类型', + `org_stcd` char(1) DEFAULT NULL COMMENT '机构状态,1未营业、2正常营业、3暂停营业、4终止营业、5已除名', + `org_parent_no` varchar(20) DEFAULT NULL COMMENT '机构父节点编号', + `sort` varchar(20) DEFAULT NULL COMMENT '机构显示顺序', + remark VARCHAR(500) DEFAULT null COMMENT '备注', + `create_time` datetime DEFAULT NULL COMMENT '创建时间', + `creator` bigint(20) DEFAULT NULL COMMENT '创建人', + `update_time` datetime DEFAULT NULL COMMENT '更新时间', + `updater` bigint(20) DEFAULT NULL COMMENT '更新人', + `org_create_time` datetime DEFAULT NULL COMMENT '机构创建时间', + `org_stop_time` datetime DEFAULT NULL COMMENT '机构停运时间', + PRIMARY KEY (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='机构表'; +-- ---------------------------- +-- 添加机构用户关系表 +-- ---------------------------- +DROP TABLE IF EXISTS `jsh_orga_user_rel`; +CREATE TABLE `jsh_orga_user_rel` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键', + `orga_id` bigint(20) NOT NULL COMMENT '机构id', + `user_id` bigint(20) NOT NULL COMMENT '用户id', + `user_blng_orga_dspl_seq` varchar(20) DEFAULT NULL COMMENT '用户在所属机构中显示顺序', + `delete_flag` char(1) DEFAULT 0 COMMENT '删除标记，0未删除，1删除', + `create_time` datetime DEFAULT NULL COMMENT '创建时间', + `creator` bigint(20) DEFAULT NULL COMMENT '创建人', + `update_time` datetime DEFAULT NULL COMMENT '更新时间', + `updater` bigint(20) DEFAULT NULL COMMENT '更新人', + PRIMARY KEY (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='机构用户关系表'; +-- ---------------------------- +-- 添加机构管理菜单 +-- ---------------------------- +INSERT INTO `jsh_functions`(`Number`, `Name`, `PNumber`, `URL`, `State`, `Sort`, `Enabled`, `Type`, `PushBtn`) VALUES ('000108', '机构管理', '0001', '../manage/organization.html', b'1', '0139', b'1', '电脑版', ''); +-- ---------------------------- +-- 添加根机构 +-- ---------------------------- +INSERT INTO `jsh_organization`(`org_no`, `org_full_name`, `org_abr`, `org_tpcd`, `org_stcd`, `org_parent_no`, `sort`, `remark`, `create_time`, `creator`, `update_time`, `updater`, `org_create_time`, `org_stop_time`) VALUES ('01', '根机构', '根机构', NULL, '2', '-1', '1', '根机构，初始化存在', NULL, NULL, NULL, NULL, NULL, NULL); + + diff --git a/sql/华夏ERP数据库设计汇总.xlsx b/sql/华夏ERP数据库设计汇总.xlsx index 2a7b3f93..18855f4b 100644 Binary files a/sql/华夏ERP数据库设计汇总.xlsx and b/sql/华夏ERP数据库设计汇总.xlsx differ diff --git a/src/main/java/com/jsh/erp/constants/BusinessConstants.java b/src/main/java/com/jsh/erp/constants/BusinessConstants.java index 26b3f775..7df6d12f 100644 --- a/src/main/java/com/jsh/erp/constants/BusinessConstants.java +++ b/src/main/java/com/jsh/erp/constants/BusinessConstants.java @@ -3,8 +3,8 @@ package com.jsh.erp.constants; /** * @ClassName:BusinessConstants * @Description 业务字典类 - * @Author linshengming - * @Date 2018-9-15 17:58 + * @Author qiankunpingtai + * @Date 2019-3-6 17:58 * @Version 1.0 **/ public class BusinessConstants { @@ -85,6 +85,21 @@ public class BusinessConstants { public static final String MATERIAL_CATEGORY_STATUS_DEFAULT = "0"; public static final String MATERIAL_CATEGORY_STATUS_ENABLE = "1"; public static final String MATERIAL_CATEGORY_STATUS_DELETE = "2"; + /** + * 机构状态 + * 1未营业、2正常营业、3暂停营业、4终止营业,5已除名 + * */ + public static final String ORGANIZATION_STCD_NOT_OPEN = "1"; + public static final String ORGANIZATION_STCD_OPEN = "2"; + public static final String ORGANIZATION_STCD_BUSINESS_SUSPENDED = "3"; + public static final String ORGANIZATION_STCD_BUSINESS_TERMINATED = "4"; + public static final String ORGANIZATION_STCD_REMOVED = "5"; + /** + * 根机构编号 + * 根机构编号默认为01 + * */ + public static final String ORGANIZATION_ROOT_NO = "01"; + diff --git a/src/main/java/com/jsh/erp/constants/ExceptionConstants.java b/src/main/java/com/jsh/erp/constants/ExceptionConstants.java index 3eec3aef..4f538bd2 100644 --- a/src/main/java/com/jsh/erp/constants/ExceptionConstants.java +++ b/src/main/java/com/jsh/erp/constants/ExceptionConstants.java @@ -75,6 +75,28 @@ public class ExceptionConstants { //商品类别编号已存在 public static final int MATERIAL_CATEGORY_SERIAL_ALREADY_EXISTS_CODE = 7500003; public static final String MATERIAL_CATEGORY_SERIAL_ALREADY_EXISTS_MSG = "商品类别编号已存在"; + /** + * 机构 + * type = 110 + * */ + //添加机构信息失败 + public static final int ORGANIZATION_ADD_FAILED_CODE = 11000000; + public static final String ORGANIZATION_ADD_FAILED_MSG = "添加机构信息失败"; + //删除机构信息失败 + public static final int ORGANIZATION_DELETE_FAILED_CODE = 11000001; + public static final String ORGANIZATION_DELETE_FAILED_MSG = "删除机构信息失败"; + //修改机构信息失败 + public static final int ORGANIZATION_EDIT_FAILED_CODE = 11000002; + public static final String ORGANIZATION_EDIT_FAILED_MSG = "修改机构信息失败"; + //机构编号已存在 + public static final int ORGANIZATION_NO_ALREADY_EXISTS_CODE = 11000003; + public static final String ORGANIZATION_NO_ALREADY_EXISTS_MSG = "机构编号已存在"; + //根机构不允许删除 + public static final int ORGANIZATION_ROOT_NOT_ALLOWED_DELETE_CODE = 11000004; + public static final String ORGANIZATION_ROOT_NOT_ALLOWED_DELETE_MSG = "根机构不允许删除"; + //根机构不允许修改 + public static final int ORGANIZATION_ROOT_NOT_ALLOWED_EDIT_CODE = 11000005; + public static final String ORGANIZATION_ROOT_NOT_ALLOWED_EDIT_MSG = "根机构不允许修改"; /** * 标准正常返回/操作成功返回 diff --git a/src/main/java/com/jsh/erp/controller/MaterialCategoryController.java b/src/main/java/com/jsh/erp/controller/MaterialCategoryController.java index 6f31a606..6ec8daa4 100644 --- a/src/main/java/com/jsh/erp/controller/MaterialCategoryController.java +++ b/src/main/java/com/jsh/erp/controller/MaterialCategoryController.java @@ -137,8 +137,8 @@ public class MaterialCategoryController { MaterialCategory mc= JSON.parseObject(beanJson, MaterialCategory.class); int i= materialCategoryService.editMaterialCategory(mc); if(i<1){ - throw new BusinessRunTimeException(ExceptionConstants.MATERIAL_CATEGORY_ADD_FAILED_CODE, - ExceptionConstants.MATERIAL_CATEGORY_ADD_FAILED_MSG); + throw new BusinessRunTimeException(ExceptionConstants.MATERIAL_CATEGORY_EDIT_FAILED_CODE, + ExceptionConstants.MATERIAL_CATEGORY_EDIT_FAILED_MSG); } return result; } diff --git a/src/main/java/com/jsh/erp/controller/OrganizationController.java b/src/main/java/com/jsh/erp/controller/OrganizationController.java new file mode 100644 index 00000000..57bee4d0 --- /dev/null +++ b/src/main/java/com/jsh/erp/controller/OrganizationController.java @@ -0,0 +1,166 @@ +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.ExceptionConstants; +import com.jsh.erp.datasource.entities.MaterialCategory; +import com.jsh.erp.datasource.entities.Organization; +import com.jsh.erp.datasource.vo.TreeNode; +import com.jsh.erp.exception.BusinessRunTimeException; +import com.jsh.erp.service.materialCategory.MaterialCategoryService; +import com.jsh.erp.service.organization.OrganizationService; +import com.jsh.erp.utils.BaseResponseInfo; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.text.SimpleDateFormat; +import java.util.List; + +/** + * create by: cjl + * description: + * + * create time: 2019/3/6 10:54 + */ +@RestController +@RequestMapping(value = "/organization") +public class OrganizationController { + private Logger logger = LoggerFactory.getLogger(OrganizationController.class); + + @Resource + private OrganizationService organizationService; + /** + * 根据id来查询机构信息 + * @param id + * @param request + * @return + */ + @RequestMapping(value = "/findById") + public BaseResponseInfo findById(@RequestParam("id") Long id, HttpServletRequest request) throws Exception { + BaseResponseInfo res = new BaseResponseInfo(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + try { + List dataList = organizationService.findById(id); + JSONObject outer = new JSONObject(); + if (null != dataList) { + for (Organization org : dataList) { + outer.put("id", org.getId()); + outer.put("orgFullName", org.getOrgFullName()); + outer.put("orgAbr", org.getOrgAbr()); + outer.put("orgParentNo", org.getOrgParentNo()); + List dataParentList = organizationService.findByOrgNo(org.getOrgParentNo()); + if(dataParentList!=null&&dataParentList.size()>0){ + //父级机构名称显示简称 + outer.put("orgParentName", dataParentList.get(0).getOrgAbr()); + } + outer.put("orgTpcd", org.getOrgTpcd()); + outer.put("orgStcd", org.getOrgStcd()); + outer.put("orgNo", org.getOrgNo()); + outer.put("sort", org.getSort()); + /** + * 判断时间不为空再做转化 + * */ + if(org.getOrgCreateTime()!=null){ + outer.put("orgCreateTime", sdf.format(org.getOrgCreateTime())); + } + if(org.getOrgStopTime()!=null){ + outer.put("orgStopTime", sdf.format(org.getOrgStopTime())); + } + outer.put("remark", org.getRemark()); + } + } + res.code = 200; + res.data = outer; + } catch(Exception e){ + e.printStackTrace(); + res.code = 500; + res.data = "获取数据失败"; + } + return res; + } + + /** + * create by: cjl + * description: + * 获取机构树数据 + * create time: 2019/2/19 11:49 + * @Param: + * @return com.alibaba.fastjson.JSONArray + */ + @RequestMapping(value = "/getOrganizationTree") + public JSONArray getOrganizationTree() throws Exception{ + JSONArray arr=new JSONArray(); + List organizationTree= organizationService.getOrganizationTree(); + if(organizationTree!=null&&organizationTree.size()>0){ + for(TreeNode node:organizationTree){ + String str=JSON.toJSONString(node); + JSONObject obj=JSON.parseObject(str); + arr.add(obj) ; + } + } + return arr; + } + /** + * create by: cjl + * description: + * 新增机构信息 + * create time: 2019/2/19 17:17 + * @Param: beanJson + * @return java.lang.Object + */ + @RequestMapping(value = "/addOrganization") + public Object addOrganization(@RequestParam("info") String beanJson) throws Exception { + JSONObject result = ExceptionConstants.standardSuccess(); + Organization org= JSON.parseObject(beanJson, Organization.class); + int i= organizationService.addOrganization(org); + if(i<1){ + throw new BusinessRunTimeException(ExceptionConstants.ORGANIZATION_ADD_FAILED_CODE, + ExceptionConstants.ORGANIZATION_ADD_FAILED_MSG); + } + return result; + } + /** + * create by: cjl + * description: + * 修改机构信息 + * create time: 2019/2/20 9:30 + * @Param: beanJson + * @return java.lang.Object + */ + @RequestMapping(value = "/editOrganization") + public Object editOrganization(@RequestParam("info") String beanJson) throws Exception { + JSONObject result = ExceptionConstants.standardSuccess(); + Organization org= JSON.parseObject(beanJson, Organization.class); + int i= organizationService.editOrganization(org); + if(i<1){ + throw new BusinessRunTimeException(ExceptionConstants.ORGANIZATION_EDIT_FAILED_CODE, + ExceptionConstants.ORGANIZATION_EDIT_FAILED_MSG); + } + return result; + } + /** + * create by: cjl + * description: + * 批量删除机构信息 + * create time: 2019/2/19 17:26 + * @Param: ids + * @return java.lang.Object + */ + @RequestMapping(value = "/batchDeleteOrganization") + public Object batchDeleteOrganization(@RequestParam("ids") String ids) throws Exception { + JSONObject result = ExceptionConstants.standardSuccess(); + int i= organizationService.batchDeleteOrganizationByIds(ids); + if(i<1){ + throw new BusinessRunTimeException(ExceptionConstants.ORGANIZATION_DELETE_FAILED_CODE, + ExceptionConstants.ORGANIZATION_DELETE_FAILED_MSG); + } + return result; + } +} diff --git a/src/main/java/com/jsh/erp/datasource/entities/OrgaUserRel.java b/src/main/java/com/jsh/erp/datasource/entities/OrgaUserRel.java new file mode 100644 index 00000000..ad41ea9f --- /dev/null +++ b/src/main/java/com/jsh/erp/datasource/entities/OrgaUserRel.java @@ -0,0 +1,293 @@ +package com.jsh.erp.datasource.entities; + +import java.util.Date; + +public class OrgaUserRel { + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column jsh_orga_user_rel.id + * + * @mbggenerated + */ + private Long id; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column jsh_orga_user_rel.orga_id + * + * @mbggenerated + */ + private Long orgaId; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column jsh_orga_user_rel.user_id + * + * @mbggenerated + */ + private Long userId; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column jsh_orga_user_rel.user_blng_orga_dspl_seq + * + * @mbggenerated + */ + private String userBlngOrgaDsplSeq; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column jsh_orga_user_rel.delete_flag + * + * @mbggenerated + */ + private String deleteFlag; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column jsh_orga_user_rel.create_time + * + * @mbggenerated + */ + private Date createTime; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column jsh_orga_user_rel.creator + * + * @mbggenerated + */ + private Long creator; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column jsh_orga_user_rel.update_time + * + * @mbggenerated + */ + private Date updateTime; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column jsh_orga_user_rel.updater + * + * @mbggenerated + */ + private Long updater; + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column jsh_orga_user_rel.id + * + * @return the value of jsh_orga_user_rel.id + * + * @mbggenerated + */ + public Long getId() { + return id; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column jsh_orga_user_rel.id + * + * @param id the value for jsh_orga_user_rel.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_orga_user_rel.orga_id + * + * @return the value of jsh_orga_user_rel.orga_id + * + * @mbggenerated + */ + public Long getOrgaId() { + return orgaId; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column jsh_orga_user_rel.orga_id + * + * @param orgaId the value for jsh_orga_user_rel.orga_id + * + * @mbggenerated + */ + public void setOrgaId(Long orgaId) { + this.orgaId = orgaId; + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column jsh_orga_user_rel.user_id + * + * @return the value of jsh_orga_user_rel.user_id + * + * @mbggenerated + */ + public Long getUserId() { + return userId; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column jsh_orga_user_rel.user_id + * + * @param userId the value for jsh_orga_user_rel.user_id + * + * @mbggenerated + */ + public void setUserId(Long userId) { + this.userId = userId; + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column jsh_orga_user_rel.user_blng_orga_dspl_seq + * + * @return the value of jsh_orga_user_rel.user_blng_orga_dspl_seq + * + * @mbggenerated + */ + public String getUserBlngOrgaDsplSeq() { + return userBlngOrgaDsplSeq; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column jsh_orga_user_rel.user_blng_orga_dspl_seq + * + * @param userBlngOrgaDsplSeq the value for jsh_orga_user_rel.user_blng_orga_dspl_seq + * + * @mbggenerated + */ + public void setUserBlngOrgaDsplSeq(String userBlngOrgaDsplSeq) { + this.userBlngOrgaDsplSeq = userBlngOrgaDsplSeq == null ? null : userBlngOrgaDsplSeq.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column jsh_orga_user_rel.delete_flag + * + * @return the value of jsh_orga_user_rel.delete_flag + * + * @mbggenerated + */ + public String getDeleteFlag() { + return deleteFlag; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column jsh_orga_user_rel.delete_flag + * + * @param deleteFlag the value for jsh_orga_user_rel.delete_flag + * + * @mbggenerated + */ + public void setDeleteFlag(String deleteFlag) { + this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column jsh_orga_user_rel.create_time + * + * @return the value of jsh_orga_user_rel.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_orga_user_rel.create_time + * + * @param createTime the value for jsh_orga_user_rel.create_time + * + * @mbggenerated + */ + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column jsh_orga_user_rel.creator + * + * @return the value of jsh_orga_user_rel.creator + * + * @mbggenerated + */ + public Long getCreator() { + return creator; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column jsh_orga_user_rel.creator + * + * @param creator the value for jsh_orga_user_rel.creator + * + * @mbggenerated + */ + public void setCreator(Long creator) { + this.creator = creator; + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column jsh_orga_user_rel.update_time + * + * @return the value of jsh_orga_user_rel.update_time + * + * @mbggenerated + */ + public Date getUpdateTime() { + return updateTime; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column jsh_orga_user_rel.update_time + * + * @param updateTime the value for jsh_orga_user_rel.update_time + * + * @mbggenerated + */ + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column jsh_orga_user_rel.updater + * + * @return the value of jsh_orga_user_rel.updater + * + * @mbggenerated + */ + public Long getUpdater() { + return updater; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column jsh_orga_user_rel.updater + * + * @param updater the value for jsh_orga_user_rel.updater + * + * @mbggenerated + */ + public void setUpdater(Long updater) { + this.updater = updater; + } +} \ No newline at end of file diff --git a/src/main/java/com/jsh/erp/datasource/entities/OrgaUserRelExample.java b/src/main/java/com/jsh/erp/datasource/entities/OrgaUserRelExample.java new file mode 100644 index 00000000..3d8bdbf7 --- /dev/null +++ b/src/main/java/com/jsh/erp/datasource/entities/OrgaUserRelExample.java @@ -0,0 +1,863 @@ +package com.jsh.erp.datasource.entities; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class OrgaUserRelExample { + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database table jsh_orga_user_rel + * + * @mbggenerated + */ + protected String orderByClause; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database table jsh_orga_user_rel + * + * @mbggenerated + */ + protected boolean distinct; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database table jsh_orga_user_rel + * + * @mbggenerated + */ + protected List oredCriteria; + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table jsh_orga_user_rel + * + * @mbggenerated + */ + public OrgaUserRelExample() { + oredCriteria = new ArrayList(); + } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table jsh_orga_user_rel + * + * @mbggenerated + */ + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table jsh_orga_user_rel + * + * @mbggenerated + */ + public String getOrderByClause() { + return orderByClause; + } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table jsh_orga_user_rel + * + * @mbggenerated + */ + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table jsh_orga_user_rel + * + * @mbggenerated + */ + public boolean isDistinct() { + return distinct; + } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table jsh_orga_user_rel + * + * @mbggenerated + */ + public List getOredCriteria() { + return oredCriteria; + } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table jsh_orga_user_rel + * + * @mbggenerated + */ + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table jsh_orga_user_rel + * + * @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_orga_user_rel + * + * @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_orga_user_rel + * + * @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_orga_user_rel + * + * @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_orga_user_rel + * + * @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 andOrgaIdIsNull() { + addCriterion("orga_id is null"); + return (Criteria) this; + } + + public Criteria andOrgaIdIsNotNull() { + addCriterion("orga_id is not null"); + return (Criteria) this; + } + + public Criteria andOrgaIdEqualTo(Long value) { + addCriterion("orga_id =", value, "orgaId"); + return (Criteria) this; + } + + public Criteria andOrgaIdNotEqualTo(Long value) { + addCriterion("orga_id <>", value, "orgaId"); + return (Criteria) this; + } + + public Criteria andOrgaIdGreaterThan(Long value) { + addCriterion("orga_id >", value, "orgaId"); + return (Criteria) this; + } + + public Criteria andOrgaIdGreaterThanOrEqualTo(Long value) { + addCriterion("orga_id >=", value, "orgaId"); + return (Criteria) this; + } + + public Criteria andOrgaIdLessThan(Long value) { + addCriterion("orga_id <", value, "orgaId"); + return (Criteria) this; + } + + public Criteria andOrgaIdLessThanOrEqualTo(Long value) { + addCriterion("orga_id <=", value, "orgaId"); + return (Criteria) this; + } + + public Criteria andOrgaIdIn(List values) { + addCriterion("orga_id in", values, "orgaId"); + return (Criteria) this; + } + + public Criteria andOrgaIdNotIn(List values) { + addCriterion("orga_id not in", values, "orgaId"); + return (Criteria) this; + } + + public Criteria andOrgaIdBetween(Long value1, Long value2) { + addCriterion("orga_id between", value1, value2, "orgaId"); + return (Criteria) this; + } + + public Criteria andOrgaIdNotBetween(Long value1, Long value2) { + addCriterion("orga_id not between", value1, value2, "orgaId"); + return (Criteria) this; + } + + public Criteria andUserIdIsNull() { + addCriterion("user_id is null"); + return (Criteria) this; + } + + public Criteria andUserIdIsNotNull() { + addCriterion("user_id is not null"); + return (Criteria) this; + } + + public Criteria andUserIdEqualTo(Long value) { + addCriterion("user_id =", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdNotEqualTo(Long value) { + addCriterion("user_id <>", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdGreaterThan(Long value) { + addCriterion("user_id >", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdGreaterThanOrEqualTo(Long value) { + addCriterion("user_id >=", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdLessThan(Long value) { + addCriterion("user_id <", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdLessThanOrEqualTo(Long value) { + addCriterion("user_id <=", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdIn(List values) { + addCriterion("user_id in", values, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdNotIn(List values) { + addCriterion("user_id not in", values, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdBetween(Long value1, Long value2) { + addCriterion("user_id between", value1, value2, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdNotBetween(Long value1, Long value2) { + addCriterion("user_id not between", value1, value2, "userId"); + return (Criteria) this; + } + + public Criteria andUserBlngOrgaDsplSeqIsNull() { + addCriterion("user_blng_orga_dspl_seq is null"); + return (Criteria) this; + } + + public Criteria andUserBlngOrgaDsplSeqIsNotNull() { + addCriterion("user_blng_orga_dspl_seq is not null"); + return (Criteria) this; + } + + public Criteria andUserBlngOrgaDsplSeqEqualTo(String value) { + addCriterion("user_blng_orga_dspl_seq =", value, "userBlngOrgaDsplSeq"); + return (Criteria) this; + } + + public Criteria andUserBlngOrgaDsplSeqNotEqualTo(String value) { + addCriterion("user_blng_orga_dspl_seq <>", value, "userBlngOrgaDsplSeq"); + return (Criteria) this; + } + + public Criteria andUserBlngOrgaDsplSeqGreaterThan(String value) { + addCriterion("user_blng_orga_dspl_seq >", value, "userBlngOrgaDsplSeq"); + return (Criteria) this; + } + + public Criteria andUserBlngOrgaDsplSeqGreaterThanOrEqualTo(String value) { + addCriterion("user_blng_orga_dspl_seq >=", value, "userBlngOrgaDsplSeq"); + return (Criteria) this; + } + + public Criteria andUserBlngOrgaDsplSeqLessThan(String value) { + addCriterion("user_blng_orga_dspl_seq <", value, "userBlngOrgaDsplSeq"); + return (Criteria) this; + } + + public Criteria andUserBlngOrgaDsplSeqLessThanOrEqualTo(String value) { + addCriterion("user_blng_orga_dspl_seq <=", value, "userBlngOrgaDsplSeq"); + return (Criteria) this; + } + + public Criteria andUserBlngOrgaDsplSeqLike(String value) { + addCriterion("user_blng_orga_dspl_seq like", value, "userBlngOrgaDsplSeq"); + return (Criteria) this; + } + + public Criteria andUserBlngOrgaDsplSeqNotLike(String value) { + addCriterion("user_blng_orga_dspl_seq not like", value, "userBlngOrgaDsplSeq"); + return (Criteria) this; + } + + public Criteria andUserBlngOrgaDsplSeqIn(List values) { + addCriterion("user_blng_orga_dspl_seq in", values, "userBlngOrgaDsplSeq"); + return (Criteria) this; + } + + public Criteria andUserBlngOrgaDsplSeqNotIn(List values) { + addCriterion("user_blng_orga_dspl_seq not in", values, "userBlngOrgaDsplSeq"); + return (Criteria) this; + } + + public Criteria andUserBlngOrgaDsplSeqBetween(String value1, String value2) { + addCriterion("user_blng_orga_dspl_seq between", value1, value2, "userBlngOrgaDsplSeq"); + return (Criteria) this; + } + + public Criteria andUserBlngOrgaDsplSeqNotBetween(String value1, String value2) { + addCriterion("user_blng_orga_dspl_seq not between", value1, value2, "userBlngOrgaDsplSeq"); + return (Criteria) this; + } + + public Criteria andDeleteFlagIsNull() { + addCriterion("delete_flag is null"); + return (Criteria) this; + } + + public Criteria andDeleteFlagIsNotNull() { + addCriterion("delete_flag is not null"); + return (Criteria) this; + } + + public Criteria andDeleteFlagEqualTo(String value) { + addCriterion("delete_flag =", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotEqualTo(String value) { + addCriterion("delete_flag <>", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagGreaterThan(String value) { + addCriterion("delete_flag >", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagGreaterThanOrEqualTo(String value) { + addCriterion("delete_flag >=", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagLessThan(String value) { + addCriterion("delete_flag <", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagLessThanOrEqualTo(String value) { + addCriterion("delete_flag <=", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagLike(String value) { + addCriterion("delete_flag like", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotLike(String value) { + addCriterion("delete_flag not like", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagIn(List values) { + addCriterion("delete_flag in", values, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotIn(List values) { + addCriterion("delete_flag not in", values, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagBetween(String value1, String value2) { + addCriterion("delete_flag between", value1, value2, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotBetween(String value1, String value2) { + addCriterion("delete_flag not between", value1, value2, "deleteFlag"); + 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 Criteria andCreatorIsNull() { + addCriterion("creator is null"); + return (Criteria) this; + } + + public Criteria andCreatorIsNotNull() { + addCriterion("creator is not null"); + return (Criteria) this; + } + + public Criteria andCreatorEqualTo(Long value) { + addCriterion("creator =", value, "creator"); + return (Criteria) this; + } + + public Criteria andCreatorNotEqualTo(Long value) { + addCriterion("creator <>", value, "creator"); + return (Criteria) this; + } + + public Criteria andCreatorGreaterThan(Long value) { + addCriterion("creator >", value, "creator"); + return (Criteria) this; + } + + public Criteria andCreatorGreaterThanOrEqualTo(Long value) { + addCriterion("creator >=", value, "creator"); + return (Criteria) this; + } + + public Criteria andCreatorLessThan(Long value) { + addCriterion("creator <", value, "creator"); + return (Criteria) this; + } + + public Criteria andCreatorLessThanOrEqualTo(Long value) { + addCriterion("creator <=", value, "creator"); + return (Criteria) this; + } + + public Criteria andCreatorIn(List values) { + addCriterion("creator in", values, "creator"); + return (Criteria) this; + } + + public Criteria andCreatorNotIn(List values) { + addCriterion("creator not in", values, "creator"); + return (Criteria) this; + } + + public Criteria andCreatorBetween(Long value1, Long value2) { + addCriterion("creator between", value1, value2, "creator"); + return (Criteria) this; + } + + public Criteria andCreatorNotBetween(Long value1, Long value2) { + addCriterion("creator not between", value1, value2, "creator"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIsNull() { + addCriterion("update_time is null"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIsNotNull() { + addCriterion("update_time is not null"); + return (Criteria) this; + } + + public Criteria andUpdateTimeEqualTo(Date value) { + addCriterion("update_time =", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotEqualTo(Date value) { + addCriterion("update_time <>", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeGreaterThan(Date value) { + addCriterion("update_time >", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) { + addCriterion("update_time >=", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeLessThan(Date value) { + addCriterion("update_time <", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeLessThanOrEqualTo(Date value) { + addCriterion("update_time <=", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIn(List values) { + addCriterion("update_time in", values, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotIn(List values) { + addCriterion("update_time not in", values, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeBetween(Date value1, Date value2) { + addCriterion("update_time between", value1, value2, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotBetween(Date value1, Date value2) { + addCriterion("update_time not between", value1, value2, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdaterIsNull() { + addCriterion("updater is null"); + return (Criteria) this; + } + + public Criteria andUpdaterIsNotNull() { + addCriterion("updater is not null"); + return (Criteria) this; + } + + public Criteria andUpdaterEqualTo(Long value) { + addCriterion("updater =", value, "updater"); + return (Criteria) this; + } + + public Criteria andUpdaterNotEqualTo(Long value) { + addCriterion("updater <>", value, "updater"); + return (Criteria) this; + } + + public Criteria andUpdaterGreaterThan(Long value) { + addCriterion("updater >", value, "updater"); + return (Criteria) this; + } + + public Criteria andUpdaterGreaterThanOrEqualTo(Long value) { + addCriterion("updater >=", value, "updater"); + return (Criteria) this; + } + + public Criteria andUpdaterLessThan(Long value) { + addCriterion("updater <", value, "updater"); + return (Criteria) this; + } + + public Criteria andUpdaterLessThanOrEqualTo(Long value) { + addCriterion("updater <=", value, "updater"); + return (Criteria) this; + } + + public Criteria andUpdaterIn(List values) { + addCriterion("updater in", values, "updater"); + return (Criteria) this; + } + + public Criteria andUpdaterNotIn(List values) { + addCriterion("updater not in", values, "updater"); + return (Criteria) this; + } + + public Criteria andUpdaterBetween(Long value1, Long value2) { + addCriterion("updater between", value1, value2, "updater"); + return (Criteria) this; + } + + public Criteria andUpdaterNotBetween(Long value1, Long value2) { + addCriterion("updater not between", value1, value2, "updater"); + return (Criteria) this; + } + } + + /** + * This class was generated by MyBatis Generator. + * This class corresponds to the database table jsh_orga_user_rel + * + * @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_orga_user_rel + * + * @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); + } + } +} \ No newline at end of file diff --git a/src/main/java/com/jsh/erp/datasource/entities/Organization.java b/src/main/java/com/jsh/erp/datasource/entities/Organization.java new file mode 100644 index 00000000..9ac9156a --- /dev/null +++ b/src/main/java/com/jsh/erp/datasource/entities/Organization.java @@ -0,0 +1,485 @@ +package com.jsh.erp.datasource.entities; + +import java.util.Date; + +public class Organization { + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column jsh_organization.id + * + * @mbggenerated + */ + private Long id; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column jsh_organization.org_no + * + * @mbggenerated + */ + private String orgNo; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column jsh_organization.org_full_name + * + * @mbggenerated + */ + private String orgFullName; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column jsh_organization.org_abr + * + * @mbggenerated + */ + private String orgAbr; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column jsh_organization.org_tpcd + * + * @mbggenerated + */ + private String orgTpcd; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column jsh_organization.org_stcd + * + * @mbggenerated + */ + private String orgStcd; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column jsh_organization.org_parent_no + * + * @mbggenerated + */ + private String orgParentNo; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column jsh_organization.sort + * + * @mbggenerated + */ + private String sort; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column jsh_organization.remark + * + * @mbggenerated + */ + private String remark; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column jsh_organization.create_time + * + * @mbggenerated + */ + private Date createTime; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column jsh_organization.creator + * + * @mbggenerated + */ + private Long creator; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column jsh_organization.update_time + * + * @mbggenerated + */ + private Date updateTime; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column jsh_organization.updater + * + * @mbggenerated + */ + private Long updater; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column jsh_organization.org_create_time + * + * @mbggenerated + */ + private Date orgCreateTime; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column jsh_organization.org_stop_time + * + * @mbggenerated + */ + private Date orgStopTime; + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column jsh_organization.id + * + * @return the value of jsh_organization.id + * + * @mbggenerated + */ + public Long getId() { + return id; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column jsh_organization.id + * + * @param id the value for jsh_organization.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_organization.org_no + * + * @return the value of jsh_organization.org_no + * + * @mbggenerated + */ + public String getOrgNo() { + return orgNo; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column jsh_organization.org_no + * + * @param orgNo the value for jsh_organization.org_no + * + * @mbggenerated + */ + public void setOrgNo(String orgNo) { + this.orgNo = orgNo == null ? null : orgNo.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column jsh_organization.org_full_name + * + * @return the value of jsh_organization.org_full_name + * + * @mbggenerated + */ + public String getOrgFullName() { + return orgFullName; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column jsh_organization.org_full_name + * + * @param orgFullName the value for jsh_organization.org_full_name + * + * @mbggenerated + */ + public void setOrgFullName(String orgFullName) { + this.orgFullName = orgFullName == null ? null : orgFullName.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column jsh_organization.org_abr + * + * @return the value of jsh_organization.org_abr + * + * @mbggenerated + */ + public String getOrgAbr() { + return orgAbr; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column jsh_organization.org_abr + * + * @param orgAbr the value for jsh_organization.org_abr + * + * @mbggenerated + */ + public void setOrgAbr(String orgAbr) { + this.orgAbr = orgAbr == null ? null : orgAbr.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column jsh_organization.org_tpcd + * + * @return the value of jsh_organization.org_tpcd + * + * @mbggenerated + */ + public String getOrgTpcd() { + return orgTpcd; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column jsh_organization.org_tpcd + * + * @param orgTpcd the value for jsh_organization.org_tpcd + * + * @mbggenerated + */ + public void setOrgTpcd(String orgTpcd) { + this.orgTpcd = orgTpcd == null ? null : orgTpcd.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column jsh_organization.org_stcd + * + * @return the value of jsh_organization.org_stcd + * + * @mbggenerated + */ + public String getOrgStcd() { + return orgStcd; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column jsh_organization.org_stcd + * + * @param orgStcd the value for jsh_organization.org_stcd + * + * @mbggenerated + */ + public void setOrgStcd(String orgStcd) { + this.orgStcd = orgStcd == null ? null : orgStcd.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column jsh_organization.org_parent_no + * + * @return the value of jsh_organization.org_parent_no + * + * @mbggenerated + */ + public String getOrgParentNo() { + return orgParentNo; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column jsh_organization.org_parent_no + * + * @param orgParentNo the value for jsh_organization.org_parent_no + * + * @mbggenerated + */ + public void setOrgParentNo(String orgParentNo) { + this.orgParentNo = orgParentNo == null ? null : orgParentNo.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column jsh_organization.sort + * + * @return the value of jsh_organization.sort + * + * @mbggenerated + */ + public String getSort() { + return sort; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column jsh_organization.sort + * + * @param sort the value for jsh_organization.sort + * + * @mbggenerated + */ + public void setSort(String sort) { + this.sort = sort == null ? null : sort.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column jsh_organization.remark + * + * @return the value of jsh_organization.remark + * + * @mbggenerated + */ + public String getRemark() { + return remark; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column jsh_organization.remark + * + * @param remark the value for jsh_organization.remark + * + * @mbggenerated + */ + public void setRemark(String remark) { + this.remark = remark == null ? null : remark.trim(); + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column jsh_organization.create_time + * + * @return the value of jsh_organization.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_organization.create_time + * + * @param createTime the value for jsh_organization.create_time + * + * @mbggenerated + */ + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column jsh_organization.creator + * + * @return the value of jsh_organization.creator + * + * @mbggenerated + */ + public Long getCreator() { + return creator; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column jsh_organization.creator + * + * @param creator the value for jsh_organization.creator + * + * @mbggenerated + */ + public void setCreator(Long creator) { + this.creator = creator; + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column jsh_organization.update_time + * + * @return the value of jsh_organization.update_time + * + * @mbggenerated + */ + public Date getUpdateTime() { + return updateTime; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column jsh_organization.update_time + * + * @param updateTime the value for jsh_organization.update_time + * + * @mbggenerated + */ + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column jsh_organization.updater + * + * @return the value of jsh_organization.updater + * + * @mbggenerated + */ + public Long getUpdater() { + return updater; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column jsh_organization.updater + * + * @param updater the value for jsh_organization.updater + * + * @mbggenerated + */ + public void setUpdater(Long updater) { + this.updater = updater; + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column jsh_organization.org_create_time + * + * @return the value of jsh_organization.org_create_time + * + * @mbggenerated + */ + public Date getOrgCreateTime() { + return orgCreateTime; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column jsh_organization.org_create_time + * + * @param orgCreateTime the value for jsh_organization.org_create_time + * + * @mbggenerated + */ + public void setOrgCreateTime(Date orgCreateTime) { + this.orgCreateTime = orgCreateTime; + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column jsh_organization.org_stop_time + * + * @return the value of jsh_organization.org_stop_time + * + * @mbggenerated + */ + public Date getOrgStopTime() { + return orgStopTime; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column jsh_organization.org_stop_time + * + * @param orgStopTime the value for jsh_organization.org_stop_time + * + * @mbggenerated + */ + public void setOrgStopTime(Date orgStopTime) { + this.orgStopTime = orgStopTime; + } +} \ No newline at end of file diff --git a/src/main/java/com/jsh/erp/datasource/entities/OrganizationExample.java b/src/main/java/com/jsh/erp/datasource/entities/OrganizationExample.java new file mode 100644 index 00000000..81a8572e --- /dev/null +++ b/src/main/java/com/jsh/erp/datasource/entities/OrganizationExample.java @@ -0,0 +1,1283 @@ +package com.jsh.erp.datasource.entities; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class OrganizationExample { + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database table jsh_organization + * + * @mbggenerated + */ + protected String orderByClause; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database table jsh_organization + * + * @mbggenerated + */ + protected boolean distinct; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database table jsh_organization + * + * @mbggenerated + */ + protected List oredCriteria; + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table jsh_organization + * + * @mbggenerated + */ + public OrganizationExample() { + oredCriteria = new ArrayList(); + } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table jsh_organization + * + * @mbggenerated + */ + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table jsh_organization + * + * @mbggenerated + */ + public String getOrderByClause() { + return orderByClause; + } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table jsh_organization + * + * @mbggenerated + */ + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table jsh_organization + * + * @mbggenerated + */ + public boolean isDistinct() { + return distinct; + } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table jsh_organization + * + * @mbggenerated + */ + public List getOredCriteria() { + return oredCriteria; + } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table jsh_organization + * + * @mbggenerated + */ + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table jsh_organization + * + * @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_organization + * + * @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_organization + * + * @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_organization + * + * @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_organization + * + * @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 andOrgNoIsNull() { + addCriterion("org_no is null"); + return (Criteria) this; + } + + public Criteria andOrgNoIsNotNull() { + addCriterion("org_no is not null"); + return (Criteria) this; + } + + public Criteria andOrgNoEqualTo(String value) { + addCriterion("org_no =", value, "orgNo"); + return (Criteria) this; + } + + public Criteria andOrgNoNotEqualTo(String value) { + addCriterion("org_no <>", value, "orgNo"); + return (Criteria) this; + } + + public Criteria andOrgNoGreaterThan(String value) { + addCriterion("org_no >", value, "orgNo"); + return (Criteria) this; + } + + public Criteria andOrgNoGreaterThanOrEqualTo(String value) { + addCriterion("org_no >=", value, "orgNo"); + return (Criteria) this; + } + + public Criteria andOrgNoLessThan(String value) { + addCriterion("org_no <", value, "orgNo"); + return (Criteria) this; + } + + public Criteria andOrgNoLessThanOrEqualTo(String value) { + addCriterion("org_no <=", value, "orgNo"); + return (Criteria) this; + } + + public Criteria andOrgNoLike(String value) { + addCriterion("org_no like", value, "orgNo"); + return (Criteria) this; + } + + public Criteria andOrgNoNotLike(String value) { + addCriterion("org_no not like", value, "orgNo"); + return (Criteria) this; + } + + public Criteria andOrgNoIn(List values) { + addCriterion("org_no in", values, "orgNo"); + return (Criteria) this; + } + + public Criteria andOrgNoNotIn(List values) { + addCriterion("org_no not in", values, "orgNo"); + return (Criteria) this; + } + + public Criteria andOrgNoBetween(String value1, String value2) { + addCriterion("org_no between", value1, value2, "orgNo"); + return (Criteria) this; + } + + public Criteria andOrgNoNotBetween(String value1, String value2) { + addCriterion("org_no not between", value1, value2, "orgNo"); + return (Criteria) this; + } + + public Criteria andOrgFullNameIsNull() { + addCriterion("org_full_name is null"); + return (Criteria) this; + } + + public Criteria andOrgFullNameIsNotNull() { + addCriterion("org_full_name is not null"); + return (Criteria) this; + } + + public Criteria andOrgFullNameEqualTo(String value) { + addCriterion("org_full_name =", value, "orgFullName"); + return (Criteria) this; + } + + public Criteria andOrgFullNameNotEqualTo(String value) { + addCriterion("org_full_name <>", value, "orgFullName"); + return (Criteria) this; + } + + public Criteria andOrgFullNameGreaterThan(String value) { + addCriterion("org_full_name >", value, "orgFullName"); + return (Criteria) this; + } + + public Criteria andOrgFullNameGreaterThanOrEqualTo(String value) { + addCriterion("org_full_name >=", value, "orgFullName"); + return (Criteria) this; + } + + public Criteria andOrgFullNameLessThan(String value) { + addCriterion("org_full_name <", value, "orgFullName"); + return (Criteria) this; + } + + public Criteria andOrgFullNameLessThanOrEqualTo(String value) { + addCriterion("org_full_name <=", value, "orgFullName"); + return (Criteria) this; + } + + public Criteria andOrgFullNameLike(String value) { + addCriterion("org_full_name like", value, "orgFullName"); + return (Criteria) this; + } + + public Criteria andOrgFullNameNotLike(String value) { + addCriterion("org_full_name not like", value, "orgFullName"); + return (Criteria) this; + } + + public Criteria andOrgFullNameIn(List values) { + addCriterion("org_full_name in", values, "orgFullName"); + return (Criteria) this; + } + + public Criteria andOrgFullNameNotIn(List values) { + addCriterion("org_full_name not in", values, "orgFullName"); + return (Criteria) this; + } + + public Criteria andOrgFullNameBetween(String value1, String value2) { + addCriterion("org_full_name between", value1, value2, "orgFullName"); + return (Criteria) this; + } + + public Criteria andOrgFullNameNotBetween(String value1, String value2) { + addCriterion("org_full_name not between", value1, value2, "orgFullName"); + return (Criteria) this; + } + + public Criteria andOrgAbrIsNull() { + addCriterion("org_abr is null"); + return (Criteria) this; + } + + public Criteria andOrgAbrIsNotNull() { + addCriterion("org_abr is not null"); + return (Criteria) this; + } + + public Criteria andOrgAbrEqualTo(String value) { + addCriterion("org_abr =", value, "orgAbr"); + return (Criteria) this; + } + + public Criteria andOrgAbrNotEqualTo(String value) { + addCriterion("org_abr <>", value, "orgAbr"); + return (Criteria) this; + } + + public Criteria andOrgAbrGreaterThan(String value) { + addCriterion("org_abr >", value, "orgAbr"); + return (Criteria) this; + } + + public Criteria andOrgAbrGreaterThanOrEqualTo(String value) { + addCriterion("org_abr >=", value, "orgAbr"); + return (Criteria) this; + } + + public Criteria andOrgAbrLessThan(String value) { + addCriterion("org_abr <", value, "orgAbr"); + return (Criteria) this; + } + + public Criteria andOrgAbrLessThanOrEqualTo(String value) { + addCriterion("org_abr <=", value, "orgAbr"); + return (Criteria) this; + } + + public Criteria andOrgAbrLike(String value) { + addCriterion("org_abr like", value, "orgAbr"); + return (Criteria) this; + } + + public Criteria andOrgAbrNotLike(String value) { + addCriterion("org_abr not like", value, "orgAbr"); + return (Criteria) this; + } + + public Criteria andOrgAbrIn(List values) { + addCriterion("org_abr in", values, "orgAbr"); + return (Criteria) this; + } + + public Criteria andOrgAbrNotIn(List values) { + addCriterion("org_abr not in", values, "orgAbr"); + return (Criteria) this; + } + + public Criteria andOrgAbrBetween(String value1, String value2) { + addCriterion("org_abr between", value1, value2, "orgAbr"); + return (Criteria) this; + } + + public Criteria andOrgAbrNotBetween(String value1, String value2) { + addCriterion("org_abr not between", value1, value2, "orgAbr"); + return (Criteria) this; + } + + public Criteria andOrgTpcdIsNull() { + addCriterion("org_tpcd is null"); + return (Criteria) this; + } + + public Criteria andOrgTpcdIsNotNull() { + addCriterion("org_tpcd is not null"); + return (Criteria) this; + } + + public Criteria andOrgTpcdEqualTo(String value) { + addCriterion("org_tpcd =", value, "orgTpcd"); + return (Criteria) this; + } + + public Criteria andOrgTpcdNotEqualTo(String value) { + addCriterion("org_tpcd <>", value, "orgTpcd"); + return (Criteria) this; + } + + public Criteria andOrgTpcdGreaterThan(String value) { + addCriterion("org_tpcd >", value, "orgTpcd"); + return (Criteria) this; + } + + public Criteria andOrgTpcdGreaterThanOrEqualTo(String value) { + addCriterion("org_tpcd >=", value, "orgTpcd"); + return (Criteria) this; + } + + public Criteria andOrgTpcdLessThan(String value) { + addCriterion("org_tpcd <", value, "orgTpcd"); + return (Criteria) this; + } + + public Criteria andOrgTpcdLessThanOrEqualTo(String value) { + addCriterion("org_tpcd <=", value, "orgTpcd"); + return (Criteria) this; + } + + public Criteria andOrgTpcdLike(String value) { + addCriterion("org_tpcd like", value, "orgTpcd"); + return (Criteria) this; + } + + public Criteria andOrgTpcdNotLike(String value) { + addCriterion("org_tpcd not like", value, "orgTpcd"); + return (Criteria) this; + } + + public Criteria andOrgTpcdIn(List values) { + addCriterion("org_tpcd in", values, "orgTpcd"); + return (Criteria) this; + } + + public Criteria andOrgTpcdNotIn(List values) { + addCriterion("org_tpcd not in", values, "orgTpcd"); + return (Criteria) this; + } + + public Criteria andOrgTpcdBetween(String value1, String value2) { + addCriterion("org_tpcd between", value1, value2, "orgTpcd"); + return (Criteria) this; + } + + public Criteria andOrgTpcdNotBetween(String value1, String value2) { + addCriterion("org_tpcd not between", value1, value2, "orgTpcd"); + return (Criteria) this; + } + + public Criteria andOrgStcdIsNull() { + addCriterion("org_stcd is null"); + return (Criteria) this; + } + + public Criteria andOrgStcdIsNotNull() { + addCriterion("org_stcd is not null"); + return (Criteria) this; + } + + public Criteria andOrgStcdEqualTo(String value) { + addCriterion("org_stcd =", value, "orgStcd"); + return (Criteria) this; + } + + public Criteria andOrgStcdNotEqualTo(String value) { + addCriterion("org_stcd <>", value, "orgStcd"); + return (Criteria) this; + } + + public Criteria andOrgStcdGreaterThan(String value) { + addCriterion("org_stcd >", value, "orgStcd"); + return (Criteria) this; + } + + public Criteria andOrgStcdGreaterThanOrEqualTo(String value) { + addCriterion("org_stcd >=", value, "orgStcd"); + return (Criteria) this; + } + + public Criteria andOrgStcdLessThan(String value) { + addCriterion("org_stcd <", value, "orgStcd"); + return (Criteria) this; + } + + public Criteria andOrgStcdLessThanOrEqualTo(String value) { + addCriterion("org_stcd <=", value, "orgStcd"); + return (Criteria) this; + } + + public Criteria andOrgStcdLike(String value) { + addCriterion("org_stcd like", value, "orgStcd"); + return (Criteria) this; + } + + public Criteria andOrgStcdNotLike(String value) { + addCriterion("org_stcd not like", value, "orgStcd"); + return (Criteria) this; + } + + public Criteria andOrgStcdIn(List values) { + addCriterion("org_stcd in", values, "orgStcd"); + return (Criteria) this; + } + + public Criteria andOrgStcdNotIn(List values) { + addCriterion("org_stcd not in", values, "orgStcd"); + return (Criteria) this; + } + + public Criteria andOrgStcdBetween(String value1, String value2) { + addCriterion("org_stcd between", value1, value2, "orgStcd"); + return (Criteria) this; + } + + public Criteria andOrgStcdNotBetween(String value1, String value2) { + addCriterion("org_stcd not between", value1, value2, "orgStcd"); + return (Criteria) this; + } + + public Criteria andOrgParentNoIsNull() { + addCriterion("org_parent_no is null"); + return (Criteria) this; + } + + public Criteria andOrgParentNoIsNotNull() { + addCriterion("org_parent_no is not null"); + return (Criteria) this; + } + + public Criteria andOrgParentNoEqualTo(String value) { + addCriterion("org_parent_no =", value, "orgParentNo"); + return (Criteria) this; + } + + public Criteria andOrgParentNoNotEqualTo(String value) { + addCriterion("org_parent_no <>", value, "orgParentNo"); + return (Criteria) this; + } + + public Criteria andOrgParentNoGreaterThan(String value) { + addCriterion("org_parent_no >", value, "orgParentNo"); + return (Criteria) this; + } + + public Criteria andOrgParentNoGreaterThanOrEqualTo(String value) { + addCriterion("org_parent_no >=", value, "orgParentNo"); + return (Criteria) this; + } + + public Criteria andOrgParentNoLessThan(String value) { + addCriterion("org_parent_no <", value, "orgParentNo"); + return (Criteria) this; + } + + public Criteria andOrgParentNoLessThanOrEqualTo(String value) { + addCriterion("org_parent_no <=", value, "orgParentNo"); + return (Criteria) this; + } + + public Criteria andOrgParentNoLike(String value) { + addCriterion("org_parent_no like", value, "orgParentNo"); + return (Criteria) this; + } + + public Criteria andOrgParentNoNotLike(String value) { + addCriterion("org_parent_no not like", value, "orgParentNo"); + return (Criteria) this; + } + + public Criteria andOrgParentNoIn(List values) { + addCriterion("org_parent_no in", values, "orgParentNo"); + return (Criteria) this; + } + + public Criteria andOrgParentNoNotIn(List values) { + addCriterion("org_parent_no not in", values, "orgParentNo"); + return (Criteria) this; + } + + public Criteria andOrgParentNoBetween(String value1, String value2) { + addCriterion("org_parent_no between", value1, value2, "orgParentNo"); + return (Criteria) this; + } + + public Criteria andOrgParentNoNotBetween(String value1, String value2) { + addCriterion("org_parent_no not between", value1, value2, "orgParentNo"); + return (Criteria) this; + } + + public Criteria andSortIsNull() { + addCriterion("sort is null"); + return (Criteria) this; + } + + public Criteria andSortIsNotNull() { + addCriterion("sort is not null"); + return (Criteria) this; + } + + public Criteria andSortEqualTo(String value) { + addCriterion("sort =", value, "sort"); + return (Criteria) this; + } + + public Criteria andSortNotEqualTo(String value) { + addCriterion("sort <>", value, "sort"); + return (Criteria) this; + } + + public Criteria andSortGreaterThan(String value) { + addCriterion("sort >", value, "sort"); + return (Criteria) this; + } + + public Criteria andSortGreaterThanOrEqualTo(String value) { + addCriterion("sort >=", value, "sort"); + return (Criteria) this; + } + + public Criteria andSortLessThan(String value) { + addCriterion("sort <", value, "sort"); + return (Criteria) this; + } + + public Criteria andSortLessThanOrEqualTo(String value) { + addCriterion("sort <=", value, "sort"); + return (Criteria) this; + } + + public Criteria andSortLike(String value) { + addCriterion("sort like", value, "sort"); + return (Criteria) this; + } + + public Criteria andSortNotLike(String value) { + addCriterion("sort not like", value, "sort"); + return (Criteria) this; + } + + public Criteria andSortIn(List values) { + addCriterion("sort in", values, "sort"); + return (Criteria) this; + } + + public Criteria andSortNotIn(List values) { + addCriterion("sort not in", values, "sort"); + return (Criteria) this; + } + + public Criteria andSortBetween(String value1, String value2) { + addCriterion("sort between", value1, value2, "sort"); + return (Criteria) this; + } + + public Criteria andSortNotBetween(String value1, String value2) { + addCriterion("sort not between", value1, value2, "sort"); + return (Criteria) this; + } + + public Criteria andRemarkIsNull() { + addCriterion("remark is null"); + return (Criteria) this; + } + + public Criteria andRemarkIsNotNull() { + addCriterion("remark is not null"); + return (Criteria) this; + } + + public Criteria andRemarkEqualTo(String value) { + addCriterion("remark =", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkNotEqualTo(String value) { + addCriterion("remark <>", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkGreaterThan(String value) { + addCriterion("remark >", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkGreaterThanOrEqualTo(String value) { + addCriterion("remark >=", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkLessThan(String value) { + addCriterion("remark <", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkLessThanOrEqualTo(String value) { + addCriterion("remark <=", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkLike(String value) { + addCriterion("remark like", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkNotLike(String value) { + addCriterion("remark not like", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkIn(List values) { + addCriterion("remark in", values, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkNotIn(List values) { + addCriterion("remark not in", values, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkBetween(String value1, String value2) { + addCriterion("remark between", value1, value2, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkNotBetween(String value1, String value2) { + addCriterion("remark not between", value1, value2, "remark"); + 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 Criteria andCreatorIsNull() { + addCriterion("creator is null"); + return (Criteria) this; + } + + public Criteria andCreatorIsNotNull() { + addCriterion("creator is not null"); + return (Criteria) this; + } + + public Criteria andCreatorEqualTo(Long value) { + addCriterion("creator =", value, "creator"); + return (Criteria) this; + } + + public Criteria andCreatorNotEqualTo(Long value) { + addCriterion("creator <>", value, "creator"); + return (Criteria) this; + } + + public Criteria andCreatorGreaterThan(Long value) { + addCriterion("creator >", value, "creator"); + return (Criteria) this; + } + + public Criteria andCreatorGreaterThanOrEqualTo(Long value) { + addCriterion("creator >=", value, "creator"); + return (Criteria) this; + } + + public Criteria andCreatorLessThan(Long value) { + addCriterion("creator <", value, "creator"); + return (Criteria) this; + } + + public Criteria andCreatorLessThanOrEqualTo(Long value) { + addCriterion("creator <=", value, "creator"); + return (Criteria) this; + } + + public Criteria andCreatorIn(List values) { + addCriterion("creator in", values, "creator"); + return (Criteria) this; + } + + public Criteria andCreatorNotIn(List values) { + addCriterion("creator not in", values, "creator"); + return (Criteria) this; + } + + public Criteria andCreatorBetween(Long value1, Long value2) { + addCriterion("creator between", value1, value2, "creator"); + return (Criteria) this; + } + + public Criteria andCreatorNotBetween(Long value1, Long value2) { + addCriterion("creator not between", value1, value2, "creator"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIsNull() { + addCriterion("update_time is null"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIsNotNull() { + addCriterion("update_time is not null"); + return (Criteria) this; + } + + public Criteria andUpdateTimeEqualTo(Date value) { + addCriterion("update_time =", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotEqualTo(Date value) { + addCriterion("update_time <>", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeGreaterThan(Date value) { + addCriterion("update_time >", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) { + addCriterion("update_time >=", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeLessThan(Date value) { + addCriterion("update_time <", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeLessThanOrEqualTo(Date value) { + addCriterion("update_time <=", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIn(List values) { + addCriterion("update_time in", values, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotIn(List values) { + addCriterion("update_time not in", values, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeBetween(Date value1, Date value2) { + addCriterion("update_time between", value1, value2, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotBetween(Date value1, Date value2) { + addCriterion("update_time not between", value1, value2, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdaterIsNull() { + addCriterion("updater is null"); + return (Criteria) this; + } + + public Criteria andUpdaterIsNotNull() { + addCriterion("updater is not null"); + return (Criteria) this; + } + + public Criteria andUpdaterEqualTo(Long value) { + addCriterion("updater =", value, "updater"); + return (Criteria) this; + } + + public Criteria andUpdaterNotEqualTo(Long value) { + addCriterion("updater <>", value, "updater"); + return (Criteria) this; + } + + public Criteria andUpdaterGreaterThan(Long value) { + addCriterion("updater >", value, "updater"); + return (Criteria) this; + } + + public Criteria andUpdaterGreaterThanOrEqualTo(Long value) { + addCriterion("updater >=", value, "updater"); + return (Criteria) this; + } + + public Criteria andUpdaterLessThan(Long value) { + addCriterion("updater <", value, "updater"); + return (Criteria) this; + } + + public Criteria andUpdaterLessThanOrEqualTo(Long value) { + addCriterion("updater <=", value, "updater"); + return (Criteria) this; + } + + public Criteria andUpdaterIn(List values) { + addCriterion("updater in", values, "updater"); + return (Criteria) this; + } + + public Criteria andUpdaterNotIn(List values) { + addCriterion("updater not in", values, "updater"); + return (Criteria) this; + } + + public Criteria andUpdaterBetween(Long value1, Long value2) { + addCriterion("updater between", value1, value2, "updater"); + return (Criteria) this; + } + + public Criteria andUpdaterNotBetween(Long value1, Long value2) { + addCriterion("updater not between", value1, value2, "updater"); + return (Criteria) this; + } + + public Criteria andOrgCreateTimeIsNull() { + addCriterion("org_create_time is null"); + return (Criteria) this; + } + + public Criteria andOrgCreateTimeIsNotNull() { + addCriterion("org_create_time is not null"); + return (Criteria) this; + } + + public Criteria andOrgCreateTimeEqualTo(Date value) { + addCriterion("org_create_time =", value, "orgCreateTime"); + return (Criteria) this; + } + + public Criteria andOrgCreateTimeNotEqualTo(Date value) { + addCriterion("org_create_time <>", value, "orgCreateTime"); + return (Criteria) this; + } + + public Criteria andOrgCreateTimeGreaterThan(Date value) { + addCriterion("org_create_time >", value, "orgCreateTime"); + return (Criteria) this; + } + + public Criteria andOrgCreateTimeGreaterThanOrEqualTo(Date value) { + addCriterion("org_create_time >=", value, "orgCreateTime"); + return (Criteria) this; + } + + public Criteria andOrgCreateTimeLessThan(Date value) { + addCriterion("org_create_time <", value, "orgCreateTime"); + return (Criteria) this; + } + + public Criteria andOrgCreateTimeLessThanOrEqualTo(Date value) { + addCriterion("org_create_time <=", value, "orgCreateTime"); + return (Criteria) this; + } + + public Criteria andOrgCreateTimeIn(List values) { + addCriterion("org_create_time in", values, "orgCreateTime"); + return (Criteria) this; + } + + public Criteria andOrgCreateTimeNotIn(List values) { + addCriterion("org_create_time not in", values, "orgCreateTime"); + return (Criteria) this; + } + + public Criteria andOrgCreateTimeBetween(Date value1, Date value2) { + addCriterion("org_create_time between", value1, value2, "orgCreateTime"); + return (Criteria) this; + } + + public Criteria andOrgCreateTimeNotBetween(Date value1, Date value2) { + addCriterion("org_create_time not between", value1, value2, "orgCreateTime"); + return (Criteria) this; + } + + public Criteria andOrgStopTimeIsNull() { + addCriterion("org_stop_time is null"); + return (Criteria) this; + } + + public Criteria andOrgStopTimeIsNotNull() { + addCriterion("org_stop_time is not null"); + return (Criteria) this; + } + + public Criteria andOrgStopTimeEqualTo(Date value) { + addCriterion("org_stop_time =", value, "orgStopTime"); + return (Criteria) this; + } + + public Criteria andOrgStopTimeNotEqualTo(Date value) { + addCriterion("org_stop_time <>", value, "orgStopTime"); + return (Criteria) this; + } + + public Criteria andOrgStopTimeGreaterThan(Date value) { + addCriterion("org_stop_time >", value, "orgStopTime"); + return (Criteria) this; + } + + public Criteria andOrgStopTimeGreaterThanOrEqualTo(Date value) { + addCriterion("org_stop_time >=", value, "orgStopTime"); + return (Criteria) this; + } + + public Criteria andOrgStopTimeLessThan(Date value) { + addCriterion("org_stop_time <", value, "orgStopTime"); + return (Criteria) this; + } + + public Criteria andOrgStopTimeLessThanOrEqualTo(Date value) { + addCriterion("org_stop_time <=", value, "orgStopTime"); + return (Criteria) this; + } + + public Criteria andOrgStopTimeIn(List values) { + addCriterion("org_stop_time in", values, "orgStopTime"); + return (Criteria) this; + } + + public Criteria andOrgStopTimeNotIn(List values) { + addCriterion("org_stop_time not in", values, "orgStopTime"); + return (Criteria) this; + } + + public Criteria andOrgStopTimeBetween(Date value1, Date value2) { + addCriterion("org_stop_time between", value1, value2, "orgStopTime"); + return (Criteria) this; + } + + public Criteria andOrgStopTimeNotBetween(Date value1, Date value2) { + addCriterion("org_stop_time not between", value1, value2, "orgStopTime"); + return (Criteria) this; + } + } + + /** + * This class was generated by MyBatis Generator. + * This class corresponds to the database table jsh_organization + * + * @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_organization + * + * @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); + } + } +} \ No newline at end of file diff --git a/src/main/java/com/jsh/erp/datasource/mappers/OrgaUserRelMapper.java b/src/main/java/com/jsh/erp/datasource/mappers/OrgaUserRelMapper.java new file mode 100644 index 00000000..bde231f8 --- /dev/null +++ b/src/main/java/com/jsh/erp/datasource/mappers/OrgaUserRelMapper.java @@ -0,0 +1,96 @@ +package com.jsh.erp.datasource.mappers; + +import com.jsh.erp.datasource.entities.OrgaUserRel; +import com.jsh.erp.datasource.entities.OrgaUserRelExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface OrgaUserRelMapper { + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table jsh_orga_user_rel + * + * @mbggenerated + */ + int countByExample(OrgaUserRelExample example); + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table jsh_orga_user_rel + * + * @mbggenerated + */ + int deleteByExample(OrgaUserRelExample example); + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table jsh_orga_user_rel + * + * @mbggenerated + */ + int deleteByPrimaryKey(Long id); + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table jsh_orga_user_rel + * + * @mbggenerated + */ + int insert(OrgaUserRel record); + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table jsh_orga_user_rel + * + * @mbggenerated + */ + int insertSelective(OrgaUserRel record); + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table jsh_orga_user_rel + * + * @mbggenerated + */ + List selectByExample(OrgaUserRelExample example); + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table jsh_orga_user_rel + * + * @mbggenerated + */ + OrgaUserRel selectByPrimaryKey(Long id); + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table jsh_orga_user_rel + * + * @mbggenerated + */ + int updateByExampleSelective(@Param("record") OrgaUserRel record, @Param("example") OrgaUserRelExample example); + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table jsh_orga_user_rel + * + * @mbggenerated + */ + int updateByExample(@Param("record") OrgaUserRel record, @Param("example") OrgaUserRelExample example); + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table jsh_orga_user_rel + * + * @mbggenerated + */ + int updateByPrimaryKeySelective(OrgaUserRel record); + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table jsh_orga_user_rel + * + * @mbggenerated + */ + int updateByPrimaryKey(OrgaUserRel record); +} \ No newline at end of file diff --git a/src/main/java/com/jsh/erp/datasource/mappers/OrganizationMapper.java b/src/main/java/com/jsh/erp/datasource/mappers/OrganizationMapper.java new file mode 100644 index 00000000..797fb6e5 --- /dev/null +++ b/src/main/java/com/jsh/erp/datasource/mappers/OrganizationMapper.java @@ -0,0 +1,96 @@ +package com.jsh.erp.datasource.mappers; + +import com.jsh.erp.datasource.entities.Organization; +import com.jsh.erp.datasource.entities.OrganizationExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface OrganizationMapper { + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table jsh_organization + * + * @mbggenerated + */ + int countByExample(OrganizationExample example); + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table jsh_organization + * + * @mbggenerated + */ + int deleteByExample(OrganizationExample example); + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table jsh_organization + * + * @mbggenerated + */ + int deleteByPrimaryKey(Long id); + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table jsh_organization + * + * @mbggenerated + */ + int insert(Organization record); + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table jsh_organization + * + * @mbggenerated + */ + int insertSelective(Organization record); + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table jsh_organization + * + * @mbggenerated + */ + List selectByExample(OrganizationExample example); + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table jsh_organization + * + * @mbggenerated + */ + Organization selectByPrimaryKey(Long id); + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table jsh_organization + * + * @mbggenerated + */ + int updateByExampleSelective(@Param("record") Organization record, @Param("example") OrganizationExample example); + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table jsh_organization + * + * @mbggenerated + */ + int updateByExample(@Param("record") Organization record, @Param("example") OrganizationExample example); + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table jsh_organization + * + * @mbggenerated + */ + int updateByPrimaryKeySelective(Organization record); + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table jsh_organization + * + * @mbggenerated + */ + int updateByPrimaryKey(Organization record); +} \ No newline at end of file diff --git a/src/main/java/com/jsh/erp/datasource/mappers/OrganizationMapperEx.java b/src/main/java/com/jsh/erp/datasource/mappers/OrganizationMapperEx.java new file mode 100644 index 00000000..bec06a91 --- /dev/null +++ b/src/main/java/com/jsh/erp/datasource/mappers/OrganizationMapperEx.java @@ -0,0 +1,29 @@ +package com.jsh.erp.datasource.mappers; + +import com.jsh.erp.datasource.entities.MaterialCategory; +import com.jsh.erp.datasource.entities.Organization; +import com.jsh.erp.datasource.vo.TreeNode; +import org.apache.ibatis.annotations.Param; + +import java.util.Date; +import java.util.List; + +/** + * Description + * + * @Author: cjl + * @Date: 2019/3/6 15:51 + */ +public interface OrganizationMapperEx { + + + List getNodeTree(); + List getNextNodeTree(@Param("id") Long id); + + int addOrganization(Organization org); + + int batchDeleteOrganizationByIds(@Param("updateTime") Date updateTime, @Param("updater") Long updater, @Param("ids") String ids[]); + + int editOrganization(Organization org); + List getOrganizationRootByIds(@Param("ids") String ids[]); +} diff --git a/src/main/java/com/jsh/erp/service/organization/OrganizationComponent.java b/src/main/java/com/jsh/erp/service/organization/OrganizationComponent.java new file mode 100644 index 00000000..c7ff227a --- /dev/null +++ b/src/main/java/com/jsh/erp/service/organization/OrganizationComponent.java @@ -0,0 +1,66 @@ +package com.jsh.erp.service.organization; + +import com.jsh.erp.service.ICommonQuery; +import com.jsh.erp.utils.Constants; +import com.jsh.erp.utils.QueryUtils; +import com.jsh.erp.utils.StringUtil; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.List; +import java.util.Map; + +/** + * Description + * + * @Author: cjl + * @Date: 2019/3/6 15:09 + */ +@Service(value = "organization_component") +@OrganizationResource +public class OrganizationComponent implements ICommonQuery { + @Resource + private OrganizationService organizationService; + @Override + public Object selectOne(String condition) { + return null; + } + + @Override + public List select(Map parameterMap) { + return getOrganizationList(parameterMap); + } + private List getOrganizationList(Map map) { + return null; + } + @Override + public Long counts(Map parameterMap) { + return null; + } + + @Override + public int insert(String beanJson, HttpServletRequest request) { + return organizationService.insertOrganization(beanJson,request); + } + + @Override + public int update(String beanJson, Long id) { + return organizationService.updateOrganization(beanJson,id); + } + + @Override + public int delete(Long id) { + return organizationService.deleteOrganization(id); + } + + @Override + public int batchDelete(String ids) { + return organizationService.batchDeleteOrganization(ids); + } + + @Override + public int checkIsNameExist(Long id, String name) { + return 0; + } +} diff --git a/src/main/java/com/jsh/erp/service/organization/OrganizationResource.java b/src/main/java/com/jsh/erp/service/organization/OrganizationResource.java new file mode 100644 index 00000000..e299cc0b --- /dev/null +++ b/src/main/java/com/jsh/erp/service/organization/OrganizationResource.java @@ -0,0 +1,18 @@ +package com.jsh.erp.service.organization; + +import com.jsh.erp.service.ResourceInfo; + +import java.lang.annotation.*; + +/** + * Description + * 机构 + * @Author: cjl + * @Date: 2019/3/6 15:10 + */ +@ResourceInfo(value = "organization", type = 110) +@Inherited +@Target(ElementType.TYPE) +@Retention(RetentionPolicy.RUNTIME) +public @interface OrganizationResource { +} diff --git a/src/main/java/com/jsh/erp/service/organization/OrganizationService.java b/src/main/java/com/jsh/erp/service/organization/OrganizationService.java new file mode 100644 index 00000000..256898c9 --- /dev/null +++ b/src/main/java/com/jsh/erp/service/organization/OrganizationService.java @@ -0,0 +1,188 @@ +package com.jsh.erp.service.organization; + +import com.alibaba.fastjson.JSONObject; +import com.jsh.erp.constants.BusinessConstants; +import com.jsh.erp.constants.ExceptionConstants; +import com.jsh.erp.datasource.entities.Organization; +import com.jsh.erp.datasource.entities.OrganizationExample; +import com.jsh.erp.datasource.entities.User; +import com.jsh.erp.datasource.mappers.OrganizationMapper; +import com.jsh.erp.datasource.mappers.OrganizationMapperEx; +import com.jsh.erp.datasource.vo.TreeNode; +import com.jsh.erp.exception.BusinessRunTimeException; +import com.jsh.erp.service.user.UserService; +import com.jsh.erp.utils.StringUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.Date; +import java.util.List; + +/** + * Description + * + * @Author: cjl + * @Date: 2019/3/6 15:10 + */ +@Service +public class OrganizationService { + private Logger logger = LoggerFactory.getLogger(OrganizationService.class); + + @Resource + private OrganizationMapper organizationMapper; + @Resource + private OrganizationMapperEx organizationMapperEx; + @Resource + private UserService userService; + @Transactional(value = "transactionManager", rollbackFor = Exception.class) + public int insertOrganization(String beanJson, HttpServletRequest request) { + Organization organization = JSONObject.parseObject(beanJson, Organization.class); + return organizationMapper.insertSelective(organization); + } + @Transactional(value = "transactionManager", rollbackFor = Exception.class) + public int updateOrganization(String beanJson, Long id) { + Organization organization = JSONObject.parseObject(beanJson, Organization.class); + organization.setId(id); + return organizationMapper.updateByPrimaryKeySelective(organization); + } + @Transactional(value = "transactionManager", rollbackFor = Exception.class) + public int deleteOrganization(Long id) { + return organizationMapper.deleteByPrimaryKey(id); + } + @Transactional(value = "transactionManager", rollbackFor = Exception.class) + public int batchDeleteOrganization(String ids) { + List idList = StringUtil.strToLongList(ids); + OrganizationExample example = new OrganizationExample(); + example.createCriteria().andIdIn(idList); + return organizationMapper.deleteByExample(example); + } + @Transactional(value = "transactionManager", rollbackFor = Exception.class) + public int addOrganization(Organization org) throws Exception{ + //新增时间 + Date date=new Date(); + User userInfo=userService.getCurrentUser(); + org.setCreateTime(date); + //新增人 + org.setCreator(userInfo==null?null:userInfo.getId()); + //修改时间 + org.setUpdateTime(date); + //修改人 + org.setUpdater(userInfo==null?null:userInfo.getId()); + /** + *添加的时候检测机构编号是否已存在 + * */ + if(StringUtil.isNotEmpty(org.getOrgNo())){ + checkOrgNoIsExists(org.getOrgNo(),null); + } + /** + * 未指定父级机构的时候默认放在根机构下 + * */ + if(StringUtil.isEmpty(org.getOrgParentNo())){ + org.setOrgParentNo(BusinessConstants.ORGANIZATION_ROOT_NO); + } + return organizationMapperEx.addOrganization(org); + } + @Transactional(value = "transactionManager", rollbackFor = Exception.class) + public int editOrganization(Organization org)throws Exception { + //修改时间 + org.setUpdateTime(new Date()); + User userInfo=userService.getCurrentUser(); + //修改人 + org.setUpdater(userInfo==null?null:userInfo.getId()); + /** + * 修改的时候检测机构编号是否已存在 + * */ + if(StringUtil.isNotEmpty(org.getOrgNo())){ + checkOrgNoIsExists(org.getOrgNo(),org.getId()); + } + /** + * 未指定父级机构的时候默认放在根机构下 + * */ + if(StringUtil.isEmpty(org.getOrgParentNo())){ + org.setOrgParentNo(BusinessConstants.ORGANIZATION_ROOT_NO); + } + /** + * 添加一个限制，根机构不允许修改 + * */ + if(BusinessConstants.ORGANIZATION_ROOT_NO.equals(org.getOrgNo())){ + logger.error("异常码[{}],异常提示[{}],参数,orgNo[{}]", + ExceptionConstants.ORGANIZATION_ROOT_NOT_ALLOWED_EDIT_CODE,ExceptionConstants.ORGANIZATION_ROOT_NOT_ALLOWED_EDIT_MSG,org.getOrgNo()); + throw new BusinessRunTimeException(ExceptionConstants.ORGANIZATION_ROOT_NOT_ALLOWED_EDIT_CODE, + ExceptionConstants.ORGANIZATION_ROOT_NOT_ALLOWED_EDIT_MSG); + } + return organizationMapperEx.editOrganization(org); + } + + public List getOrganizationTree()throws Exception { + return organizationMapperEx.getNodeTree(); + } + + public List findById(Long id) throws Exception{ + OrganizationExample example = new OrganizationExample(); + example.createCriteria().andIdEqualTo(id); + return organizationMapper.selectByExample(example); + } + + public List findByOrgNo(String orgNo)throws Exception { + OrganizationExample example = new OrganizationExample(); + example.createCriteria().andOrgNoEqualTo(orgNo).andOrgStcdNotEqualTo(BusinessConstants.ORGANIZATION_STCD_REMOVED); + return organizationMapper.selectByExample(example); + } + /** + * create by: cjl + * description: + * 检查机构编号是否已经存在 + * create time: 2019/3/7 10:01 + * @Param: orgNo + * @return void + */ + public void checkOrgNoIsExists(String orgNo,Long id)throws Exception { + List orgList=findByOrgNo(orgNo); + if(orgList!=null&&orgList.size()>0){ + if(orgList.size()>1){ + logger.error("异常码[{}],异常提示[{}],参数,orgNo[{}]", + ExceptionConstants.ORGANIZATION_NO_ALREADY_EXISTS_CODE,ExceptionConstants.ORGANIZATION_NO_ALREADY_EXISTS_MSG,orgNo); + //获取的数据条数大于1，机构编号已存在 + throw new BusinessRunTimeException(ExceptionConstants.ORGANIZATION_NO_ALREADY_EXISTS_CODE, + ExceptionConstants.ORGANIZATION_NO_ALREADY_EXISTS_MSG); + } + if(id!=null){ + if(!orgList.get(0).getId().equals(id)){ + //数据条数等于1，但是和编辑的数据的id不相同 + logger.error("异常码[{}],异常提示[{}],参数,orgNo[{}],id[{}]", + ExceptionConstants.ORGANIZATION_NO_ALREADY_EXISTS_CODE,ExceptionConstants.ORGANIZATION_NO_ALREADY_EXISTS_MSG,orgNo,id); + throw new BusinessRunTimeException(ExceptionConstants.ORGANIZATION_NO_ALREADY_EXISTS_CODE, + ExceptionConstants.ORGANIZATION_NO_ALREADY_EXISTS_MSG); + } + }else{ + logger.error("异常码[{}],异常提示[{}],参数,orgNo[{}]", + ExceptionConstants.ORGANIZATION_NO_ALREADY_EXISTS_CODE,ExceptionConstants.ORGANIZATION_NO_ALREADY_EXISTS_MSG,orgNo); + //数据条数等于1，但此时是新增 + throw new BusinessRunTimeException(ExceptionConstants.ORGANIZATION_NO_ALREADY_EXISTS_CODE, + ExceptionConstants.ORGANIZATION_NO_ALREADY_EXISTS_MSG); + } + } + + } + @Transactional(value = "transactionManager", rollbackFor = Exception.class) + public int batchDeleteOrganizationByIds(String ids) throws Exception{ + User userInfo=userService.getCurrentUser(); + String [] idArray=ids.split(","); + /** + * 添加一个限制，根机构不允许删除 + * */ + List orgRootList=organizationMapperEx.getOrganizationRootByIds(idArray); + if(orgRootList!=null&&orgRootList.size()>0){ + logger.error("异常码[{}],异常提示[{}],参数,ids[{}]", + ExceptionConstants.ORGANIZATION_ROOT_NOT_ALLOWED_DELETE_CODE,ExceptionConstants.ORGANIZATION_ROOT_NOT_ALLOWED_DELETE_MSG,ids); + throw new BusinessRunTimeException(ExceptionConstants.ORGANIZATION_ROOT_NOT_ALLOWED_DELETE_CODE, + ExceptionConstants.ORGANIZATION_ROOT_NOT_ALLOWED_DELETE_MSG); + } + + return organizationMapperEx.batchDeleteOrganizationByIds(new Date(),userInfo==null?null:userInfo.getId(),idArray); + } +} diff --git a/src/main/resources/mapper_xml/OrgaUserRelMapper.xml b/src/main/resources/mapper_xml/OrgaUserRelMapper.xml new file mode 100644 index 00000000..582b31c8 --- /dev/null +++ b/src/main/resources/mapper_xml/OrgaUserRelMapper.xml @@ -0,0 +1,336 @@ + + + + + + + + + + + + + + + + + + + + + + + + + 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, orga_id, user_id, user_blng_orga_dspl_seq, delete_flag, create_time, creator, + update_time, updater + + + + + + delete from jsh_orga_user_rel + where id = #{id,jdbcType=BIGINT} + + + + delete from jsh_orga_user_rel + + + + + + + insert into jsh_orga_user_rel (id, orga_id, user_id, + user_blng_orga_dspl_seq, delete_flag, create_time, + creator, update_time, updater + ) + values (#{id,jdbcType=BIGINT}, #{orgaId,jdbcType=BIGINT}, #{userId,jdbcType=BIGINT}, + #{userBlngOrgaDsplSeq,jdbcType=VARCHAR}, #{deleteFlag,jdbcType=CHAR}, #{createTime,jdbcType=TIMESTAMP}, + #{creator,jdbcType=BIGINT}, #{updateTime,jdbcType=TIMESTAMP}, #{updater,jdbcType=BIGINT} + ) + + + + insert into jsh_orga_user_rel + + + id, + + + orga_id, + + + user_id, + + + user_blng_orga_dspl_seq, + + + delete_flag, + + + create_time, + + + creator, + + + update_time, + + + updater, + + + + + #{id,jdbcType=BIGINT}, + + + #{orgaId,jdbcType=BIGINT}, + + + #{userId,jdbcType=BIGINT}, + + + #{userBlngOrgaDsplSeq,jdbcType=VARCHAR}, + + + #{deleteFlag,jdbcType=CHAR}, + + + #{createTime,jdbcType=TIMESTAMP}, + + + #{creator,jdbcType=BIGINT}, + + + #{updateTime,jdbcType=TIMESTAMP}, + + + #{updater,jdbcType=BIGINT}, + + + + + + + update jsh_orga_user_rel + + + id = #{record.id,jdbcType=BIGINT}, + + + orga_id = #{record.orgaId,jdbcType=BIGINT}, + + + user_id = #{record.userId,jdbcType=BIGINT}, + + + user_blng_orga_dspl_seq = #{record.userBlngOrgaDsplSeq,jdbcType=VARCHAR}, + + + delete_flag = #{record.deleteFlag,jdbcType=CHAR}, + + + create_time = #{record.createTime,jdbcType=TIMESTAMP}, + + + creator = #{record.creator,jdbcType=BIGINT}, + + + update_time = #{record.updateTime,jdbcType=TIMESTAMP}, + + + updater = #{record.updater,jdbcType=BIGINT}, + + + + + + + + + update jsh_orga_user_rel + set id = #{record.id,jdbcType=BIGINT}, + orga_id = #{record.orgaId,jdbcType=BIGINT}, + user_id = #{record.userId,jdbcType=BIGINT}, + user_blng_orga_dspl_seq = #{record.userBlngOrgaDsplSeq,jdbcType=VARCHAR}, + delete_flag = #{record.deleteFlag,jdbcType=CHAR}, + create_time = #{record.createTime,jdbcType=TIMESTAMP}, + creator = #{record.creator,jdbcType=BIGINT}, + update_time = #{record.updateTime,jdbcType=TIMESTAMP}, + updater = #{record.updater,jdbcType=BIGINT} + + + + + + + update jsh_orga_user_rel + + + orga_id = #{orgaId,jdbcType=BIGINT}, + + + user_id = #{userId,jdbcType=BIGINT}, + + + user_blng_orga_dspl_seq = #{userBlngOrgaDsplSeq,jdbcType=VARCHAR}, + + + delete_flag = #{deleteFlag,jdbcType=CHAR}, + + + create_time = #{createTime,jdbcType=TIMESTAMP}, + + + creator = #{creator,jdbcType=BIGINT}, + + + update_time = #{updateTime,jdbcType=TIMESTAMP}, + + + updater = #{updater,jdbcType=BIGINT}, + + + where id = #{id,jdbcType=BIGINT} + + + + update jsh_orga_user_rel + set orga_id = #{orgaId,jdbcType=BIGINT}, + user_id = #{userId,jdbcType=BIGINT}, + user_blng_orga_dspl_seq = #{userBlngOrgaDsplSeq,jdbcType=VARCHAR}, + delete_flag = #{deleteFlag,jdbcType=CHAR}, + create_time = #{createTime,jdbcType=TIMESTAMP}, + creator = #{creator,jdbcType=BIGINT}, + update_time = #{updateTime,jdbcType=TIMESTAMP}, + updater = #{updater,jdbcType=BIGINT} + where id = #{id,jdbcType=BIGINT} + + \ No newline at end of file diff --git a/src/main/resources/mapper_xml/OrganizationMapper.xml b/src/main/resources/mapper_xml/OrganizationMapper.xml new file mode 100644 index 00000000..119e72f7 --- /dev/null +++ b/src/main/resources/mapper_xml/OrganizationMapper.xml @@ -0,0 +1,430 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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, org_no, org_full_name, org_abr, org_tpcd, org_stcd, org_parent_no, sort, remark, + create_time, creator, update_time, updater, org_create_time, org_stop_time + + + + + + delete from jsh_organization + where id = #{id,jdbcType=BIGINT} + + + + delete from jsh_organization + + + + + + + insert into jsh_organization (id, org_no, org_full_name, + org_abr, org_tpcd, org_stcd, + org_parent_no, sort, remark, + create_time, creator, update_time, + updater, org_create_time, org_stop_time + ) + values (#{id,jdbcType=BIGINT}, #{orgNo,jdbcType=VARCHAR}, #{orgFullName,jdbcType=VARCHAR}, + #{orgAbr,jdbcType=VARCHAR}, #{orgTpcd,jdbcType=VARCHAR}, #{orgStcd,jdbcType=CHAR}, + #{orgParentNo,jdbcType=VARCHAR}, #{sort,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, + #{createTime,jdbcType=TIMESTAMP}, #{creator,jdbcType=BIGINT}, #{updateTime,jdbcType=TIMESTAMP}, + #{updater,jdbcType=BIGINT}, #{orgCreateTime,jdbcType=TIMESTAMP}, #{orgStopTime,jdbcType=TIMESTAMP} + ) + + + + insert into jsh_organization + + + id, + + + org_no, + + + org_full_name, + + + org_abr, + + + org_tpcd, + + + org_stcd, + + + org_parent_no, + + + sort, + + + remark, + + + create_time, + + + creator, + + + update_time, + + + updater, + + + org_create_time, + + + org_stop_time, + + + + + #{id,jdbcType=BIGINT}, + + + #{orgNo,jdbcType=VARCHAR}, + + + #{orgFullName,jdbcType=VARCHAR}, + + + #{orgAbr,jdbcType=VARCHAR}, + + + #{orgTpcd,jdbcType=VARCHAR}, + + + #{orgStcd,jdbcType=CHAR}, + + + #{orgParentNo,jdbcType=VARCHAR}, + + + #{sort,jdbcType=VARCHAR}, + + + #{remark,jdbcType=VARCHAR}, + + + #{createTime,jdbcType=TIMESTAMP}, + + + #{creator,jdbcType=BIGINT}, + + + #{updateTime,jdbcType=TIMESTAMP}, + + + #{updater,jdbcType=BIGINT}, + + + #{orgCreateTime,jdbcType=TIMESTAMP}, + + + #{orgStopTime,jdbcType=TIMESTAMP}, + + + + + + + update jsh_organization + + + id = #{record.id,jdbcType=BIGINT}, + + + org_no = #{record.orgNo,jdbcType=VARCHAR}, + + + org_full_name = #{record.orgFullName,jdbcType=VARCHAR}, + + + org_abr = #{record.orgAbr,jdbcType=VARCHAR}, + + + org_tpcd = #{record.orgTpcd,jdbcType=VARCHAR}, + + + org_stcd = #{record.orgStcd,jdbcType=CHAR}, + + + org_parent_no = #{record.orgParentNo,jdbcType=VARCHAR}, + + + sort = #{record.sort,jdbcType=VARCHAR}, + + + remark = #{record.remark,jdbcType=VARCHAR}, + + + create_time = #{record.createTime,jdbcType=TIMESTAMP}, + + + creator = #{record.creator,jdbcType=BIGINT}, + + + update_time = #{record.updateTime,jdbcType=TIMESTAMP}, + + + updater = #{record.updater,jdbcType=BIGINT}, + + + org_create_time = #{record.orgCreateTime,jdbcType=TIMESTAMP}, + + + org_stop_time = #{record.orgStopTime,jdbcType=TIMESTAMP}, + + + + + + + + + update jsh_organization + set id = #{record.id,jdbcType=BIGINT}, + org_no = #{record.orgNo,jdbcType=VARCHAR}, + org_full_name = #{record.orgFullName,jdbcType=VARCHAR}, + org_abr = #{record.orgAbr,jdbcType=VARCHAR}, + org_tpcd = #{record.orgTpcd,jdbcType=VARCHAR}, + org_stcd = #{record.orgStcd,jdbcType=CHAR}, + org_parent_no = #{record.orgParentNo,jdbcType=VARCHAR}, + sort = #{record.sort,jdbcType=VARCHAR}, + remark = #{record.remark,jdbcType=VARCHAR}, + create_time = #{record.createTime,jdbcType=TIMESTAMP}, + creator = #{record.creator,jdbcType=BIGINT}, + update_time = #{record.updateTime,jdbcType=TIMESTAMP}, + updater = #{record.updater,jdbcType=BIGINT}, + org_create_time = #{record.orgCreateTime,jdbcType=TIMESTAMP}, + org_stop_time = #{record.orgStopTime,jdbcType=TIMESTAMP} + + + + + + + update jsh_organization + + + org_no = #{orgNo,jdbcType=VARCHAR}, + + + org_full_name = #{orgFullName,jdbcType=VARCHAR}, + + + org_abr = #{orgAbr,jdbcType=VARCHAR}, + + + org_tpcd = #{orgTpcd,jdbcType=VARCHAR}, + + + org_stcd = #{orgStcd,jdbcType=CHAR}, + + + org_parent_no = #{orgParentNo,jdbcType=VARCHAR}, + + + sort = #{sort,jdbcType=VARCHAR}, + + + remark = #{remark,jdbcType=VARCHAR}, + + + create_time = #{createTime,jdbcType=TIMESTAMP}, + + + creator = #{creator,jdbcType=BIGINT}, + + + update_time = #{updateTime,jdbcType=TIMESTAMP}, + + + updater = #{updater,jdbcType=BIGINT}, + + + org_create_time = #{orgCreateTime,jdbcType=TIMESTAMP}, + + + org_stop_time = #{orgStopTime,jdbcType=TIMESTAMP}, + + + where id = #{id,jdbcType=BIGINT} + + + + update jsh_organization + set org_no = #{orgNo,jdbcType=VARCHAR}, + org_full_name = #{orgFullName,jdbcType=VARCHAR}, + org_abr = #{orgAbr,jdbcType=VARCHAR}, + org_tpcd = #{orgTpcd,jdbcType=VARCHAR}, + org_stcd = #{orgStcd,jdbcType=CHAR}, + org_parent_no = #{orgParentNo,jdbcType=VARCHAR}, + sort = #{sort,jdbcType=VARCHAR}, + remark = #{remark,jdbcType=VARCHAR}, + create_time = #{createTime,jdbcType=TIMESTAMP}, + creator = #{creator,jdbcType=BIGINT}, + update_time = #{updateTime,jdbcType=TIMESTAMP}, + updater = #{updater,jdbcType=BIGINT}, + org_create_time = #{orgCreateTime,jdbcType=TIMESTAMP}, + org_stop_time = #{orgStopTime,jdbcType=TIMESTAMP} + where id = #{id,jdbcType=BIGINT} + + \ No newline at end of file diff --git a/src/main/resources/mapper_xml/OrganizationMapperEx.xml b/src/main/resources/mapper_xml/OrganizationMapperEx.xml new file mode 100644 index 00000000..8eef8c55 --- /dev/null +++ b/src/main/resources/mapper_xml/OrganizationMapperEx.xml @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + + id, org_abr,org_no + + + + + + + insert into jsh_organization + (org_no, org_full_name, + org_abr, org_tpcd, org_stcd, + org_parent_no, sort, remark, + create_time, creator, update_time, + updater, org_create_time, org_stop_time) + values + (#{orgNo,jdbcType=VARCHAR}, #{orgFullName,jdbcType=VARCHAR}, + #{orgAbr,jdbcType=VARCHAR}, #{orgTpcd,jdbcType=VARCHAR}, #{orgStcd,jdbcType=CHAR}, + #{orgParentNo,jdbcType=VARCHAR}, #{sort,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, + #{createTime,jdbcType=TIMESTAMP}, #{creator,jdbcType=BIGINT}, #{updateTime,jdbcType=TIMESTAMP}, + #{updater,jdbcType=BIGINT}, #{orgCreateTime,jdbcType=TIMESTAMP}, #{orgStopTime,jdbcType=TIMESTAMP} + ) + + + update jsh_organization + set update_Time=#{updateTime},updater=#{updater},org_stcd='5' + where id in ( + + #{id} + + ) + + + update jsh_organization + set update_time=#{updateTime},updater=#{updater}, + org_no = #{orgNo},org_full_name = #{orgFullName}, + org_abr = #{orgAbr},org_tpcd = #{orgTpcd}, + org_stcd = #{orgStcd},org_parent_no = #{orgParentNo}, + sort = #{sort},remark = #{remark}, + org_create_time = #{orgCreateTime},org_stop_time = #{orgStopTime} + where id =#{id} + + + + + \ No newline at end of file diff --git a/src/test/resources/generatorConfig.xml b/src/test/resources/generatorConfig.xml index d267bdb4..78241a6a 100644 --- a/src/test/resources/generatorConfig.xml +++ b/src/test/resources/generatorConfig.xml @@ -48,7 +48,7 @@
--> -
+ +
+