From d7f910aa84d72f2da5ec3eb2bd12418f67ef5b9c Mon Sep 17 00:00:00 2001 From: dxfeng Date: Wed, 1 Jun 2022 18:20:44 +0800 Subject: [PATCH 01/77] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D=20=E5=B2=97?= =?UTF-8?q?=E4=BD=8D=E5=A4=8D=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/表结构SQL/MySQL.sql | 12 ++++++---- .../organization/entity/DeleteParam.java | 4 +--- .../organization/entity/job/bo/JobBO.java | 4 ++-- .../entity/job/param/JobCopyParam.java | 23 +++++++++++++++++++ .../entity/job/param/JobSearchParam.java | 4 ++++ .../organization/service/JobService.java | 6 ++--- .../service/impl/JobServiceImpl.java | 19 ++++++++++----- .../organization/web/JobController.java | 13 +++++++++-- .../organization/wrapper/JobWrapper.java | 10 ++++---- 9 files changed, 70 insertions(+), 25 deletions(-) create mode 100644 src/com/engine/organization/entity/job/param/JobCopyParam.java diff --git a/docs/表结构SQL/MySQL.sql b/docs/表结构SQL/MySQL.sql index 604dc705..f83f1e74 100644 --- a/docs/表结构SQL/MySQL.sql +++ b/docs/表结构SQL/MySQL.sql @@ -240,8 +240,10 @@ CREATE TABLE JCL_ORG_JOB ( CREATE TABLE JCL_ORG_JOBDT ( id int auto_increment NOT NULL, mainid int NULL, - level_id int null, - grade_id int null, + level_id varchar(100) NULL, + grade_id varchar(100) NULL, + level_id_span varchar(100) NULL, + grade_id_span varchar(100) NULL, creator int null, delete_type int null, create_time date null, @@ -249,14 +251,14 @@ CREATE TABLE JCL_ORG_JOBDT ( CONSTRAINT JCL_ORG_JOBDT_PK PRIMARY KEY (id) ); --- JCL_ORG_JOBPEXT -CREATE TABLE JCL_ORG_JOBPEXT ( +-- JCL_ORG_JOBEXT +CREATE TABLE JCL_ORG_JOBEXT ( id int auto_increment NOT NULL, creator int null, delete_type int null, create_time date null, update_time date null, - CONSTRAINT JCL_ORG_JOBPEXT_PK PRIMARY KEY (id) + CONSTRAINT JCL_ORG_JOBEXT_PK PRIMARY KEY (id) ); -- JCL_ORG_JOBEXT_DT1 diff --git a/src/com/engine/organization/entity/DeleteParam.java b/src/com/engine/organization/entity/DeleteParam.java index 422a8735..8ce69e88 100644 --- a/src/com/engine/organization/entity/DeleteParam.java +++ b/src/com/engine/organization/entity/DeleteParam.java @@ -9,7 +9,6 @@ import weaver.general.StringUtil; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; -import java.util.List; import java.util.stream.Collectors; /** @@ -29,8 +28,7 @@ public class DeleteParam { if(StringUtil.isEmpty(ids)){ return new ArrayList<>(); } - List collect = Arrays.stream(ids.split(",")).map(item -> Long.parseLong(item)).collect(Collectors.toList()); - return collect; + return Arrays.stream(ids.split(",")).map(Long::parseLong).collect(Collectors.toList()); } } diff --git a/src/com/engine/organization/entity/job/bo/JobBO.java b/src/com/engine/organization/entity/job/bo/JobBO.java index 89f50305..f0345015 100644 --- a/src/com/engine/organization/entity/job/bo/JobBO.java +++ b/src/com/engine/organization/entity/job/bo/JobBO.java @@ -28,8 +28,8 @@ public class JobBO { .id(param.getId() == null ? 0 : param.getId()) .jobNo(param.getJobNo()) .jobName(param.getJobName()) - .parentComp(param.getParentComp()) - .parentDept(param.getParentDept()) + .parentComp(null==param.getParentComp()?param.getSubcompanyid1():param.getParentComp()) + .parentDept(null==param.getParentDept()?param.getDepartmentid():param.getParentDept()) .sequenceId(param.getSequenceId()) .schemeId(param.getSchemeId()) .parentJob(param.getParentJob()) diff --git a/src/com/engine/organization/entity/job/param/JobCopyParam.java b/src/com/engine/organization/entity/job/param/JobCopyParam.java new file mode 100644 index 00000000..2057508e --- /dev/null +++ b/src/com/engine/organization/entity/job/param/JobCopyParam.java @@ -0,0 +1,23 @@ +package com.engine.organization.entity.job.param; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @description: TODO + * @author:dxfeng + * @createTime: 2022/06/01 + * @version: 1.0 + */ +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class JobCopyParam { + private String ids; + + private String department; + +} diff --git a/src/com/engine/organization/entity/job/param/JobSearchParam.java b/src/com/engine/organization/entity/job/param/JobSearchParam.java index 69088ae8..6e0525ef 100644 --- a/src/com/engine/organization/entity/job/param/JobSearchParam.java +++ b/src/com/engine/organization/entity/job/param/JobSearchParam.java @@ -73,4 +73,8 @@ public class JobSearchParam extends BaseQueryParam { * 禁用标记 */ private Boolean forbiddenTag; + + private Long subcompanyid1; + + private Long departmentid; } diff --git a/src/com/engine/organization/service/JobService.java b/src/com/engine/organization/service/JobService.java index 68a86ebf..be3ae804 100644 --- a/src/com/engine/organization/service/JobService.java +++ b/src/com/engine/organization/service/JobService.java @@ -76,11 +76,11 @@ public interface JobService { /** * 复制岗位到指定部门 * - * @param id - * @param departmentId + * @param ids + * @param department * @return */ - int copyJobItem(long id, long departmentId); + int copyJobItem(String ids, String department); /** * 更新禁用标记 diff --git a/src/com/engine/organization/service/impl/JobServiceImpl.java b/src/com/engine/organization/service/impl/JobServiceImpl.java index 7873ca5f..74ba42d7 100644 --- a/src/com/engine/organization/service/impl/JobServiceImpl.java +++ b/src/com/engine/organization/service/impl/JobServiceImpl.java @@ -422,12 +422,19 @@ public class JobServiceImpl extends Service implements JobService { } @Override - public int copyJobItem(long id, long departmentId) { - JobPO jobById = getJobMapper().getJobById(id); - // TODO 自动编号 - jobById.setJobNo("复制_" + jobById.getJobNo()); - jobById.setParentDept(departmentId); - return getJobMapper().insertIgnoreNull(jobById); + public int copyJobItem(String ids, String department) { + OrganizationAssert.notBlank(department, "请指定需要复制的部门"); + int insertCount = 0; + List idList = Arrays.stream(ids.split(",")).map(Long::parseLong).collect(Collectors.toList()); + for (Long id : idList) { + JobPO jobById = getJobMapper().getJobById(id); + // TODO 自动编号 + jobById.setJobNo("复制_" + jobById.getJobNo()); + jobById.setParentDept(Long.parseLong(department)); + insertCount += getJobMapper().insertIgnoreNull(jobById); + } + + return insertCount; } @Override diff --git a/src/com/engine/organization/web/JobController.java b/src/com/engine/organization/web/JobController.java index 0bdc3de0..686b162e 100644 --- a/src/com/engine/organization/web/JobController.java +++ b/src/com/engine/organization/web/JobController.java @@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject; import com.engine.common.util.ParamUtil; import com.engine.common.util.ServiceUtil; import com.engine.organization.entity.DeleteParam; +import com.engine.organization.entity.job.param.JobCopyParam; import com.engine.organization.entity.job.param.JobSearchParam; import com.engine.organization.entity.searchtree.SearchTreeParams; import com.engine.organization.util.response.ReturnResult; @@ -168,13 +169,21 @@ public class JobController { } } + /** + * 复制到指定部门 + * + * @param request + * @param response + * @param param + * @return + */ @POST @Path("/copyJobItem") @Produces(MediaType.APPLICATION_JSON) - public ReturnResult copyJobItem(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody JobSearchParam param) { + public ReturnResult copyJobItem(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody JobCopyParam param) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getJobWrapper(user).copyJobItem(param.getId(), param.getParentDept())); + return ReturnResult.successed(getJobWrapper(user).copyJobItem(param.getIds(), param.getDepartment())); } catch (Exception e) { return ReturnResult.exceptionHandle(e.getMessage()); } diff --git a/src/com/engine/organization/wrapper/JobWrapper.java b/src/com/engine/organization/wrapper/JobWrapper.java index 587cf1de..4d5b0bf6 100644 --- a/src/com/engine/organization/wrapper/JobWrapper.java +++ b/src/com/engine/organization/wrapper/JobWrapper.java @@ -106,12 +106,12 @@ public class JobWrapper extends Service { /** * 复制岗位到指定部门 * - * @param id - * @param departmentId + * @param ids + * @param department * @return */ - public int copyJobItem(long id, long departmentId) { - return getJobService(user).copyJobItem(id, departmentId); + public int copyJobItem(String ids, String department) { + return getJobService(user).copyJobItem(ids, department); } /** @@ -135,6 +135,7 @@ public class JobWrapper extends Service { /** * 获取复制表单 + * * @return */ public ReturnResult getCopyForm() { @@ -149,6 +150,7 @@ public class JobWrapper extends Service { /** * 根据岗位获取人员 + * * @param jobId * @return */ From b027a118f103259b1bb96114200b62f1506992c2 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Thu, 2 Jun 2022 09:58:16 +0800 Subject: [PATCH 02/77] =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=B7=A6=E4=BE=A7?= =?UTF-8?q?=E6=A0=91=20=E9=83=A8=E9=97=A8=E5=90=8D=E7=A7=B0=E5=91=BD?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/company/bo/CompBO.java | 3 +- .../entity/department/bo/DepartmentBO.java | 2 +- .../department/param/DeptSearchParam.java | 2 +- .../service/DepartmentService.java | 9 + .../service/impl/DepartmentServiceImpl.java | 177 ++++++++++++++++-- .../service/impl/JobServiceImpl.java | 17 +- .../web/DepartmentController.java | 21 +++ .../wrapper/DepartmentWrapper.java | 11 +- 8 files changed, 217 insertions(+), 25 deletions(-) diff --git a/src/com/engine/organization/entity/company/bo/CompBO.java b/src/com/engine/organization/entity/company/bo/CompBO.java index d81bfb6d..8f7e492b 100644 --- a/src/com/engine/organization/entity/company/bo/CompBO.java +++ b/src/com/engine/organization/entity/company/bo/CompBO.java @@ -1,6 +1,5 @@ package com.engine.organization.entity.company.bo; -import com.api.hrm.bean.TreeNode; import com.engine.organization.entity.company.dto.CompListDTO; import com.engine.organization.entity.company.param.CompSearchParam; import com.engine.organization.entity.company.po.CompPO; @@ -70,7 +69,7 @@ public class CompBO { } - public static List buildSetToSearchTree(Set comps) { + public static List buildSetToSearchTree(Set comps) { return comps.stream().map(item -> { SearchTree tree = new SearchTree(); tree.setCanClick(true); diff --git a/src/com/engine/organization/entity/department/bo/DepartmentBO.java b/src/com/engine/organization/entity/department/bo/DepartmentBO.java index be59ed1e..f9b7688c 100644 --- a/src/com/engine/organization/entity/department/bo/DepartmentBO.java +++ b/src/com/engine/organization/entity/department/bo/DepartmentBO.java @@ -80,7 +80,7 @@ public class DepartmentBO { .builder() .id(param.getId() == null ? 0 : param.getId()) .deptNo(param.getDeptNo()) - .deptName(param.getDeptName()) + .deptName(param.getDepartmentName()) .deptNameShort(param.getDeptNameShort()) .parentComp(param.getParentComp()) .parentDept(param.getParentDept()) diff --git a/src/com/engine/organization/entity/department/param/DeptSearchParam.java b/src/com/engine/organization/entity/department/param/DeptSearchParam.java index 619b9ec1..f17751f9 100644 --- a/src/com/engine/organization/entity/department/param/DeptSearchParam.java +++ b/src/com/engine/organization/entity/department/param/DeptSearchParam.java @@ -21,7 +21,7 @@ public class DeptSearchParam extends BaseQueryParam { private String deptNo; - private String deptName; + private String departmentName; private String deptNameShort; diff --git a/src/com/engine/organization/service/DepartmentService.java b/src/com/engine/organization/service/DepartmentService.java index bd69c703..2eb10131 100644 --- a/src/com/engine/organization/service/DepartmentService.java +++ b/src/com/engine/organization/service/DepartmentService.java @@ -3,6 +3,7 @@ package com.engine.organization.service; import com.engine.organization.entity.department.param.DeptSearchParam; import com.engine.organization.entity.department.param.QuerySingleDeptListParam; import com.engine.organization.entity.department.vo.SingleDeptTreeVO; +import com.engine.organization.entity.searchtree.SearchTreeParams; import com.engine.organization.util.page.PageInfo; import java.util.Collection; @@ -25,6 +26,13 @@ public interface DepartmentService { */ PageInfo getDeptListByPid(QuerySingleDeptListParam param); + /** + * 列表左侧树 + * + * @return + */ + Map getSearchTree(SearchTreeParams params); + /** * 列表数据展示 * @@ -40,6 +48,7 @@ public interface DepartmentService { * @return */ int saveBaseForm(DeptSearchParam params); + /** * 更新禁用标记 * diff --git a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java index 1819cf7d..f79e9a5c 100644 --- a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java +++ b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java @@ -5,17 +5,22 @@ import com.api.browser.bean.BrowserBean; import com.api.browser.bean.SearchConditionGroup; import com.api.browser.bean.SearchConditionItem; import com.api.browser.bean.SearchConditionOption; +import com.api.hrm.bean.TreeNode; import com.cloudstore.eccom.pc.table.WeaTableColumn; import com.cloudstore.eccom.result.WeaResultMsg; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; import com.engine.organization.component.OrganizationWeaTable; +import com.engine.organization.entity.company.bo.CompBO; +import com.engine.organization.entity.company.po.CompPO; import com.engine.organization.entity.department.bo.DepartmentBO; import com.engine.organization.entity.department.dto.DepartmentListDTO; import com.engine.organization.entity.department.param.DeptSearchParam; import com.engine.organization.entity.department.param.QuerySingleDeptListParam; import com.engine.organization.entity.department.po.DepartmentPO; import com.engine.organization.entity.department.vo.SingleDeptTreeVO; +import com.engine.organization.entity.searchtree.SearchTree; +import com.engine.organization.entity.searchtree.SearchTreeParams; import com.engine.organization.mapper.comp.CompMapper; import com.engine.organization.mapper.department.DepartmentMapper; import com.engine.organization.mapper.extend.ExtendGroupMapper; @@ -28,6 +33,8 @@ import com.engine.organization.util.db.MapperProxyFactory; import com.engine.organization.util.page.Column; import com.engine.organization.util.page.PageInfo; import com.engine.organization.util.page.PageUtil; +import org.apache.commons.collections4.CollectionUtils; +import weaver.conn.RecordSet; import weaver.general.StringUtil; import weaver.general.Util; import weaver.hrm.User; @@ -59,6 +66,15 @@ public class DepartmentServiceImpl extends Service implements DepartmentService */ private static final String JCL_ORG_DEPTEXT_DT1 = "JCL_ORG_DEPTEXT_DT1"; + /** + * 左侧树 类型表示 + *

+ * 0：集团 + * 1：分部 + * 2：部门 + */ + private static final String TYPE_GROUP = "0"; + private DepartmentMapper getDepartmentMapper() { return MapperProxyFactory.getProxy(DepartmentMapper.class); } @@ -83,7 +99,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService //PageUtil.start(param.getCurrent(), param.getPageSize()); List departmentPOS = MapperProxyFactory.getProxy(DepartmentMapper.class).list(); PageInfo pageInfo = new PageInfo<>(departmentPOS); - List singleDeptTreeVOS = DepartmentBO.buildSingleDeptTreeVOS(departmentPOS,param.getParentComp()); + List singleDeptTreeVOS = DepartmentBO.buildSingleDeptTreeVOS(departmentPOS, param.getParentComp()); PageInfo pageInfos = new PageInfo<>(singleDeptTreeVOS, SingleDeptTreeVO.class); pageInfos.setTotal(pageInfo.getTotal()); pageInfos.setPageNum(param.getCurrent()); @@ -92,25 +108,54 @@ public class DepartmentServiceImpl extends Service implements DepartmentService return pageInfos; } + + @Override + public Map getSearchTree(SearchTreeParams params) { + Map dataMap = new HashMap<>(); + SearchTree topGroup = getTopGroup(); + // 集团 + List companyList = new ArrayList<>(); + companyList.add(topGroup); + String keyword = params.getKeyword(); + String type = Util.null2String(params.getType()); + String id = params.getId(); + + List treeDatas = getFilterCompany(id, type, keyword); + // 未点击，初始化树结构 + if (StringUtil.isEmpty(type)) { + dataMap.put("companys", companyList); + SearchTree rootCompany = getTopGroup(); + rootCompany.setSubs(treeDatas); + rootCompany.setIsParent(CollectionUtils.isNotEmpty(rootCompany.getSubs())); + Map rootCompanyMap = new HashMap<>(); + rootCompanyMap.put("rootCompany", rootCompany); + dataMap.put("datas", rootCompanyMap); + } else { + // 根据ID查询 + dataMap.put("datas", treeDatas); + } + return dataMap; + } + @Override public Map listPage(DeptSearchParam param) { Map datas = new HashMap<>(); - DepartmentPO departmentPO = DepartmentBO.convertParamsToPO(param, (long) user.getUID()); + DepartmentPO departmentPO = DepartmentBO.convertParamsToPO(param, user.getUID()); boolean filter = isFilter(departmentPO); PageInfo pageInfos; - List alltList = getDepartmentMapper().list(); + List allList = getDepartmentMapper().list(); // 通过子级遍历父级元素 if (filter) { // 根据条件获取元素 - List filteDeptPOs = getDepartmentMapper().listByFilter(departmentPO); + List filterDeptPOs = getDepartmentMapper().listByFilter(departmentPO); // 添加父级元素 - List compListDTOS = DepartmentBO.buildDeptDTOList(alltList, filteDeptPOs); + List compListDTOS = DepartmentBO.buildDeptDTOList(allList, filterDeptPOs); List subList = PageUtil.subList(param.getCurrent(), param.getPageSize(), compListDTOS); pageInfos = new PageInfo<>(subList, DepartmentListDTO.class); pageInfos.setTotal(compListDTOS.size()); } else { // 组合list - List compListDTOS = DepartmentBO.buildDeptDTOList(alltList); + List compListDTOS = DepartmentBO.buildDeptDTOList(allList); List subList = PageUtil.subList(param.getCurrent(), param.getPageSize(), compListDTOS); pageInfos = new PageInfo<>(subList, DepartmentListDTO.class); pageInfos.setTotal(compListDTOS.size()); @@ -138,7 +183,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService public int saveBaseForm(DeptSearchParam params) { List list = getDepartmentMapper().listByNo(Util.null2String(params.getDeptNo())); OrganizationAssert.isEmpty(list, "编号不允许重复"); - DepartmentPO departmentPO = DepartmentBO.convertParamsToPO(params, (long) user.getUID()); + DepartmentPO departmentPO = DepartmentBO.convertParamsToPO(params, user.getUID()); return getDepartmentMapper().insertIgnoreNull(departmentPO); } @@ -152,7 +197,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService public int updateForm(Map params) { DeptSearchParam searchParam = JSONObject.parseObject(JSONObject.toJSONString(params), DeptSearchParam.class); String groupId = (String) params.get("viewCondition"); - DepartmentPO departmentPO = DepartmentBO.convertParamsToPO(searchParam,user.getUID()); + DepartmentPO departmentPO = DepartmentBO.convertParamsToPO(searchParam, user.getUID()); int updateCount = 0; // 更新主表数据 updateCount += getDepartmentMapper().updateBaseDept(departmentPO); @@ -178,7 +223,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService // 编号 SearchConditionItem deptNoItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "编号", "deptNo"); // 名称 - SearchConditionItem deptNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "名称", "deptName"); + SearchConditionItem deptNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "名称", "departmentName"); // 简称 SearchConditionItem deptNameShortItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "简称", "deptNameShort"); // TODO @@ -274,7 +319,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService SearchConditionItem deptNoItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 3, 50, "编号", "deptNo"); deptNoItem.setRules("required|string"); // 名称 - SearchConditionItem deptNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 3, 50, "名称", "deptName"); + SearchConditionItem deptNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 3, 50, "名称", "departmentName"); deptNameItem.setRules("required|string"); // 简称 SearchConditionItem deptNameShortItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 3, 50, "简称", "deptNameShort"); @@ -328,7 +373,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService // 编号 SearchConditionItem deptNoItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 1, 50, "编号", "deptNo"); // 名称 - SearchConditionItem deptNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 3, 50, "名称", "deptName"); + SearchConditionItem deptNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 3, 50, "名称", "departmentName"); deptNameItem.setRules("required|string"); // 简称 SearchConditionItem deptNameShortItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 3, 50, "简称", "deptNameShort"); @@ -411,5 +456,115 @@ public class DepartmentServiceImpl extends Service implements DepartmentService } + /** + * 获取集团 + * + * @return + */ + private SearchTree getTopGroup() { + RecordSet rs = new RecordSet(); + String sql = "select * from HrmCompany "; + rs.executeQuery(sql); + SearchTree groupTree = new SearchTree(); + groupTree.setCanClick(false); + groupTree.setCanceled(false); + groupTree.setCompanyid("1"); + groupTree.setIcon("icon-coms-LargeArea"); + groupTree.setId("0"); + groupTree.setIsVirtual("0"); + while (rs.next()) { + groupTree.setName(rs.getString("COMPANYNAME")); + } + groupTree.setSelected(false); + groupTree.setType(TYPE_GROUP); + return groupTree; + } + + /** + * 根据keyword查询数据 + * + * @param id + * @param type + * @param keyword + * @return + */ + private List getFilterCompany(String id, String type, String keyword) { + List compSearchTree = new ArrayList<>(); + + // + // 查询部门信息 + Long parentCompId = StringUtil.isEmpty(id) ? null : Long.parseLong(id); + CompPO compBuild = CompPO.builder().compName(keyword).parentCompany(parentCompId).build(); + List filterComps = getCompMapper().listByFilter(compBuild); + + Set builderComps = new HashSet<>(); + for (CompPO compPO : filterComps) { + buildParentComps(compPO, builderComps); + } + List compTrees = builderTreeMode(CompBO.buildSetToSearchTree(builderComps)); + + // 排序，设置是否为叶子节点 + List collect = compTrees.stream().peek(item -> + item.setIsParent(CollectionUtils.isNotEmpty(item.getSubs())) + ).sorted(Comparator.comparing(item -> Integer.parseInt(item.getId()))).collect(Collectors.toList()); + if (CollectionUtils.isNotEmpty(collect)) { + compSearchTree.addAll(collect); + } + + return compSearchTree; + } + + /** + * 添加查询元素的父级元素 + * + * @param compPO + * @param builderComps + */ + private void buildParentComps(CompPO compPO, Set builderComps) { + builderComps.add(compPO); + if (isTop(compPO.getParentCompany())) { + return; + } + CompPO parentComp = getCompMapper().listById(compPO.getParentCompany()); + if (null != parentComp) { + buildParentComps(parentComp, builderComps); + } + } + + /** + * 处理树层级 + * + * @param treeList + * @return + */ + private List builderTreeMode(List treeList) { + Map> collects = treeList.stream().collect(Collectors.groupingBy(TreeNode::getPid)); + return treeList.stream().peek(e -> e.setSubs(collects.get(e.getId()))).peek(item -> { + if (CollectionUtils.isNotEmpty(item.getSubs())) { + item.setIsParent(true); + } + }).filter(item -> isTop(item.getPid())).collect(Collectors.toList()); + } + + /** + * 判断是为顶层数据 + * + * @param pid + * @return + */ + private boolean isTop(Long pid) { + return null == pid; + } + + /** + * 判断是为顶层数据 + * + * @param pid + * @return + */ + private boolean isTop(String pid) { + return StringUtil.isEmpty(pid) || "0".equals(pid); + } + } diff --git a/src/com/engine/organization/service/impl/JobServiceImpl.java b/src/com/engine/organization/service/impl/JobServiceImpl.java index 74ba42d7..b8224b9d 100644 --- a/src/com/engine/organization/service/impl/JobServiceImpl.java +++ b/src/com/engine/organization/service/impl/JobServiceImpl.java @@ -15,7 +15,6 @@ import com.engine.organization.entity.DeleteParam; import com.engine.organization.entity.company.bo.CompBO; import com.engine.organization.entity.company.po.CompPO; import com.engine.organization.entity.department.bo.DepartmentBO; -import com.engine.organization.entity.department.dto.DepartmentListDTO; import com.engine.organization.entity.department.po.DepartmentPO; import com.engine.organization.entity.employee.vo.EmployeeTableVO; import com.engine.organization.entity.extend.bo.ExtendInfoBO; @@ -164,22 +163,22 @@ public class JobServiceImpl extends Service implements JobService { // 根据条件获取元素 List filterJobPOs = getJobMapper().listByFilter(jobPO); // 添加父级元素 - List compListDTOS = JobBO.buildJobDTOList(allList, filterJobPOs); - List subList = PageUtil.subList(param.getCurrent(), param.getPageSize(), compListDTOS); + List jobListDTOS = JobBO.buildJobDTOList(allList, filterJobPOs); + List subList = PageUtil.subList(param.getCurrent(), param.getPageSize(), jobListDTOS); pageInfos = new PageInfo<>(subList, JobListDTO.class); - pageInfos.setTotal(compListDTOS.size()); + pageInfos.setTotal(jobListDTOS.size()); } else { // 组合list - List compListDTOS = JobBO.buildDTOList(allList); - List subList = PageUtil.subList(param.getCurrent(), param.getPageSize(), compListDTOS); + List jobListDTOS = JobBO.buildDTOList(allList); + List subList = PageUtil.subList(param.getCurrent(), param.getPageSize(), jobListDTOS); pageInfos = new PageInfo<>(subList, JobListDTO.class); - pageInfos.setTotal(compListDTOS.size()); + pageInfos.setTotal(jobListDTOS.size()); } pageInfos.setPageNum(param.getCurrent()); pageInfos.setPageSize(param.getPageSize()); - OrganizationWeaTable table = new OrganizationWeaTable<>(user, DepartmentListDTO.class); + OrganizationWeaTable table = new OrganizationWeaTable<>(user, JobListDTO.class); List columns = pageInfos.getColumns(); List weaTableColumn = columns.stream().map(v -> new WeaTableColumn("100", v.getTitle(), v.getKey())).collect(Collectors.toList()); @@ -637,7 +636,7 @@ public class JobServiceImpl extends Service implements JobService { * @param deptTrees * @return */ - private List builderTreeMode(List treeList, List deptTrees) { + private List builderTreeMode(List treeList, List deptTrees) { Map> parentMap = treeList.stream().collect(Collectors.groupingBy(TreeNode::getPid)); Map> childMap = deptTrees.stream().collect(Collectors.groupingBy(SearchTree::getParentComp)); boolean isAdd = !childMap.isEmpty(); diff --git a/src/com/engine/organization/web/DepartmentController.java b/src/com/engine/organization/web/DepartmentController.java index 565e2e1f..5d598ab9 100644 --- a/src/com/engine/organization/web/DepartmentController.java +++ b/src/com/engine/organization/web/DepartmentController.java @@ -1,10 +1,13 @@ package com.engine.organization.web; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.engine.common.util.ParamUtil; import com.engine.common.util.ServiceUtil; import com.engine.organization.entity.DeleteParam; import com.engine.organization.entity.department.param.DeptSearchParam; import com.engine.organization.entity.department.param.QuerySingleDeptListParam; +import com.engine.organization.entity.searchtree.SearchTreeParams; import com.engine.organization.util.response.ReturnResult; import com.engine.organization.wrapper.DepartmentWrapper; import io.swagger.v3.oas.annotations.parameters.RequestBody; @@ -46,6 +49,24 @@ public class DepartmentController { } } + /** + * 左侧树接口 + * + * @param request + * @param response + * @return + */ + @GET + @Path("/getSearchTree") + @Produces(MediaType.APPLICATION_JSON) + public Map getSearchTree(@Context HttpServletRequest request, @Context HttpServletResponse response) { + User user = HrmUserVarify.getUser(request, response); + Map map = ParamUtil.request2Map(request); + SearchTreeParams params = JSONObject.toJavaObject((JSON) JSONObject.toJSON(map), SearchTreeParams.class); + return getDepartmentWrapper(user).getSearchTree(params); + + } + /** * 获取list列表 * diff --git a/src/com/engine/organization/wrapper/DepartmentWrapper.java b/src/com/engine/organization/wrapper/DepartmentWrapper.java index 363ae0f4..b154d321 100644 --- a/src/com/engine/organization/wrapper/DepartmentWrapper.java +++ b/src/com/engine/organization/wrapper/DepartmentWrapper.java @@ -5,6 +5,7 @@ import com.engine.core.impl.Service; import com.engine.organization.entity.department.param.DeptSearchParam; import com.engine.organization.entity.department.param.QuerySingleDeptListParam; import com.engine.organization.entity.department.vo.SingleDeptTreeVO; +import com.engine.organization.entity.searchtree.SearchTreeParams; import com.engine.organization.service.DepartmentService; import com.engine.organization.service.impl.DepartmentServiceImpl; import com.engine.organization.util.page.PageInfo; @@ -30,7 +31,15 @@ public class DepartmentWrapper extends Service { PageInfo singleDeptTreeVOS = getDepartmentService(user).getDeptListByPid(param); return ReturnResult.successed(singleDeptTreeVOS); } - + /** + * 左侧树 + * + * @param params + * @return + */ + public Map getSearchTree(SearchTreeParams params) { + return getDepartmentService(user).getSearchTree(params); + } /** * 列表数据展示 * From 3d9a027c8fdf523b42cefb640169a061f928c189 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Thu, 2 Jun 2022 10:53:43 +0800 Subject: [PATCH 03/77] =?UTF-8?q?=E9=83=A8=E9=97=A8BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/department/bo/DepartmentBO.java | 4 +-- .../department/dto/DepartmentListDTO.java | 10 +++---- .../department/param/DeptSearchParam.java | 4 +++ .../service/DepartmentService.java | 9 ++++++ .../service/impl/DepartmentServiceImpl.java | 28 +++++++++++++++++-- 5 files changed, 46 insertions(+), 9 deletions(-) diff --git a/src/com/engine/organization/entity/department/bo/DepartmentBO.java b/src/com/engine/organization/entity/department/bo/DepartmentBO.java index f9b7688c..d4c55adb 100644 --- a/src/com/engine/organization/entity/department/bo/DepartmentBO.java +++ b/src/com/engine/organization/entity/department/bo/DepartmentBO.java @@ -82,8 +82,8 @@ public class DepartmentBO { .deptNo(param.getDeptNo()) .deptName(param.getDepartmentName()) .deptNameShort(param.getDeptNameShort()) - .parentComp(param.getParentComp()) - .parentDept(param.getParentDept()) + .parentComp(null==param.getParentComp()?param.getSubcompanyid1():param.getParentComp()) + .parentDept(null==param.getParentDept()?param.getDepartmentid():param.getParentDept()) .deptPrincipal(param.getDeptPrincipal()) .showOrder(param.getShowOrder()) .forbiddenTag(param.getForbiddenTag() == null ? null : param.getForbiddenTag() ? 0 : 1) diff --git a/src/com/engine/organization/entity/department/dto/DepartmentListDTO.java b/src/com/engine/organization/entity/department/dto/DepartmentListDTO.java index 5ea3a8f0..6be4c2f7 100644 --- a/src/com/engine/organization/entity/department/dto/DepartmentListDTO.java +++ b/src/com/engine/organization/entity/department/dto/DepartmentListDTO.java @@ -82,11 +82,11 @@ public class DepartmentListDTO { @TableTitle(title = "显示顺序", dataIndex = "showOrder", key = "showOrder") private int showOrder; - /** - * 说明 - */ - @TableTitle(title = "说明", dataIndex = "description", key = "description") - private String description; + ///** + // * 说明 + // */ + //@TableTitle(title = "说明", dataIndex = "description", key = "description") + //private String description; /** * 禁用标记 diff --git a/src/com/engine/organization/entity/department/param/DeptSearchParam.java b/src/com/engine/organization/entity/department/param/DeptSearchParam.java index f17751f9..36f8eec2 100644 --- a/src/com/engine/organization/entity/department/param/DeptSearchParam.java +++ b/src/com/engine/organization/entity/department/param/DeptSearchParam.java @@ -36,4 +36,8 @@ public class DeptSearchParam extends BaseQueryParam { private String description; private Boolean forbiddenTag; + + private Long subcompanyid1; + + private Long departmentid; } diff --git a/src/com/engine/organization/service/DepartmentService.java b/src/com/engine/organization/service/DepartmentService.java index 2eb10131..1e3fd41e 100644 --- a/src/com/engine/organization/service/DepartmentService.java +++ b/src/com/engine/organization/service/DepartmentService.java @@ -1,5 +1,6 @@ package com.engine.organization.service; +import com.api.browser.bean.SearchConditionGroup; import com.engine.organization.entity.department.param.DeptSearchParam; import com.engine.organization.entity.department.param.QuerySingleDeptListParam; import com.engine.organization.entity.department.vo.SingleDeptTreeVO; @@ -7,6 +8,7 @@ import com.engine.organization.entity.searchtree.SearchTreeParams; import com.engine.organization.util.page.PageInfo; import java.util.Collection; +import java.util.List; import java.util.Map; /** @@ -104,4 +106,11 @@ public interface DepartmentService { */ Map getSaveForm(); + /** + * 复制表单 + * + * @return + */ + List getCopyForm(); + } diff --git a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java index f79e9a5c..cb08bfab 100644 --- a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java +++ b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java @@ -266,9 +266,13 @@ public class DepartmentServiceImpl extends Service implements DepartmentService topMenuList.add(MenuBtn.topMenu_addNew()); // 批量删除 topMenuList.add(MenuBtn.topMenu_batchDelete()); + // 复制 + topMenuList.add(MenuBtn.topMenu_copy()); btnDatas.put("topMenu", topMenuList); // 新增 rightMenuList.add(MenuBtn.rightMenu_addNew()); + // 复制 + rightMenuList.add(MenuBtn.rightMenu_copy()); // 日志 rightMenuList.add(MenuBtn.rightMenu_btnLog()); btnDatas.put("rightMenu", rightMenuList); @@ -327,11 +331,11 @@ public class DepartmentServiceImpl extends Service implements DepartmentService // 所属分部 SearchConditionItem compBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "所属分部", "161", "parentComp", "compBrowser"); //上级部门 - SearchConditionItem deptBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "上级公司", "161", "parentDept", "deptBrowser"); + SearchConditionItem deptBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "上级部门", "161", "parentDept", "deptBrowser"); // 部门负责人 SearchConditionItem deptPrincipalItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "部门负责人", "1", "deptPrincipal", ""); // 显示顺序 - SearchConditionItem showOrderItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 3, 50, "编号", "showOrder"); + SearchConditionItem showOrderItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 3, 50, "显示顺序", "showOrder"); // 说明 SearchConditionItem descriptionItem = OrganizationFormItemUtil.textareaItem(user, 2, 16, true, 2, 60, "说明", "description"); @@ -351,6 +355,26 @@ public class DepartmentServiceImpl extends Service implements DepartmentService return apiDatas; } + /** + * 复制表单 + * + * @return + */ + @Override + public List getCopyForm() { + List addGroups = new ArrayList<>(); + List condition = new ArrayList<>(); + SearchConditionItem deptBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, "复制到", "161", "department", "deptBrowser"); + deptBrowserItem.setRules("required|string"); + List selectOptions = new ArrayList<>(); + SearchConditionItem isCheckItem = OrganizationFormItemUtil.selectItem(user, selectOptions, 2, 16, 15, false, "是否复制岗位信息", "copyJob"); + isCheckItem.setDetailtype(2); + condition.add(deptBrowserItem); + condition.add(isCheckItem); + addGroups.add(new SearchConditionGroup("", true, condition)); + return addGroups; + } + /** * 是否为搜索查询 * From 5252770a61a9acd08c8999ca0a7c0d20bb2abb98 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Thu, 2 Jun 2022 11:40:24 +0800 Subject: [PATCH 04/77] =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=A4=8D=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../department/param/DeptCopyParam.java | 26 +++++++++ .../organization/mapper/job/JobMapper.java | 8 +++ .../organization/mapper/job/JobMapper.xml | 8 +++ .../service/DepartmentService.java | 9 ++++ .../service/impl/DepartmentServiceImpl.java | 51 +++++++++++++++--- .../web/DepartmentController.java | 25 +++++++++ .../webservice/CustomBrowserService.java | 30 ----------- .../webservice/CustomBrowserServiceImpl.java | 53 ------------------- .../wrapper/DepartmentWrapper.java | 24 +++++++++ 9 files changed, 144 insertions(+), 90 deletions(-) create mode 100644 src/com/engine/organization/entity/department/param/DeptCopyParam.java delete mode 100644 src/com/engine/organization/webservice/CustomBrowserService.java delete mode 100644 src/com/engine/organization/webservice/CustomBrowserServiceImpl.java diff --git a/src/com/engine/organization/entity/department/param/DeptCopyParam.java b/src/com/engine/organization/entity/department/param/DeptCopyParam.java new file mode 100644 index 00000000..d7954280 --- /dev/null +++ b/src/com/engine/organization/entity/department/param/DeptCopyParam.java @@ -0,0 +1,26 @@ +package com.engine.organization.entity.department.param; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @description: TODO + * @author:dxfeng + * @createTime: 2022/06/01 + * @version: 1.0 + */ +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class DeptCopyParam { + private String ids; + + private String company; + /** + * 是否复制岗位 + */ + private String copyJob; +} diff --git a/src/com/engine/organization/mapper/job/JobMapper.java b/src/com/engine/organization/mapper/job/JobMapper.java index 46fb890b..18e51f78 100644 --- a/src/com/engine/organization/mapper/job/JobMapper.java +++ b/src/com/engine/organization/mapper/job/JobMapper.java @@ -62,6 +62,14 @@ public interface JobMapper { */ List listByNo(@Param("jobNo") String jobNo); + /** + * 根据所属部门查询数据 + * + * @param departmentId + * @return + */ + List listJobsByDepartmentId(@Param("departmentId") long departmentId); + /** * 添加数据 * diff --git a/src/com/engine/organization/mapper/job/JobMapper.xml b/src/com/engine/organization/mapper/job/JobMapper.xml index 214f8d5d..a1700a05 100644 --- a/src/com/engine/organization/mapper/job/JobMapper.xml +++ b/src/com/engine/organization/mapper/job/JobMapper.xml @@ -276,11 +276,19 @@ where delete_type = 0 and parent_job = #{pid} + + diff --git a/src/com/engine/organization/service/DepartmentService.java b/src/com/engine/organization/service/DepartmentService.java index 1e3fd41e..9bb50bd0 100644 --- a/src/com/engine/organization/service/DepartmentService.java +++ b/src/com/engine/organization/service/DepartmentService.java @@ -1,6 +1,7 @@ package com.engine.organization.service; import com.api.browser.bean.SearchConditionGroup; +import com.engine.organization.entity.department.param.DeptCopyParam; import com.engine.organization.entity.department.param.DeptSearchParam; import com.engine.organization.entity.department.param.QuerySingleDeptListParam; import com.engine.organization.entity.department.vo.SingleDeptTreeVO; @@ -113,4 +114,12 @@ public interface DepartmentService { */ List getCopyForm(); + /** + * 复制岗位到指定部门 + * + * @param copyParam + * @return + */ + int copyDepartment(DeptCopyParam copyParam); + } diff --git a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java index cb08bfab..5e4da8b9 100644 --- a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java +++ b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java @@ -15,15 +15,18 @@ import com.engine.organization.entity.company.bo.CompBO; import com.engine.organization.entity.company.po.CompPO; import com.engine.organization.entity.department.bo.DepartmentBO; import com.engine.organization.entity.department.dto.DepartmentListDTO; +import com.engine.organization.entity.department.param.DeptCopyParam; import com.engine.organization.entity.department.param.DeptSearchParam; import com.engine.organization.entity.department.param.QuerySingleDeptListParam; import com.engine.organization.entity.department.po.DepartmentPO; import com.engine.organization.entity.department.vo.SingleDeptTreeVO; +import com.engine.organization.entity.job.po.JobPO; import com.engine.organization.entity.searchtree.SearchTree; import com.engine.organization.entity.searchtree.SearchTreeParams; import com.engine.organization.mapper.comp.CompMapper; import com.engine.organization.mapper.department.DepartmentMapper; import com.engine.organization.mapper.extend.ExtendGroupMapper; +import com.engine.organization.mapper.job.JobMapper; import com.engine.organization.service.DepartmentService; import com.engine.organization.service.ExtService; import com.engine.organization.util.MenuBtn; @@ -120,7 +123,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService String type = Util.null2String(params.getType()); String id = params.getId(); - List treeDatas = getFilterCompany(id, type, keyword); + List treeDatas = getFilterCompany(id, keyword); // 未点击，初始化树结构 if (StringUtil.isEmpty(type)) { dataMap.put("companys", companyList); @@ -364,17 +367,52 @@ public class DepartmentServiceImpl extends Service implements DepartmentService public List getCopyForm() { List addGroups = new ArrayList<>(); List condition = new ArrayList<>(); - SearchConditionItem deptBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, "复制到", "161", "department", "deptBrowser"); - deptBrowserItem.setRules("required|string"); + SearchConditionItem compBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, "复制到", "161", "company", "compBrowser"); + compBrowserItem.setRules("required|string"); List selectOptions = new ArrayList<>(); - SearchConditionItem isCheckItem = OrganizationFormItemUtil.selectItem(user, selectOptions, 2, 16, 15, false, "是否复制岗位信息", "copyJob"); + SearchConditionOption Option = new SearchConditionOption("1", ""); + selectOptions.add(Option); + SearchConditionItem isCheckItem = OrganizationFormItemUtil.selectItem(user, selectOptions, 2, 16, 6, false, "是否复制岗位信息", "copyJob"); isCheckItem.setDetailtype(2); - condition.add(deptBrowserItem); + condition.add(compBrowserItem); condition.add(isCheckItem); addGroups.add(new SearchConditionGroup("", true, condition)); return addGroups; } + /** + * 复制岗位到指定部门 + * + * @param copyParam + * @return + */ + @Override + public int copyDepartment(DeptCopyParam copyParam) { + OrganizationAssert.notBlank(copyParam.getCompany(), "请指定需要复制的公司/分部"); + int insertCount = 0; + List idList = Arrays.stream(copyParam.getIds().split(",")).map(Long::parseLong).collect(Collectors.toList()); + for (Long id : idList) { + DepartmentPO deptById = getDepartmentMapper().getDeptById(id); + // TODO 自动编号 + deptById.setDeptNo("复制_" + deptById.getDeptNo()); + deptById.setParentComp(Long.parseLong(copyParam.getCompany())); + insertCount += getDepartmentMapper().insertIgnoreNull(deptById); + if ("1".equals(copyParam.getCopyJob())) { + List jobPOS = MapperProxyFactory.getProxy(JobMapper.class).listJobsByDepartmentId(id); + for (JobPO jobPO : jobPOS) { + // TODO 自动编号 + jobPO.setJobNo("部门复制_" + jobPO.getJobNo()); + jobPO.setParentDept(deptById.getId()); + jobPO.setCreator((long) user.getUID()); + jobPO.setCreateTime(new Date()); + jobPO.setParentComp(deptById.getParentComp()); + insertCount += MapperProxyFactory.getProxy(JobMapper.class).insertIgnoreNull(jobPO); + } + } + } + return insertCount; + } + /** * 是否为搜索查询 * @@ -508,11 +546,10 @@ public class DepartmentServiceImpl extends Service implements DepartmentService * 根据keyword查询数据 * * @param id - * @param type * @param keyword * @return */ - private List getFilterCompany(String id, String type, String keyword) { + private List getFilterCompany(String id, String keyword) { List compSearchTree = new ArrayList<>(); // diff --git a/src/com/engine/organization/web/DepartmentController.java b/src/com/engine/organization/web/DepartmentController.java index 5d598ab9..a5106ff4 100644 --- a/src/com/engine/organization/web/DepartmentController.java +++ b/src/com/engine/organization/web/DepartmentController.java @@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject; import com.engine.common.util.ParamUtil; import com.engine.common.util.ServiceUtil; import com.engine.organization.entity.DeleteParam; +import com.engine.organization.entity.department.param.DeptCopyParam; import com.engine.organization.entity.department.param.DeptSearchParam; import com.engine.organization.entity.department.param.QuerySingleDeptListParam; import com.engine.organization.entity.searchtree.SearchTreeParams; @@ -247,4 +248,28 @@ public class DepartmentController { } + @GET + @Path("/getCopyForm") + @Produces(MediaType.APPLICATION_JSON) + public ReturnResult getCopyForm(@Context HttpServletRequest request, @Context HttpServletResponse response) { + try { + User user = HrmUserVarify.getUser(request, response); + return ReturnResult.successed(getDepartmentWrapper(user).getCopyForm()); + } catch (Exception e) { + return ReturnResult.exceptionHandle(e.getMessage()); + } + } + + @POST + @Path("/copyDepartment") + @Produces(MediaType.APPLICATION_JSON) + public ReturnResult copyDepartment(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody DeptCopyParam copyParam) { + try { + User user = HrmUserVarify.getUser(request, response); + return ReturnResult.successed(getDepartmentWrapper(user).copyDepartment(copyParam)); + } catch (Exception e) { + return ReturnResult.exceptionHandle(e.getMessage()); + } + } + } diff --git a/src/com/engine/organization/webservice/CustomBrowserService.java b/src/com/engine/organization/webservice/CustomBrowserService.java deleted file mode 100644 index 2c155efb..00000000 --- a/src/com/engine/organization/webservice/CustomBrowserService.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.engine.organization.webservice; - -import com.engine.organization.entity.company.po.CompPO; - -import javax.jws.WebMethod; -import javax.jws.WebService; -import java.util.List; - -/** - * @description: TODO - * @author:dxfeng - * @createTime: 2022/05/23 - * @version: 1.0 - */ -@WebService -public interface CustomBrowserService { - - - /** - * 公司/分部 树形列表 - * 只获取未删除且启用的数据 - * - * @return - */ - @WebMethod( - operationName = "getCompTreeList", - action = "com.engine.organization.webservice.CustomBrowserService.getCompTreeList" - ) - List getCompTreeList(); -} diff --git a/src/com/engine/organization/webservice/CustomBrowserServiceImpl.java b/src/com/engine/organization/webservice/CustomBrowserServiceImpl.java deleted file mode 100644 index 1591caeb..00000000 --- a/src/com/engine/organization/webservice/CustomBrowserServiceImpl.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.engine.organization.webservice; - -import com.engine.organization.entity.company.po.CompPO; -import com.engine.organization.mapper.comp.CompMapper; -import com.engine.organization.util.db.MapperProxyFactory; -import org.apache.commons.collections4.CollectionUtils; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - -/** - * @description: TODO - * @author:dxfeng - * @createTime: 2022/05/23 - * @version: 1.0 - */ -public class CustomBrowserServiceImpl implements CustomBrowserService { - private CompMapper getCompMapper() { - return MapperProxyFactory.getProxy(CompMapper.class); - } - - @Override - public List getCompTreeList() { - // 获取所有启用数据 - List allList = getCompMapper().list().stream().filter(item -> 0 == item.getForbiddenTag()).collect(Collectors.toList()); - - List parentList = allList.stream().filter(item -> (null == item.getParentCompany() || 0 == item.getParentCompany())).collect(Collectors.toList()); - Map> compMap = allList.stream().filter(item -> (null != item.getParentCompany() && 0 != item.getParentCompany())).collect(Collectors.groupingBy(CompPO::getParentCompany)); - List returnList = new ArrayList<>(); - dealChildren(parentList, returnList, compMap); - - return returnList; - } - - /** - * 处理分部子节点 - * - * @param parentList - * @param returnList - * @param compMap - */ - private void dealChildren(List parentList, List returnList, Map> compMap) { - if (CollectionUtils.isEmpty(parentList)) { - return; - } - for (CompPO compPO : parentList) { - returnList.add(compPO); - dealChildren(compMap.get(compPO.getId()), returnList, compMap); - } - } -} diff --git a/src/com/engine/organization/wrapper/DepartmentWrapper.java b/src/com/engine/organization/wrapper/DepartmentWrapper.java index b154d321..d3d1d82d 100644 --- a/src/com/engine/organization/wrapper/DepartmentWrapper.java +++ b/src/com/engine/organization/wrapper/DepartmentWrapper.java @@ -1,7 +1,9 @@ package com.engine.organization.wrapper; +import com.api.browser.bean.SearchConditionGroup; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; +import com.engine.organization.entity.department.param.DeptCopyParam; import com.engine.organization.entity.department.param.DeptSearchParam; import com.engine.organization.entity.department.param.QuerySingleDeptListParam; import com.engine.organization.entity.department.vo.SingleDeptTreeVO; @@ -13,6 +15,7 @@ import com.engine.organization.util.response.ReturnResult; import weaver.hrm.User; import java.util.Collection; +import java.util.List; import java.util.Map; /** @@ -31,6 +34,7 @@ public class DepartmentWrapper extends Service { PageInfo singleDeptTreeVOS = getDepartmentService(user).getDeptListByPid(param); return ReturnResult.successed(singleDeptTreeVOS); } + /** * 左侧树 * @@ -40,6 +44,7 @@ public class DepartmentWrapper extends Service { public Map getSearchTree(SearchTreeParams params) { return getDepartmentService(user).getSearchTree(params); } + /** * 列表数据展示 * @@ -127,5 +132,24 @@ public class DepartmentWrapper extends Service { return getDepartmentService(user).getDeptBaseForm(params); } + /** + * 复制表单 + * + * @return + */ + public List getCopyForm() { + return getDepartmentService(user).getCopyForm(); + } + + /** + * 复制岗位到指定部门 + * + * @param copyParam + * @return + */ + public int copyDepartment(DeptCopyParam copyParam) { + return getDepartmentService(user).copyDepartment(copyParam); + } + } From 076d0997151cccd213df4703f9a63ab78c0244ff Mon Sep 17 00:00:00 2001 From: dxfeng Date: Thu, 2 Jun 2022 13:38:26 +0800 Subject: [PATCH 05/77] =?UTF-8?q?=E9=83=A8=E9=97=A8BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/department/bo/DepartmentBO.java | 18 ++++++++++++++---- .../mapper/department/DepartmentMapper.xml | 1 + 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/com/engine/organization/entity/department/bo/DepartmentBO.java b/src/com/engine/organization/entity/department/bo/DepartmentBO.java index d4c55adb..8e8e957d 100644 --- a/src/com/engine/organization/entity/department/bo/DepartmentBO.java +++ b/src/com/engine/organization/entity/department/bo/DepartmentBO.java @@ -82,12 +82,13 @@ public class DepartmentBO { .deptNo(param.getDeptNo()) .deptName(param.getDepartmentName()) .deptNameShort(param.getDeptNameShort()) - .parentComp(null==param.getParentComp()?param.getSubcompanyid1():param.getParentComp()) - .parentDept(null==param.getParentDept()?param.getDepartmentid():param.getParentDept()) + .parentComp(null == param.getParentComp() ? param.getSubcompanyid1() : param.getParentComp()) + .parentDept(null == param.getParentDept() ? param.getDepartmentid() : param.getParentDept()) .deptPrincipal(param.getDeptPrincipal()) .showOrder(param.getShowOrder()) .forbiddenTag(param.getForbiddenTag() == null ? null : param.getForbiddenTag() ? 0 : 1) - .description(param.getDescription()).deleteType(0) + .description(param.getDescription()) + .deleteType(0) .createTime(new Date()) .updateTime(new Date()) .creator(employeeId) @@ -100,7 +101,16 @@ public class DepartmentBO { return Collections.emptyList(); } - List singleDeptTreeVOS = departmentPOs.stream().map(e -> SingleDeptTreeVO.builder().id(e.getId()).deptName(e.getDeptName()).parentComp(e.getParentComp()).parentDept(e.getParentDept()).parentDeptName(e.getParentDept() == null ? "" : getDeptNameById(e.getParentDept().intValue())).deptPrincipalName(getEmployeeNameById(e.getDeptPrincipal())).build()).collect(Collectors.toList()); + List singleDeptTreeVOS = departmentPOs.stream().map(e -> + SingleDeptTreeVO + .builder() + .id(e.getId()) + .deptName(e.getDeptName()) + .parentComp(e.getParentComp()) + .parentDept(e.getParentDept()) + .parentDeptName(e.getParentDept() == null ? "" : getDeptNameById(e.getParentDept().intValue())) + .deptPrincipalName(getEmployeeNameById(e.getDeptPrincipal())) + .build()).collect(Collectors.toList()); //获取非一级部门 Map> collects = singleDeptTreeVOS.stream().filter(item -> !parentComp.equals(item.getParentComp()) && null != item.getParentDept()).collect(Collectors.groupingBy(SingleDeptTreeVO::getParentDept)); diff --git a/src/com/engine/organization/mapper/department/DepartmentMapper.xml b/src/com/engine/organization/mapper/department/DepartmentMapper.xml index 1e5b00a9..ad8540c0 100644 --- a/src/com/engine/organization/mapper/department/DepartmentMapper.xml +++ b/src/com/engine/organization/mapper/department/DepartmentMapper.xml @@ -31,6 +31,7 @@ t.parent_dept, t.dept_principal, t.show_order, + t.description, t.forbidden_tag From 96e8042156d4e3f1e39d1aa10bac0f26694b8545 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Thu, 2 Jun 2022 15:43:19 +0800 Subject: [PATCH 06/77] =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E3=80=81=E8=BD=AC=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/department/bo/DepartmentBO.java | 9 +- .../param/DepartmentMergeParam.java | 31 ++++++ .../department/param/DepartmentMoveParam.java | 23 ++++ .../mapper/department/DepartmentMapper.java | 8 ++ .../mapper/department/DepartmentMapper.xml | 7 ++ .../service/DepartmentService.java | 34 +++++- .../service/impl/DepartmentServiceImpl.java | 102 +++++++++++++++++- .../web/DepartmentController.java | 54 +++++++++- .../wrapper/DepartmentWrapper.java | 41 ++++++- 9 files changed, 293 insertions(+), 16 deletions(-) create mode 100644 src/com/engine/organization/entity/department/param/DepartmentMergeParam.java create mode 100644 src/com/engine/organization/entity/department/param/DepartmentMoveParam.java diff --git a/src/com/engine/organization/entity/department/bo/DepartmentBO.java b/src/com/engine/organization/entity/department/bo/DepartmentBO.java index 8e8e957d..749eb557 100644 --- a/src/com/engine/organization/entity/department/bo/DepartmentBO.java +++ b/src/com/engine/organization/entity/department/bo/DepartmentBO.java @@ -5,6 +5,7 @@ import com.engine.organization.entity.department.param.DeptSearchParam; import com.engine.organization.entity.department.po.DepartmentPO; import com.engine.organization.entity.department.vo.SingleDeptTreeVO; import com.engine.organization.entity.searchtree.SearchTree; +import com.engine.organization.mapper.comp.CompMapper; import com.engine.organization.mapper.department.DepartmentMapper; import com.engine.organization.mapper.employee.EmployeeMapper; import com.engine.organization.util.db.MapperProxyFactory; @@ -32,13 +33,13 @@ public class DepartmentBO { .deptNo(e.getDeptNo()) .deptName(e.getDeptName()) .deptNameShort(e.getDeptNameShort()) - .parentComp(e.getParentComp() + "")// 命名 + .parentComp(null == e.getParentComp() ? "" : MapperProxyFactory.getProxy(CompMapper.class).listById(e.getParentComp()).getCompName()) .parentDept(e.getParentDept()) - .parentDeptName(null == poMaps.get(e.getParentDept()) ? "" : poMaps.get(e.getParentDept()) - .getDeptName()).deptPrincipal(getEmployeeNameById(e.getDeptPrincipal())) + .parentDeptName(null == poMaps.get(e.getParentDept()) ? "" : poMaps.get(e.getParentDept()).getDeptName()) + .deptPrincipal(getEmployeeNameById(e.getDeptPrincipal())) .showOrder(null == e.getShowOrder() ? 0 : e.getShowOrder()) .forbiddenTag(e.getForbiddenTag()) - .build()).collect(Collectors.toList()); + .build() ).collect(Collectors.toList()); Map> collects = dtoList.stream().filter(item -> null != item.getParentDept() && 0 != item.getParentDept()).collect(Collectors.groupingBy(DepartmentListDTO::getParentDept)); // 处理被引用数据 List usedIds = MapperProxyFactory.getProxy(DepartmentMapper.class).listUsedId(); diff --git a/src/com/engine/organization/entity/department/param/DepartmentMergeParam.java b/src/com/engine/organization/entity/department/param/DepartmentMergeParam.java new file mode 100644 index 00000000..4436d87c --- /dev/null +++ b/src/com/engine/organization/entity/department/param/DepartmentMergeParam.java @@ -0,0 +1,31 @@ +package com.engine.organization.entity.department.param; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @description: TODO + * @author:dxfeng + * @createTime: 2022/06/02 + * @version: 1.0 + */ +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class DepartmentMergeParam { + /** + * 所选部门 + */ + private Long id; + /** + * 合并部门 + */ + private Long department; + /** + * 合并后名称 + */ + private String mergeName; +} diff --git a/src/com/engine/organization/entity/department/param/DepartmentMoveParam.java b/src/com/engine/organization/entity/department/param/DepartmentMoveParam.java new file mode 100644 index 00000000..7f4aa4b1 --- /dev/null +++ b/src/com/engine/organization/entity/department/param/DepartmentMoveParam.java @@ -0,0 +1,23 @@ +package com.engine.organization.entity.department.param; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @description: TODO + * @author:dxfeng + * @createTime: 2022/06/02 + * @version: 1.0 + */ +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class DepartmentMoveParam { + private Long id; + private String moveType; + private Long company; + private Long department; +} diff --git a/src/com/engine/organization/mapper/department/DepartmentMapper.java b/src/com/engine/organization/mapper/department/DepartmentMapper.java index 84569713..c481f4be 100644 --- a/src/com/engine/organization/mapper/department/DepartmentMapper.java +++ b/src/com/engine/organization/mapper/department/DepartmentMapper.java @@ -92,6 +92,14 @@ public interface DepartmentMapper { */ int updateForbiddenTagById(DepartmentPO departmentPO); + /** + * 批量禁用部门 + * + * @param ids + * @return + */ + int forbiddenDepartmentByIds(@Param("ids") Collection ids); + /** * 批量删除 * diff --git a/src/com/engine/organization/mapper/department/DepartmentMapper.xml b/src/com/engine/organization/mapper/department/DepartmentMapper.xml index ad8540c0..e5ec0fff 100644 --- a/src/com/engine/organization/mapper/department/DepartmentMapper.xml +++ b/src/com/engine/organization/mapper/department/DepartmentMapper.xml @@ -244,6 +244,13 @@ #{id} + + update jcl_org_dept set forbidden_tag = 1 WHERE delete_type = 0 + AND id IN + + #{id} + + diff --git a/src/com/engine/organization/service/DepartmentService.java b/src/com/engine/organization/service/DepartmentService.java index 9bb50bd0..aa695bae 100644 --- a/src/com/engine/organization/service/DepartmentService.java +++ b/src/com/engine/organization/service/DepartmentService.java @@ -1,9 +1,7 @@ package com.engine.organization.service; import com.api.browser.bean.SearchConditionGroup; -import com.engine.organization.entity.department.param.DeptCopyParam; -import com.engine.organization.entity.department.param.DeptSearchParam; -import com.engine.organization.entity.department.param.QuerySingleDeptListParam; +import com.engine.organization.entity.department.param.*; import com.engine.organization.entity.department.vo.SingleDeptTreeVO; import com.engine.organization.entity.searchtree.SearchTreeParams; import com.engine.organization.util.page.PageInfo; @@ -122,4 +120,34 @@ public interface DepartmentService { */ int copyDepartment(DeptCopyParam copyParam); + /** + * 获取合并表单 + * + * @return + */ + List getMergeForm(Long id); + + /** + * 合并到指定部门 + * + * @param mergeParam + * @return + */ + int mergeDepartment(DepartmentMergeParam mergeParam); + + /** + * 获取转移表单 + * + * @return + */ + List getMoveForm(); + + /** + * 转移到指定分部或部门 + * + * @param moveParam + * @return + */ + int moveDepartment(DepartmentMoveParam moveParam); + } diff --git a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java index 5e4da8b9..9ec2e8fa 100644 --- a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java +++ b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java @@ -15,9 +15,7 @@ import com.engine.organization.entity.company.bo.CompBO; import com.engine.organization.entity.company.po.CompPO; import com.engine.organization.entity.department.bo.DepartmentBO; import com.engine.organization.entity.department.dto.DepartmentListDTO; -import com.engine.organization.entity.department.param.DeptCopyParam; -import com.engine.organization.entity.department.param.DeptSearchParam; -import com.engine.organization.entity.department.param.QuerySingleDeptListParam; +import com.engine.organization.entity.department.param.*; import com.engine.organization.entity.department.po.DepartmentPO; import com.engine.organization.entity.department.vo.SingleDeptTreeVO; import com.engine.organization.entity.job.po.JobPO; @@ -413,6 +411,104 @@ public class DepartmentServiceImpl extends Service implements DepartmentService return insertCount; } + @Override + public List getMergeForm(Long id) { + List addGroups = new ArrayList<>(); + List condition = new ArrayList<>(); + SearchConditionItem deptBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, "合并部门", "161", "department", "deptBrowser"); + deptBrowserItem.setRules("required|string"); + SearchConditionItem mergeNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 3, 50, "合并后名称", "mergeName"); + mergeNameItem.setRules("required|string"); + String departmentName = getDepartmentMapper().getDeptNameById(id.intValue()); + mergeNameItem.setValue(departmentName); + + condition.add(deptBrowserItem); + condition.add(mergeNameItem); + addGroups.add(new SearchConditionGroup("", true, condition)); + return addGroups; + } + + @Override + public int mergeDepartment(DepartmentMergeParam mergeParam) { + int updateCount = 0; + OrganizationAssert.isFalse(mergeParam.getId().equals(mergeParam.getDepartment()), "所选部门与待合并部门一致，无需操作"); + OrganizationAssert.isNull(mergeParam.getDepartment(), "请选择需要合并的部门"); + OrganizationAssert.isBlank(mergeParam.getMergeName(), "请输入合并后的名称"); + // 所选部门 + DepartmentPO mergeDepartment = getDepartmentMapper().getDeptById(mergeParam.getId()); + mergeDepartment.setDeptName(mergeParam.getMergeName()); + mergeDepartment.setDeptNameShort(mergeParam.getMergeName()); + mergeDepartment.setParentDept(mergeParam.getDepartment()); + updateCount += getDepartmentMapper().updateBaseDept(mergeDepartment); + // 合并后部门及子部门禁用 + Set ids = new HashSet<>(); + ids.add(mergeParam.getId()); + List deptList = getDepartmentMapper().getDeptListByPId(mergeParam.getId()); + forbiddenChildTag(deptList, ids); + updateCount += getDepartmentMapper().forbiddenDepartmentByIds(ids); + return updateCount; + } + + @Override + public List getMoveForm() { + List addGroups = new ArrayList<>(); + List condition = new ArrayList<>(); + SearchConditionItem compBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, "请选择部门", "161", "company", "compBrowser"); + compBrowserItem.setRules("required|string"); + SearchConditionItem deptBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, "请选择部门", "161", "department", "deptBrowser"); + deptBrowserItem.setRules("required|string"); + + + List selectOptions = new ArrayList<>(); + SearchConditionOption compOption = new SearchConditionOption("0", "公司/分部"); + SearchConditionOption deptOption = new SearchConditionOption("1", "部门"); + selectOptions.add(compOption); + selectOptions.add(deptOption); + SearchConditionItem moveTypeItem = OrganizationFormItemUtil.selectItem(user, selectOptions, 2, 16, 6, false, "转移到", "moveType"); + moveTypeItem.setDetailtype(3); + + condition.add(moveTypeItem); + condition.add(compBrowserItem); + condition.add(deptBrowserItem); + addGroups.add(new SearchConditionGroup("", true, condition)); + return addGroups; + } + + @Override + public int moveDepartment(DepartmentMoveParam moveParam) { + OrganizationAssert.notBlank(moveParam.getMoveType(), "请选择转移类型"); + DepartmentPO deptById = getDepartmentMapper().getDeptById(moveParam.getId()); + // 0：公司/分部 1：部门 + if ("0".equals(moveParam.getMoveType())) { + Long company = moveParam.getCompany(); + OrganizationAssert.notNull(company, "请选择要转移到的公司/分部"); + deptById.setParentComp(company); + deptById.setParentDept(null); + } else if ("1".equals(moveParam.getMoveType())) { + Long department = moveParam.getDepartment(); + OrganizationAssert.notNull(department, "请选择要转移到的部门"); + deptById.setParentDept(department); + deptById.setParentComp(null); + } + return getDepartmentMapper().updateBaseDept(deptById); + } + + /** + * 获取所有子部门id + * + * @param deptList + * @param ids + */ + void forbiddenChildTag(List deptList, Set ids) { + if (CollectionUtils.isNotEmpty(deptList)) { + for (DepartmentPO departmentPO : deptList) { + ids.add(departmentPO.getId()); + List childList = getDepartmentMapper().getDeptListByPId(departmentPO.getId()); + forbiddenChildTag(childList, ids); + } + } + } + /** * 是否为搜索查询 * diff --git a/src/com/engine/organization/web/DepartmentController.java b/src/com/engine/organization/web/DepartmentController.java index a5106ff4..856c77da 100644 --- a/src/com/engine/organization/web/DepartmentController.java +++ b/src/com/engine/organization/web/DepartmentController.java @@ -5,9 +5,7 @@ import com.alibaba.fastjson.JSONObject; import com.engine.common.util.ParamUtil; import com.engine.common.util.ServiceUtil; import com.engine.organization.entity.DeleteParam; -import com.engine.organization.entity.department.param.DeptCopyParam; -import com.engine.organization.entity.department.param.DeptSearchParam; -import com.engine.organization.entity.department.param.QuerySingleDeptListParam; +import com.engine.organization.entity.department.param.*; import com.engine.organization.entity.searchtree.SearchTreeParams; import com.engine.organization.util.response.ReturnResult; import com.engine.organization.wrapper.DepartmentWrapper; @@ -272,4 +270,54 @@ public class DepartmentController { } } + @GET + @Path("/getMergeForm") + @Produces(MediaType.APPLICATION_JSON) + public ReturnResult getMergeForm(@Context HttpServletRequest request, @Context HttpServletResponse response) { + try { + User user = HrmUserVarify.getUser(request, response); + Map map = ParamUtil.request2Map(request); + String id = (String) map.get("id"); + return ReturnResult.successed(getDepartmentWrapper(user).getMergeForm(Long.parseLong(id))); + } catch (Exception e) { + return ReturnResult.exceptionHandle(e.getMessage()); + } + } + + @POST + @Path("/mergeDepartment") + @Produces(MediaType.APPLICATION_JSON) + public ReturnResult mergeDepartment(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody DepartmentMergeParam mergeParam) { + try { + User user = HrmUserVarify.getUser(request, response); + return ReturnResult.successed(getDepartmentWrapper(user).mergeDepartment(mergeParam)); + } catch (Exception e) { + return ReturnResult.exceptionHandle(e.getMessage()); + } + } + + @GET + @Path("/getMoveForm") + @Produces(MediaType.APPLICATION_JSON) + public ReturnResult getMoveForm(@Context HttpServletRequest request, @Context HttpServletResponse response) { + try { + User user = HrmUserVarify.getUser(request, response); + return ReturnResult.successed(getDepartmentWrapper(user).getMoveForm()); + } catch (Exception e) { + return ReturnResult.exceptionHandle(e.getMessage()); + } + } + + @POST + @Path("/moveDepartment") + @Produces(MediaType.APPLICATION_JSON) + public ReturnResult moveDepartment(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody DepartmentMoveParam moveParam) { + try { + User user = HrmUserVarify.getUser(request, response); + return ReturnResult.successed(getDepartmentWrapper(user).moveDepartment(moveParam)); + } catch (Exception e) { + return ReturnResult.exceptionHandle(e.getMessage()); + } + } + } diff --git a/src/com/engine/organization/wrapper/DepartmentWrapper.java b/src/com/engine/organization/wrapper/DepartmentWrapper.java index d3d1d82d..4a617500 100644 --- a/src/com/engine/organization/wrapper/DepartmentWrapper.java +++ b/src/com/engine/organization/wrapper/DepartmentWrapper.java @@ -3,9 +3,7 @@ package com.engine.organization.wrapper; import com.api.browser.bean.SearchConditionGroup; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; -import com.engine.organization.entity.department.param.DeptCopyParam; -import com.engine.organization.entity.department.param.DeptSearchParam; -import com.engine.organization.entity.department.param.QuerySingleDeptListParam; +import com.engine.organization.entity.department.param.*; import com.engine.organization.entity.department.vo.SingleDeptTreeVO; import com.engine.organization.entity.searchtree.SearchTreeParams; import com.engine.organization.service.DepartmentService; @@ -151,5 +149,42 @@ public class DepartmentWrapper extends Service { return getDepartmentService(user).copyDepartment(copyParam); } + /** + * 获取合并表单 + * + * @param id + * @return + */ + public List getMergeForm(Long id) { + return getDepartmentService(user).getMergeForm(id); + } + + /** + * 合并到指定部门 + * + * @param mergeParam + * @return + */ + public int mergeDepartment(DepartmentMergeParam mergeParam) { + return getDepartmentService(user).mergeDepartment(mergeParam); + } + /** + * 获取转移表单 + * + * @return + */ + public List getMoveForm() { + return getDepartmentService(user).getMoveForm(); + } + + /** + * 转移到指定分部或部门 + * + * @param moveParam + * @return + */ + public int moveDepartment(DepartmentMoveParam moveParam) { + return getDepartmentService(user).moveDepartment(moveParam); + } } From ec71f31859be16d4ce4dec82155fa7a918e6dbe9 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Thu, 2 Jun 2022 16:49:25 +0800 Subject: [PATCH 07/77] =?UTF-8?q?=E9=83=A8=E9=97=A8=E8=81=94=E6=9F=A5?= =?UTF-8?q?=E5=B2=97=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../param/QuerySingleDeptListParam.java | 2 + .../organization/entity/job/bo/JobBO.java | 28 +++++++++++- .../entity/job/vo/SingleJobTreeVO.java | 44 +++++++++++++++++++ .../organization/mapper/job/JobMapper.java | 7 +++ .../organization/mapper/job/JobMapper.xml | 6 +++ .../service/DepartmentService.java | 10 +++++ .../service/impl/DepartmentServiceImpl.java | 14 ++++++ .../web/DepartmentController.java | 12 +++++ .../wrapper/DepartmentWrapper.java | 11 +++++ 9 files changed, 132 insertions(+), 2 deletions(-) create mode 100644 src/com/engine/organization/entity/job/vo/SingleJobTreeVO.java diff --git a/src/com/engine/organization/entity/department/param/QuerySingleDeptListParam.java b/src/com/engine/organization/entity/department/param/QuerySingleDeptListParam.java index aee890e3..e3120cb3 100644 --- a/src/com/engine/organization/entity/department/param/QuerySingleDeptListParam.java +++ b/src/com/engine/organization/entity/department/param/QuerySingleDeptListParam.java @@ -20,4 +20,6 @@ public class QuerySingleDeptListParam extends BaseQueryParam { private Long parentComp; + private Long parentDept; + } diff --git a/src/com/engine/organization/entity/job/bo/JobBO.java b/src/com/engine/organization/entity/job/bo/JobBO.java index f0345015..db506256 100644 --- a/src/com/engine/organization/entity/job/bo/JobBO.java +++ b/src/com/engine/organization/entity/job/bo/JobBO.java @@ -3,6 +3,7 @@ package com.engine.organization.entity.job.bo; import com.engine.organization.entity.job.dto.JobListDTO; import com.engine.organization.entity.job.param.JobSearchParam; import com.engine.organization.entity.job.po.JobPO; +import com.engine.organization.entity.job.vo.SingleJobTreeVO; import com.engine.organization.mapper.job.JobMapper; import com.engine.organization.transmethod.JobTransMethod; import com.engine.organization.util.db.MapperProxyFactory; @@ -28,8 +29,8 @@ public class JobBO { .id(param.getId() == null ? 0 : param.getId()) .jobNo(param.getJobNo()) .jobName(param.getJobName()) - .parentComp(null==param.getParentComp()?param.getSubcompanyid1():param.getParentComp()) - .parentDept(null==param.getParentDept()?param.getDepartmentid():param.getParentDept()) + .parentComp(null == param.getParentComp() ? param.getSubcompanyid1() : param.getParentComp()) + .parentDept(null == param.getParentDept() ? param.getDepartmentid() : param.getParentDept()) .sequenceId(param.getSequenceId()) .schemeId(param.getSchemeId()) .parentJob(param.getParentJob()) @@ -47,6 +48,29 @@ public class JobBO { } + public static List buildSingleJobTreeVOS(List jobPOS, Long parentDept) { + if (CollectionUtils.isEmpty(jobPOS)) { + return Collections.emptyList(); + } + Map poMaps = jobPOS.stream().collect(Collectors.toMap(JobPO::getId, item -> item)); + + List singleJobTreeVOS = jobPOS.stream().map(e -> + SingleJobTreeVO + .builder() + .id(e.getId()) + .jobNo(e.getJobNo()) + .jobName(e.getJobName()) + .parentJobName(null == poMaps.get(e.getParentJob()) ? "" : poMaps.get(e.getParentJob()).getJobName()) + .parentJob(e.getParentJob()) + .parentDept(e.getParentDept()) + .build()).collect(Collectors.toList()); + //获取非一级部门 + Map> collects = singleJobTreeVOS.stream().filter(item -> null != item.getParentJob()).collect(Collectors.groupingBy(SingleJobTreeVO::getParentJob)); + + return singleJobTreeVOS.stream().peek(e -> e.setChildren(collects.get(e.getId()))).filter(item -> parentDept.equals(item.getParentDept()) && null == item.getParentJob()).collect(Collectors.toList()); + } + + public static List buildDTOList(Collection list) { // 递归添加父级数据 Map poMaps = list.stream().collect(Collectors.toMap(JobListDTO::getId, item -> item)); diff --git a/src/com/engine/organization/entity/job/vo/SingleJobTreeVO.java b/src/com/engine/organization/entity/job/vo/SingleJobTreeVO.java new file mode 100644 index 00000000..3917bb05 --- /dev/null +++ b/src/com/engine/organization/entity/job/vo/SingleJobTreeVO.java @@ -0,0 +1,44 @@ +package com.engine.organization.entity.job.vo; + +import com.cloudstore.eccom.pc.table.WeaTableType; +import com.engine.organization.annotation.OrganizationTable; +import com.engine.organization.annotation.TableTitle; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +/** + * @description: TODO + * @author:dxfeng + * @createTime: 2022/06/02 + * @version: 1.0 + */ +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +@OrganizationTable(pageId = "434c1b24-e248-11ec-8a67-00e04c680716", + tableType = WeaTableType.NONE) +public class SingleJobTreeVO { + + private Long id; + + @TableTitle(title = "编号", dataIndex = "jobNo", key = "jobNo") + private String jobNo; + + @TableTitle(title = "编号", dataIndex = "jobName", key = "jobName") + private String jobName; + + @TableTitle(title = "编号", dataIndex = "parentJobName", key = "parentJobName") + private String parentJobName; + + private Long parentJob; + + private Long parentDept; + + private List children; + +} diff --git a/src/com/engine/organization/mapper/job/JobMapper.java b/src/com/engine/organization/mapper/job/JobMapper.java index 18e51f78..607ef8b6 100644 --- a/src/com/engine/organization/mapper/job/JobMapper.java +++ b/src/com/engine/organization/mapper/job/JobMapper.java @@ -30,6 +30,13 @@ public interface JobMapper { */ List listNoFilter(); + /** + * 查询所有数据 + * + * @return + */ + List listAll(); + /** * 根据ID查询元素 * diff --git a/src/com/engine/organization/mapper/job/JobMapper.xml b/src/com/engine/organization/mapper/job/JobMapper.xml index a1700a05..6a6123b2 100644 --- a/src/com/engine/organization/mapper/job/JobMapper.xml +++ b/src/com/engine/organization/mapper/job/JobMapper.xml @@ -289,6 +289,12 @@ where delete_type = 0 and parent_dept = #{departmentId} + diff --git a/src/com/engine/organization/service/DepartmentService.java b/src/com/engine/organization/service/DepartmentService.java index aa695bae..a4261e2d 100644 --- a/src/com/engine/organization/service/DepartmentService.java +++ b/src/com/engine/organization/service/DepartmentService.java @@ -3,6 +3,7 @@ package com.engine.organization.service; import com.api.browser.bean.SearchConditionGroup; import com.engine.organization.entity.department.param.*; import com.engine.organization.entity.department.vo.SingleDeptTreeVO; +import com.engine.organization.entity.job.vo.SingleJobTreeVO; import com.engine.organization.entity.searchtree.SearchTreeParams; import com.engine.organization.util.page.PageInfo; @@ -27,6 +28,15 @@ public interface DepartmentService { */ PageInfo getDeptListByPid(QuerySingleDeptListParam param); + /** + * 部门联查岗位 + * + * @param param + * @return + */ + PageInfo getJobListByPid(QuerySingleDeptListParam param); + + /** * 列表左侧树 * diff --git a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java index 9ec2e8fa..c958b145 100644 --- a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java +++ b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java @@ -18,7 +18,9 @@ import com.engine.organization.entity.department.dto.DepartmentListDTO; import com.engine.organization.entity.department.param.*; import com.engine.organization.entity.department.po.DepartmentPO; import com.engine.organization.entity.department.vo.SingleDeptTreeVO; +import com.engine.organization.entity.job.bo.JobBO; import com.engine.organization.entity.job.po.JobPO; +import com.engine.organization.entity.job.vo.SingleJobTreeVO; import com.engine.organization.entity.searchtree.SearchTree; import com.engine.organization.entity.searchtree.SearchTreeParams; import com.engine.organization.mapper.comp.CompMapper; @@ -109,6 +111,18 @@ public class DepartmentServiceImpl extends Service implements DepartmentService return pageInfos; } + @Override + public PageInfo getJobListByPid(QuerySingleDeptListParam param) { + List jobPOS = MapperProxyFactory.getProxy(JobMapper.class).listAll(); + PageInfo pageInfo = new PageInfo<>(jobPOS); + List singleDeptTreeVOS = JobBO.buildSingleJobTreeVOS(jobPOS, param.getParentDept()); + PageInfo pageInfos = new PageInfo<>(singleDeptTreeVOS, SingleJobTreeVO.class); + pageInfos.setTotal(pageInfo.getTotal()); + pageInfos.setPageNum(param.getCurrent()); + pageInfos.setPageSize(param.getPageSize()); + return pageInfos; + } + @Override public Map getSearchTree(SearchTreeParams params) { diff --git a/src/com/engine/organization/web/DepartmentController.java b/src/com/engine/organization/web/DepartmentController.java index 856c77da..97905666 100644 --- a/src/com/engine/organization/web/DepartmentController.java +++ b/src/com/engine/organization/web/DepartmentController.java @@ -48,6 +48,18 @@ public class DepartmentController { } } + @POST + @Path("/getJobListByPid") + @Produces(MediaType.APPLICATION_JSON) + public ReturnResult getJobListByPid(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody QuerySingleDeptListParam querySingleDeptListParam) { + try { + User user = HrmUserVarify.getUser(request, response); + return ReturnResult.successed(getDepartmentWrapper(user).getJobListByPid(querySingleDeptListParam)); + } catch (Exception e) { + return ReturnResult.exceptionHandle(e.getMessage()); + } + } + /** * 左侧树接口 * diff --git a/src/com/engine/organization/wrapper/DepartmentWrapper.java b/src/com/engine/organization/wrapper/DepartmentWrapper.java index 4a617500..d8596edf 100644 --- a/src/com/engine/organization/wrapper/DepartmentWrapper.java +++ b/src/com/engine/organization/wrapper/DepartmentWrapper.java @@ -5,6 +5,7 @@ import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; import com.engine.organization.entity.department.param.*; import com.engine.organization.entity.department.vo.SingleDeptTreeVO; +import com.engine.organization.entity.job.vo.SingleJobTreeVO; import com.engine.organization.entity.searchtree.SearchTreeParams; import com.engine.organization.service.DepartmentService; import com.engine.organization.service.impl.DepartmentServiceImpl; @@ -33,6 +34,16 @@ public class DepartmentWrapper extends Service { return ReturnResult.successed(singleDeptTreeVOS); } + /** + * 部门联查岗位 + * + * @param param + * @return + */ + public PageInfo getJobListByPid(QuerySingleDeptListParam param) { + return getDepartmentService(user).getJobListByPid(param); + } + /** * 左侧树 * From 98a2750727581d965e8c63cf4022bb7b8a48fe16 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Thu, 2 Jun 2022 17:22:49 +0800 Subject: [PATCH 08/77] =?UTF-8?q?=E8=A1=A8=E7=BB=93=E6=9E=84=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/表结构SQL/MySQL.sql | 48 +++++------ docs/表结构SQL/Oracle.sql | 150 +++++++++++++++------------------- docs/表结构SQL/SqlServer.sql | 154 ++++++++++++++++------------------- 3 files changed, 158 insertions(+), 194 deletions(-) diff --git a/docs/表结构SQL/MySQL.sql b/docs/表结构SQL/MySQL.sql index f83f1e74..637a8bb0 100644 --- a/docs/表结构SQL/MySQL.sql +++ b/docs/表结构SQL/MySQL.sql @@ -5,7 +5,7 @@ CREATE TABLE JCL_ORG_SCHEME ( scheme_name varchar(100) NULL, scheme_description text NULL, forbidden_tag int NULL, - is_used int not null, + is_used int null, creator int null, delete_type int null, create_time date null, @@ -20,7 +20,7 @@ CREATE TABLE JCL_ORG_LEVEL ( description text NULL, scheme_id int null, forbidden_tag int NULL, - is_used int not null, + is_used int null, creator int null, delete_type int null, create_time date null, @@ -36,7 +36,7 @@ CREATE TABLE JCL_ORG_GRADE ( scheme_id int null, level_id varchar(100) null, forbidden_tag int NULL, - is_used int not null, + is_used int null, creator int null, delete_type int null, create_time date null, @@ -52,7 +52,7 @@ CREATE TABLE JCL_ORG_SEQUENCE ( description text NULL, scheme_id int null, forbidden_tag int NULL, - is_used int not null, + is_used int null, creator int null, delete_type int null, create_time date null, @@ -66,7 +66,7 @@ CREATE TABLE JCL_ORG_POST ( post_no varchar(100) null, post_name varchar(100) NULL, description text NULL, - is_used int not null, + is_used int null, creator int null, delete_type int null, create_time date null, @@ -85,7 +85,7 @@ CREATE TABLE JCL_ORG_POST_INFO ( post_id int null, description text NULL, forbidden_tag int NULL, - is_used int not null, + is_used int null, creator int null, delete_type int null, create_time date null, @@ -105,7 +105,7 @@ CREATE TABLE JCL_ORG_COMP ( comp_principal int null, description text NULL, forbidden_tag int NULL, - is_used int not null, + is_used int null, creator int null, delete_type int null, create_time date null, @@ -141,7 +141,7 @@ CREATE TABLE JCL_FIELD_EXTENDINFO ( search_show int null, edit_show int null, add_show int null, - browser_show int null, + browser_show int null, show_order int null, creator int null, delete_type int null, @@ -183,7 +183,7 @@ CREATE TABLE JCL_ORG_DEPT ( show_order int null, description text NULL, forbidden_tag int NULL, - is_used int not null, + is_used int null, creator int null, delete_type int null, create_time date null, @@ -191,14 +191,14 @@ CREATE TABLE JCL_ORG_DEPT ( CONSTRAINT JCL_ORG_DEPT_PK PRIMARY KEY (id) ); --- JCL_ORG_DEPTPEXT -CREATE TABLE JCL_ORG_DEPTPEXT ( +-- JCL_ORG_DEPTEXT +CREATE TABLE JCL_ORG_DEPTEXT ( id int auto_increment NOT NULL, creator int null, delete_type int null, create_time date null, update_time date null, - CONSTRAINT JCL_ORG_DEPTPEXT_PK PRIMARY KEY (id) + CONSTRAINT JCL_ORG_DEPTEXT_PK PRIMARY KEY (id) ); -- JCL_ORG_DEPTEXT_DT1 @@ -228,7 +228,7 @@ CREATE TABLE JCL_ORG_JOB ( work_duty text null, work_authority text null, forbidden_tag int NULL, - is_used int not null, + is_used int null, creator int null, delete_type int null, create_time date null, @@ -284,7 +284,7 @@ CREATE TABLE JCL_ORG_STAFFPLAN ( company_id varchar(100) NULL, description text NULL, forbidden_tag int NULL, - is_used int not null, + is_used int null, creator int null, delete_type int null, create_time date null, @@ -306,7 +306,7 @@ CREATE TABLE JCL_ORG_STAFF ( lack_status int null, staff_desc varchar(100) NULL, description text null, - is_used int not null, + is_used int null, creator int null, delete_type int null, create_time date null, @@ -332,15 +332,15 @@ CREATE TABLE JCL_ORG_STAFFS ( --JCL_CODERULE CREATE TABLE JCL_CODERULE ( - id int auto_increment NOT NULL, - serial_type varchar(50) null, - serial_enable char(1) null, - oneself_type varchar(50) null, - creator int null, - delete_type int null, - create_time date null, - update_time date null, - CONSTRAINT JCL_CODERULE PRIMARY KEY (id) + id int auto_increment NOT NULL, + serial_type varchar(50) null, + serial_enable char(1) null, + oneself_type varchar(50) null, + creator int null, + delete_type int null, + create_time date null, + update_time date null, + CONSTRAINT JCL_CODERULE PRIMARY KEY (id) ); --JCL_CODERULE_DETAIL diff --git a/docs/表结构SQL/Oracle.sql b/docs/表结构SQL/Oracle.sql index f19323bc..90aa5518 100644 --- a/docs/表结构SQL/Oracle.sql +++ b/docs/表结构SQL/Oracle.sql @@ -5,6 +5,7 @@ CREATE TABLE JCL_ORG_SCHEME ( SCHEME_NAME NVARCHAR2(100) NULL, SCHEME_DESCRIPTION NVARCHAR2(1000) NULL, FORBIDDEN_TAG NUMBER NULL, + IS_USED NUMBER NULL, CREATOR NUMBER NULL, DELETE_TYPE NUMBER NULL, CREATE_TIME DATE NULL, @@ -19,6 +20,7 @@ CREATE TABLE JCL_ORG_LEVEL ( DESCRIPTION NVARCHAR2(1000) NULL, SCHEME_ID NUMBER NULL, FORBIDDEN_TAG NUMBER NULL, + IS_USED NUMBER NULL, CREATOR NUMBER NULL, DELETE_TYPE NUMBER NULL, CREATE_TIME DATE NULL, @@ -35,6 +37,7 @@ CREATE TABLE JCL_ORG_GRADE ( SCHEME_ID NUMBER NULL, LEVEL_ID NVARCHAR2(100) NULL, FORBIDDEN_TAG NUMBER NULL, + IS_USED NUMBER NULL, CREATOR NUMBER NULL, DELETE_TYPE NUMBER NULL, CREATE_TIME DATE NULL, @@ -51,6 +54,7 @@ CREATE TABLE JCL_ORG_SEQUENCE ( DESCRIPTION NVARCHAR2(1000) NULL, SCHEME_ID NUMBER NULL, FORBIDDEN_TAG NUMBER NULL, + IS_USED NUMBER NULL, CREATOR NUMBER NULL, DELETE_TYPE NUMBER NULL, CREATE_TIME DATE NULL, @@ -64,6 +68,7 @@ CREATE TABLE JCL_ORG_POST ( POST_NO NVARCHAR2(100) NULL, POST_NAME NVARCHAR2(100) NULL, DESCRIPTION NVARCHAR2(1000) NULL, + IS_USED NUMBER NULL, CREATOR NUMBER NULL, DELETE_TYPE NUMBER NULL, CREATE_TIME DATE NULL, @@ -81,7 +86,8 @@ CREATE TABLE JCL_ORG_POST_INFO ( POST_INFO_QUALIFICATION NVARCHAR2(1000) NULL, POST_ID NUMBER NULL, DESCRIPTION NVARCHAR2(1000) NULL, - FORBIDDEN_TAG NUMBER NULL, + FORBIDDEN_TAG NUMBER NULL, + IS_USED NUMBER NULL, CREATOR NUMBER NULL, DELETE_TYPE NUMBER NULL, CREATE_TIME DATE NULL, @@ -101,6 +107,7 @@ CREATE TABLE JCL_ORG_COMP ( COMP_PRINCIPAL NUMBER NULL, DESCRIPTION NVARCHAR2(1000) NULL, FORBIDDEN_TAG NUMBER NULL, + IS_USED NUMBER NULL, CREATOR NUMBER NULL, DELETE_TYPE NUMBER NULL, CREATE_TIME DATE NULL, @@ -178,6 +185,7 @@ CREATE TABLE JCL_ORG_DEPT ( SHOW_ORDER NUMBER NULL, DESCRIPTION NVARCHAR2(1000) NULL, FORBIDDEN_TAG NUMBER NULL, + IS_USED NUMBER NULL, CREATOR NUMBER NULL, DELETE_TYPE NUMBER NULL, CREATE_TIME DATE NULL, @@ -185,51 +193,14 @@ CREATE TABLE JCL_ORG_DEPT ( CONSTRAINT JCL_ORG_DEPT_PK PRIMARY KEY (ID) ); --- JCL_FIELD_EXTENDGROUP_DEPT -CREATE TABLE JCL_FIELD_EXTENDGROUP_DEPT ( +-- JCL_ORG_DEPTEXT +CREATE TABLE JCL_ORG_DEPTEXT ( ID NUMBER NOT NULL, - EXTEND_TYPE NUMBER NULL, - GROUP_NAME NVARCHAR2(100) NULL, CREATOR NUMBER NULL, DELETE_TYPE NUMBER NULL, CREATE_TIME DATE NULL, UPDATE_TIME DATE NULL, - CONSTRAINT JCL_FIELD_EXTENDGROUP_DEPT_PK PRIMARY KEY (ID) -); - --- JCL_FIELD_EXTENDINFO_DEPT -CREATE TABLE JCL_FIELD_EXTENDINFO_DEPT ( - ID NUMBER NOT NULL, - EXTEND_TYPE NUMBER NULL, - TABLE_NAME NVARCHAR2(100) NULL, - FIELD_NAME NVARCHAR2(100) NULL, - FIELD_NAME_DESC NVARCHAR2(100) NULL, - FIELD_TYPE NVARCHAR2(1000) NULL, - CONTROL_TYPE NUMBER NULL, - EXTEND_GROUP NUMBER NULL, - ISENABLE NUMBER NULL, - ISREQUIRED NUMBER NULL, - LIST_SHOW NUMBER NULL, - SEARCH_SHOW NUMBER NULL, - EDIT_SHOW NUMBER NULL, - ADD_SHOW NUMBER NULL, - BUTTON_SHOW NUMBER NULL, - SHOW_ORDER NUMBER NULL, - CREATOR NUMBER NULL, - DELETE_TYPE NUMBER NULL, - CREATE_TIME DATE NULL, - UPDATE_TIME DATE NULL, - CONSTRAINT JCL_FIELD_EXTENDINFO_DEPT_PK PRIMARY KEY (ID) -); - --- JCL_ORG_DEPTPEXT -CREATE TABLE JCL_ORG_DEPTPEXT ( - ID NUMBER NOT NULL, - CREATOR NUMBER NULL, - DELETE_TYPE NUMBER NULL, - CREATE_TIME DATE NULL, - UPDATE_TIME DATE NULL, - CONSTRAINT JCL_ORG_DEPTPEXT_PK PRIMARY KEY (ID) + CONSTRAINT JCL_ORG_DEPTEXT_PK PRIMARY KEY (ID) ); -- JCL_ORG_DEPTEXT_DT1 @@ -259,6 +230,7 @@ CREATE TABLE JCL_ORG_JOB ( WORK_DUTY NVARCHAR2(1000) NULL, WORK_AUTHORITY NVARCHAR2(1000) NULL, FORBIDDEN_TAG NUMBER NULL, + IS_USED NUMBER NULL, CREATOR NUMBER NULL, DELETE_TYPE NUMBER NULL, CREATE_TIME DATE NULL, @@ -270,60 +242,25 @@ CREATE TABLE JCL_ORG_JOB ( CREATE TABLE JCL_ORG_JOBDT ( ID NUMBER NOT NULL, MAINID NUMBER NULL, - LEVEL_ID NUMBER NULL, - GRADE_ID NUMBER NULL, - CREATOR NUMBER NULL, - DELETE_TYPE NUMBER NULL, - CREATE_TIME DATE NULL, - UPDATE_TIME DATE NULL, - CONSTRAINT CL_ORG_DEPTPEXT_PK PRIMARY KEY (ID) -); - --- JCL_FIELD_EXTENDGROUP_JOB -CREATE TABLE JCL_FIELD_EXTENDGROUP_JOB ( - ID NUMBER NOT NULL, - EXTEND_TYPE NUMBER NULL, - GROUP_NAME NVARCHAR2(100) NULL, + LEVEL_ID NVARCHAR2(100) NULL, + GRADE_ID NVARCHAR2(100) NULL, + LEVEL_ID_SPAN NVARCHAR2(100) NULL, + GRADE_ID_SPAN NVARCHAR2(100) NULL, CREATOR NUMBER NULL, DELETE_TYPE NUMBER NULL, CREATE_TIME DATE NULL, UPDATE_TIME DATE NULL, - CONSTRAINT JCL_FIELD_EXTENDGROUP_JOB_PK PRIMARY KEY (ID) + CONSTRAINT JCL_ORG_JOBDT_PK PRIMARY KEY (ID) ); --- JCL_FIELD_EXTENDINFO_JOB -CREATE TABLE JCL_FIELD_EXTENDINFO_JOB ( +-- JCL_ORG_JOBEXT +CREATE TABLE JCL_ORG_JOBEXT ( ID NUMBER NOT NULL, - EXTEND_TYPE NUMBER NULL, - TABLE_NAME NVARCHAR2(100) NULL, - FIELD_NAME NVARCHAR2(100) NULL, - FIELD_NAME_DESC NVARCHAR2(100) NULL, - FIELD_TYPE NVARCHAR2(1000) NULL, - CONTROL_TYPE NUMBER NULL, - EXTEND_GROUP NUMBER NULL, - ISENABLE NUMBER NULL, - ISREQUIRED NUMBER NULL, - LIST_SHOW NUMBER NULL, - SEARCH_SHOW NUMBER NULL, - EDIT_SHOW NUMBER NULL, - ADD_SHOW NUMBER NULL, - BUTTON_SHOW NUMBER NULL, - SHOW_ORDER NUMBER NULL, CREATOR NUMBER NULL, DELETE_TYPE NUMBER NULL, CREATE_TIME DATE NULL, UPDATE_TIME DATE NULL, - CONSTRAINT JCL_FIELD_EXTENDINFO_JOB_PK PRIMARY KEY (ID) -); - --- JCL_ORG_JOBPEXT -CREATE TABLE JCL_ORG_JOBPEXT ( - ID NUMBER NOT NULL, - CREATOR NUMBER NULL, - DELETE_TYPE NUMBER NULL, - CREATE_TIME DATE NULL, - UPDATE_TIME DATE NULL, - CONSTRAINT JCL_ORG_JOBPEXT_PK PRIMARY KEY (ID) + CONSTRAINT JCL_ORG_JOBEXT_PK PRIMARY KEY (ID) ); -- JCL_ORG_JOBEXT_DT1 @@ -348,6 +285,7 @@ CREATE TABLE JCL_ORG_STAFFPLAN ( COMPANY_ID NVARCHAR2(100) NULL, DESCRIPTION NVARCHAR2(1000) NULL, FORBIDDEN_TAG NUMBER NULL, + IS_USED NUMBER NULL, CREATOR NUMBER NULL, DELETE_TYPE NUMBER NULL, CREATE_TIME DATE NULL, @@ -369,6 +307,7 @@ CREATE TABLE JCL_ORG_STAFF ( LACK_STATUS NUMBER NULL, STAFF_DESC NVARCHAR2(100) NULL, DESCRIPTION NVARCHAR2(1000) NULL, + IS_USED NUMBER NULL, CREATOR NUMBER NULL, DELETE_TYPE NUMBER NULL, CREATE_TIME DATE NULL, @@ -392,6 +331,49 @@ CREATE TABLE JCL_ORG_STAFFS ( ); +--JCL_CODERULE +create table JCL_CODERULE ( + ID NUMBER not null, + SERIAL_TYPE NVARCHAR2(50) null, + SERIAL_ENABLE CHAR(1) null, + ONESELF_TYPE NVARCHAR2(50) null, + CREATOR NUMBER null, + DELETE_TYPE NUMBER null, + CREATE_TIME DATE null, + UPDATE_TIME DATE null, + constraint JCL_CODERULE primary key (ID) +); + +--JCL_CODERULE_DETAIL +create table JCL_CODERULE_DETAIL ( + ID NUMBER not null, + CODERULE_ID NUMBER(11) null, + RULE_TYPE NVARCHAR2(50) null, + RULE_VALUE NVARCHAR2(255) null, + SHOW_ORDER NUMBER(11) null, + CREATOR NUMBER null, + DELETE_TYPE NUMBER null, + CREATE_TIME DATE null, + UPDATE_TIME DATE null, + constraint JCL_CODERULE_DETAIL primary key (ID) +); + +--JCL_CODERULE_RESERVED +CREATE TABLE JCL_CODERULE_RESERVED ( + ID NUMBER NOT NULL, + CODERULE_ID NUMBER(11) NULL, + RESERVED_CODE NVARCHAR2(255) NULL, + RESERVED_DESC NVARCHAR2 (1000) NULL, + CREATOR NUMBER NULL, + DELETE_TYPE NUMBER NULL, + CREATE_TIME DATE NULL, + UPDATE_TIME DATE NULL, + CONSTRAINT JCL_CODERULE_RESERVED PRIMARY KEY (ID) +); + + + + diff --git a/docs/表结构SQL/SqlServer.sql b/docs/表结构SQL/SqlServer.sql index 8cea6e9b..a466c2c2 100644 --- a/docs/表结构SQL/SqlServer.sql +++ b/docs/表结构SQL/SqlServer.sql @@ -5,6 +5,7 @@ CREATE TABLE JCL_ORG_SCHEME ( scheme_name varchar(100) COLLATE Chinese_PRC_CI_AS NULL, scheme_description text COLLATE Chinese_PRC_CI_AS NULL, forbidden_tag int NULL, + is_used int null, creator int null, delete_type int null, create_time date null, @@ -19,6 +20,7 @@ CREATE TABLE JCL_ORG_LEVEL ( description text COLLATE Chinese_PRC_CI_AS NULL, scheme_id int null, forbidden_tag int NULL, + is_used int null, creator int null, delete_type int null, create_time date null, @@ -34,6 +36,7 @@ CREATE TABLE JCL_ORG_GRADE ( scheme_id int null, level_id varchar(100) null, forbidden_tag int NULL, + is_used int null, creator int null, delete_type int null, create_time date null, @@ -49,6 +52,7 @@ CREATE TABLE JCL_ORG_SEQUENCE ( description text COLLATE Chinese_PRC_CI_AS NULL, scheme_id int null, forbidden_tag int NULL, + is_used int null, creator int null, delete_type int null, create_time date null, @@ -62,6 +66,7 @@ CREATE TABLE JCL_ORG_POST ( post_no varchar(100) COLLATE Chinese_PRC_CI_AS NULL, post_name varchar(100) COLLATE Chinese_PRC_CI_AS NULL, description text COLLATE Chinese_PRC_CI_AS NULL, + is_used int null, creator int null, delete_type int null, create_time date null, @@ -79,7 +84,8 @@ CREATE TABLE JCL_ORG_POST_INFO ( post_info_qualification text null, post_id int null, description text COLLATE Chinese_PRC_CI_AS NULL, - forbidden_tag int NULL, + forbidden_tag int NULL, + is_used int null, creator int null, delete_type int null, create_time date null, @@ -99,6 +105,7 @@ CREATE TABLE JCL_ORG_COMP ( comp_principal int null, description text COLLATE Chinese_PRC_CI_AS NULL, forbidden_tag int NULL, + is_used int null, creator int null, delete_type int null, create_time date null, @@ -176,6 +183,7 @@ CREATE TABLE JCL_ORG_DEPT ( show_order int null, description text COLLATE Chinese_PRC_CI_AS NULL, forbidden_tag int NULL, + is_used int null, creator int null, delete_type int null, create_time date null, @@ -183,51 +191,14 @@ CREATE TABLE JCL_ORG_DEPT ( CONSTRAINT JCL_ORG_DEPT_PK PRIMARY KEY (id) ); --- JCL_FIELD_EXTENDGROUP_DEPT -CREATE TABLE JCL_FIELD_EXTENDGROUP_DEPT ( - id int IDENTITY(1,1) NOT NULL, - extend_type int null, - group_name varchar(100) COLLATE Chinese_PRC_CI_AS NULL, - creator int null, - delete_type int null, - create_time date null, - update_time date null, - CONSTRAINT JCL_FIELD_EXTENDGROUP_DEPT_PK PRIMARY KEY (id) -); - --- JCL_FIELD_EXTENDINFO_DEPT -CREATE TABLE JCL_FIELD_EXTENDINFO_DEPT ( - id int IDENTITY(1,1) NOT NULL, - extend_type int null, - table_name varchar(100) COLLATE Chinese_PRC_CI_AS NULL, - field_name varchar(100) COLLATE Chinese_PRC_CI_AS NULL, - field_name_desc varchar(100) COLLATE Chinese_PRC_CI_AS NULL, - field_type varchar(1000) COLLATE Chinese_PRC_CI_AS NULL, - control_type int null, - extend_group int null, - isenable int null, - isrequired int null, - list_show int null, - search_show int null, - edit_show int null, - add_show int null, - button_show int null, - show_order int null, - creator int null, - delete_type int null, - create_time date null, - update_time date null, - CONSTRAINT JCL_FIELD_EXTENDINFO_DEPT_PK PRIMARY KEY (id) -); - --- JCL_ORG_DEPTPEXT -CREATE TABLE JCL_ORG_DEPTPEXT ( +-- JCL_ORG_DEPTEXT +CREATE TABLE JCL_ORG_DEPTEXT ( id int IDENTITY(1,1) NOT NULL, creator int null, delete_type int null, create_time date null, update_time date null, - CONSTRAINT JCL_ORG_DEPTPEXT_PK PRIMARY KEY (id) + CONSTRAINT JCL_ORG_DEPTEXT_PK PRIMARY KEY (id) ); -- JCL_ORG_DEPTEXT_DT1 @@ -248,7 +219,7 @@ CREATE TABLE JCL_ORG_JOB ( job_name varchar(100) COLLATE Chinese_PRC_CI_AS NULL, parent_comp int null, parent_dept int null, - sequence_id int null, + sequence_id int null, scheme_id int null, parent_job int null, is_key int null, @@ -257,6 +228,7 @@ CREATE TABLE JCL_ORG_JOB ( work_duty text null, work_authority text null, forbidden_tag int NULL, + is_used int null, creator int null, delete_type int null, create_time date null, @@ -268,60 +240,25 @@ CREATE TABLE JCL_ORG_JOB ( CREATE TABLE JCL_ORG_JOBDT ( id int IDENTITY(1,1) NOT NULL, mainid int NULL, - level_id int null, - grade_id int null, - creator int null, - delete_type int null, - create_time date null, - update_time date null, - CONSTRAINT CL_ORG_DEPTPEXT_PK PRIMARY KEY (id) -); - --- JCL_FIELD_EXTENDGROUP_JOB -CREATE TABLE JCL_FIELD_EXTENDGROUP_JOB ( - id int IDENTITY(1,1) NOT NULL, - extend_type int null, - group_name varchar(100) COLLATE Chinese_PRC_CI_AS NULL, + level_id varchar(100) NULL, + grade_id varchar(100) NULL, + level_id_span varchar(100) NULL, + grade_id_span varchar(100) NULL, creator int null, delete_type int null, create_time date null, update_time date null, - CONSTRAINT JCL_FIELD_EXTENDGROUP_JOB_PK PRIMARY KEY (id) + CONSTRAINT JCL_ORG_JOBDT_PK PRIMARY KEY (id) ); --- JCL_FIELD_EXTENDINFO_JOB -CREATE TABLE JCL_FIELD_EXTENDINFO_JOB ( - id int IDENTITY(1,1) NOT NULL, - extend_type int null, - table_name varchar(100) COLLATE Chinese_PRC_CI_AS NULL, - field_name varchar(100) COLLATE Chinese_PRC_CI_AS NULL, - field_name_desc varchar(100) COLLATE Chinese_PRC_CI_AS NULL, - field_type varchar(1000) COLLATE Chinese_PRC_CI_AS NULL, - control_type int null, - extend_group int null, - isenable int null, - isrequired int null, - list_show int null, - search_show int null, - edit_show int null, - add_show int null, - button_show int null, - show_order int null, - creator int null, - delete_type int null, - create_time date null, - update_time date null, - CONSTRAINT JCL_FIELD_EXTENDINFO_JOB_PK PRIMARY KEY (id) -); - --- JCL_ORG_JOBPEXT -CREATE TABLE JCL_ORG_JOBPEXT ( +-- JCL_ORG_JOBEXT +CREATE TABLE JCL_ORG_JOBEXT ( id int IDENTITY(1,1) NOT NULL, creator int null, delete_type int null, create_time date null, update_time date null, - CONSTRAINT JCL_ORG_JOBPEXT_PK PRIMARY KEY (id) + CONSTRAINT JCL_ORG_JOBEXT_PK PRIMARY KEY (id) ); -- JCL_ORG_JOBEXT_DT1 @@ -347,6 +284,7 @@ CREATE TABLE JCL_ORG_STAFFPLAN ( company_id varchar(100) COLLATE Chinese_PRC_CI_AS NULL, description text NULL, forbidden_tag int NULL, + is_used int null, creator int null, delete_type int null, create_time date null, @@ -367,7 +305,8 @@ CREATE TABLE JCL_ORG_STAFF ( freeze_num int null, lack_status int null, staff_desc varchar(100) COLLATE Chinese_PRC_CI_AS NULL, - description text null, + description text null, + is_used int null, creator int null, delete_type int null, create_time date null, @@ -391,6 +330,49 @@ CREATE TABLE JCL_ORG_STAFFS ( ); +--JCL_CODERULE +CREATE TABLE JCL_CODERULE ( + id int IDENTITY(1,1) NOT NULL, + serial_type varchar(50) null, + serial_enable char(1) null, + oneself_type varchar(50) null, + creator int null, + delete_type int null, + create_time date null, + update_time date null, + CONSTRAINT JCL_CODERULE PRIMARY KEY (id) +); + +--JCL_CODERULE_DETAIL +CREATE TABLE JCL_CODERULE_DETAIL ( + id int IDENTITY(1,1) NOT NULL, + coderule_id int(11) null, + rule_type varchar(50) null, + rule_value varchar(255) null, + show_order int(11) null, + creator int null, + delete_type int null, + create_time date null, + update_time date null, + CONSTRAINT JCL_CODERULE_DETAIL PRIMARY KEY (id) +); + +--JCL_CODERULE_RESERVED +CREATE TABLE JCL_CODERULE_RESERVED ( + id int IDENTITY(1,1) NOT NULL, + coderule_id int(11) null, + reserved_code varchar(255) null, + reserved_desc varchar (1000) null, + creator int null, + delete_type int null, + create_time date null, + update_time date null, + CONSTRAINT JCL_CODERULE_RESERVED PRIMARY KEY (id) +); + + + + From d53365aba39c7a0d9b1d0935b5ee0ed7065ce32e Mon Sep 17 00:00:00 2001 From: dxfeng Date: Mon, 6 Jun 2022 13:17:35 +0800 Subject: [PATCH 09/77] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90?= =?UTF-8?q?=E7=BC=96=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/company/bo/CompBO.java | 18 ++++- .../codesetting/CodeRuleDetailMapper.java | 13 ++++ .../codesetting/CodeRuleDetailMapper.xml | 11 ++- .../mapper/codesetting/CodeRuleMapper.java | 2 + .../mapper/codesetting/CodeRuleMapper.xml | 9 ++- .../organization/mapper/job/JobMapper.xml | 8 +- .../service/CodeSettingService.java | 8 +- .../service/impl/CodeSettingServiceImpl.java | 73 ++++++++++++++++--- .../service/impl/CompServiceImpl.java | 18 +++++ .../service/impl/DepartmentServiceImpl.java | 17 +++++ .../service/impl/JobServiceImpl.java | 17 +++++ .../wrapper/CodeSettingWrapper.java | 5 +- 12 files changed, 179 insertions(+), 20 deletions(-) diff --git a/src/com/engine/organization/entity/company/bo/CompBO.java b/src/com/engine/organization/entity/company/bo/CompBO.java index 8f7e492b..a66cc2bd 100644 --- a/src/com/engine/organization/entity/company/bo/CompBO.java +++ b/src/com/engine/organization/entity/company/bo/CompBO.java @@ -65,7 +65,23 @@ public class CompBO { if (null == param) { return null; } - return CompPO.builder().id(param.getId() == null ? 0 : param.getId()).compNo(param.getCompNo()).compName(param.getCompName()).compNameShort(param.getCompNameShort()).parentCompany(param.getParentCompany()).orgCode(param.getOrgCode()).industry(param.getIndustry()).compPrincipal(param.getCompPrincipal()).description(param.getDescription()).forbiddenTag(param.getForbiddenTag() == null ? null : param.getForbiddenTag() ? 0 : 1).deleteType(0).createTime(new Date()).updateTime(new Date()).creator(employeeId).build(); + return CompPO + .builder() + .id(param.getId() == null ? 0 : param.getId()) + .compNo(param.getCompNo()) + .compName(param.getCompName()) + .compNameShort(param.getCompNameShort()) + .parentCompany(param.getParentCompany()) + .orgCode(param.getOrgCode()) + .industry(param.getIndustry()) + .compPrincipal(param.getCompPrincipal()) + .description(param.getDescription()) + .forbiddenTag(param.getForbiddenTag() == null ? null : param.getForbiddenTag() ? 0 : 1) + .deleteType(0) + .createTime(new Date()) + .updateTime(new Date()) + .creator(employeeId) + .build(); } diff --git a/src/com/engine/organization/mapper/codesetting/CodeRuleDetailMapper.java b/src/com/engine/organization/mapper/codesetting/CodeRuleDetailMapper.java index 190256be..5f3a57a7 100644 --- a/src/com/engine/organization/mapper/codesetting/CodeRuleDetailMapper.java +++ b/src/com/engine/organization/mapper/codesetting/CodeRuleDetailMapper.java @@ -1,5 +1,10 @@ package com.engine.organization.mapper.codesetting; +import com.engine.organization.entity.codesetting.po.CodeRuleDetailPO; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + /** * @Author weaver_cl * @Description: TODO @@ -9,4 +14,12 @@ package com.engine.organization.mapper.codesetting; public interface CodeRuleDetailMapper { void delete(Long codeRuleId); + + /** + * 批量插入明细表数据 + * + * @param codeRuleDetailPOs + * @return + */ + void batchInsert(@Param("codeRuleDetailPOs") List codeRuleDetailPOs); } diff --git a/src/com/engine/organization/mapper/codesetting/CodeRuleDetailMapper.xml b/src/com/engine/organization/mapper/codesetting/CodeRuleDetailMapper.xml index 1a26183b..89d1bfba 100644 --- a/src/com/engine/organization/mapper/codesetting/CodeRuleDetailMapper.xml +++ b/src/com/engine/organization/mapper/codesetting/CodeRuleDetailMapper.xml @@ -2,8 +2,17 @@ + + insert into hrm_coderuledetail (coderuleid, ruletype, rulevalue, showorder) values + + (#{CodeRuleDetailPO.coderuleId},#{CodeRuleDetailPO.ruleType},#{CodeRuleDetailPO.ruleValue},#{CodeRuleDetailPO.showOrder}) + + + - delete from JCL_CODERULE_DETAIL where coderule_id = #{codeRuleId} + delete + from JCL_CODERULE_DETAIL + where coderule_id = #{codeRuleId} \ No newline at end of file diff --git a/src/com/engine/organization/mapper/codesetting/CodeRuleMapper.java b/src/com/engine/organization/mapper/codesetting/CodeRuleMapper.java index 69f1e3b7..b42bcdd9 100644 --- a/src/com/engine/organization/mapper/codesetting/CodeRuleMapper.java +++ b/src/com/engine/organization/mapper/codesetting/CodeRuleMapper.java @@ -13,6 +13,8 @@ public interface CodeRuleMapper { Long getCodeRuleId(@Param("serialType") String serialType); + CodeRulePO getCodeRuleByType(@Param("serialType") String serialType); + void updateCodeRule(@Param("codeRulePO") CodeRulePO codeRulePO); void insertCodeRule(CodeRulePO codeRulePO); diff --git a/src/com/engine/organization/mapper/codesetting/CodeRuleMapper.xml b/src/com/engine/organization/mapper/codesetting/CodeRuleMapper.xml index 6368201e..28d40a6d 100644 --- a/src/com/engine/organization/mapper/codesetting/CodeRuleMapper.xml +++ b/src/com/engine/organization/mapper/codesetting/CodeRuleMapper.xml @@ -8,6 +8,12 @@ where serial_type = #{serialType} + + update JCL_CODERULE @@ -21,7 +27,8 @@ - INSERT INTO JCL_CODERULE diff --git a/src/com/engine/organization/mapper/job/JobMapper.xml b/src/com/engine/organization/mapper/job/JobMapper.xml index 6a6123b2..5e8ce87a 100644 --- a/src/com/engine/organization/mapper/job/JobMapper.xml +++ b/src/com/engine/organization/mapper/job/JobMapper.xml @@ -197,9 +197,9 @@ d.scheme_name, FROM jcl_org_job t - inner join jcl_org_comp a on + left join jcl_org_comp a on t.parent_comp = a.id - inner join jcl_org_dept b on + left join jcl_org_dept b on t.parent_dept = b.id left join jcl_org_sequence c on t.sequence_id = c.id @@ -235,9 +235,9 @@ d.scheme_name, FROM jcl_org_job t - inner join jcl_org_comp a on + left join jcl_org_comp a on t.parent_comp = a.id - inner join jcl_org_dept b on + left join jcl_org_dept b on t.parent_dept = b.id left join jcl_org_sequence c on t.sequence_id = c.id diff --git a/src/com/engine/organization/service/CodeSettingService.java b/src/com/engine/organization/service/CodeSettingService.java index 1c19b309..35358237 100644 --- a/src/com/engine/organization/service/CodeSettingService.java +++ b/src/com/engine/organization/service/CodeSettingService.java @@ -22,7 +22,7 @@ public interface CodeSettingService { * 保存更新 * @param params */ - void saveOrUpdateCodeSetting(CodeSaveParam params); + String saveOrUpdateCodeSetting(CodeSaveParam params); /** * 获取主表id @@ -30,4 +30,10 @@ public interface CodeSettingService { * @return */ Long getCodeRuleId(String serialType); + + /** + * 获取编码规则配置信息 + * @return + */ + String getCodeSetting(String serialType); } diff --git a/src/com/engine/organization/service/impl/CodeSettingServiceImpl.java b/src/com/engine/organization/service/impl/CodeSettingServiceImpl.java index 820c2f94..47fa87da 100644 --- a/src/com/engine/organization/service/impl/CodeSettingServiceImpl.java +++ b/src/com/engine/organization/service/impl/CodeSettingServiceImpl.java @@ -1,5 +1,6 @@ package com.engine.organization.service.impl; +import com.alibaba.fastjson.JSONObject; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; import com.engine.hrm.entity.RuleCodeType; @@ -13,6 +14,9 @@ import com.engine.organization.service.CodeSettingService; import com.engine.organization.util.OrganizationAssert; import com.engine.organization.util.db.MapperProxyFactory; import com.engine.organization.util.response.ReturnResult; +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import weaver.general.Util; import weaver.hrm.HrmUserVarify; import weaver.hrm.User; @@ -29,7 +33,7 @@ import java.util.Map; public class CodeSettingServiceImpl extends Service implements CodeSettingService { public CodeSettingService getCodeSettingService(User user) { - return ServiceUtil.getService(CodeSettingServiceImpl.class,user); + return ServiceUtil.getService(CodeSettingServiceImpl.class, user); } @Override @@ -55,27 +59,78 @@ public class CodeSettingServiceImpl extends Service implements CodeSettingServic } @Override - public void saveOrUpdateCodeSetting(CodeSaveParam params) { - OrganizationAssert.notNull(params,"参数不能为空"); + public String saveOrUpdateCodeSetting(CodeSaveParam params) { + OrganizationAssert.notNull(params, "参数不能为空"); Long codeRuleId = getCodeSettingService(user).getCodeRuleId(params.getSerialType()); - CodeRulePO codeRulePO = CodeSettingBO.buildCodeRule(params,(long)user.getUID(),codeRuleId); + CodeRulePO codeRulePO = CodeSettingBO.buildCodeRule(params, (long) user.getUID(), codeRuleId); //1.新增或更新主表 - if (codeRulePO != null) { + if (codeRuleId != null) { MapperProxyFactory.getProxy(CodeRuleMapper.class).updateCodeRule(codeRulePO); - }else { + } else { MapperProxyFactory.getProxy(CodeRuleMapper.class).insertCodeRule(codeRulePO); } //2.插入明细表 codeRuleId = getCodeSettingService(user).getCodeRuleId(params.getSerialType()); MapperProxyFactory.getProxy(CodeRuleDetailMapper.class).delete(codeRuleId); - List codeRuleDetailPO = CodeSettingBO.bulidCodeDetailList(params.getCodeSaveDetailParams(),(long)user.getUID(),codeRuleId); - - + List codeRuleDetailPOs = CodeSettingBO.bulidCodeDetailList(params.getCodeSaveDetailParams(), (long) user.getUID(), codeRuleId); + if (CollectionUtils.isEmpty(codeRuleDetailPOs)) { + MapperProxyFactory.getProxy(CodeRuleDetailMapper.class).batchInsert(codeRuleDetailPOs); + } + Map apidatas = new HashMap<>(); + apidatas.put("coderuleid", codeRuleId); + return JSONObject.toJSONString(apidatas); } @Override public Long getCodeRuleId(String serialType) { return MapperProxyFactory.getProxy(CodeRuleMapper.class).getCodeRuleId(serialType); } + + @Override + public String getCodeSetting(String serialType) { + Map datas = new HashMap<>(); + CodeRulePO codeRulePO = MapperProxyFactory.getProxy(CodeRuleMapper.class).getCodeRuleByType(serialType); + if (null != codeRulePO) { + datas.put("serialtype", serialType); + datas.put("serialenable", Util.null2String(codeRulePO.getSerialEnable(), "0")); + String oneselftype = Util.null2String(codeRulePO.getOneselfType(), ""); + if (StringUtils.isNotEmpty(oneselftype)) { + String[] oneselftypes = oneselftype.split(","); + // 日期流水 + Map dateSerialMap = new HashMap<>(); + dateSerialMap.put("enable", "0"); + // 机构流水 + Map deptSerialMap = new HashMap<>(); + deptSerialMap.put("enable", "0"); + // 岗位 + Map jobtitlesSerialMap = new HashMap<>(); + jobtitlesSerialMap.put("enable", "0"); + for (String type : oneselftypes) { + switch (RuleCodeType.getByValue(type)) { + case YEAR: + case MONTH: + case DAY: + dateSerialMap.put("enable", "1"); + dateSerialMap.put("key", type); + break; + case SUBCOMPANY: + case DEPARTMENT: + deptSerialMap.put("enable", "1"); + deptSerialMap.put("key", type); + break; + case JOBTITLES: + jobtitlesSerialMap.put("enable", "1"); + jobtitlesSerialMap.put("key", type); + break; + } + } + datas.put("dateSerial", dateSerialMap); + datas.put("deptSerial", deptSerialMap); + datas.put("jobtitlesSerial", jobtitlesSerialMap); + } + + } + return null; + } } diff --git a/src/com/engine/organization/service/impl/CompServiceImpl.java b/src/com/engine/organization/service/impl/CompServiceImpl.java index 4a0df575..b26aa625 100644 --- a/src/com/engine/organization/service/impl/CompServiceImpl.java +++ b/src/com/engine/organization/service/impl/CompServiceImpl.java @@ -10,11 +10,15 @@ import com.cloudstore.eccom.pc.table.WeaTableColumn; import com.cloudstore.eccom.result.WeaResultMsg; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; +import com.engine.hrm.entity.RuleCodeType; +import com.engine.hrm.util.CodeRuleManager; import com.engine.organization.component.OrganizationWeaTable; +import com.engine.organization.entity.codesetting.po.CodeRulePO; import com.engine.organization.entity.company.bo.CompBO; import com.engine.organization.entity.company.dto.CompListDTO; import com.engine.organization.entity.company.param.CompSearchParam; import com.engine.organization.entity.company.po.CompPO; +import com.engine.organization.mapper.codesetting.CodeRuleMapper; import com.engine.organization.mapper.comp.CompMapper; import com.engine.organization.mapper.extend.ExtendGroupMapper; import com.engine.organization.service.CompService; @@ -115,6 +119,13 @@ public class CompServiceImpl extends Service implements CompService { @Override public int saveBaseComp(CompSearchParam params) { + try { + // 处理自动编号 + String compNo = CodeRuleManager.getCodeRuleManager().generateRuleCode(RuleCodeType.SUBCOMPANY, params.getCompNo()); + params.setCompNo(compNo); + } catch (Exception e) { + throw new RuntimeException(e); + } List list = getCompMapper().listByNo(Util.null2String(params.getCompNo())); OrganizationAssert.isEmpty(list, "编号不允许重复"); CompPO compPO = CompBO.convertParamToPO(params, (long) user.getUID()); @@ -253,6 +264,13 @@ public class CompServiceImpl extends Service implements CompService { // 编号 SearchConditionItem compNoItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 3, 50, "编号", "compNo"); compNoItem.setRules("required|string"); + // 判断是否开启自动编号 + CodeRulePO codeRuleByType = MapperProxyFactory.getProxy(CodeRuleMapper.class).getCodeRuleByType(RuleCodeType.SUBCOMPANY.getValue()); + if ("1".equals(codeRuleByType.getSerialEnable())) { + compNoItem.setViewAttr(2); + compNoItem.setHelpfulTip("编号为空,则按照指定规则自动生成编号"); + } + // 名称 SearchConditionItem compNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 3, 50, "名称", "compName"); compNameItem.setRules("required|string"); diff --git a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java index c958b145..c81f90a5 100644 --- a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java +++ b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java @@ -10,7 +10,10 @@ import com.cloudstore.eccom.pc.table.WeaTableColumn; import com.cloudstore.eccom.result.WeaResultMsg; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; +import com.engine.hrm.entity.RuleCodeType; +import com.engine.hrm.util.CodeRuleManager; import com.engine.organization.component.OrganizationWeaTable; +import com.engine.organization.entity.codesetting.po.CodeRulePO; import com.engine.organization.entity.company.bo.CompBO; import com.engine.organization.entity.company.po.CompPO; import com.engine.organization.entity.department.bo.DepartmentBO; @@ -23,6 +26,7 @@ import com.engine.organization.entity.job.po.JobPO; import com.engine.organization.entity.job.vo.SingleJobTreeVO; import com.engine.organization.entity.searchtree.SearchTree; import com.engine.organization.entity.searchtree.SearchTreeParams; +import com.engine.organization.mapper.codesetting.CodeRuleMapper; import com.engine.organization.mapper.comp.CompMapper; import com.engine.organization.mapper.department.DepartmentMapper; import com.engine.organization.mapper.extend.ExtendGroupMapper; @@ -196,6 +200,14 @@ public class DepartmentServiceImpl extends Service implements DepartmentService @Override public int saveBaseForm(DeptSearchParam params) { + try { + // 处理自动编号 + String departmentNo = CodeRuleManager.getCodeRuleManager().generateRuleCode(RuleCodeType. + DEPARTMENT, params.getDeptNo()); + params.setDeptNo(departmentNo); + } catch (Exception e) { + throw new RuntimeException(e); + } List list = getDepartmentMapper().listByNo(Util.null2String(params.getDeptNo())); OrganizationAssert.isEmpty(list, "编号不允许重复"); DepartmentPO departmentPO = DepartmentBO.convertParamsToPO(params, user.getUID()); @@ -337,6 +349,11 @@ public class DepartmentServiceImpl extends Service implements DepartmentService // 编号 SearchConditionItem deptNoItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 3, 50, "编号", "deptNo"); deptNoItem.setRules("required|string"); + CodeRulePO codeRuleByType = MapperProxyFactory.getProxy(CodeRuleMapper.class).getCodeRuleByType(RuleCodeType.DEPARTMENT.getValue()); + if ("1".equals(codeRuleByType.getSerialEnable())) { + deptNoItem.setViewAttr(2); + deptNoItem.setHelpfulTip("编号为空,则按照指定规则自动生成编号"); + } // 名称 SearchConditionItem deptNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 3, 50, "名称", "departmentName"); deptNameItem.setRules("required|string"); diff --git a/src/com/engine/organization/service/impl/JobServiceImpl.java b/src/com/engine/organization/service/impl/JobServiceImpl.java index b8224b9d..2da44b0f 100644 --- a/src/com/engine/organization/service/impl/JobServiceImpl.java +++ b/src/com/engine/organization/service/impl/JobServiceImpl.java @@ -10,8 +10,11 @@ import com.cloudstore.eccom.pc.table.WeaTableColumn; import com.cloudstore.eccom.result.WeaResultMsg; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; +import com.engine.hrm.entity.RuleCodeType; +import com.engine.hrm.util.CodeRuleManager; import com.engine.organization.component.OrganizationWeaTable; import com.engine.organization.entity.DeleteParam; +import com.engine.organization.entity.codesetting.po.CodeRulePO; import com.engine.organization.entity.company.bo.CompBO; import com.engine.organization.entity.company.po.CompPO; import com.engine.organization.entity.department.bo.DepartmentBO; @@ -27,6 +30,7 @@ import com.engine.organization.entity.job.po.JobPO; import com.engine.organization.entity.scheme.po.GradePO; import com.engine.organization.entity.searchtree.SearchTree; import com.engine.organization.entity.searchtree.SearchTreeParams; +import com.engine.organization.mapper.codesetting.CodeRuleMapper; import com.engine.organization.mapper.comp.CompMapper; import com.engine.organization.mapper.department.DepartmentMapper; import com.engine.organization.mapper.extend.ExtendGroupMapper; @@ -284,6 +288,11 @@ public class JobServiceImpl extends Service implements JobService { // 编号 SearchConditionItem jobNoItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 3, 50, "编号", "jobNo"); jobNoItem.setRules("required|string"); + CodeRulePO codeRuleByType = MapperProxyFactory.getProxy(CodeRuleMapper.class).getCodeRuleByType(RuleCodeType.JOBTITLES.getValue()); + if ("1".equals(codeRuleByType.getSerialEnable())) { + jobNoItem.setViewAttr(2); + jobNoItem.setHelpfulTip("编号为空,则按照指定规则自动生成编号"); + } // 名称 SearchConditionItem jobNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 3, 50, "名称", "jobName"); jobNameItem.setRules("required|string"); @@ -377,6 +386,14 @@ public class JobServiceImpl extends Service implements JobService { @Override public int saveBaseForm(JobSearchParam params) { + try { + // 处理自动编号 + String jobNo = CodeRuleManager.getCodeRuleManager().generateRuleCode(RuleCodeType. + DEPARTMENT, params.getJobNo()); + params.setJobNo(jobNo); + } catch (Exception e) { + throw new RuntimeException(e); + } List list = getJobMapper().listByNo(Util.null2String(params.getJobNo())); OrganizationAssert.isEmpty(list, "编号不允许重复"); JobPO jobPO = JobBO.convertParamsToPO(params, user.getUID()); diff --git a/src/com/engine/organization/wrapper/CodeSettingWrapper.java b/src/com/engine/organization/wrapper/CodeSettingWrapper.java index d5df6b93..a65bc52a 100644 --- a/src/com/engine/organization/wrapper/CodeSettingWrapper.java +++ b/src/com/engine/organization/wrapper/CodeSettingWrapper.java @@ -17,7 +17,7 @@ import weaver.hrm.User; public class CodeSettingWrapper extends Service { public CodeSettingService getCodeSettingService(User user) { - return ServiceUtil.getService(CodeSettingServiceImpl.class,user); + return ServiceUtil.getService(CodeSettingServiceImpl.class, user); } public ReturnResult getHasRight(String serialtype) { @@ -25,7 +25,6 @@ public class CodeSettingWrapper extends Service { } public ReturnResult saveOrUpdateCodeSetting(CodeSaveParam params) { - getCodeSettingService(user).saveOrUpdateCodeSetting(params); - return ReturnResult.successed(); + return ReturnResult.successed(getCodeSettingService(user).saveOrUpdateCodeSetting(params)); } } From eefd5b8483966655e4ee589fb06254d5076ac009 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Mon, 6 Jun 2022 14:41:46 +0800 Subject: [PATCH 10/77] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90?= =?UTF-8?q?=E7=BC=96=E5=8F=B7=20=E6=96=B9=E6=B3=95=E6=8A=BD=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CompServiceImpl.java | 129 +++++--------- .../service/impl/DepartmentServiceImpl.java | 136 +++------------ .../service/impl/JobServiceImpl.java | 164 +++--------------- src/com/engine/organization/util/MenuBtn.java | 23 +++ .../util/tree/SearchTreeUtil.java | 146 ++++++++++++++++ 5 files changed, 263 insertions(+), 335 deletions(-) create mode 100644 src/com/engine/organization/util/tree/SearchTreeUtil.java diff --git a/src/com/engine/organization/service/impl/CompServiceImpl.java b/src/com/engine/organization/service/impl/CompServiceImpl.java index b26aa625..caa8e8ab 100644 --- a/src/com/engine/organization/service/impl/CompServiceImpl.java +++ b/src/com/engine/organization/service/impl/CompServiceImpl.java @@ -204,26 +204,12 @@ public class CompServiceImpl extends Service implements CompService { @Override public Map getHasRight() { - Map btnDatas = new HashMap<>(); - ArrayList topMenuList = new ArrayList<>(); - ArrayList rightMenuList = new ArrayList<>(); - // 新增 - topMenuList.add(MenuBtn.topMenu_addNew()); - // 批量删除 - topMenuList.add(MenuBtn.topMenu_batchDelete()); - btnDatas.put("topMenu", topMenuList); - // 新增 - rightMenuList.add(MenuBtn.rightMenu_addNew()); - // 日志 - rightMenuList.add(MenuBtn.rightMenu_btnLog()); - btnDatas.put("rightMenu", rightMenuList); - return btnDatas; + return MenuBtn.getDatasNoBtnColum(); } @Override public Map getCompBaseForm(Map params) { OrganizationAssert.notNull(params.get("viewAttr"), "请标识操作类型"); - // 2编辑 1查看 int viewAttr = Integer.parseInt((String) params.get("viewAttr")); long id = Long.parseLong((String) params.get("id")); @@ -271,6 +257,23 @@ public class CompServiceImpl extends Service implements CompService { compNoItem.setHelpfulTip("编号为空,则按照指定规则自动生成编号"); } + getSameFormItem(conditionItems, compNoItem, null); + + + addGroups.add(new SearchConditionGroup("基本信息", true, conditionItems)); + apiDatas.put("condition", addGroups); + + return apiDatas; + + } + + /** + * 新增、编辑表单，相同属性 + * + * @param conditionItems + * @param compNoItem + */ + private void getSameFormItem(List conditionItems, SearchConditionItem compNoItem, Long id) { // 名称 SearchConditionItem compNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 3, 50, "名称", "compName"); compNameItem.setRules("required|string"); @@ -299,12 +302,36 @@ public class CompServiceImpl extends Service implements CompService { conditionItems.add(compPrincipalItem); conditionItems.add(descriptionItem); + if (null == id) { + return; + } + // 赋值 + CompPO compPO = getCompMapper().listById(id); + OrganizationAssert.notNull(compPO, "数据不存在或数据已删除"); + compNoItem.setValue(compPO.getCompNo()); + compNameItem.setValue(compPO.getCompName()); + compNameShortItem.setValue(compPO.getCompNameShort()); - addGroups.add(new SearchConditionGroup("基本信息", true, conditionItems)); - apiDatas.put("condition", addGroups); - - return apiDatas; - + // compBrowserItem + if (null != compPO.getParentCompany()) { + BrowserBean compBrowserBean = compBrowserItem.getBrowserConditionParam(); + compBrowserBean.setReplaceDatas(creatReplaceDatas(compPO.getParentCompany(), getCompMapper().listById(compPO.getParentCompany()).getCompName())); + compBrowserItem.setBrowserConditionParam(compBrowserBean); + } + orgCodeItem.setValue(compPO.getOrgCode()); + // industryItem + BrowserBean industryBean = industryItem.getBrowserConditionParam(); + industryBean.setReplaceDatas(creatReplaceDatas(compPO.getIndustry(), new SectorInfoComInfo().getSectorInfoname(compPO.getIndustry() + ""))); + industryItem.setBrowserConditionParam(industryBean); + try { + // compPrincipalItem + BrowserBean PrincipalBean = compPrincipalItem.getBrowserConditionParam(); + PrincipalBean.setReplaceDatas(creatReplaceDatas(compPO.getCompPrincipal(), new ResourceComInfo().getLastname(compPO.getCompPrincipal() + ""))); + compPrincipalItem.setBrowserConditionParam(PrincipalBean); + } catch (Exception e) { + throw new RuntimeException(e); + } + descriptionItem.setValue(compPO.getDescription()); } /** @@ -354,67 +381,7 @@ public class CompServiceImpl extends Service implements CompService { List conditionItems = new ArrayList<>(); // 编号 SearchConditionItem compNoItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 1, 50, "编号", "compNo"); - // 名称 - SearchConditionItem compNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 3, 50, "名称", "compName"); - compNameItem.setRules("required|string"); - // 简称 - SearchConditionItem compNameShortItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 3, 50, "简称", "compNameShort"); - compNameShortItem.setRules("required|string"); - // TODO 自定义按钮 - // 上级公司 - SearchConditionItem compBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "上级公司", "161", "parentCompany", "compBrowser"); - // 组织机构代码 - SearchConditionItem orgCodeItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "组织机构代码", "orgCode"); - orgCodeItem.setRules("required|string"); - // 行业 - SearchConditionItem industryItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "行业", "63", "industry", ""); - // 负责人 - SearchConditionItem compPrincipalItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "负责人", "1", "compPrincipal", ""); - compPrincipalItem.setRules("required|string"); - // 说明 - SearchConditionItem descriptionItem = OrganizationFormItemUtil.textareaItem(user, 2, 16, true, 2, 60, "说明", "description"); - - - conditionItems.add(compNoItem); - conditionItems.add(compNameItem); - conditionItems.add(compNameShortItem); - conditionItems.add(compBrowserItem); - conditionItems.add(orgCodeItem); - conditionItems.add(industryItem); - conditionItems.add(compPrincipalItem); - conditionItems.add(descriptionItem); - - - // 编辑、查看状态赋值,设置只读状态 - - // 赋值 - CompPO compPO = getCompMapper().listById(id); - OrganizationAssert.notNull(compPO, "数据不存在或数据已删除"); - compNoItem.setValue(compPO.getCompNo()); - compNameItem.setValue(compPO.getCompName()); - compNameShortItem.setValue(compPO.getCompNameShort()); - - // compBrowserItem - if (null != compPO.getParentCompany()) { - BrowserBean compBrowserBean = compBrowserItem.getBrowserConditionParam(); - compBrowserBean.setReplaceDatas(creatReplaceDatas(compPO.getParentCompany(), getCompMapper().listById(compPO.getParentCompany()).getCompName())); - compBrowserItem.setBrowserConditionParam(compBrowserBean); - } - orgCodeItem.setValue(compPO.getOrgCode()); - // industryItem - BrowserBean industryBean = industryItem.getBrowserConditionParam(); - industryBean.setReplaceDatas(creatReplaceDatas(compPO.getIndustry(), new SectorInfoComInfo().getSectorInfoname(compPO.getIndustry() + ""))); - industryItem.setBrowserConditionParam(industryBean); - try { - // compPrincipalItem - BrowserBean PrincipalBean = compPrincipalItem.getBrowserConditionParam(); - PrincipalBean.setReplaceDatas(creatReplaceDatas(compPO.getCompPrincipal(), new ResourceComInfo().getLastname(compPO.getCompPrincipal() + ""))); - compPrincipalItem.setBrowserConditionParam(PrincipalBean); - } catch (Exception e) { - throw new RuntimeException(e); - } - descriptionItem.setValue(compPO.getDescription()); - + getSameFormItem(conditionItems, compNoItem, id); // 查看，全部置位只读 if (1 == viewAttr) { for (SearchConditionItem item : conditionItems) { diff --git a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java index c81f90a5..560c9f80 100644 --- a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java +++ b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java @@ -5,7 +5,6 @@ import com.api.browser.bean.BrowserBean; import com.api.browser.bean.SearchConditionGroup; import com.api.browser.bean.SearchConditionItem; import com.api.browser.bean.SearchConditionOption; -import com.api.hrm.bean.TreeNode; import com.cloudstore.eccom.pc.table.WeaTableColumn; import com.cloudstore.eccom.result.WeaResultMsg; import com.engine.common.util.ServiceUtil; @@ -40,8 +39,8 @@ import com.engine.organization.util.db.MapperProxyFactory; import com.engine.organization.util.page.Column; import com.engine.organization.util.page.PageInfo; import com.engine.organization.util.page.PageUtil; +import com.engine.organization.util.tree.SearchTreeUtil; import org.apache.commons.collections4.CollectionUtils; -import weaver.conn.RecordSet; import weaver.general.StringUtil; import weaver.general.Util; import weaver.hrm.User; @@ -73,14 +72,6 @@ public class DepartmentServiceImpl extends Service implements DepartmentService */ private static final String JCL_ORG_DEPTEXT_DT1 = "JCL_ORG_DEPTEXT_DT1"; - /** - * 左侧树 类型表示 - *

- * 0：集团 - * 1：分部 - * 2：部门 - */ - private static final String TYPE_GROUP = "0"; private DepartmentMapper getDepartmentMapper() { return MapperProxyFactory.getProxy(DepartmentMapper.class); @@ -130,30 +121,11 @@ public class DepartmentServiceImpl extends Service implements DepartmentService @Override public Map getSearchTree(SearchTreeParams params) { - Map dataMap = new HashMap<>(); - SearchTree topGroup = getTopGroup(); - // 集团 - List companyList = new ArrayList<>(); - companyList.add(topGroup); String keyword = params.getKeyword(); - String type = Util.null2String(params.getType()); String id = params.getId(); - - List treeDatas = getFilterCompany(id, keyword); - // 未点击，初始化树结构 - if (StringUtil.isEmpty(type)) { - dataMap.put("companys", companyList); - SearchTree rootCompany = getTopGroup(); - rootCompany.setSubs(treeDatas); - rootCompany.setIsParent(CollectionUtils.isNotEmpty(rootCompany.getSubs())); - Map rootCompanyMap = new HashMap<>(); - rootCompanyMap.put("rootCompany", rootCompany); - dataMap.put("datas", rootCompanyMap); - } else { - // 根据ID查询 - dataMap.put("datas", treeDatas); - } - return dataMap; + String type = Util.null2String(params.getType()); + List treeList = getFilterCompany(id, keyword); + return SearchTreeUtil.getSearchTree(type, treeList); } @Override @@ -202,9 +174,8 @@ public class DepartmentServiceImpl extends Service implements DepartmentService public int saveBaseForm(DeptSearchParam params) { try { // 处理自动编号 - String departmentNo = CodeRuleManager.getCodeRuleManager().generateRuleCode(RuleCodeType. - DEPARTMENT, params.getDeptNo()); - params.setDeptNo(departmentNo); + params.setDeptNo(CodeRuleManager.getCodeRuleManager().generateRuleCode(RuleCodeType. + DEPARTMENT, params.getDeptNo())); } catch (Exception e) { throw new RuntimeException(e); } @@ -253,7 +224,6 @@ public class DepartmentServiceImpl extends Service implements DepartmentService SearchConditionItem deptNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "名称", "departmentName"); // 简称 SearchConditionItem deptNameShortItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "简称", "deptNameShort"); - // TODO // 所属分部 SearchConditionItem parentCompBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "所属分部", "161", "parentComp", "compBrowser"); // 上级部门 @@ -422,15 +392,25 @@ public class DepartmentServiceImpl extends Service implements DepartmentService List idList = Arrays.stream(copyParam.getIds().split(",")).map(Long::parseLong).collect(Collectors.toList()); for (Long id : idList) { DepartmentPO deptById = getDepartmentMapper().getDeptById(id); - // TODO 自动编号 - deptById.setDeptNo("复制_" + deptById.getDeptNo()); + try { + // 处理自动编号 + deptById.setDeptNo(CodeRuleManager.getCodeRuleManager().generateRuleCode(RuleCodeType. + DEPARTMENT, "")); + } catch (Exception e) { + throw new RuntimeException(e); + } deptById.setParentComp(Long.parseLong(copyParam.getCompany())); insertCount += getDepartmentMapper().insertIgnoreNull(deptById); if ("1".equals(copyParam.getCopyJob())) { List jobPOS = MapperProxyFactory.getProxy(JobMapper.class).listJobsByDepartmentId(id); for (JobPO jobPO : jobPOS) { - // TODO 自动编号 - jobPO.setJobNo("部门复制_" + jobPO.getJobNo()); + try { + // 处理自动编号 + jobPO.setJobNo(CodeRuleManager.getCodeRuleManager().generateRuleCode(RuleCodeType. + JOBTITLES, "")); + } catch (Exception e) { + throw new RuntimeException(e); + } jobPO.setParentDept(deptById.getId()); jobPO.setCreator((long) user.getUID()); jobPO.setCreateTime(new Date()); @@ -645,29 +625,6 @@ public class DepartmentServiceImpl extends Service implements DepartmentService } - /** - * 获取集团 - * - * @return - */ - private SearchTree getTopGroup() { - RecordSet rs = new RecordSet(); - String sql = "select * from HrmCompany "; - rs.executeQuery(sql); - SearchTree groupTree = new SearchTree(); - groupTree.setCanClick(false); - groupTree.setCanceled(false); - groupTree.setCompanyid("1"); - groupTree.setIcon("icon-coms-LargeArea"); - groupTree.setId("0"); - groupTree.setIsVirtual("0"); - while (rs.next()) { - groupTree.setName(rs.getString("COMPANYNAME")); - } - groupTree.setSelected(false); - groupTree.setType(TYPE_GROUP); - return groupTree; - } /** * 根据keyword查询数据 @@ -676,10 +633,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService * @param keyword * @return */ - private List getFilterCompany(String id, String keyword) { - List compSearchTree = new ArrayList<>(); - - // + private List getFilterCompany(String id, String keyword) { // 查询部门信息 Long parentCompId = StringUtil.isEmpty(id) ? null : Long.parseLong(id); CompPO compBuild = CompPO.builder().compName(keyword).parentCompany(parentCompId).build(); @@ -689,17 +643,8 @@ public class DepartmentServiceImpl extends Service implements DepartmentService for (CompPO compPO : filterComps) { buildParentComps(compPO, builderComps); } - List compTrees = builderTreeMode(CompBO.buildSetToSearchTree(builderComps)); - - // 排序，设置是否为叶子节点 - List collect = compTrees.stream().peek(item -> - item.setIsParent(CollectionUtils.isNotEmpty(item.getSubs())) - ).sorted(Comparator.comparing(item -> Integer.parseInt(item.getId()))).collect(Collectors.toList()); - if (CollectionUtils.isNotEmpty(collect)) { - compSearchTree.addAll(collect); - } + return SearchTreeUtil.builderTreeMode(CompBO.buildSetToSearchTree(builderComps)); - return compSearchTree; } /** @@ -710,7 +655,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService */ private void buildParentComps(CompPO compPO, Set builderComps) { builderComps.add(compPO); - if (isTop(compPO.getParentCompany())) { + if (SearchTreeUtil.isTop(compPO.getParentCompany())) { return; } CompPO parentComp = getCompMapper().listById(compPO.getParentCompany()); @@ -719,40 +664,5 @@ public class DepartmentServiceImpl extends Service implements DepartmentService } } - /** - * 处理树层级 - * - * @param treeList - * @return - */ - private List builderTreeMode(List treeList) { - Map> collects = treeList.stream().collect(Collectors.groupingBy(TreeNode::getPid)); - return treeList.stream().peek(e -> e.setSubs(collects.get(e.getId()))).peek(item -> { - if (CollectionUtils.isNotEmpty(item.getSubs())) { - item.setIsParent(true); - } - }).filter(item -> isTop(item.getPid())).collect(Collectors.toList()); - } - - /** - * 判断是为顶层数据 - * - * @param pid - * @return - */ - private boolean isTop(Long pid) { - return null == pid; - } - - /** - * 判断是为顶层数据 - * - * @param pid - * @return - */ - private boolean isTop(String pid) { - return StringUtil.isEmpty(pid) || "0".equals(pid); - } - } diff --git a/src/com/engine/organization/service/impl/JobServiceImpl.java b/src/com/engine/organization/service/impl/JobServiceImpl.java index 2da44b0f..369978c8 100644 --- a/src/com/engine/organization/service/impl/JobServiceImpl.java +++ b/src/com/engine/organization/service/impl/JobServiceImpl.java @@ -5,7 +5,6 @@ import com.api.browser.bean.BrowserBean; import com.api.browser.bean.SearchConditionGroup; import com.api.browser.bean.SearchConditionItem; import com.api.browser.bean.SearchConditionOption; -import com.api.hrm.bean.TreeNode; import com.cloudstore.eccom.pc.table.WeaTableColumn; import com.cloudstore.eccom.result.WeaResultMsg; import com.engine.common.util.ServiceUtil; @@ -49,8 +48,8 @@ import com.engine.organization.util.db.MapperProxyFactory; import com.engine.organization.util.page.Column; import com.engine.organization.util.page.PageInfo; import com.engine.organization.util.page.PageUtil; +import com.engine.organization.util.tree.SearchTreeUtil; import org.apache.commons.collections4.CollectionUtils; -import weaver.conn.RecordSet; import weaver.general.StringUtil; import weaver.general.Util; import weaver.hrm.User; @@ -73,7 +72,6 @@ public class JobServiceImpl extends Service implements JobService { * 1：分部 * 2：部门 */ - private static final String TYPE_GROUP = "0"; private static final String TYPE_COMP = "1"; private static final String TYPE_DEPT = "2"; @@ -128,31 +126,11 @@ public class JobServiceImpl extends Service implements JobService { @Override public Map getSearchTree(SearchTreeParams params) { - Map dataMap = new HashMap<>(); - SearchTree topGroup = getTopGroup(); - // 集团 - List companyList = new ArrayList<>(); - companyList.add(topGroup); String keyword = params.getKeyword(); - String type = Util.null2String(params.getType()); String id = params.getId(); - - List treeDatas = getFilterCompany(id, type, keyword); - // 未点击，初始化树结构 - if (StringUtil.isEmpty(type)) { - dataMap.put("companys", companyList); - SearchTree rootCompany = getTopGroup(); - rootCompany.setSubs(treeDatas); - rootCompany.setIsParent(CollectionUtils.isNotEmpty(rootCompany.getSubs())); - Map rootCompanyMap = new HashMap<>(); - rootCompanyMap.put("rootCompany", rootCompany); - dataMap.put("datas", rootCompanyMap); - } else { - // 根据ID查询 - dataMap.put("datas", treeDatas); - } - - return dataMap; + String type = Util.null2String(params.getType()); + List treeList = getFilterCompany(id, type, keyword); + return SearchTreeUtil.getSearchTree(type, treeList); } @Override @@ -444,8 +422,13 @@ public class JobServiceImpl extends Service implements JobService { List idList = Arrays.stream(ids.split(",")).map(Long::parseLong).collect(Collectors.toList()); for (Long id : idList) { JobPO jobById = getJobMapper().getJobById(id); - // TODO 自动编号 - jobById.setJobNo("复制_" + jobById.getJobNo()); + try { + // 处理自动编号 + jobById.setJobNo(CodeRuleManager.getCodeRuleManager().generateRuleCode(RuleCodeType. + JOBTITLES, "")); + } catch (Exception e) { + throw new RuntimeException(e); + } jobById.setParentDept(Long.parseLong(department)); insertCount += getJobMapper().insertIgnoreNull(jobById); } @@ -485,7 +468,7 @@ public class JobServiceImpl extends Service implements JobService { */ private void buildParentDepts(DepartmentPO departmentPO, Set builderDeparts) { builderDeparts.add(departmentPO); - if (isTop(departmentPO.getParentDept())) { + if (SearchTreeUtil.isTop(departmentPO.getParentDept())) { return; } DepartmentPO parentDept = getDepartmentMapper().getDeptById(departmentPO.getParentDept()); @@ -502,7 +485,7 @@ public class JobServiceImpl extends Service implements JobService { */ private void buildParentComps(CompPO compPO, Set builderComps) { builderComps.add(compPO); - if (isTop(compPO.getParentCompany())) { + if (SearchTreeUtil.isTop(compPO.getParentCompany())) { return; } CompPO parentComp = getCompMapper().listById(compPO.getParentCompany()); @@ -511,30 +494,6 @@ public class JobServiceImpl extends Service implements JobService { } } - /** - * 获取集团 - * - * @return - */ - private SearchTree getTopGroup() { - RecordSet rs = new RecordSet(); - String sql = "select * from HrmCompany "; - rs.executeQuery(sql); - SearchTree groupTree = new SearchTree(); - groupTree.setCanClick(false); - groupTree.setCanceled(false); - groupTree.setCompanyid("1"); - groupTree.setIcon("icon-coms-LargeArea"); - groupTree.setId("0"); - groupTree.setIsVirtual("0"); - while (rs.next()) { - groupTree.setName(rs.getString("COMPANYNAME")); - } - groupTree.setSelected(false); - groupTree.setType(TYPE_GROUP); - return groupTree; - } - /** * 根据keyword查询数据 * @@ -543,14 +502,14 @@ public class JobServiceImpl extends Service implements JobService { * @param keyword * @return */ - private List getFilterCompany(String id, String type, String keyword) { - List compSearchTree = new ArrayList<>(); + private List getFilterCompany(String id, String type, String keyword) { + List searchTree = new ArrayList<>(); // 通过分部、公司 组装数据 if (StringUtil.isEmpty(id) || TYPE_COMP.equals(type)) { Long parentCompId = StringUtil.isEmpty(id) ? null : Long.parseLong(id); DepartmentPO departmentBuild = DepartmentPO.builder().deptName(keyword).parentComp(parentCompId).build(); CompPO compBuild = CompPO.builder().compName(keyword).parentCompany(parentCompId).build(); - buildTreeByCompAndDept(departmentBuild, compBuild, compSearchTree); + searchTree = buildTreeByCompAndDept(departmentBuild, compBuild); } else if (TYPE_DEPT.equals(type)) { // // 查询部门信息 @@ -559,16 +518,10 @@ public class JobServiceImpl extends Service implements JobService { for (DepartmentPO departmentPO : filterDeparts) { buildParentDepts(departmentPO, builderDeparts); } - List deptTrees = builderTreeMode(DepartmentBO.buildSetToSearchTree(builderDeparts)); - // 排序，设置是否为叶子节点 - List collect = deptTrees.stream().peek(item -> - item.setIsParent(CollectionUtils.isNotEmpty(item.getSubs())) - ).sorted(Comparator.comparing(item -> Integer.parseInt(item.getId()))).collect(Collectors.toList()); - if (CollectionUtils.isNotEmpty(collect)) { - compSearchTree.addAll(collect); - } + searchTree = SearchTreeUtil.builderTreeMode(DepartmentBO.buildSetToSearchTree(builderDeparts)); + } - return compSearchTree; + return searchTree; } /** @@ -576,9 +529,9 @@ public class JobServiceImpl extends Service implements JobService { * * @param departmentBuild * @param compBuild - * @param compSearchTree + * @return */ - private void buildTreeByCompAndDept(DepartmentPO departmentBuild, CompPO compBuild, List compSearchTree) { + private List buildTreeByCompAndDept(DepartmentPO departmentBuild, CompPO compBuild) { List filterDeparts = getDepartmentMapper().listByFilter(departmentBuild); // 查询分部信息 List filterComps = getCompMapper().listByFilter(compBuild); @@ -586,7 +539,7 @@ public class JobServiceImpl extends Service implements JobService { for (DepartmentPO departmentPO : filterDeparts) { buildParentDepts(departmentPO, builderDeparts); } - List deptTrees = builderTreeMode(DepartmentBO.buildSetToSearchTree(builderDeparts)); + List deptTrees = SearchTreeUtil.builderTreeMode(DepartmentBO.buildSetToSearchTree(builderDeparts)); // 添加部门的上级分部 String parentCompS = deptTrees.stream().map(SearchTree::getParentComp).collect(Collectors.joining(",")); if (!StringUtil.isEmpty(parentCompS)) { @@ -599,81 +552,10 @@ public class JobServiceImpl extends Service implements JobService { for (CompPO compPO : filterComps) { buildParentComps(compPO, builderComps); } - List compTrees = builderTreeMode(CompBO.buildSetToSearchTree(builderComps), deptTrees); - - // 排序，设置是否为叶子节点 - List collect = compTrees.stream().peek(item -> - item.setIsParent(CollectionUtils.isNotEmpty(item.getSubs())) - ).sorted(Comparator.comparing(item -> Integer.parseInt(item.getId()))).collect(Collectors.toList()); - if (CollectionUtils.isNotEmpty(collect)) { - compSearchTree.addAll(collect); - } - } - - /** - * 判断是为顶层数据 - * - * @param pid - * @return - */ - private boolean isTop(Long pid) { - return null == pid; - } - - /** - * 判断是为顶层数据 - * - * @param pid - * @return - */ - private boolean isTop(String pid) { - return StringUtil.isEmpty(pid) || "0".equals(pid); + return SearchTreeUtil.builderTreeMode(CompBO.buildSetToSearchTree(builderComps), deptTrees); } - /** - * 处理树层级 - * - * @param treeList - * @return - */ - private List builderTreeMode(List treeList) { - Map> collects = treeList.stream().collect(Collectors.groupingBy(TreeNode::getPid)); - return treeList.stream().peek(e -> e.setSubs(collects.get(e.getId()))).peek(item -> { - if (CollectionUtils.isNotEmpty(item.getSubs())) { - item.setIsParent(true); - } - }).filter(item -> isTop(item.getPid())).collect(Collectors.toList()); - } - - /** - * 组合分部、部门层级关系 - * - * @param treeList - * @param deptTrees - * @return - */ - private List builderTreeMode(List treeList, List deptTrees) { - Map> parentMap = treeList.stream().collect(Collectors.groupingBy(TreeNode::getPid)); - Map> childMap = deptTrees.stream().collect(Collectors.groupingBy(SearchTree::getParentComp)); - boolean isAdd = !childMap.isEmpty(); - return treeList.stream().peek(e -> { - List treeNodes = new ArrayList<>(); - List nodes = parentMap.get(e.getId()); - if (CollectionUtils.isNotEmpty(nodes)) { - treeNodes.addAll(nodes); - } - if (isAdd && CollectionUtils.isNotEmpty(childMap.get(e.getId()))) { - treeNodes.addAll(childMap.get(e.getId())); - } - e.setSubs(treeNodes); - }).peek(item -> { - if (CollectionUtils.isNotEmpty(item.getSubs())) { - item.setIsParent(true); - } - }).filter(item -> isTop(item.getPid())).collect(Collectors.toList()); - } - /** * 是否有搜索查询 * diff --git a/src/com/engine/organization/util/MenuBtn.java b/src/com/engine/organization/util/MenuBtn.java index cad98205..7d00f83d 100644 --- a/src/com/engine/organization/util/MenuBtn.java +++ b/src/com/engine/organization/util/MenuBtn.java @@ -113,5 +113,28 @@ public class MenuBtn { return btnDatas; } + /** + * 获取常用按钮列表 + * @return + */ + public static Map getDatasNoBtnColum() { + Map btnDatas = new HashMap<>(); + ArrayList topMenuList = new ArrayList<>(); + ArrayList rightMenuList = new ArrayList<>(); + // 新增 + topMenuList.add(MenuBtn.topMenu_addNew()); + // 批量删除 + topMenuList.add(MenuBtn.topMenu_batchDelete()); + btnDatas.put("topMenu", topMenuList); + // 新增 + rightMenuList.add(MenuBtn.rightMenu_addNew()); + // 日志 + rightMenuList.add(MenuBtn.rightMenu_btnLog()); + // 显示列定制 + rightMenuList.add(MenuBtn.rightMenu_btnColumn()); + btnDatas.put("rightMenu", rightMenuList); + return btnDatas; + } + } diff --git a/src/com/engine/organization/util/tree/SearchTreeUtil.java b/src/com/engine/organization/util/tree/SearchTreeUtil.java new file mode 100644 index 00000000..497e12d4 --- /dev/null +++ b/src/com/engine/organization/util/tree/SearchTreeUtil.java @@ -0,0 +1,146 @@ +package com.engine.organization.util.tree; + +import com.api.hrm.bean.TreeNode; +import com.engine.organization.entity.searchtree.SearchTree; +import org.apache.commons.collections4.CollectionUtils; +import weaver.conn.RecordSet; +import weaver.general.StringUtil; + +import java.util.*; +import java.util.stream.Collectors; + +/** + * @description: TODO + * @author:dxfeng + * @createTime: 2022/06/06 + * @version: 1.0 + */ +public class SearchTreeUtil { + /** + * 左侧树 类型表示 + *

+ * 0：集团 + * 1：分部 + * 2：部门 + */ + private static final String TYPE_GROUP = "0"; + + public static Map getSearchTree(String type, List treeList) { + Map dataMap = new HashMap<>(); + SearchTree topGroup = getTopGroup(); + // 集团 + List companyList = new ArrayList<>(); + companyList.add(topGroup); + + List treeDatas = new ArrayList<>(); + // 排序，设置是否为叶子节点 + List collect = treeList.stream().peek(item -> + item.setIsParent(CollectionUtils.isNotEmpty(item.getSubs())) + ).sorted(Comparator.comparing(item -> Integer.parseInt(item.getId()))).collect(Collectors.toList()); + if (CollectionUtils.isNotEmpty(collect)) { + treeDatas.addAll(collect); + } + + // 未点击，初始化树结构 + if (StringUtil.isEmpty(type)) { + dataMap.put("companys", companyList); + SearchTree rootCompany = getTopGroup(); + rootCompany.setSubs(treeDatas); + rootCompany.setIsParent(CollectionUtils.isNotEmpty(rootCompany.getSubs())); + Map rootCompanyMap = new HashMap<>(); + rootCompanyMap.put("rootCompany", rootCompany); + dataMap.put("datas", rootCompanyMap); + } else { + // 根据ID查询 + dataMap.put("datas", treeDatas); + } + return dataMap; + } + + /** + * 获取集团 + * + * @return + */ + private static SearchTree getTopGroup() { + RecordSet rs = new RecordSet(); + String sql = "select * from HrmCompany "; + rs.executeQuery(sql); + SearchTree groupTree = new SearchTree(); + groupTree.setCanClick(false); + groupTree.setCanceled(false); + groupTree.setCompanyid("1"); + groupTree.setIcon("icon-coms-LargeArea"); + groupTree.setId("0"); + groupTree.setIsVirtual("0"); + while (rs.next()) { + groupTree.setName(rs.getString("COMPANYNAME")); + } + groupTree.setSelected(false); + groupTree.setType(TYPE_GROUP); + return groupTree; + } + + /** + * 处理树层级 + * + * @param treeList + * @return + */ + public static List builderTreeMode(List treeList) { + Map> collects = treeList.stream().collect(Collectors.groupingBy(TreeNode::getPid)); + return treeList.stream().peek(e -> e.setSubs(collects.get(e.getId()))).peek(item -> { + if (CollectionUtils.isNotEmpty(item.getSubs())) { + item.setIsParent(true); + } + }).filter(item -> isTop(item.getPid())).collect(Collectors.toList()); + } + + /** + * 组合分部、部门层级关系 + * + * @param treeList + * @param deptTrees + * @return + */ + public static List builderTreeMode(List treeList, List deptTrees) { + Map> parentMap = treeList.stream().collect(Collectors.groupingBy(TreeNode::getPid)); + Map> childMap = deptTrees.stream().collect(Collectors.groupingBy(SearchTree::getParentComp)); + boolean isAdd = !childMap.isEmpty(); + return treeList.stream().peek(e -> { + List treeNodes = new ArrayList<>(); + List nodes = parentMap.get(e.getId()); + if (CollectionUtils.isNotEmpty(nodes)) { + treeNodes.addAll(nodes); + } + if (isAdd && CollectionUtils.isNotEmpty(childMap.get(e.getId()))) { + treeNodes.addAll(childMap.get(e.getId())); + } + e.setSubs(treeNodes); + }).peek(item -> { + if (CollectionUtils.isNotEmpty(item.getSubs())) { + item.setIsParent(true); + } + }).filter(item -> isTop(item.getPid())).collect(Collectors.toList()); + } + + /** + * 判断是为顶层数据 + * + * @param pid + * @return + */ + private static boolean isTop(String pid) { + return StringUtil.isEmpty(pid) || "0".equals(pid); + } + + /** + * 判断是为顶层数据 + * + * @param pid + * @return + */ + public static boolean isTop(Long pid) { + return null == pid; + } +} From 0282af7be6dd9b7d1e4c4a92154b4271338fd95a Mon Sep 17 00:00:00 2001 From: dxfeng Date: Mon, 6 Jun 2022 15:15:12 +0800 Subject: [PATCH 11/77] =?UTF-8?q?=E8=81=94=E6=9F=A5=E5=B2=97=E4=BD=8D=20?= =?UTF-8?q?=E8=AF=B7=E6=B1=82=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/organization/web/DepartmentController.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/com/engine/organization/web/DepartmentController.java b/src/com/engine/organization/web/DepartmentController.java index 97905666..2f85fc96 100644 --- a/src/com/engine/organization/web/DepartmentController.java +++ b/src/com/engine/organization/web/DepartmentController.java @@ -48,13 +48,15 @@ public class DepartmentController { } } - @POST + @GET @Path("/getJobListByPid") @Produces(MediaType.APPLICATION_JSON) - public ReturnResult getJobListByPid(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody QuerySingleDeptListParam querySingleDeptListParam) { + public ReturnResult getJobListByPid(@Context HttpServletRequest request, @Context HttpServletResponse response) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getDepartmentWrapper(user).getJobListByPid(querySingleDeptListParam)); + Map map = ParamUtil.request2Map(request); + String parentDept = (String) map.get("parentDept"); + return ReturnResult.successed(getDepartmentWrapper(user).getJobListByPid(QuerySingleDeptListParam.builder().parentDept(Long.parseLong(parentDept)).build())); } catch (Exception e) { return ReturnResult.exceptionHandle(e.getMessage()); } From e7b6d44fd5e899dc97e45ee6ebe7e651ad0fd189 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Mon, 6 Jun 2022 15:52:40 +0800 Subject: [PATCH 12/77] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../organization/service/impl/DepartmentServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java index 560c9f80..7b449bfa 100644 --- a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java +++ b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java @@ -426,7 +426,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService public List getMergeForm(Long id) { List addGroups = new ArrayList<>(); List condition = new ArrayList<>(); - SearchConditionItem deptBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, "合并部门", "161", "department", "deptBrowser"); + SearchConditionItem deptBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, "合并到部门", "161", "department", "deptBrowser"); deptBrowserItem.setRules("required|string"); SearchConditionItem mergeNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 3, 50, "合并后名称", "mergeName"); mergeNameItem.setRules("required|string"); @@ -464,7 +464,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService public List getMoveForm() { List addGroups = new ArrayList<>(); List condition = new ArrayList<>(); - SearchConditionItem compBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, "请选择部门", "161", "company", "compBrowser"); + SearchConditionItem compBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, "请选择公司/分部", "161", "company", "compBrowser"); compBrowserItem.setRules("required|string"); SearchConditionItem deptBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, "请选择部门", "161", "department", "deptBrowser"); deptBrowserItem.setRules("required|string"); From c0389942a96788afc96d72a6f9ec1d15a2968c9b Mon Sep 17 00:00:00 2001 From: dxfeng Date: Mon, 6 Jun 2022 16:19:35 +0800 Subject: [PATCH 13/77] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../organization/service/impl/DepartmentServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java index 7b449bfa..61056ec1 100644 --- a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java +++ b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java @@ -443,8 +443,8 @@ public class DepartmentServiceImpl extends Service implements DepartmentService public int mergeDepartment(DepartmentMergeParam mergeParam) { int updateCount = 0; OrganizationAssert.isFalse(mergeParam.getId().equals(mergeParam.getDepartment()), "所选部门与待合并部门一致，无需操作"); - OrganizationAssert.isNull(mergeParam.getDepartment(), "请选择需要合并的部门"); - OrganizationAssert.isBlank(mergeParam.getMergeName(), "请输入合并后的名称"); + OrganizationAssert.notNull(mergeParam.getDepartment(), "请选择需要合并的部门"); + OrganizationAssert.notBlank(mergeParam.getMergeName(), "请输入合并后的名称"); // 所选部门 DepartmentPO mergeDepartment = getDepartmentMapper().getDeptById(mergeParam.getId()); mergeDepartment.setDeptName(mergeParam.getMergeName()); From 0c2a4a3e68ed44c57ac686387ad14feb6784d85e Mon Sep 17 00:00:00 2001 From: dxfeng Date: Mon, 6 Jun 2022 16:30:43 +0800 Subject: [PATCH 14/77] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../organization/service/impl/DepartmentServiceImpl.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java index 61056ec1..c02d5779 100644 --- a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java +++ b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java @@ -464,10 +464,8 @@ public class DepartmentServiceImpl extends Service implements DepartmentService public List getMoveForm() { List addGroups = new ArrayList<>(); List condition = new ArrayList<>(); - SearchConditionItem compBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, "请选择公司/分部", "161", "company", "compBrowser"); - compBrowserItem.setRules("required|string"); - SearchConditionItem deptBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, "请选择部门", "161", "department", "deptBrowser"); - deptBrowserItem.setRules("required|string"); + SearchConditionItem compBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "请选择公司/分部", "161", "company", "compBrowser"); + SearchConditionItem deptBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "请选择部门", "161", "department", "deptBrowser"); List selectOptions = new ArrayList<>(); From ad73710f0dd45aeb31aa57329a54a1fb11730de3 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Mon, 6 Jun 2022 17:48:11 +0800 Subject: [PATCH 15/77] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=BC=96=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/job/vo/SingleJobTreeVO.java | 4 +- .../service/impl/CompServiceImpl.java | 17 +++----- .../service/impl/DepartmentServiceImpl.java | 32 ++++---------- .../service/impl/JobServiceImpl.java | 24 +++-------- .../util/coderule/CodeRuleUtil.java | 43 +++++++++++++++++++ 5 files changed, 66 insertions(+), 54 deletions(-) create mode 100644 src/com/engine/organization/util/coderule/CodeRuleUtil.java diff --git a/src/com/engine/organization/entity/job/vo/SingleJobTreeVO.java b/src/com/engine/organization/entity/job/vo/SingleJobTreeVO.java index 3917bb05..f9a09068 100644 --- a/src/com/engine/organization/entity/job/vo/SingleJobTreeVO.java +++ b/src/com/engine/organization/entity/job/vo/SingleJobTreeVO.java @@ -29,10 +29,10 @@ public class SingleJobTreeVO { @TableTitle(title = "编号", dataIndex = "jobNo", key = "jobNo") private String jobNo; - @TableTitle(title = "编号", dataIndex = "jobName", key = "jobName") + @TableTitle(title = "名称", dataIndex = "jobName", key = "jobName") private String jobName; - @TableTitle(title = "编号", dataIndex = "parentJobName", key = "parentJobName") + @TableTitle(title = "上级岗位", dataIndex = "parentJobName", key = "parentJobName") private String parentJobName; private Long parentJob; diff --git a/src/com/engine/organization/service/impl/CompServiceImpl.java b/src/com/engine/organization/service/impl/CompServiceImpl.java index caa8e8ab..fe38230d 100644 --- a/src/com/engine/organization/service/impl/CompServiceImpl.java +++ b/src/com/engine/organization/service/impl/CompServiceImpl.java @@ -11,7 +11,6 @@ import com.cloudstore.eccom.result.WeaResultMsg; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; import com.engine.hrm.entity.RuleCodeType; -import com.engine.hrm.util.CodeRuleManager; import com.engine.organization.component.OrganizationWeaTable; import com.engine.organization.entity.codesetting.po.CodeRulePO; import com.engine.organization.entity.company.bo.CompBO; @@ -26,6 +25,7 @@ import com.engine.organization.service.ExtService; import com.engine.organization.util.MenuBtn; import com.engine.organization.util.OrganizationAssert; import com.engine.organization.util.OrganizationFormItemUtil; +import com.engine.organization.util.coderule.CodeRuleUtil; import com.engine.organization.util.db.MapperProxyFactory; import com.engine.organization.util.page.Column; import com.engine.organization.util.page.PageInfo; @@ -119,13 +119,8 @@ public class CompServiceImpl extends Service implements CompService { @Override public int saveBaseComp(CompSearchParam params) { - try { - // 处理自动编号 - String compNo = CodeRuleManager.getCodeRuleManager().generateRuleCode(RuleCodeType.SUBCOMPANY, params.getCompNo()); - params.setCompNo(compNo); - } catch (Exception e) { - throw new RuntimeException(e); - } + // 自动编号 + params.setCompNo(CodeRuleUtil.generateCode(RuleCodeType.SUBCOMPANY, params.getCompNo())); List list = getCompMapper().listByNo(Util.null2String(params.getCompNo())); OrganizationAssert.isEmpty(list, "编号不允许重复"); CompPO compPO = CompBO.convertParamToPO(params, (long) user.getUID()); @@ -252,14 +247,12 @@ public class CompServiceImpl extends Service implements CompService { compNoItem.setRules("required|string"); // 判断是否开启自动编号 CodeRulePO codeRuleByType = MapperProxyFactory.getProxy(CodeRuleMapper.class).getCodeRuleByType(RuleCodeType.SUBCOMPANY.getValue()); - if ("1".equals(codeRuleByType.getSerialEnable())) { + if (null != codeRuleByType && "1".equals(codeRuleByType.getSerialEnable())) { compNoItem.setViewAttr(2); compNoItem.setHelpfulTip("编号为空,则按照指定规则自动生成编号"); + compNoItem.setRules(""); } - getSameFormItem(conditionItems, compNoItem, null); - - addGroups.add(new SearchConditionGroup("基本信息", true, conditionItems)); apiDatas.put("condition", addGroups); diff --git a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java index c02d5779..0b97537f 100644 --- a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java +++ b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java @@ -10,7 +10,6 @@ import com.cloudstore.eccom.result.WeaResultMsg; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; import com.engine.hrm.entity.RuleCodeType; -import com.engine.hrm.util.CodeRuleManager; import com.engine.organization.component.OrganizationWeaTable; import com.engine.organization.entity.codesetting.po.CodeRulePO; import com.engine.organization.entity.company.bo.CompBO; @@ -35,6 +34,7 @@ import com.engine.organization.service.ExtService; import com.engine.organization.util.MenuBtn; import com.engine.organization.util.OrganizationAssert; import com.engine.organization.util.OrganizationFormItemUtil; +import com.engine.organization.util.coderule.CodeRuleUtil; import com.engine.organization.util.db.MapperProxyFactory; import com.engine.organization.util.page.Column; import com.engine.organization.util.page.PageInfo; @@ -172,13 +172,8 @@ public class DepartmentServiceImpl extends Service implements DepartmentService @Override public int saveBaseForm(DeptSearchParam params) { - try { - // 处理自动编号 - params.setDeptNo(CodeRuleManager.getCodeRuleManager().generateRuleCode(RuleCodeType. - DEPARTMENT, params.getDeptNo())); - } catch (Exception e) { - throw new RuntimeException(e); - } + // 自动编号 + params.setDeptNo(CodeRuleUtil.generateCode(RuleCodeType.DEPARTMENT, params.getDeptNo())); List list = getDepartmentMapper().listByNo(Util.null2String(params.getDeptNo())); OrganizationAssert.isEmpty(list, "编号不允许重复"); DepartmentPO departmentPO = DepartmentBO.convertParamsToPO(params, user.getUID()); @@ -320,8 +315,9 @@ public class DepartmentServiceImpl extends Service implements DepartmentService SearchConditionItem deptNoItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 3, 50, "编号", "deptNo"); deptNoItem.setRules("required|string"); CodeRulePO codeRuleByType = MapperProxyFactory.getProxy(CodeRuleMapper.class).getCodeRuleByType(RuleCodeType.DEPARTMENT.getValue()); - if ("1".equals(codeRuleByType.getSerialEnable())) { + if (null != codeRuleByType && "1".equals(codeRuleByType.getSerialEnable())) { deptNoItem.setViewAttr(2); + deptNoItem.setRules(""); deptNoItem.setHelpfulTip("编号为空,则按照指定规则自动生成编号"); } // 名称 @@ -392,25 +388,15 @@ public class DepartmentServiceImpl extends Service implements DepartmentService List idList = Arrays.stream(copyParam.getIds().split(",")).map(Long::parseLong).collect(Collectors.toList()); for (Long id : idList) { DepartmentPO deptById = getDepartmentMapper().getDeptById(id); - try { - // 处理自动编号 - deptById.setDeptNo(CodeRuleManager.getCodeRuleManager().generateRuleCode(RuleCodeType. - DEPARTMENT, "")); - } catch (Exception e) { - throw new RuntimeException(e); - } + // 处理自动编号 + deptById.setDeptNo(CodeRuleUtil.generateCode(RuleCodeType.DEPARTMENT, deptById.getDeptNo(), true)); deptById.setParentComp(Long.parseLong(copyParam.getCompany())); insertCount += getDepartmentMapper().insertIgnoreNull(deptById); if ("1".equals(copyParam.getCopyJob())) { List jobPOS = MapperProxyFactory.getProxy(JobMapper.class).listJobsByDepartmentId(id); for (JobPO jobPO : jobPOS) { - try { - // 处理自动编号 - jobPO.setJobNo(CodeRuleManager.getCodeRuleManager().generateRuleCode(RuleCodeType. - JOBTITLES, "")); - } catch (Exception e) { - throw new RuntimeException(e); - } + // 处理自动编号 + jobPO.setJobNo(CodeRuleUtil.generateCode(RuleCodeType.JOBTITLES, jobPO.getJobNo(), true)); jobPO.setParentDept(deptById.getId()); jobPO.setCreator((long) user.getUID()); jobPO.setCreateTime(new Date()); diff --git a/src/com/engine/organization/service/impl/JobServiceImpl.java b/src/com/engine/organization/service/impl/JobServiceImpl.java index 369978c8..16c0d295 100644 --- a/src/com/engine/organization/service/impl/JobServiceImpl.java +++ b/src/com/engine/organization/service/impl/JobServiceImpl.java @@ -10,7 +10,6 @@ import com.cloudstore.eccom.result.WeaResultMsg; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; import com.engine.hrm.entity.RuleCodeType; -import com.engine.hrm.util.CodeRuleManager; import com.engine.organization.component.OrganizationWeaTable; import com.engine.organization.entity.DeleteParam; import com.engine.organization.entity.codesetting.po.CodeRulePO; @@ -44,6 +43,7 @@ import com.engine.organization.service.JobService; import com.engine.organization.util.MenuBtn; import com.engine.organization.util.OrganizationAssert; import com.engine.organization.util.OrganizationFormItemUtil; +import com.engine.organization.util.coderule.CodeRuleUtil; import com.engine.organization.util.db.MapperProxyFactory; import com.engine.organization.util.page.Column; import com.engine.organization.util.page.PageInfo; @@ -267,8 +267,9 @@ public class JobServiceImpl extends Service implements JobService { SearchConditionItem jobNoItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 3, 50, "编号", "jobNo"); jobNoItem.setRules("required|string"); CodeRulePO codeRuleByType = MapperProxyFactory.getProxy(CodeRuleMapper.class).getCodeRuleByType(RuleCodeType.JOBTITLES.getValue()); - if ("1".equals(codeRuleByType.getSerialEnable())) { + if (null != codeRuleByType && "1".equals(codeRuleByType.getSerialEnable())) { jobNoItem.setViewAttr(2); + jobNoItem.setRules(""); jobNoItem.setHelpfulTip("编号为空,则按照指定规则自动生成编号"); } // 名称 @@ -364,14 +365,8 @@ public class JobServiceImpl extends Service implements JobService { @Override public int saveBaseForm(JobSearchParam params) { - try { - // 处理自动编号 - String jobNo = CodeRuleManager.getCodeRuleManager().generateRuleCode(RuleCodeType. - DEPARTMENT, params.getJobNo()); - params.setJobNo(jobNo); - } catch (Exception e) { - throw new RuntimeException(e); - } + // 处理自动编号 + params.setJobNo(CodeRuleUtil.generateCode(RuleCodeType.JOBTITLES, params.getJobNo())); List list = getJobMapper().listByNo(Util.null2String(params.getJobNo())); OrganizationAssert.isEmpty(list, "编号不允许重复"); JobPO jobPO = JobBO.convertParamsToPO(params, user.getUID()); @@ -422,13 +417,8 @@ public class JobServiceImpl extends Service implements JobService { List idList = Arrays.stream(ids.split(",")).map(Long::parseLong).collect(Collectors.toList()); for (Long id : idList) { JobPO jobById = getJobMapper().getJobById(id); - try { - // 处理自动编号 - jobById.setJobNo(CodeRuleManager.getCodeRuleManager().generateRuleCode(RuleCodeType. - JOBTITLES, "")); - } catch (Exception e) { - throw new RuntimeException(e); - } + // 处理自动编号 + jobById.setJobNo(CodeRuleUtil.generateCode(RuleCodeType.JOBTITLES, jobById.getJobNo(), true)); jobById.setParentDept(Long.parseLong(department)); insertCount += getJobMapper().insertIgnoreNull(jobById); } diff --git a/src/com/engine/organization/util/coderule/CodeRuleUtil.java b/src/com/engine/organization/util/coderule/CodeRuleUtil.java new file mode 100644 index 00000000..0571c7db --- /dev/null +++ b/src/com/engine/organization/util/coderule/CodeRuleUtil.java @@ -0,0 +1,43 @@ +package com.engine.organization.util.coderule; + +import com.engine.hrm.entity.RuleCodeType; +import com.engine.hrm.util.CodeRuleManager; + +/** + * @description: TODO + * @author:dxfeng + * @createTime: 2022/06/06 + * @version: 1.0 + */ +public class CodeRuleUtil { + /** + * 自动编号 + * + * @param ruleCodeType + * @param code + * @return + */ + public static String generateCode(RuleCodeType ruleCodeType, String code) { + try { + return CodeRuleManager.getCodeRuleManager().generateRuleCode(ruleCodeType, code); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + /** + * 复制过程 自动生成编号 + * + * @param ruleCodeType + * @param code + * @param isCopy + * @return + */ + public static String generateCode(RuleCodeType ruleCodeType, String code, boolean isCopy) { + if (isCopy) { + return generateCode(ruleCodeType, code); + } else { + return generateCode(ruleCodeType, code + "_cp"); + } + } +} From 644172662121728089c0f64179af20214601bf7b Mon Sep 17 00:00:00 2001 From: dxfeng Date: Mon, 6 Jun 2022 19:19:28 +0800 Subject: [PATCH 16/77] =?UTF-8?q?=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CompServiceImpl.java | 23 ++++++++ .../service/impl/DepartmentServiceImpl.java | 54 +++++++++++-------- .../service/impl/GradeServiceImpl.java | 26 ++++++++- .../service/impl/GroupServiceImpl.java | 14 +++++ .../service/impl/JobServiceImpl.java | 44 ++++++++------- .../service/impl/LevelServiceImpl.java | 26 ++++++++- .../service/impl/PostInfoServiceImpl.java | 25 ++++++++- .../service/impl/PostServiceImpl.java | 19 ++++++- .../service/impl/SchemeServiceImpl.java | 25 ++++++++- .../service/impl/SequenceServiceImpl.java | 26 ++++++++- .../service/impl/StaffPlanServiceImpl.java | 25 ++++++++- .../service/impl/StaffServiceImpl.java | 24 ++++++++- src/com/engine/organization/util/MenuBtn.java | 25 +++++++++ 13 files changed, 308 insertions(+), 48 deletions(-) diff --git a/src/com/engine/organization/service/impl/CompServiceImpl.java b/src/com/engine/organization/service/impl/CompServiceImpl.java index fe38230d..4a6e6c37 100644 --- a/src/com/engine/organization/service/impl/CompServiceImpl.java +++ b/src/com/engine/organization/service/impl/CompServiceImpl.java @@ -33,6 +33,7 @@ import com.engine.organization.util.page.PageUtil; import weaver.crm.Maint.SectorInfoComInfo; import weaver.general.StringUtil; import weaver.general.Util; +import weaver.hrm.HrmUserVarify; import weaver.hrm.User; import weaver.hrm.resource.ResourceComInfo; @@ -78,6 +79,11 @@ public class CompServiceImpl extends Service implements CompService { @Override public Map listPage(CompSearchParam params) { Map datas = new HashMap<>(); + + datas.put("hasRight", hasRight()); + if (!hasRight()) { + return datas; + } CompPO compPO = CompBO.convertParamToPO(params, (long) user.getUID()); boolean filter = isFilter(compPO); PageInfo pageInfos; @@ -119,6 +125,7 @@ public class CompServiceImpl extends Service implements CompService { @Override public int saveBaseComp(CompSearchParam params) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); // 自动编号 params.setCompNo(CodeRuleUtil.generateCode(RuleCodeType.SUBCOMPANY, params.getCompNo())); List list = getCompMapper().listByNo(Util.null2String(params.getCompNo())); @@ -129,12 +136,14 @@ public class CompServiceImpl extends Service implements CompService { @Override public int updateForbiddenTagById(CompSearchParam params) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); CompPO compPO = CompPO.builder().id(params.getId()).forbiddenTag(params.getForbiddenTag() ? 0 : 1).build(); return getCompMapper().updateForbiddenTagById(compPO); } @Override public int updateComp(Map params) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); CompSearchParam searchParam = JSONObject.parseObject(JSONObject.toJSONString(params), CompSearchParam.class); String groupId = (String) params.get("viewCondition"); CompPO compPO = CompBO.convertParamToPO(searchParam, (long) user.getUID()); @@ -151,12 +160,14 @@ public class CompServiceImpl extends Service implements CompService { @Override public int deleteByIds(Collection ids) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); OrganizationAssert.notEmpty(ids, "请选择要删除的数据"); return getCompMapper().deleteByIds(ids); } @Override public Map getSearchCondition(Map params) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); Map apiDatas = new HashMap<>(); List addGroups = new ArrayList<>(); List conditionItems = new ArrayList<>(); @@ -199,11 +210,13 @@ public class CompServiceImpl extends Service implements CompService { @Override public Map getHasRight() { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); return MenuBtn.getDatasNoBtnColum(); } @Override public Map getCompBaseForm(Map params) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); OrganizationAssert.notNull(params.get("viewAttr"), "请标识操作类型"); // 2编辑 1查看 int viewAttr = Integer.parseInt((String) params.get("viewAttr")); @@ -239,6 +252,7 @@ public class CompServiceImpl extends Service implements CompService { @Override public Map getCompSaveForm() { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); Map apiDatas = new HashMap<>(); List addGroups = new ArrayList<>(); List conditionItems = new ArrayList<>(); @@ -384,5 +398,14 @@ public class CompServiceImpl extends Service implements CompService { return conditionItems; } + /** + * 是否有该模块权限 + * + * @return + */ + private boolean hasRight() { + return HrmUserVarify.checkUserRight("Company:All", user); + } + } diff --git a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java index 0b97537f..e611b919 100644 --- a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java +++ b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java @@ -43,6 +43,7 @@ import com.engine.organization.util.tree.SearchTreeUtil; import org.apache.commons.collections4.CollectionUtils; import weaver.general.StringUtil; import weaver.general.Util; +import weaver.hrm.HrmUserVarify; import weaver.hrm.User; import java.util.*; @@ -92,7 +93,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService @Override public PageInfo getDeptListByPid(QuerySingleDeptListParam param) { - + OrganizationAssert.isTrue(hasRight(), "暂无权限"); //1.查询分部下所有部门 //PageUtil.start(param.getCurrent(), param.getPageSize()); List departmentPOS = MapperProxyFactory.getProxy(DepartmentMapper.class).list(); @@ -108,6 +109,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService @Override public PageInfo getJobListByPid(QuerySingleDeptListParam param) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); List jobPOS = MapperProxyFactory.getProxy(JobMapper.class).listAll(); PageInfo pageInfo = new PageInfo<>(jobPOS); List singleDeptTreeVOS = JobBO.buildSingleJobTreeVOS(jobPOS, param.getParentDept()); @@ -121,6 +123,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService @Override public Map getSearchTree(SearchTreeParams params) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); String keyword = params.getKeyword(); String id = params.getId(); String type = Util.null2String(params.getType()); @@ -131,6 +134,10 @@ public class DepartmentServiceImpl extends Service implements DepartmentService @Override public Map listPage(DeptSearchParam param) { Map datas = new HashMap<>(); + datas.put("hasRight", hasRight()); + if (!hasRight()) { + return datas; + } DepartmentPO departmentPO = DepartmentBO.convertParamsToPO(param, user.getUID()); boolean filter = isFilter(departmentPO); PageInfo pageInfos; @@ -172,6 +179,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService @Override public int saveBaseForm(DeptSearchParam params) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); // 自动编号 params.setDeptNo(CodeRuleUtil.generateCode(RuleCodeType.DEPARTMENT, params.getDeptNo())); List list = getDepartmentMapper().listByNo(Util.null2String(params.getDeptNo())); @@ -182,12 +190,14 @@ public class DepartmentServiceImpl extends Service implements DepartmentService @Override public int updateForbiddenTagById(DeptSearchParam params) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); DepartmentPO departmentPO = DepartmentPO.builder().id(params.getId()).forbiddenTag(params.getForbiddenTag() ? 0 : 1).build(); return getDepartmentMapper().updateForbiddenTagById(departmentPO); } @Override public int updateForm(Map params) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); DeptSearchParam searchParam = JSONObject.parseObject(JSONObject.toJSONString(params), DeptSearchParam.class); String groupId = (String) params.get("viewCondition"); DepartmentPO departmentPO = DepartmentBO.convertParamsToPO(searchParam, user.getUID()); @@ -204,12 +214,14 @@ public class DepartmentServiceImpl extends Service implements DepartmentService @Override public int deleteByIds(Collection ids) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); OrganizationAssert.notEmpty(ids, "请选择要删除的数据"); return getDepartmentMapper().deleteByIds(ids); } @Override public Map getSearchCondition(Map params) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); Map apiDatas = new HashMap<>(); List addGroups = new ArrayList<>(); List conditionItems = new ArrayList<>(); @@ -251,28 +263,13 @@ public class DepartmentServiceImpl extends Service implements DepartmentService @Override public Map getHasRight() { - Map btnDatas = new HashMap<>(); - ArrayList topMenuList = new ArrayList<>(); - ArrayList rightMenuList = new ArrayList<>(); - // 新增 - topMenuList.add(MenuBtn.topMenu_addNew()); - // 批量删除 - topMenuList.add(MenuBtn.topMenu_batchDelete()); - // 复制 - topMenuList.add(MenuBtn.topMenu_copy()); - btnDatas.put("topMenu", topMenuList); - // 新增 - rightMenuList.add(MenuBtn.rightMenu_addNew()); - // 复制 - rightMenuList.add(MenuBtn.rightMenu_copy()); - // 日志 - rightMenuList.add(MenuBtn.rightMenu_btnLog()); - btnDatas.put("rightMenu", rightMenuList); - return btnDatas; + OrganizationAssert.isTrue(hasRight(), "暂无权限"); + return MenuBtn.getDatasHasCopy(); } @Override public Map getDeptBaseForm(Map params) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); OrganizationAssert.notNull(params.get("viewAttr"), "请标识操作类型"); // 2编辑 1查看 @@ -308,6 +305,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService @Override public Map getSaveForm() { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); Map apiDatas = new HashMap<>(); List addGroups = new ArrayList<>(); List conditionItems = new ArrayList<>(); @@ -360,6 +358,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService */ @Override public List getCopyForm() { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); List addGroups = new ArrayList<>(); List condition = new ArrayList<>(); SearchConditionItem compBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, "复制到", "161", "company", "compBrowser"); @@ -367,7 +366,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService List selectOptions = new ArrayList<>(); SearchConditionOption Option = new SearchConditionOption("1", ""); selectOptions.add(Option); - SearchConditionItem isCheckItem = OrganizationFormItemUtil.selectItem(user, selectOptions, 2, 16, 6, false, "是否复制岗位信息", "copyJob"); + SearchConditionItem isCheckItem = OrganizationFormItemUtil.selectItem(user, selectOptions, 2, 5, 10, false, "是否复制岗位信息", "copyJob"); isCheckItem.setDetailtype(2); condition.add(compBrowserItem); condition.add(isCheckItem); @@ -383,6 +382,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService */ @Override public int copyDepartment(DeptCopyParam copyParam) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); OrganizationAssert.notBlank(copyParam.getCompany(), "请指定需要复制的公司/分部"); int insertCount = 0; List idList = Arrays.stream(copyParam.getIds().split(",")).map(Long::parseLong).collect(Collectors.toList()); @@ -410,6 +410,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService @Override public List getMergeForm(Long id) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); List addGroups = new ArrayList<>(); List condition = new ArrayList<>(); SearchConditionItem deptBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, "合并到部门", "161", "department", "deptBrowser"); @@ -427,6 +428,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService @Override public int mergeDepartment(DepartmentMergeParam mergeParam) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); int updateCount = 0; OrganizationAssert.isFalse(mergeParam.getId().equals(mergeParam.getDepartment()), "所选部门与待合并部门一致，无需操作"); OrganizationAssert.notNull(mergeParam.getDepartment(), "请选择需要合并的部门"); @@ -448,6 +450,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService @Override public List getMoveForm() { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); List addGroups = new ArrayList<>(); List condition = new ArrayList<>(); SearchConditionItem compBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "请选择公司/分部", "161", "company", "compBrowser"); @@ -461,6 +464,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService selectOptions.add(deptOption); SearchConditionItem moveTypeItem = OrganizationFormItemUtil.selectItem(user, selectOptions, 2, 16, 6, false, "转移到", "moveType"); moveTypeItem.setDetailtype(3); + moveTypeItem.setValue("0"); condition.add(moveTypeItem); condition.add(compBrowserItem); @@ -471,6 +475,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService @Override public int moveDepartment(DepartmentMoveParam moveParam) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); OrganizationAssert.notBlank(moveParam.getMoveType(), "请选择转移类型"); DepartmentPO deptById = getDepartmentMapper().getDeptById(moveParam.getId()); // 0：公司/分部 1：部门 @@ -648,5 +653,12 @@ public class DepartmentServiceImpl extends Service implements DepartmentService } } - + /** + * 是否有该模块权限 + * + * @return + */ + private boolean hasRight() { + return HrmUserVarify.checkUserRight("Department:All", user); + } } diff --git a/src/com/engine/organization/service/impl/GradeServiceImpl.java b/src/com/engine/organization/service/impl/GradeServiceImpl.java index aa172367..21cdc09d 100644 --- a/src/com/engine/organization/service/impl/GradeServiceImpl.java +++ b/src/com/engine/organization/service/impl/GradeServiceImpl.java @@ -26,6 +26,7 @@ import org.apache.commons.lang3.StringUtils; import weaver.conn.RecordSet; import weaver.general.StringUtil; import weaver.general.Util; +import weaver.hrm.HrmUserVarify; import java.util.*; @@ -53,6 +54,11 @@ public class GradeServiceImpl extends Service implements GradeService { @Override public Map listPage(Map params) { // 刷新引用状态 + Map resultMap = new HashMap<>(); + resultMap.put("hasRight", hasRight()); + if (!hasRight()) { + return resultMap; + } RefreshIsUsedUtil.RefreshGrade("jcl_org_grade"); OrganizationWeaTable table = new OrganizationWeaTable<>(user, GradeTableVO.class); String sqlWhere = buildSqlWhere(params); @@ -60,12 +66,14 @@ public class GradeServiceImpl extends Service implements GradeService { WeaResultMsg result = new WeaResultMsg(false); result.putAll(table.makeDataResult()); result.success(); - return result.getResultMap(); + resultMap.putAll(result.getResultMap()); + return resultMap; } @Override public int saveGrade(GradeSearchParam param) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); List list = getGradeMapper().listByNo(Util.null2String(param.getGradeNo())); OrganizationAssert.isEmpty(list, "编号不允许重复"); GradePO gradePO = GradeDTO.convertParamToPO(param, (long) user.getUID()); @@ -74,18 +82,21 @@ public class GradeServiceImpl extends Service implements GradeService { @Override public int updateGrade(GradeSearchParam param) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); GradePO gradePO = GradeDTO.convertParamToPO(param, (long) user.getUID()); return getGradeMapper().updateGrade(gradePO); } @Override public int updateForbiddenTagById(GradeSearchParam params) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); GradePO gradePO = GradePO.builder().id(params.getId()).forbiddenTag(params.getForbiddenTag() ? 0 : 1).build(); return getGradeMapper().updateForbiddenTagById(gradePO); } @Override public int deleteByIds(Collection ids) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); OrganizationAssert.notEmpty(ids, "请选择要删除的数据"); return getGradeMapper().deleteByIds(ids); } @@ -93,6 +104,7 @@ public class GradeServiceImpl extends Service implements GradeService { @Override public Map getSearchCondition(Map params) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); Map apiDatas = new HashMap<>(); List addGroups = new ArrayList<>(); List conditionItems = new ArrayList<>(); @@ -108,6 +120,7 @@ public class GradeServiceImpl extends Service implements GradeService { @Override public Map getGradeForm(Map params) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); Map apiDatas = new HashMap<>(); List selectItems = new ArrayList<>(); List addGroups = new ArrayList<>(); @@ -159,11 +172,13 @@ public class GradeServiceImpl extends Service implements GradeService { @Override public Map getHasRight() { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); return MenuBtn.getCommonBtnDatas(); } @Override public Map getTabInfo() { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); Map apiDatas = new HashMap<>(); List topTabs = new ArrayList<>(); topTabs.add(TopTab.builder().color("#000000").groupId("flowAll").showcount(true).title("全部").viewCondition("-1").build()); @@ -204,4 +219,13 @@ public class GradeServiceImpl extends Service implements GradeService { } return sqlWhere; } + + /** + * 是否有该模块权限 + * + * @return + */ + private boolean hasRight() { + return HrmUserVarify.checkUserRight("Grade:All", user); + } } diff --git a/src/com/engine/organization/service/impl/GroupServiceImpl.java b/src/com/engine/organization/service/impl/GroupServiceImpl.java index 47bb3e61..e2a51b86 100644 --- a/src/com/engine/organization/service/impl/GroupServiceImpl.java +++ b/src/com/engine/organization/service/impl/GroupServiceImpl.java @@ -11,6 +11,7 @@ import com.engine.organization.util.OrganizationFormItemUtil; import weaver.conn.RecordSet; import weaver.general.StringUtil; import weaver.general.Util; +import weaver.hrm.HrmUserVarify; import java.util.ArrayList; import java.util.HashMap; @@ -26,6 +27,7 @@ import java.util.Map; public class GroupServiceImpl extends Service implements GroupService { @Override public Map getGroupFormField(Map params) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); Map apiDatas = new HashMap<>(); List selectItems = new ArrayList<>(); List addGroups = new ArrayList<>(); @@ -72,6 +74,7 @@ public class GroupServiceImpl extends Service implements GroupService { @Override public boolean updateGroup(Map params) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); String id = Util.null2String(params.get("id")); OrganizationAssert.notNull(id, "数据有误"); String companyname = (String) params.get("companyname"); @@ -84,6 +87,7 @@ public class GroupServiceImpl extends Service implements GroupService { @Override public Map getHasRight() { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); Map btnDatas = new HashMap<>(); ArrayList topMenuList = new ArrayList<>(); ArrayList rightMenuList = new ArrayList<>(); @@ -98,6 +102,7 @@ public class GroupServiceImpl extends Service implements GroupService { @Override public Map getTabInfo() { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); Map apiDatas = new HashMap<>(); List topTabs = new ArrayList<>(); topTabs.add(TopTab.builder().title("总部信息").viewCondition("1").build()); @@ -105,4 +110,13 @@ public class GroupServiceImpl extends Service implements GroupService { return apiDatas; } + + /** + * 是否有该模块权限 + * + * @return + */ + private boolean hasRight() { + return HrmUserVarify.checkUserRight("Group:All", user); + } } diff --git a/src/com/engine/organization/service/impl/JobServiceImpl.java b/src/com/engine/organization/service/impl/JobServiceImpl.java index 16c0d295..8b024799 100644 --- a/src/com/engine/organization/service/impl/JobServiceImpl.java +++ b/src/com/engine/organization/service/impl/JobServiceImpl.java @@ -52,6 +52,7 @@ import com.engine.organization.util.tree.SearchTreeUtil; import org.apache.commons.collections4.CollectionUtils; import weaver.general.StringUtil; import weaver.general.Util; +import weaver.hrm.HrmUserVarify; import weaver.hrm.User; import java.util.*; @@ -126,6 +127,7 @@ public class JobServiceImpl extends Service implements JobService { @Override public Map getSearchTree(SearchTreeParams params) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); String keyword = params.getKeyword(); String id = params.getId(); String type = Util.null2String(params.getType()); @@ -136,6 +138,10 @@ public class JobServiceImpl extends Service implements JobService { @Override public Map listPage(JobSearchParam param) { Map datas = new HashMap<>(); + datas.put("hasRight", hasRight()); + if (!hasRight()) { + return datas; + } JobPO jobPO = JobBO.convertParamsToPO(param, user.getUID()); boolean filter = isFilter(jobPO); PageInfo pageInfos; @@ -177,28 +183,13 @@ public class JobServiceImpl extends Service implements JobService { @Override public Map getHasRight() { - Map btnDatas = new HashMap<>(); - ArrayList topMenuList = new ArrayList<>(); - ArrayList rightMenuList = new ArrayList<>(); - // 新增 - topMenuList.add(MenuBtn.topMenu_addNew()); - // 批量删除 - topMenuList.add(MenuBtn.topMenu_batchDelete()); - // 复制 - topMenuList.add(MenuBtn.topMenu_copy()); - btnDatas.put("topMenu", topMenuList); - // 新增 - rightMenuList.add(MenuBtn.rightMenu_addNew()); - // 复制 - rightMenuList.add(MenuBtn.rightMenu_copy()); - // 日志 - rightMenuList.add(MenuBtn.rightMenu_btnLog()); - btnDatas.put("rightMenu", rightMenuList); - return btnDatas; + OrganizationAssert.isTrue(hasRight(), "暂无权限"); + return MenuBtn.getDatasHasCopy(); } @Override public Map getSearchCondition() { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); Map apiDatas = new HashMap<>(); List addGroups = new ArrayList<>(); List conditionItems = new ArrayList<>(); @@ -260,6 +251,7 @@ public class JobServiceImpl extends Service implements JobService { @Override public Map getSaveForm() { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); Map apiDatas = new HashMap<>(); List addGroups = new ArrayList<>(); List conditionItems = new ArrayList<>(); @@ -310,6 +302,7 @@ public class JobServiceImpl extends Service implements JobService { @Override public Map getJobBaseForm(Map params) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); OrganizationAssert.notNull(params.get("viewAttr"), "请标识操作类型"); // 2编辑 1查看 @@ -365,6 +358,7 @@ public class JobServiceImpl extends Service implements JobService { @Override public int saveBaseForm(JobSearchParam params) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); // 处理自动编号 params.setJobNo(CodeRuleUtil.generateCode(RuleCodeType.JOBTITLES, params.getJobNo())); List list = getJobMapper().listByNo(Util.null2String(params.getJobNo())); @@ -387,6 +381,7 @@ public class JobServiceImpl extends Service implements JobService { @Override public int updateForm(Map params) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); JobSearchParam searchParam = JSONObject.parseObject(JSONObject.toJSONString(params), JobSearchParam.class); String groupId = (String) params.get("viewCondition"); JobPO jobPO = JobBO.convertParamsToPO(searchParam, user.getUID()); @@ -412,6 +407,7 @@ public class JobServiceImpl extends Service implements JobService { @Override public int copyJobItem(String ids, String department) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); OrganizationAssert.notBlank(department, "请指定需要复制的部门"); int insertCount = 0; List idList = Arrays.stream(ids.split(",")).map(Long::parseLong).collect(Collectors.toList()); @@ -428,12 +424,14 @@ public class JobServiceImpl extends Service implements JobService { @Override public int updateForbiddenTagById(JobSearchParam params) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); JobPO jobPO = JobPO.builder().id(params.getId()).forbiddenTag(params.getForbiddenTag() ? 0 : 1).build(); return getJobMapper().updateForbiddenTagById(jobPO.getId(), jobPO.getForbiddenTag()); } @Override public int deleteByIds(Collection ids) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); OrganizationAssert.notEmpty(ids, "请选择要删除的数据"); Collection deleteIds = new ArrayList<>(); // 递归删除子节点 @@ -443,6 +441,7 @@ public class JobServiceImpl extends Service implements JobService { @Override public Map getHrmListByJobId(Long jobId) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); OrganizationWeaTable table = new OrganizationWeaTable<>(user, EmployeeTableVO.class); WeaResultMsg result = new WeaResultMsg(false); result.putAll(table.makeDataResult()); @@ -686,4 +685,13 @@ public class JobServiceImpl extends Service implements JobService { getChildIds(childIds, deleteIds); } } + + /** + * 是否有该模块权限 + * + * @return + */ + private boolean hasRight() { + return HrmUserVarify.checkUserRight("Job:All", user); + } } diff --git a/src/com/engine/organization/service/impl/LevelServiceImpl.java b/src/com/engine/organization/service/impl/LevelServiceImpl.java index 30593d7d..a122c11f 100644 --- a/src/com/engine/organization/service/impl/LevelServiceImpl.java +++ b/src/com/engine/organization/service/impl/LevelServiceImpl.java @@ -25,6 +25,7 @@ import org.apache.commons.lang3.StringUtils; import weaver.conn.RecordSet; import weaver.general.StringUtil; import weaver.general.Util; +import weaver.hrm.HrmUserVarify; import java.util.*; @@ -47,6 +48,11 @@ public class LevelServiceImpl extends Service implements LevelService { @Override public Map listPage(Map params) { + Map resultMap = new HashMap<>(); + resultMap.put("hasRight", hasRight()); + if (!hasRight()) { + return resultMap; + } // 刷新引用状态 RefreshIsUsedUtil.RefreshLevel("jcl_org_level"); OrganizationWeaTable table = new OrganizationWeaTable<>(user, LevelTableVO.class); @@ -55,12 +61,14 @@ public class LevelServiceImpl extends Service implements LevelService { WeaResultMsg result = new WeaResultMsg(false); result.putAll(table.makeDataResult()); result.success(); - return result.getResultMap(); + resultMap.putAll(result.getResultMap()); + return resultMap; } @Override public int saveLevel(LevelSearchParam param) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); List list = getLevelMapper().listByNo(Util.null2String(param.getLevelNo())); OrganizationAssert.isEmpty(list, "编号不允许重复"); LevelPO levelPO = LevelDTO.convertParamToPO(param, (long) user.getUID()); @@ -69,18 +77,21 @@ public class LevelServiceImpl extends Service implements LevelService { @Override public int updateLevel(LevelSearchParam param) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); LevelPO levelPO = LevelDTO.convertParamToPO(param, (long) user.getUID()); return getLevelMapper().updateLevel(levelPO); } @Override public int updateForbiddenTagById(LevelSearchParam params) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); LevelPO levelPO = LevelPO.builder().id(params.getId()).forbiddenTag(params.getForbiddenTag() ? 0 : 1).build(); return getLevelMapper().updateForbiddenTagById(levelPO); } @Override public int deleteByIds(Collection ids) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); OrganizationAssert.notEmpty(ids, "请选择要删除的数据"); return getLevelMapper().deleteByIds(ids); } @@ -88,6 +99,7 @@ public class LevelServiceImpl extends Service implements LevelService { @Override public Map getSearchCondition(Map params) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); Map apiDatas = new HashMap<>(); List addGroups = new ArrayList<>(); List conditionItems = new ArrayList<>(); @@ -103,6 +115,7 @@ public class LevelServiceImpl extends Service implements LevelService { @Override public Map getLevelForm(Map params) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); Map apiDatas = new HashMap<>(); List selectItems = new ArrayList<>(); List addGroups = new ArrayList<>(); @@ -145,11 +158,13 @@ public class LevelServiceImpl extends Service implements LevelService { @Override public Map getTableBtn() { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); return MenuBtn.getCommonBtnDatas(); } @Override public Map getTabInfo() { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); Map apiDatas = new HashMap<>(); List topTabs = new ArrayList<>(); topTabs.add(TopTab.builder().color("#000000").groupId("flowAll").showcount(true).title("全部").viewCondition("-1").build()); @@ -190,4 +205,13 @@ public class LevelServiceImpl extends Service implements LevelService { } return sqlWhere; } + + /** + * 是否有该模块权限 + * + * @return + */ + private boolean hasRight() { + return HrmUserVarify.checkUserRight("Level:All", user); + } } diff --git a/src/com/engine/organization/service/impl/PostInfoServiceImpl.java b/src/com/engine/organization/service/impl/PostInfoServiceImpl.java index 1c27612e..09ac70af 100644 --- a/src/com/engine/organization/service/impl/PostInfoServiceImpl.java +++ b/src/com/engine/organization/service/impl/PostInfoServiceImpl.java @@ -23,6 +23,7 @@ import org.apache.commons.lang3.StringUtils; import weaver.conn.RecordSet; import weaver.general.StringUtil; import weaver.general.Util; +import weaver.hrm.HrmUserVarify; import java.util.*; @@ -45,18 +46,25 @@ public class PostInfoServiceImpl extends Service implements PostInfoService { @Override public Map listPage(Map params) { + Map resultMap = new HashMap<>(); + resultMap.put("hasRight", hasRight()); + if (!hasRight()) { + return resultMap; + } OrganizationWeaTable table = new OrganizationWeaTable<>(user, PostInfoTableVO.class); String sqlWhere = buildSqlWhere(params); table.setSqlwhere(sqlWhere); WeaResultMsg result = new WeaResultMsg(false); result.putAll(table.makeDataResult()); result.success(); - return result.getResultMap(); + resultMap.putAll(result.getResultMap()); + return resultMap; } @Override public int savePostInfo(PostInfoSearchParam param) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); List list = getPostInfoMapper().listByNo(Util.null2String(param.getPostInfoNo())); OrganizationAssert.isEmpty(list, "编号不允许重复"); PostInfoPO postInfoPO = PostInfoDTO.convertParamToPO(param, (long) user.getUID()); @@ -65,12 +73,14 @@ public class PostInfoServiceImpl extends Service implements PostInfoService { @Override public int updatePostInfo(PostInfoSearchParam param) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); PostInfoPO postInfoPO = PostInfoDTO.convertParamToPO(param, (long) user.getUID()); return getPostInfoMapper().updatePostInfo(postInfoPO); } @Override public int updateForbiddenTagById(PostInfoSearchParam params) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); PostInfoPO postInfoPO = PostInfoPO.builder().id(params.getId()).forbiddenTag(params.getForbiddenTag() ? 0 : 1).build(); return getPostInfoMapper().updateForbiddenTagById(postInfoPO); } @@ -78,6 +88,7 @@ public class PostInfoServiceImpl extends Service implements PostInfoService { @Override public int deleteByIds(Collection ids) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); OrganizationAssert.notEmpty(ids, "请选择要删除的数据"); return getPostInfoMapper().deleteByIds(ids); } @@ -85,6 +96,7 @@ public class PostInfoServiceImpl extends Service implements PostInfoService { @Override public Map getSearchCondition(Map params) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); Map apiDatas = new HashMap<>(); List addGroups = new ArrayList<>(); List conditionItems = new ArrayList<>(); @@ -100,6 +112,7 @@ public class PostInfoServiceImpl extends Service implements PostInfoService { @Override public Map getPostInfoForm(Map params) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); Map apiDatas = new HashMap<>(); List selectItems = new ArrayList<>(); List addGroups = new ArrayList<>(); @@ -157,6 +170,7 @@ public class PostInfoServiceImpl extends Service implements PostInfoService { @Override public Map getHasRight() { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); return MenuBtn.getCommonBtnDatas(); } @@ -180,4 +194,13 @@ public class PostInfoServiceImpl extends Service implements PostInfoService { } return sqlWhere; } + + /** + * 是否有该模块权限 + * + * @return + */ + private boolean hasRight() { + return HrmUserVarify.checkUserRight("PostInfo:All", user); + } } diff --git a/src/com/engine/organization/service/impl/PostServiceImpl.java b/src/com/engine/organization/service/impl/PostServiceImpl.java index 2f2561e5..ce5e4a34 100644 --- a/src/com/engine/organization/service/impl/PostServiceImpl.java +++ b/src/com/engine/organization/service/impl/PostServiceImpl.java @@ -13,6 +13,7 @@ import com.engine.organization.util.OrganizationFormItemUtil; import com.engine.organization.util.db.MapperProxyFactory; import weaver.general.StringUtil; import weaver.general.Util; +import weaver.hrm.HrmUserVarify; import java.util.*; @@ -30,24 +31,28 @@ public class PostServiceImpl extends Service implements PostService { @Override public int savePost(PostPO postPO) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); List list = getPostMapper().listByNo(Util.null2String(postPO.getPostNo())); OrganizationAssert.isEmpty(list, "编号不允许重复"); - return getPostMapper().insertIgnoreNull(PostDTO.convertPO(postPO,user.getUID())); + return getPostMapper().insertIgnoreNull(PostDTO.convertPO(postPO, user.getUID())); } @Override public int updatePost(PostPO postPO) { - return getPostMapper().updatePost(PostDTO.convertPO(postPO,user.getUID())); + OrganizationAssert.isTrue(hasRight(), "暂无权限"); + return getPostMapper().updatePost(PostDTO.convertPO(postPO, user.getUID())); } @Override public int deleteByIds(Collection ids) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); OrganizationAssert.notEmpty(ids, "请选择要删除的数据"); return getPostMapper().deleteByIds(ids); } @Override public Map getPostForm(Map params) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); Map apiDatas = new HashMap<>(); List selectItems = new ArrayList<>(); List addGroups = new ArrayList<>(); @@ -79,7 +84,17 @@ public class PostServiceImpl extends Service implements PostService { @Override public TreeData getTreeData() { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); ArrayList treeDataList = getPostMapper().getTreeData(); return TreeData.builder().children(treeDataList).title("全部类型").key("-1").build(); } + + /** + * 是否有该模块权限 + * + * @return + */ + private boolean hasRight() { + return HrmUserVarify.checkUserRight("Post:All", user); + } } diff --git a/src/com/engine/organization/service/impl/SchemeServiceImpl.java b/src/com/engine/organization/service/impl/SchemeServiceImpl.java index 8175fc31..3b675ac1 100644 --- a/src/com/engine/organization/service/impl/SchemeServiceImpl.java +++ b/src/com/engine/organization/service/impl/SchemeServiceImpl.java @@ -21,6 +21,7 @@ import org.apache.commons.lang3.StringUtils; import weaver.conn.RecordSet; import weaver.general.StringUtil; import weaver.general.Util; +import weaver.hrm.HrmUserVarify; import java.util.*; @@ -38,6 +39,11 @@ public class SchemeServiceImpl extends Service implements SchemeService { @Override public Map listPage(Map params) { + Map resultMap = new HashMap<>(); + resultMap.put("hasRight", hasRight()); + if (!hasRight()) { + return resultMap; + } // 刷新引用状态 RefreshIsUsedUtil.RefreshScheme("jcl_org_scheme"); OrganizationWeaTable table = new OrganizationWeaTable<>(user, SchemeTableVO.class); @@ -46,11 +52,13 @@ public class SchemeServiceImpl extends Service implements SchemeService { WeaResultMsg result = new WeaResultMsg(false); result.putAll(table.makeDataResult()); result.success(); - return result.getResultMap(); + resultMap.putAll(result.getResultMap()); + return resultMap; } @Override public Map save(SchemeSearchParam param) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); Map apidatas = new HashMap<>(16); List list = getSchemeMapper().listByNo(Util.null2String(param.getSchemeNo())); OrganizationAssert.isEmpty(list, "编号不允许重复"); @@ -61,6 +69,7 @@ public class SchemeServiceImpl extends Service implements SchemeService { @Override public Map updateScheme(SchemeSearchParam param) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); Map apidatas = new HashMap<>(); SchemePO schemePO = SchemeDTO.convertParamToPO(param, (long) user.getUID()); getSchemeMapper().updateScheme(schemePO); @@ -69,6 +78,7 @@ public class SchemeServiceImpl extends Service implements SchemeService { @Override public void updateForbiddenTagById(SchemeSearchParam params) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); SchemePO schemePO = SchemePO.builder().id(params.getId()).forbiddenTag(params.getForbiddenTag() ? 0 : 1).build(); getSchemeMapper().updateForbiddenTagById(schemePO); } @@ -76,6 +86,7 @@ public class SchemeServiceImpl extends Service implements SchemeService { @Override public void deleteByIds(Collection ids) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); OrganizationAssert.notEmpty(ids, "请选择要删除的数据"); getSchemeMapper().deleteByIds(ids); } @@ -83,6 +94,7 @@ public class SchemeServiceImpl extends Service implements SchemeService { @Override public Map getSearchCondition(Map params) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); Map apiDatas = new HashMap<>(); List addGroups = new ArrayList<>(); List conditionItems = new ArrayList<>(); @@ -98,6 +110,7 @@ public class SchemeServiceImpl extends Service implements SchemeService { @Override public Map getSchemeForm(Map params) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); Map apiDatas = new HashMap<>(); List selectItems = new ArrayList<>(); List addGroups = new ArrayList<>(); @@ -130,6 +143,7 @@ public class SchemeServiceImpl extends Service implements SchemeService { @Override public Map getTableBtn() { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); return MenuBtn.getCommonBtnDatas(); } @@ -153,4 +167,13 @@ public class SchemeServiceImpl extends Service implements SchemeService { return sqlWhere; } + /** + * 是否有该模块权限 + * + * @return + */ + private boolean hasRight() { + return HrmUserVarify.checkUserRight("Scheme:All", user); + } + } diff --git a/src/com/engine/organization/service/impl/SequenceServiceImpl.java b/src/com/engine/organization/service/impl/SequenceServiceImpl.java index 92439f4e..779e7f41 100644 --- a/src/com/engine/organization/service/impl/SequenceServiceImpl.java +++ b/src/com/engine/organization/service/impl/SequenceServiceImpl.java @@ -25,6 +25,7 @@ import org.apache.commons.lang3.StringUtils; import weaver.conn.RecordSet; import weaver.general.StringUtil; import weaver.general.Util; +import weaver.hrm.HrmUserVarify; import java.util.*; @@ -47,6 +48,11 @@ public class SequenceServiceImpl extends Service implements SequenceService { @Override public Map listPage(Map params) { + Map resultMap = new HashMap<>(); + resultMap.put("hasRight", hasRight()); + if (!hasRight()) { + return resultMap; + } // 刷新引用状态 RefreshIsUsedUtil.RefreshSequence("jcl_org_sequence"); OrganizationWeaTable table = new OrganizationWeaTable<>(user, SequenceTableVO.class); @@ -55,12 +61,14 @@ public class SequenceServiceImpl extends Service implements SequenceService { WeaResultMsg result = new WeaResultMsg(false); result.putAll(table.makeDataResult()); result.success(); - return result.getResultMap(); + resultMap.putAll(result.getResultMap()); + return resultMap; } @Override public int saveSequence(SequenceSearchParam param) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); List list = getSequenceMapper().listByNo(Util.null2String(param.getSequenceNo())); OrganizationAssert.isEmpty(list, "编号不允许重复"); SequencePO sequencePO = SequenceDTO.convertParamToPO(param, (long) user.getUID()); @@ -69,18 +77,21 @@ public class SequenceServiceImpl extends Service implements SequenceService { @Override public int updateSequence(SequenceSearchParam param) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); SequencePO sequencePO = SequenceDTO.convertParamToPO(param, (long) user.getUID()); return getSequenceMapper().updateSequence(sequencePO); } @Override public int updateForbiddenTagById(SequenceSearchParam params) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); SequencePO sequencePO = SequencePO.builder().id(params.getId()).forbiddenTag(params.getForbiddenTag() ? 0 : 1).build(); return getSequenceMapper().updateForbiddenTagById(sequencePO); } @Override public int deleteByIds(Collection ids) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); OrganizationAssert.notEmpty(ids, "请选择要删除的数据"); return getSequenceMapper().deleteByIds(ids); } @@ -88,6 +99,7 @@ public class SequenceServiceImpl extends Service implements SequenceService { @Override public Map getSearchCondition(Map params) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); Map apiDatas = new HashMap<>(); List addGroups = new ArrayList<>(); List conditionItems = new ArrayList<>(); @@ -103,6 +115,7 @@ public class SequenceServiceImpl extends Service implements SequenceService { @Override public Map getSequenceForm(Map params) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); Map apiDatas = new HashMap<>(); List selectItems = new ArrayList<>(); List addGroups = new ArrayList<>(); @@ -145,11 +158,13 @@ public class SequenceServiceImpl extends Service implements SequenceService { @Override public Map getHasRight() { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); return MenuBtn.getCommonBtnDatas(); } @Override public Map getTabInfo() { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); Map apiDatas = new HashMap<>(); List topTabs = new ArrayList<>(); topTabs.add(TopTab.builder().color("#000000").groupId("flowAll").showcount(true).title("全部").viewCondition("-1").build()); @@ -190,4 +205,13 @@ public class SequenceServiceImpl extends Service implements SequenceService { } return sqlWhere; } + + /** + * 是否有该模块权限 + * + * @return + */ + private boolean hasRight() { + return HrmUserVarify.checkUserRight("Sequence:All", user); + } } diff --git a/src/com/engine/organization/service/impl/StaffPlanServiceImpl.java b/src/com/engine/organization/service/impl/StaffPlanServiceImpl.java index ddd7ab31..324b8fbf 100644 --- a/src/com/engine/organization/service/impl/StaffPlanServiceImpl.java +++ b/src/com/engine/organization/service/impl/StaffPlanServiceImpl.java @@ -25,6 +25,7 @@ import org.apache.commons.lang3.StringUtils; import weaver.conn.RecordSet; import weaver.general.StringUtil; import weaver.general.Util; +import weaver.hrm.HrmUserVarify; import java.util.*; @@ -46,6 +47,11 @@ public class StaffPlanServiceImpl extends Service implements StaffPlanService { @Override public Map listPage(StaffPlanSearchParam params) { + Map resultMap = new HashMap<>(); + resultMap.put("hasRight", hasRight()); + if (!hasRight()) { + return resultMap; + } // 刷新引用状态 RefreshIsUsedUtil.RefreshStaffPlan("jcl_org_staffplan"); OrganizationWeaTable table = new OrganizationWeaTable<>(user, StaffPlanTableVO.class); @@ -55,11 +61,13 @@ public class StaffPlanServiceImpl extends Service implements StaffPlanService { WeaResultMsg result = new WeaResultMsg(false); result.putAll(table.makeDataResult()); result.success(); - return result.getResultMap(); + resultMap.putAll(result.getResultMap()); + return resultMap; } @Override public int saveStaffPlan(StaffPlanSearchParam param) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); List list = getStaffPlanMapper().listByNo(Util.null2String(param.getPlanNo())); OrganizationAssert.isEmpty(list, "编号不允许重复"); StaffPlanPO staffPlanPO = StaffPlanBO.convertParamToPO(param, (long) user.getUID()); @@ -68,24 +76,28 @@ public class StaffPlanServiceImpl extends Service implements StaffPlanService { @Override public int updateStaffPlan(StaffPlanSearchParam param) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); StaffPlanPO staffPlanPO = StaffPlanBO.convertParamToPO(param, (long) user.getUID()); return getStaffPlanMapper().updateStaffPlan(staffPlanPO); } @Override public int updateForbiddenTagById(StaffPlanSearchParam params) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); StaffPlanPO staffPlanPO = StaffPlanPO.builder().id(params.getId()).forbiddenTag(params.getForbiddenTag() ? 0 : 1).build(); return getStaffPlanMapper().updateForbiddenTagById(staffPlanPO); } @Override public int deleteByIds(Collection ids) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); OrganizationAssert.notEmpty(ids, "请选择要删除的数据"); return getStaffPlanMapper().deleteByIds(ids); } @Override public Map getSearchCondition(Map params) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); Map apiDatas = new HashMap<>(); List addGroups = new ArrayList<>(); List conditionItems = new ArrayList<>(); @@ -128,6 +140,7 @@ public class StaffPlanServiceImpl extends Service implements StaffPlanService { @Override public Map getForm(Map params) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); Map apiDatas = new HashMap<>(); List selectItems = new ArrayList<>(); List addGroups = new ArrayList<>(); @@ -189,6 +202,7 @@ public class StaffPlanServiceImpl extends Service implements StaffPlanService { @Override public Map getHasRight() { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); return MenuBtn.getCommonBtnDatas(); } @@ -237,4 +251,13 @@ public class StaffPlanServiceImpl extends Service implements StaffPlanService { } return sqlWhere; } + + /** + * 是否有该模块权限 + * + * @return + */ + private boolean hasRight() { + return HrmUserVarify.checkUserRight("StaffPlan:All", user); + } } diff --git a/src/com/engine/organization/service/impl/StaffServiceImpl.java b/src/com/engine/organization/service/impl/StaffServiceImpl.java index 6704fb45..193d7244 100644 --- a/src/com/engine/organization/service/impl/StaffServiceImpl.java +++ b/src/com/engine/organization/service/impl/StaffServiceImpl.java @@ -28,6 +28,7 @@ import org.apache.commons.lang3.StringUtils; import weaver.conn.RecordSet; import weaver.general.StringUtil; import weaver.general.Util; +import weaver.hrm.HrmUserVarify; import java.util.*; @@ -61,6 +62,11 @@ public class StaffServiceImpl extends Service implements StaffService { @Override public Map listPage(StaffSearchParam params) { + Map resultMap = new HashMap<>(); + resultMap.put("hasRight", hasRight()); + if (!hasRight()) { + return resultMap; + } // 刷新引用状态 RefreshIsUsedUtil.RefreshStaff("jcl_org_staff"); OrganizationWeaTable table = new OrganizationWeaTable<>(user, StaffTableVO.class); @@ -70,17 +76,20 @@ public class StaffServiceImpl extends Service implements StaffService { WeaResultMsg result = new WeaResultMsg(false); result.putAll(table.makeDataResult()); result.success(); - return result.getResultMap(); + resultMap.putAll(result.getResultMap()); + return resultMap; } @Override public int saveStaff(StaffSearchParam param) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); StaffPO staffPO = StaffBO.convertParamToPO(param, (long) user.getUID()); return getStaffMapper().insertIgnoreNull(staffPO); } @Override public int updateStaff(StaffSearchParam param) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); StaffPO staffPlanPO = StaffBO.convertParamToPO(param, (long) user.getUID()); return getStaffMapper().updateStaff(staffPlanPO); } @@ -88,12 +97,14 @@ public class StaffServiceImpl extends Service implements StaffService { @Override public int deleteByIds(Collection ids) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); OrganizationAssert.notEmpty(ids, "请选择要删除的数据"); return getStaffMapper().deleteByIds(ids); } @Override public Map getSearchCondition(Map params) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); Map apiDatas = new HashMap<>(); List addGroups = new ArrayList<>(); List conditionItems = new ArrayList<>(); @@ -144,6 +155,7 @@ public class StaffServiceImpl extends Service implements StaffService { @Override public Map getForm(Map params) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); Map apiDatas = new HashMap<>(); List selectItems = new ArrayList<>(); List addGroups = new ArrayList<>(); @@ -217,6 +229,7 @@ public class StaffServiceImpl extends Service implements StaffService { @Override public Map getHasRight() { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); return MenuBtn.getCommonBtnDatas(); } @@ -277,4 +290,13 @@ public class StaffServiceImpl extends Service implements StaffService { return sqlWhere; } + + /** + * 是否有该模块权限 + * + * @return + */ + private boolean hasRight() { + return HrmUserVarify.checkUserRight("StaffPlan:All", user); + } } diff --git a/src/com/engine/organization/util/MenuBtn.java b/src/com/engine/organization/util/MenuBtn.java index 7d00f83d..b95ad66d 100644 --- a/src/com/engine/organization/util/MenuBtn.java +++ b/src/com/engine/organization/util/MenuBtn.java @@ -136,5 +136,30 @@ public class MenuBtn { return btnDatas; } + /** + * 获取常用按钮列表 + * @return + */ + public static Map getDatasHasCopy() { + Map btnDatas = new HashMap<>(); + ArrayList topMenuList = new ArrayList<>(); + ArrayList rightMenuList = new ArrayList<>(); + // 新增 + topMenuList.add(MenuBtn.topMenu_addNew()); + // 批量删除 + topMenuList.add(MenuBtn.topMenu_batchDelete()); + // 复制 + topMenuList.add(MenuBtn.topMenu_copy()); + btnDatas.put("topMenu", topMenuList); + // 新增 + rightMenuList.add(MenuBtn.rightMenu_addNew()); + // 复制 + rightMenuList.add(MenuBtn.rightMenu_copy()); + // 日志 + rightMenuList.add(MenuBtn.rightMenu_btnLog()); + btnDatas.put("rightMenu", rightMenuList); + return btnDatas; + } + } From 7cb6bec147d09cbe6f7aeef82a2e0335f32468b3 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Tue, 7 Jun 2022 09:47:33 +0800 Subject: [PATCH 17/77] =?UTF-8?q?=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/权限SQL/权限插入SQL.sql | 71 +++++++++++++++++++ .../service/impl/StaffServiceImpl.java | 2 +- 2 files changed, 72 insertions(+), 1 deletion(-) create mode 100644 docs/权限SQL/权限插入SQL.sql diff --git a/docs/权限SQL/权限插入SQL.sql b/docs/权限SQL/权限插入SQL.sql new file mode 100644 index 00000000..995ea9e3 --- /dev/null +++ b/docs/权限SQL/权限插入SQL.sql @@ -0,0 +1,71 @@ +-- 等级方案 +insert into SystemRights (id,rightdesc,righttype) values (-20220601,'等级方案权限','0'); +insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (-20220601,7,'等级方案权限','等级方案权限'); +insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (-20220601,8,'Scheme Right','Scheme Right'); +insert into SystemRightDetail (id,rightdetailname,rightdetail,rightid) values (-20220601,'等级方案权限','Scheme:All:',-20220601) ; + +-- 职等 +insert into SystemRights (id,rightdesc,righttype) values (-20220602,'职等权限','0'); +insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (-20220602,7,'职等权限','职等权限'); +insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (-20220602,8,'Level Right','Level Right'); +insert into SystemRightDetail (id,rightdetailname,rightdetail,rightid) values (-20220602,'职等权限','Level:All:',-20220602) ; + +-- 职级 +insert into SystemRights (id,rightdesc,righttype) values (-20220603,'职级权限','0'); +insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (-20220603,7,'职级权限','职级权限'); +insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (-20220603,8,'Grade Right','Grade Right'); +insert into SystemRightDetail (id,rightdetailname,rightdetail,rightid) values (-20220603,'职级权限','Grade:All:',-20220603) ; + +-- 岗位序列 +insert into SystemRights (id,rightdesc,righttype) values (-20220604,'岗位序列权限','0'); +insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (-20220604,7,'岗位序列权限','岗位序列权限'); +insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (-20220604,8,'Sequence Right','Sequence Right'); +insert into SystemRightDetail (id,rightdetailname,rightdetail,rightid) values (-20220604,'岗位序列权限','Sequence:All:',-20220604) ; + +-- 职务分类 +insert into SystemRights (id,rightdesc,righttype) values (-20220605,'职务分类权限','0'); +insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (-20220605,7,'职务分类权限','职务分类权限'); +insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (-20220605,8,'Post Right','Post Right'); +insert into SystemRightDetail (id,rightdetailname,rightdetail,rightid) values (-20220605,'职务分类权限','Post:All:',-20220605) ; + +-- 职务信息 +insert into SystemRights (id,rightdesc,righttype) values (-20220606,'职务信息权限','0'); +insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (-20220606,7,'职务信息权限','职务信息权限'); +insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (-20220606,8,'PostInfo Right','PostInfo Right'); +insert into SystemRightDetail (id,rightdetailname,rightdetail,rightid) values (-20220606,'职务信息权限','PostInfo:All:',-20220606) ; + +-- 集团管理 +insert into SystemRights (id,rightdesc,righttype) values (-20220607,'集团管理权限','0'); +insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (-20220607,7,'集团管理权限','集团管理权限'); +insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (-20220607,8,'Group Right','Group Right'); +insert into SystemRightDetail (id,rightdetailname,rightdetail,rightid) values (-20220607,'集团管理权限','Group:All:',-20220607) ; + +-- 公司/分部管理 +insert into SystemRights (id,rightdesc,righttype) values (-20220608,'公司/分部管理权限','0'); +insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (-20220608,7,'公司/分部管理权限','公司/分部管理权限'); +insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (-20220608,8,'Company Right','Company Right'); +insert into SystemRightDetail (id,rightdetailname,rightdetail,rightid) values (-20220608,'公司/分部管理权限','Company:All:',-20220608) ; + +-- 部门管理 +insert into SystemRights (id,rightdesc,righttype) values (-20220609,'部门管理权限','0'); +insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (-20220609,7,'部门管理权限','部门管理权限'); +insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (-20220609,8,'Department Right','Department Right'); +insert into SystemRightDetail (id,rightdetailname,rightdetail,rightid) values (-20220609,'部门管理权限','Department:All:',-20220609) ; + +-- 岗位管理 +insert into SystemRights (id,rightdesc,righttype) values (-20220610,'岗位管理权限','0'); +insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (-20220610,7,'岗位管理权限','岗位管理权限'); +insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (-20220610,8,'Job Right','Job Right'); +insert into SystemRightDetail (id,rightdetailname,rightdetail,rightid) values (-20220610,'岗位管理权限','Job:All:',-20220610) ; + +-- 编制方案 +insert into SystemRights (id,rightdesc,righttype) values (-20220611,'编制方案权限','0'); +insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (-20220611,7,'编制方案权限','编制方案权限'); +insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (-20220611,8,'StaffPlan Right','StaffPlan Right'); +insert into SystemRightDetail (id,rightdetailname,rightdetail,rightid) values (-20220611,'编制方案权限','StaffPlan:All:',-20220611) ; + +-- 编制表 +insert into SystemRights (id,rightdesc,righttype) values (-20220612,'编制表权限','0'); +insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (-20220612,7,'编制表权限','编制表权限'); +insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (-20220612,8,'Staff Right','Staff Right'); +insert into SystemRightDetail (id,rightdetailname,rightdetail,rightid) values (-20220612,'编制表权限','Staff:All:',-20220612) ; \ No newline at end of file diff --git a/src/com/engine/organization/service/impl/StaffServiceImpl.java b/src/com/engine/organization/service/impl/StaffServiceImpl.java index 193d7244..f55bb840 100644 --- a/src/com/engine/organization/service/impl/StaffServiceImpl.java +++ b/src/com/engine/organization/service/impl/StaffServiceImpl.java @@ -297,6 +297,6 @@ public class StaffServiceImpl extends Service implements StaffService { * @return */ private boolean hasRight() { - return HrmUserVarify.checkUserRight("StaffPlan:All", user); + return HrmUserVarify.checkUserRight("Staff:All", user); } } From 1eb2eb330680467b98ab4041b83eb2defc35935f Mon Sep 17 00:00:00 2001 From: dxfeng Date: Tue, 7 Jun 2022 10:00:23 +0800 Subject: [PATCH 18/77] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/organization/service/impl/StaffServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/engine/organization/service/impl/StaffServiceImpl.java b/src/com/engine/organization/service/impl/StaffServiceImpl.java index f55bb840..8fe2b59f 100644 --- a/src/com/engine/organization/service/impl/StaffServiceImpl.java +++ b/src/com/engine/organization/service/impl/StaffServiceImpl.java @@ -173,7 +173,7 @@ public class StaffServiceImpl extends Service implements StaffService { jobIdItem.setRules("required|string"); // 编制数 SearchConditionItem staffNumItem = OrganizationFormItemUtil.inputNumberItem(user, 2, 16, 3, "编制数", "staffNum"); - staffNumItem.setRules("required|string"); + staffNumItem.setRules("required|int"); // 控制策略 List selectOptions = new ArrayList<>(); SearchConditionOption option1 = new SearchConditionOption("1", "弱控"); From de881d88b1ff9a5cebfa822cf9f2df34de43b708 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Tue, 7 Jun 2022 12:02:36 +0800 Subject: [PATCH 19/77] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=BC=96=E5=8F=B7=20BU?= =?UTF-8?q?G=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/staff/bo/StaffPlanBO.java | 10 ++-- .../staff/param/StaffPlanSearchParam.java | 6 +-- .../service/impl/CompServiceImpl.java | 35 +++++-------- .../service/impl/DepartmentServiceImpl.java | 51 +++++++++---------- .../service/impl/GradeServiceImpl.java | 37 +++++--------- .../service/impl/GroupServiceImpl.java | 21 +++----- .../service/impl/JobServiceImpl.java | 39 +++++++------- .../service/impl/LevelServiceImpl.java | 38 +++++--------- .../service/impl/PostInfoServiceImpl.java | 31 +++++------ .../service/impl/PostServiceImpl.java | 23 ++++----- .../service/impl/SchemeServiceImpl.java | 36 +++++-------- .../service/impl/SequenceServiceImpl.java | 39 ++++++-------- .../service/impl/StaffPlanServiceImpl.java | 49 ++++++++---------- .../service/impl/StaffServiceImpl.java | 34 +++++-------- .../organization/util/HasRightUtil.java | 29 +++++++++++ 15 files changed, 211 insertions(+), 267 deletions(-) create mode 100644 src/com/engine/organization/util/HasRightUtil.java diff --git a/src/com/engine/organization/entity/staff/bo/StaffPlanBO.java b/src/com/engine/organization/entity/staff/bo/StaffPlanBO.java index 83efcb56..b8acb6f1 100644 --- a/src/com/engine/organization/entity/staff/bo/StaffPlanBO.java +++ b/src/com/engine/organization/entity/staff/bo/StaffPlanBO.java @@ -2,6 +2,8 @@ package com.engine.organization.entity.staff.bo; import com.engine.organization.entity.staff.param.StaffPlanSearchParam; import com.engine.organization.entity.staff.po.StaffPlanPO; +import weaver.common.DateUtil; +import weaver.general.StringUtil; import java.util.Date; @@ -21,15 +23,17 @@ public class StaffPlanBO { .planNo(param.getPlanNo()) .planName(param.getPlanName()) .planYear(param.getPlanYear()) - .timeStart(param.getTimeStart()) - .timeEnd(param.getTimeEnd()) + .timeStart(StringUtil.isEmpty(param.getTimeStart()) ? null : DateUtil.parseToDateTime(param.getTimeStart())) + .timeEnd(StringUtil.isEmpty(param.getTimeEnd()) ? null : DateUtil.parseToDateTime(param.getTimeEnd())) .companyId(param.getCompanyId()) .description(param.getDescription()) - .forbiddenTag(param.getForbiddenTag() == null ? 0 : param.getForbiddenTag() ? 0 : 1) + .forbiddenTag(param.getForbiddenTag() == null ? null : param.getForbiddenTag() ? 0 : 1) .deleteType(0) .createTime(new Date()) .updateTime(new Date()) .creator(employeeId) .build(); } + + } diff --git a/src/com/engine/organization/entity/staff/param/StaffPlanSearchParam.java b/src/com/engine/organization/entity/staff/param/StaffPlanSearchParam.java index fd55a60e..3e40f0ea 100644 --- a/src/com/engine/organization/entity/staff/param/StaffPlanSearchParam.java +++ b/src/com/engine/organization/entity/staff/param/StaffPlanSearchParam.java @@ -5,8 +5,6 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import java.util.Date; - /** * @description: TODO * @author:dxfeng @@ -37,11 +35,11 @@ public class StaffPlanSearchParam { /** * 时间开始 */ - private Date timeStart; + private String timeStart; /** * 时间结束 */ - private Date timeEnd; + private String timeEnd; /** * 适用公司 */ diff --git a/src/com/engine/organization/service/impl/CompServiceImpl.java b/src/com/engine/organization/service/impl/CompServiceImpl.java index 4a6e6c37..3631dbe7 100644 --- a/src/com/engine/organization/service/impl/CompServiceImpl.java +++ b/src/com/engine/organization/service/impl/CompServiceImpl.java @@ -22,6 +22,7 @@ import com.engine.organization.mapper.comp.CompMapper; import com.engine.organization.mapper.extend.ExtendGroupMapper; import com.engine.organization.service.CompService; import com.engine.organization.service.ExtService; +import com.engine.organization.util.HasRightUtil; import com.engine.organization.util.MenuBtn; import com.engine.organization.util.OrganizationAssert; import com.engine.organization.util.OrganizationFormItemUtil; @@ -33,7 +34,6 @@ import com.engine.organization.util.page.PageUtil; import weaver.crm.Maint.SectorInfoComInfo; import weaver.general.StringUtil; import weaver.general.Util; -import weaver.hrm.HrmUserVarify; import weaver.hrm.User; import weaver.hrm.resource.ResourceComInfo; @@ -63,6 +63,8 @@ public class CompServiceImpl extends Service implements CompService { */ private static final String JCL_ORG_COMPEXT_DT1 = "JCL_ORG_COMPEXT_DT1"; + private static final String RIGHT_NAME = "Company:All"; + private CompMapper getCompMapper() { return MapperProxyFactory.getProxy(CompMapper.class); } @@ -79,9 +81,9 @@ public class CompServiceImpl extends Service implements CompService { @Override public Map listPage(CompSearchParam params) { Map datas = new HashMap<>(); - - datas.put("hasRight", hasRight()); - if (!hasRight()) { + boolean hasRight = HasRightUtil.hasRight(user, RIGHT_NAME, true); + datas.put("hasRight", hasRight); + if (!hasRight) { return datas; } CompPO compPO = CompBO.convertParamToPO(params, (long) user.getUID()); @@ -125,7 +127,7 @@ public class CompServiceImpl extends Service implements CompService { @Override public int saveBaseComp(CompSearchParam params) { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); // 自动编号 params.setCompNo(CodeRuleUtil.generateCode(RuleCodeType.SUBCOMPANY, params.getCompNo())); List list = getCompMapper().listByNo(Util.null2String(params.getCompNo())); @@ -136,14 +138,14 @@ public class CompServiceImpl extends Service implements CompService { @Override public int updateForbiddenTagById(CompSearchParam params) { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); CompPO compPO = CompPO.builder().id(params.getId()).forbiddenTag(params.getForbiddenTag() ? 0 : 1).build(); return getCompMapper().updateForbiddenTagById(compPO); } @Override public int updateComp(Map params) { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); CompSearchParam searchParam = JSONObject.parseObject(JSONObject.toJSONString(params), CompSearchParam.class); String groupId = (String) params.get("viewCondition"); CompPO compPO = CompBO.convertParamToPO(searchParam, (long) user.getUID()); @@ -160,14 +162,14 @@ public class CompServiceImpl extends Service implements CompService { @Override public int deleteByIds(Collection ids) { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); OrganizationAssert.notEmpty(ids, "请选择要删除的数据"); return getCompMapper().deleteByIds(ids); } @Override public Map getSearchCondition(Map params) { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); Map apiDatas = new HashMap<>(); List addGroups = new ArrayList<>(); List conditionItems = new ArrayList<>(); @@ -210,13 +212,13 @@ public class CompServiceImpl extends Service implements CompService { @Override public Map getHasRight() { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); return MenuBtn.getDatasNoBtnColum(); } @Override public Map getCompBaseForm(Map params) { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); OrganizationAssert.notNull(params.get("viewAttr"), "请标识操作类型"); // 2编辑 1查看 int viewAttr = Integer.parseInt((String) params.get("viewAttr")); @@ -252,7 +254,7 @@ public class CompServiceImpl extends Service implements CompService { @Override public Map getCompSaveForm() { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); Map apiDatas = new HashMap<>(); List addGroups = new ArrayList<>(); List conditionItems = new ArrayList<>(); @@ -398,14 +400,5 @@ public class CompServiceImpl extends Service implements CompService { return conditionItems; } - /** - * 是否有该模块权限 - * - * @return - */ - private boolean hasRight() { - return HrmUserVarify.checkUserRight("Company:All", user); - } - } diff --git a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java index e611b919..908b9d43 100644 --- a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java +++ b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java @@ -31,6 +31,7 @@ import com.engine.organization.mapper.extend.ExtendGroupMapper; import com.engine.organization.mapper.job.JobMapper; import com.engine.organization.service.DepartmentService; import com.engine.organization.service.ExtService; +import com.engine.organization.util.HasRightUtil; import com.engine.organization.util.MenuBtn; import com.engine.organization.util.OrganizationAssert; import com.engine.organization.util.OrganizationFormItemUtil; @@ -43,7 +44,6 @@ import com.engine.organization.util.tree.SearchTreeUtil; import org.apache.commons.collections4.CollectionUtils; import weaver.general.StringUtil; import weaver.general.Util; -import weaver.hrm.HrmUserVarify; import weaver.hrm.User; import java.util.*; @@ -73,6 +73,8 @@ public class DepartmentServiceImpl extends Service implements DepartmentService */ private static final String JCL_ORG_DEPTEXT_DT1 = "JCL_ORG_DEPTEXT_DT1"; + private static final String RIGHT_NAME = "Department:All"; + private DepartmentMapper getDepartmentMapper() { return MapperProxyFactory.getProxy(DepartmentMapper.class); @@ -93,7 +95,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService @Override public PageInfo getDeptListByPid(QuerySingleDeptListParam param) { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); //1.查询分部下所有部门 //PageUtil.start(param.getCurrent(), param.getPageSize()); List departmentPOS = MapperProxyFactory.getProxy(DepartmentMapper.class).list(); @@ -109,7 +111,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService @Override public PageInfo getJobListByPid(QuerySingleDeptListParam param) { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); List jobPOS = MapperProxyFactory.getProxy(JobMapper.class).listAll(); PageInfo pageInfo = new PageInfo<>(jobPOS); List singleDeptTreeVOS = JobBO.buildSingleJobTreeVOS(jobPOS, param.getParentDept()); @@ -123,7 +125,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService @Override public Map getSearchTree(SearchTreeParams params) { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); String keyword = params.getKeyword(); String id = params.getId(); String type = Util.null2String(params.getType()); @@ -134,8 +136,9 @@ public class DepartmentServiceImpl extends Service implements DepartmentService @Override public Map listPage(DeptSearchParam param) { Map datas = new HashMap<>(); - datas.put("hasRight", hasRight()); - if (!hasRight()) { + boolean hasRight = HasRightUtil.hasRight(user, RIGHT_NAME, true); + datas.put("hasRight", hasRight); + if (!hasRight) { return datas; } DepartmentPO departmentPO = DepartmentBO.convertParamsToPO(param, user.getUID()); @@ -179,7 +182,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService @Override public int saveBaseForm(DeptSearchParam params) { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); // 自动编号 params.setDeptNo(CodeRuleUtil.generateCode(RuleCodeType.DEPARTMENT, params.getDeptNo())); List list = getDepartmentMapper().listByNo(Util.null2String(params.getDeptNo())); @@ -190,14 +193,14 @@ public class DepartmentServiceImpl extends Service implements DepartmentService @Override public int updateForbiddenTagById(DeptSearchParam params) { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); DepartmentPO departmentPO = DepartmentPO.builder().id(params.getId()).forbiddenTag(params.getForbiddenTag() ? 0 : 1).build(); return getDepartmentMapper().updateForbiddenTagById(departmentPO); } @Override public int updateForm(Map params) { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); DeptSearchParam searchParam = JSONObject.parseObject(JSONObject.toJSONString(params), DeptSearchParam.class); String groupId = (String) params.get("viewCondition"); DepartmentPO departmentPO = DepartmentBO.convertParamsToPO(searchParam, user.getUID()); @@ -214,14 +217,14 @@ public class DepartmentServiceImpl extends Service implements DepartmentService @Override public int deleteByIds(Collection ids) { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); OrganizationAssert.notEmpty(ids, "请选择要删除的数据"); return getDepartmentMapper().deleteByIds(ids); } @Override public Map getSearchCondition(Map params) { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); Map apiDatas = new HashMap<>(); List addGroups = new ArrayList<>(); List conditionItems = new ArrayList<>(); @@ -263,13 +266,13 @@ public class DepartmentServiceImpl extends Service implements DepartmentService @Override public Map getHasRight() { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); return MenuBtn.getDatasHasCopy(); } @Override public Map getDeptBaseForm(Map params) { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); OrganizationAssert.notNull(params.get("viewAttr"), "请标识操作类型"); // 2编辑 1查看 @@ -305,7 +308,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService @Override public Map getSaveForm() { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); Map apiDatas = new HashMap<>(); List addGroups = new ArrayList<>(); List conditionItems = new ArrayList<>(); @@ -358,7 +361,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService */ @Override public List getCopyForm() { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); List addGroups = new ArrayList<>(); List condition = new ArrayList<>(); SearchConditionItem compBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, "复制到", "161", "company", "compBrowser"); @@ -382,7 +385,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService */ @Override public int copyDepartment(DeptCopyParam copyParam) { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); OrganizationAssert.notBlank(copyParam.getCompany(), "请指定需要复制的公司/分部"); int insertCount = 0; List idList = Arrays.stream(copyParam.getIds().split(",")).map(Long::parseLong).collect(Collectors.toList()); @@ -410,7 +413,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService @Override public List getMergeForm(Long id) { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); List addGroups = new ArrayList<>(); List condition = new ArrayList<>(); SearchConditionItem deptBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, "合并到部门", "161", "department", "deptBrowser"); @@ -428,7 +431,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService @Override public int mergeDepartment(DepartmentMergeParam mergeParam) { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); int updateCount = 0; OrganizationAssert.isFalse(mergeParam.getId().equals(mergeParam.getDepartment()), "所选部门与待合并部门一致，无需操作"); OrganizationAssert.notNull(mergeParam.getDepartment(), "请选择需要合并的部门"); @@ -450,7 +453,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService @Override public List getMoveForm() { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); List addGroups = new ArrayList<>(); List condition = new ArrayList<>(); SearchConditionItem compBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "请选择公司/分部", "161", "company", "compBrowser"); @@ -475,7 +478,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService @Override public int moveDepartment(DepartmentMoveParam moveParam) { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); OrganizationAssert.notBlank(moveParam.getMoveType(), "请选择转移类型"); DepartmentPO deptById = getDepartmentMapper().getDeptById(moveParam.getId()); // 0：公司/分部 1：部门 @@ -653,12 +656,4 @@ public class DepartmentServiceImpl extends Service implements DepartmentService } } - /** - * 是否有该模块权限 - * - * @return - */ - private boolean hasRight() { - return HrmUserVarify.checkUserRight("Department:All", user); - } } diff --git a/src/com/engine/organization/service/impl/GradeServiceImpl.java b/src/com/engine/organization/service/impl/GradeServiceImpl.java index 21cdc09d..bc4d9a69 100644 --- a/src/com/engine/organization/service/impl/GradeServiceImpl.java +++ b/src/com/engine/organization/service/impl/GradeServiceImpl.java @@ -16,17 +16,13 @@ import com.engine.organization.mapper.scheme.GradeMapper; import com.engine.organization.mapper.scheme.LevelMapper; import com.engine.organization.mapper.scheme.SchemeMapper; import com.engine.organization.service.GradeService; -import com.engine.organization.util.MenuBtn; -import com.engine.organization.util.OrganizationAssert; -import com.engine.organization.util.OrganizationFormItemUtil; -import com.engine.organization.util.RefreshIsUsedUtil; +import com.engine.organization.util.*; import com.engine.organization.util.db.DBType; import com.engine.organization.util.db.MapperProxyFactory; import org.apache.commons.lang3.StringUtils; import weaver.conn.RecordSet; import weaver.general.StringUtil; import weaver.general.Util; -import weaver.hrm.HrmUserVarify; import java.util.*; @@ -39,6 +35,8 @@ import java.util.*; */ public class GradeServiceImpl extends Service implements GradeService { + private static final String RIGHT_NAME = "Grade:All"; + private GradeMapper getGradeMapper() { return MapperProxyFactory.getProxy(GradeMapper.class); } @@ -55,8 +53,9 @@ public class GradeServiceImpl extends Service implements GradeService { public Map listPage(Map params) { // 刷新引用状态 Map resultMap = new HashMap<>(); - resultMap.put("hasRight", hasRight()); - if (!hasRight()) { + boolean hasRight = HasRightUtil.hasRight(user, RIGHT_NAME, true); + resultMap.put("hasRight", hasRight); + if (!hasRight) { return resultMap; } RefreshIsUsedUtil.RefreshGrade("jcl_org_grade"); @@ -73,7 +72,7 @@ public class GradeServiceImpl extends Service implements GradeService { @Override public int saveGrade(GradeSearchParam param) { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); List list = getGradeMapper().listByNo(Util.null2String(param.getGradeNo())); OrganizationAssert.isEmpty(list, "编号不允许重复"); GradePO gradePO = GradeDTO.convertParamToPO(param, (long) user.getUID()); @@ -82,21 +81,21 @@ public class GradeServiceImpl extends Service implements GradeService { @Override public int updateGrade(GradeSearchParam param) { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); GradePO gradePO = GradeDTO.convertParamToPO(param, (long) user.getUID()); return getGradeMapper().updateGrade(gradePO); } @Override public int updateForbiddenTagById(GradeSearchParam params) { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); GradePO gradePO = GradePO.builder().id(params.getId()).forbiddenTag(params.getForbiddenTag() ? 0 : 1).build(); return getGradeMapper().updateForbiddenTagById(gradePO); } @Override public int deleteByIds(Collection ids) { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); OrganizationAssert.notEmpty(ids, "请选择要删除的数据"); return getGradeMapper().deleteByIds(ids); } @@ -104,7 +103,7 @@ public class GradeServiceImpl extends Service implements GradeService { @Override public Map getSearchCondition(Map params) { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); Map apiDatas = new HashMap<>(); List addGroups = new ArrayList<>(); List conditionItems = new ArrayList<>(); @@ -120,7 +119,7 @@ public class GradeServiceImpl extends Service implements GradeService { @Override public Map getGradeForm(Map params) { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); Map apiDatas = new HashMap<>(); List selectItems = new ArrayList<>(); List addGroups = new ArrayList<>(); @@ -172,13 +171,13 @@ public class GradeServiceImpl extends Service implements GradeService { @Override public Map getHasRight() { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); return MenuBtn.getCommonBtnDatas(); } @Override public Map getTabInfo() { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); Map apiDatas = new HashMap<>(); List topTabs = new ArrayList<>(); topTabs.add(TopTab.builder().color("#000000").groupId("flowAll").showcount(true).title("全部").viewCondition("-1").build()); @@ -220,12 +219,4 @@ public class GradeServiceImpl extends Service implements GradeService { return sqlWhere; } - /** - * 是否有该模块权限 - * - * @return - */ - private boolean hasRight() { - return HrmUserVarify.checkUserRight("Grade:All", user); - } } diff --git a/src/com/engine/organization/service/impl/GroupServiceImpl.java b/src/com/engine/organization/service/impl/GroupServiceImpl.java index e2a51b86..c34d97ce 100644 --- a/src/com/engine/organization/service/impl/GroupServiceImpl.java +++ b/src/com/engine/organization/service/impl/GroupServiceImpl.java @@ -5,13 +5,13 @@ import com.api.browser.bean.SearchConditionItem; import com.engine.core.impl.Service; import com.engine.organization.entity.TopTab; import com.engine.organization.service.GroupService; +import com.engine.organization.util.HasRightUtil; import com.engine.organization.util.MenuBtn; import com.engine.organization.util.OrganizationAssert; import com.engine.organization.util.OrganizationFormItemUtil; import weaver.conn.RecordSet; import weaver.general.StringUtil; import weaver.general.Util; -import weaver.hrm.HrmUserVarify; import java.util.ArrayList; import java.util.HashMap; @@ -25,9 +25,11 @@ import java.util.Map; * @version: 1.0 */ public class GroupServiceImpl extends Service implements GroupService { + private static final String RIGHT_NAME = "Group:All"; + @Override public Map getGroupFormField(Map params) { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); Map apiDatas = new HashMap<>(); List selectItems = new ArrayList<>(); List addGroups = new ArrayList<>(); @@ -74,7 +76,7 @@ public class GroupServiceImpl extends Service implements GroupService { @Override public boolean updateGroup(Map params) { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); String id = Util.null2String(params.get("id")); OrganizationAssert.notNull(id, "数据有误"); String companyname = (String) params.get("companyname"); @@ -87,7 +89,7 @@ public class GroupServiceImpl extends Service implements GroupService { @Override public Map getHasRight() { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); Map btnDatas = new HashMap<>(); ArrayList topMenuList = new ArrayList<>(); ArrayList rightMenuList = new ArrayList<>(); @@ -102,21 +104,12 @@ public class GroupServiceImpl extends Service implements GroupService { @Override public Map getTabInfo() { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); Map apiDatas = new HashMap<>(); List topTabs = new ArrayList<>(); topTabs.add(TopTab.builder().title("总部信息").viewCondition("1").build()); apiDatas.put("topTabs", topTabs); - return apiDatas; } - /** - * 是否有该模块权限 - * - * @return - */ - private boolean hasRight() { - return HrmUserVarify.checkUserRight("Group:All", user); - } } diff --git a/src/com/engine/organization/service/impl/JobServiceImpl.java b/src/com/engine/organization/service/impl/JobServiceImpl.java index 8b024799..0c61cb8d 100644 --- a/src/com/engine/organization/service/impl/JobServiceImpl.java +++ b/src/com/engine/organization/service/impl/JobServiceImpl.java @@ -40,6 +40,7 @@ import com.engine.organization.mapper.scheme.SchemeMapper; import com.engine.organization.mapper.sequence.SequenceMapper; import com.engine.organization.service.ExtService; import com.engine.organization.service.JobService; +import com.engine.organization.util.HasRightUtil; import com.engine.organization.util.MenuBtn; import com.engine.organization.util.OrganizationAssert; import com.engine.organization.util.OrganizationFormItemUtil; @@ -52,7 +53,6 @@ import com.engine.organization.util.tree.SearchTreeUtil; import org.apache.commons.collections4.CollectionUtils; import weaver.general.StringUtil; import weaver.general.Util; -import weaver.hrm.HrmUserVarify; import weaver.hrm.User; import java.util.*; @@ -92,6 +92,8 @@ public class JobServiceImpl extends Service implements JobService { */ private static final String JCL_ORG_JOBEXT_DT1 = "JCL_ORG_JOBEXT_DT1"; + private static final String RIGHT_NAME = "Job:All"; + private JobMapper getJobMapper() { return MapperProxyFactory.getProxy(JobMapper.class); } @@ -127,7 +129,7 @@ public class JobServiceImpl extends Service implements JobService { @Override public Map getSearchTree(SearchTreeParams params) { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); String keyword = params.getKeyword(); String id = params.getId(); String type = Util.null2String(params.getType()); @@ -138,8 +140,9 @@ public class JobServiceImpl extends Service implements JobService { @Override public Map listPage(JobSearchParam param) { Map datas = new HashMap<>(); - datas.put("hasRight", hasRight()); - if (!hasRight()) { + boolean hasRight = HasRightUtil.hasRight(user, RIGHT_NAME, true); + datas.put("hasRight", hasRight); + if (!hasRight) { return datas; } JobPO jobPO = JobBO.convertParamsToPO(param, user.getUID()); @@ -183,13 +186,13 @@ public class JobServiceImpl extends Service implements JobService { @Override public Map getHasRight() { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); return MenuBtn.getDatasHasCopy(); } @Override public Map getSearchCondition() { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); Map apiDatas = new HashMap<>(); List addGroups = new ArrayList<>(); List conditionItems = new ArrayList<>(); @@ -251,7 +254,7 @@ public class JobServiceImpl extends Service implements JobService { @Override public Map getSaveForm() { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); Map apiDatas = new HashMap<>(); List addGroups = new ArrayList<>(); List conditionItems = new ArrayList<>(); @@ -302,7 +305,7 @@ public class JobServiceImpl extends Service implements JobService { @Override public Map getJobBaseForm(Map params) { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); OrganizationAssert.notNull(params.get("viewAttr"), "请标识操作类型"); // 2编辑 1查看 @@ -358,7 +361,7 @@ public class JobServiceImpl extends Service implements JobService { @Override public int saveBaseForm(JobSearchParam params) { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); // 处理自动编号 params.setJobNo(CodeRuleUtil.generateCode(RuleCodeType.JOBTITLES, params.getJobNo())); List list = getJobMapper().listByNo(Util.null2String(params.getJobNo())); @@ -381,7 +384,7 @@ public class JobServiceImpl extends Service implements JobService { @Override public int updateForm(Map params) { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); JobSearchParam searchParam = JSONObject.parseObject(JSONObject.toJSONString(params), JobSearchParam.class); String groupId = (String) params.get("viewCondition"); JobPO jobPO = JobBO.convertParamsToPO(searchParam, user.getUID()); @@ -407,7 +410,7 @@ public class JobServiceImpl extends Service implements JobService { @Override public int copyJobItem(String ids, String department) { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); OrganizationAssert.notBlank(department, "请指定需要复制的部门"); int insertCount = 0; List idList = Arrays.stream(ids.split(",")).map(Long::parseLong).collect(Collectors.toList()); @@ -424,14 +427,14 @@ public class JobServiceImpl extends Service implements JobService { @Override public int updateForbiddenTagById(JobSearchParam params) { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); JobPO jobPO = JobPO.builder().id(params.getId()).forbiddenTag(params.getForbiddenTag() ? 0 : 1).build(); return getJobMapper().updateForbiddenTagById(jobPO.getId(), jobPO.getForbiddenTag()); } @Override public int deleteByIds(Collection ids) { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); OrganizationAssert.notEmpty(ids, "请选择要删除的数据"); Collection deleteIds = new ArrayList<>(); // 递归删除子节点 @@ -441,7 +444,7 @@ public class JobServiceImpl extends Service implements JobService { @Override public Map getHrmListByJobId(Long jobId) { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); OrganizationWeaTable table = new OrganizationWeaTable<>(user, EmployeeTableVO.class); WeaResultMsg result = new WeaResultMsg(false); result.putAll(table.makeDataResult()); @@ -686,12 +689,4 @@ public class JobServiceImpl extends Service implements JobService { } } - /** - * 是否有该模块权限 - * - * @return - */ - private boolean hasRight() { - return HrmUserVarify.checkUserRight("Job:All", user); - } } diff --git a/src/com/engine/organization/service/impl/LevelServiceImpl.java b/src/com/engine/organization/service/impl/LevelServiceImpl.java index a122c11f..9aad6c50 100644 --- a/src/com/engine/organization/service/impl/LevelServiceImpl.java +++ b/src/com/engine/organization/service/impl/LevelServiceImpl.java @@ -15,17 +15,13 @@ import com.engine.organization.entity.scheme.vo.LevelTableVO; import com.engine.organization.mapper.scheme.LevelMapper; import com.engine.organization.mapper.scheme.SchemeMapper; import com.engine.organization.service.LevelService; -import com.engine.organization.util.MenuBtn; -import com.engine.organization.util.OrganizationAssert; -import com.engine.organization.util.OrganizationFormItemUtil; -import com.engine.organization.util.RefreshIsUsedUtil; +import com.engine.organization.util.*; import com.engine.organization.util.db.DBType; import com.engine.organization.util.db.MapperProxyFactory; import org.apache.commons.lang3.StringUtils; import weaver.conn.RecordSet; import weaver.general.StringUtil; import weaver.general.Util; -import weaver.hrm.HrmUserVarify; import java.util.*; @@ -38,6 +34,8 @@ import java.util.*; */ public class LevelServiceImpl extends Service implements LevelService { + private static final String RIGHT_NAME = "Level:All"; + private LevelMapper getLevelMapper() { return MapperProxyFactory.getProxy(LevelMapper.class); } @@ -49,8 +47,9 @@ public class LevelServiceImpl extends Service implements LevelService { @Override public Map listPage(Map params) { Map resultMap = new HashMap<>(); - resultMap.put("hasRight", hasRight()); - if (!hasRight()) { + boolean hasRight = HasRightUtil.hasRight(user, RIGHT_NAME, true); + resultMap.put("hasRight", hasRight); + if (!hasRight) { return resultMap; } // 刷新引用状态 @@ -68,7 +67,7 @@ public class LevelServiceImpl extends Service implements LevelService { @Override public int saveLevel(LevelSearchParam param) { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); List list = getLevelMapper().listByNo(Util.null2String(param.getLevelNo())); OrganizationAssert.isEmpty(list, "编号不允许重复"); LevelPO levelPO = LevelDTO.convertParamToPO(param, (long) user.getUID()); @@ -77,21 +76,21 @@ public class LevelServiceImpl extends Service implements LevelService { @Override public int updateLevel(LevelSearchParam param) { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); LevelPO levelPO = LevelDTO.convertParamToPO(param, (long) user.getUID()); return getLevelMapper().updateLevel(levelPO); } @Override public int updateForbiddenTagById(LevelSearchParam params) { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); LevelPO levelPO = LevelPO.builder().id(params.getId()).forbiddenTag(params.getForbiddenTag() ? 0 : 1).build(); return getLevelMapper().updateForbiddenTagById(levelPO); } @Override public int deleteByIds(Collection ids) { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); OrganizationAssert.notEmpty(ids, "请选择要删除的数据"); return getLevelMapper().deleteByIds(ids); } @@ -99,7 +98,7 @@ public class LevelServiceImpl extends Service implements LevelService { @Override public Map getSearchCondition(Map params) { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); Map apiDatas = new HashMap<>(); List addGroups = new ArrayList<>(); List conditionItems = new ArrayList<>(); @@ -115,7 +114,7 @@ public class LevelServiceImpl extends Service implements LevelService { @Override public Map getLevelForm(Map params) { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); Map apiDatas = new HashMap<>(); List selectItems = new ArrayList<>(); List addGroups = new ArrayList<>(); @@ -158,13 +157,13 @@ public class LevelServiceImpl extends Service implements LevelService { @Override public Map getTableBtn() { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); return MenuBtn.getCommonBtnDatas(); } @Override public Map getTabInfo() { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); Map apiDatas = new HashMap<>(); List topTabs = new ArrayList<>(); topTabs.add(TopTab.builder().color("#000000").groupId("flowAll").showcount(true).title("全部").viewCondition("-1").build()); @@ -205,13 +204,4 @@ public class LevelServiceImpl extends Service implements LevelService { } return sqlWhere; } - - /** - * 是否有该模块权限 - * - * @return - */ - private boolean hasRight() { - return HrmUserVarify.checkUserRight("Level:All", user); - } } diff --git a/src/com/engine/organization/service/impl/PostInfoServiceImpl.java b/src/com/engine/organization/service/impl/PostInfoServiceImpl.java index 09ac70af..3558f08c 100644 --- a/src/com/engine/organization/service/impl/PostInfoServiceImpl.java +++ b/src/com/engine/organization/service/impl/PostInfoServiceImpl.java @@ -14,6 +14,7 @@ import com.engine.organization.entity.postion.vo.PostInfoTableVO; import com.engine.organization.mapper.post.PostInfoMapper; import com.engine.organization.mapper.post.PostMapper; import com.engine.organization.service.PostInfoService; +import com.engine.organization.util.HasRightUtil; import com.engine.organization.util.MenuBtn; import com.engine.organization.util.OrganizationAssert; import com.engine.organization.util.OrganizationFormItemUtil; @@ -23,7 +24,6 @@ import org.apache.commons.lang3.StringUtils; import weaver.conn.RecordSet; import weaver.general.StringUtil; import weaver.general.Util; -import weaver.hrm.HrmUserVarify; import java.util.*; @@ -36,6 +36,8 @@ import java.util.*; */ public class PostInfoServiceImpl extends Service implements PostInfoService { + private static final String RIGHT_NAME = "PostInfo:All"; + private PostInfoMapper getPostInfoMapper() { return MapperProxyFactory.getProxy(PostInfoMapper.class); } @@ -47,8 +49,9 @@ public class PostInfoServiceImpl extends Service implements PostInfoService { @Override public Map listPage(Map params) { Map resultMap = new HashMap<>(); - resultMap.put("hasRight", hasRight()); - if (!hasRight()) { + boolean hasRight = HasRightUtil.hasRight(user, RIGHT_NAME, true); + resultMap.put("hasRight", hasRight); + if (!hasRight) { return resultMap; } OrganizationWeaTable table = new OrganizationWeaTable<>(user, PostInfoTableVO.class); @@ -64,7 +67,7 @@ public class PostInfoServiceImpl extends Service implements PostInfoService { @Override public int savePostInfo(PostInfoSearchParam param) { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); List list = getPostInfoMapper().listByNo(Util.null2String(param.getPostInfoNo())); OrganizationAssert.isEmpty(list, "编号不允许重复"); PostInfoPO postInfoPO = PostInfoDTO.convertParamToPO(param, (long) user.getUID()); @@ -73,14 +76,14 @@ public class PostInfoServiceImpl extends Service implements PostInfoService { @Override public int updatePostInfo(PostInfoSearchParam param) { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); PostInfoPO postInfoPO = PostInfoDTO.convertParamToPO(param, (long) user.getUID()); return getPostInfoMapper().updatePostInfo(postInfoPO); } @Override public int updateForbiddenTagById(PostInfoSearchParam params) { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); PostInfoPO postInfoPO = PostInfoPO.builder().id(params.getId()).forbiddenTag(params.getForbiddenTag() ? 0 : 1).build(); return getPostInfoMapper().updateForbiddenTagById(postInfoPO); } @@ -88,7 +91,7 @@ public class PostInfoServiceImpl extends Service implements PostInfoService { @Override public int deleteByIds(Collection ids) { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); OrganizationAssert.notEmpty(ids, "请选择要删除的数据"); return getPostInfoMapper().deleteByIds(ids); } @@ -96,7 +99,7 @@ public class PostInfoServiceImpl extends Service implements PostInfoService { @Override public Map getSearchCondition(Map params) { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); Map apiDatas = new HashMap<>(); List addGroups = new ArrayList<>(); List conditionItems = new ArrayList<>(); @@ -112,7 +115,7 @@ public class PostInfoServiceImpl extends Service implements PostInfoService { @Override public Map getPostInfoForm(Map params) { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); Map apiDatas = new HashMap<>(); List selectItems = new ArrayList<>(); List addGroups = new ArrayList<>(); @@ -170,7 +173,7 @@ public class PostInfoServiceImpl extends Service implements PostInfoService { @Override public Map getHasRight() { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); return MenuBtn.getCommonBtnDatas(); } @@ -195,12 +198,4 @@ public class PostInfoServiceImpl extends Service implements PostInfoService { return sqlWhere; } - /** - * 是否有该模块权限 - * - * @return - */ - private boolean hasRight() { - return HrmUserVarify.checkUserRight("PostInfo:All", user); - } } diff --git a/src/com/engine/organization/service/impl/PostServiceImpl.java b/src/com/engine/organization/service/impl/PostServiceImpl.java index ce5e4a34..f3dcca44 100644 --- a/src/com/engine/organization/service/impl/PostServiceImpl.java +++ b/src/com/engine/organization/service/impl/PostServiceImpl.java @@ -8,12 +8,12 @@ import com.engine.organization.entity.postion.dto.PostDTO; import com.engine.organization.entity.postion.po.PostPO; import com.engine.organization.mapper.post.PostMapper; import com.engine.organization.service.PostService; +import com.engine.organization.util.HasRightUtil; import com.engine.organization.util.OrganizationAssert; import com.engine.organization.util.OrganizationFormItemUtil; import com.engine.organization.util.db.MapperProxyFactory; import weaver.general.StringUtil; import weaver.general.Util; -import weaver.hrm.HrmUserVarify; import java.util.*; @@ -25,13 +25,15 @@ import java.util.*; */ public class PostServiceImpl extends Service implements PostService { + private static final String RIGHT_NAME = "Post:All"; + private PostMapper getPostMapper() { return MapperProxyFactory.getProxy(PostMapper.class); } @Override public int savePost(PostPO postPO) { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); List list = getPostMapper().listByNo(Util.null2String(postPO.getPostNo())); OrganizationAssert.isEmpty(list, "编号不允许重复"); return getPostMapper().insertIgnoreNull(PostDTO.convertPO(postPO, user.getUID())); @@ -39,20 +41,20 @@ public class PostServiceImpl extends Service implements PostService { @Override public int updatePost(PostPO postPO) { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); return getPostMapper().updatePost(PostDTO.convertPO(postPO, user.getUID())); } @Override public int deleteByIds(Collection ids) { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); OrganizationAssert.notEmpty(ids, "请选择要删除的数据"); return getPostMapper().deleteByIds(ids); } @Override public Map getPostForm(Map params) { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); Map apiDatas = new HashMap<>(); List selectItems = new ArrayList<>(); List addGroups = new ArrayList<>(); @@ -84,17 +86,10 @@ public class PostServiceImpl extends Service implements PostService { @Override public TreeData getTreeData() { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); ArrayList treeDataList = getPostMapper().getTreeData(); return TreeData.builder().children(treeDataList).title("全部类型").key("-1").build(); } - /** - * 是否有该模块权限 - * - * @return - */ - private boolean hasRight() { - return HrmUserVarify.checkUserRight("Post:All", user); - } + } diff --git a/src/com/engine/organization/service/impl/SchemeServiceImpl.java b/src/com/engine/organization/service/impl/SchemeServiceImpl.java index 3b675ac1..9b4519cc 100644 --- a/src/com/engine/organization/service/impl/SchemeServiceImpl.java +++ b/src/com/engine/organization/service/impl/SchemeServiceImpl.java @@ -11,17 +11,13 @@ import com.engine.organization.entity.scheme.po.SchemePO; import com.engine.organization.entity.scheme.vo.SchemeTableVO; import com.engine.organization.mapper.scheme.SchemeMapper; import com.engine.organization.service.SchemeService; -import com.engine.organization.util.MenuBtn; -import com.engine.organization.util.OrganizationAssert; -import com.engine.organization.util.OrganizationFormItemUtil; -import com.engine.organization.util.RefreshIsUsedUtil; +import com.engine.organization.util.*; import com.engine.organization.util.db.DBType; import com.engine.organization.util.db.MapperProxyFactory; import org.apache.commons.lang3.StringUtils; import weaver.conn.RecordSet; import weaver.general.StringUtil; import weaver.general.Util; -import weaver.hrm.HrmUserVarify; import java.util.*; @@ -33,15 +29,19 @@ import java.util.*; **/ public class SchemeServiceImpl extends Service implements SchemeService { + private static final String RIGHT_NAME = "Scheme:All"; + private SchemeMapper getSchemeMapper() { return MapperProxyFactory.getProxy(SchemeMapper.class); } + @Override public Map listPage(Map params) { Map resultMap = new HashMap<>(); - resultMap.put("hasRight", hasRight()); - if (!hasRight()) { + boolean hasRight = HasRightUtil.hasRight(user, RIGHT_NAME, true); + resultMap.put("hasRight", hasRight); + if (!hasRight) { return resultMap; } // 刷新引用状态 @@ -58,7 +58,7 @@ public class SchemeServiceImpl extends Service implements SchemeService { @Override public Map save(SchemeSearchParam param) { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); Map apidatas = new HashMap<>(16); List list = getSchemeMapper().listByNo(Util.null2String(param.getSchemeNo())); OrganizationAssert.isEmpty(list, "编号不允许重复"); @@ -69,7 +69,7 @@ public class SchemeServiceImpl extends Service implements SchemeService { @Override public Map updateScheme(SchemeSearchParam param) { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); Map apidatas = new HashMap<>(); SchemePO schemePO = SchemeDTO.convertParamToPO(param, (long) user.getUID()); getSchemeMapper().updateScheme(schemePO); @@ -78,7 +78,7 @@ public class SchemeServiceImpl extends Service implements SchemeService { @Override public void updateForbiddenTagById(SchemeSearchParam params) { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); SchemePO schemePO = SchemePO.builder().id(params.getId()).forbiddenTag(params.getForbiddenTag() ? 0 : 1).build(); getSchemeMapper().updateForbiddenTagById(schemePO); } @@ -86,7 +86,7 @@ public class SchemeServiceImpl extends Service implements SchemeService { @Override public void deleteByIds(Collection ids) { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); OrganizationAssert.notEmpty(ids, "请选择要删除的数据"); getSchemeMapper().deleteByIds(ids); } @@ -94,7 +94,7 @@ public class SchemeServiceImpl extends Service implements SchemeService { @Override public Map getSearchCondition(Map params) { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); Map apiDatas = new HashMap<>(); List addGroups = new ArrayList<>(); List conditionItems = new ArrayList<>(); @@ -110,7 +110,7 @@ public class SchemeServiceImpl extends Service implements SchemeService { @Override public Map getSchemeForm(Map params) { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); Map apiDatas = new HashMap<>(); List selectItems = new ArrayList<>(); List addGroups = new ArrayList<>(); @@ -143,7 +143,7 @@ public class SchemeServiceImpl extends Service implements SchemeService { @Override public Map getTableBtn() { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); return MenuBtn.getCommonBtnDatas(); } @@ -167,13 +167,5 @@ public class SchemeServiceImpl extends Service implements SchemeService { return sqlWhere; } - /** - * 是否有该模块权限 - * - * @return - */ - private boolean hasRight() { - return HrmUserVarify.checkUserRight("Scheme:All", user); - } } diff --git a/src/com/engine/organization/service/impl/SequenceServiceImpl.java b/src/com/engine/organization/service/impl/SequenceServiceImpl.java index 779e7f41..c95fcf6e 100644 --- a/src/com/engine/organization/service/impl/SequenceServiceImpl.java +++ b/src/com/engine/organization/service/impl/SequenceServiceImpl.java @@ -12,20 +12,16 @@ import com.engine.organization.entity.sequence.dto.SequenceDTO; import com.engine.organization.entity.sequence.param.SequenceSearchParam; import com.engine.organization.entity.sequence.po.SequencePO; import com.engine.organization.entity.sequence.vo.SequenceTableVO; -import com.engine.organization.mapper.sequence.SequenceMapper; import com.engine.organization.mapper.scheme.SchemeMapper; +import com.engine.organization.mapper.sequence.SequenceMapper; import com.engine.organization.service.SequenceService; -import com.engine.organization.util.MenuBtn; -import com.engine.organization.util.OrganizationAssert; -import com.engine.organization.util.OrganizationFormItemUtil; -import com.engine.organization.util.RefreshIsUsedUtil; +import com.engine.organization.util.*; import com.engine.organization.util.db.DBType; import com.engine.organization.util.db.MapperProxyFactory; import org.apache.commons.lang3.StringUtils; import weaver.conn.RecordSet; import weaver.general.StringUtil; import weaver.general.Util; -import weaver.hrm.HrmUserVarify; import java.util.*; @@ -38,6 +34,8 @@ import java.util.*; */ public class SequenceServiceImpl extends Service implements SequenceService { + private static final String RIGHT_NAME = "Sequence:All"; + private SequenceMapper getSequenceMapper() { return MapperProxyFactory.getProxy(SequenceMapper.class); } @@ -49,8 +47,9 @@ public class SequenceServiceImpl extends Service implements SequenceService { @Override public Map listPage(Map params) { Map resultMap = new HashMap<>(); - resultMap.put("hasRight", hasRight()); - if (!hasRight()) { + boolean hasRight = HasRightUtil.hasRight(user, RIGHT_NAME, true); + resultMap.put("hasRight", hasRight); + if (!hasRight) { return resultMap; } // 刷新引用状态 @@ -68,7 +67,7 @@ public class SequenceServiceImpl extends Service implements SequenceService { @Override public int saveSequence(SequenceSearchParam param) { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); List list = getSequenceMapper().listByNo(Util.null2String(param.getSequenceNo())); OrganizationAssert.isEmpty(list, "编号不允许重复"); SequencePO sequencePO = SequenceDTO.convertParamToPO(param, (long) user.getUID()); @@ -77,21 +76,21 @@ public class SequenceServiceImpl extends Service implements SequenceService { @Override public int updateSequence(SequenceSearchParam param) { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); SequencePO sequencePO = SequenceDTO.convertParamToPO(param, (long) user.getUID()); return getSequenceMapper().updateSequence(sequencePO); } @Override public int updateForbiddenTagById(SequenceSearchParam params) { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); SequencePO sequencePO = SequencePO.builder().id(params.getId()).forbiddenTag(params.getForbiddenTag() ? 0 : 1).build(); return getSequenceMapper().updateForbiddenTagById(sequencePO); } @Override public int deleteByIds(Collection ids) { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); OrganizationAssert.notEmpty(ids, "请选择要删除的数据"); return getSequenceMapper().deleteByIds(ids); } @@ -99,7 +98,7 @@ public class SequenceServiceImpl extends Service implements SequenceService { @Override public Map getSearchCondition(Map params) { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); Map apiDatas = new HashMap<>(); List addGroups = new ArrayList<>(); List conditionItems = new ArrayList<>(); @@ -115,7 +114,7 @@ public class SequenceServiceImpl extends Service implements SequenceService { @Override public Map getSequenceForm(Map params) { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); Map apiDatas = new HashMap<>(); List selectItems = new ArrayList<>(); List addGroups = new ArrayList<>(); @@ -158,13 +157,13 @@ public class SequenceServiceImpl extends Service implements SequenceService { @Override public Map getHasRight() { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); return MenuBtn.getCommonBtnDatas(); } @Override public Map getTabInfo() { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); Map apiDatas = new HashMap<>(); List topTabs = new ArrayList<>(); topTabs.add(TopTab.builder().color("#000000").groupId("flowAll").showcount(true).title("全部").viewCondition("-1").build()); @@ -206,12 +205,4 @@ public class SequenceServiceImpl extends Service implements SequenceService { return sqlWhere; } - /** - * 是否有该模块权限 - * - * @return - */ - private boolean hasRight() { - return HrmUserVarify.checkUserRight("Sequence:All", user); - } } diff --git a/src/com/engine/organization/service/impl/StaffPlanServiceImpl.java b/src/com/engine/organization/service/impl/StaffPlanServiceImpl.java index 324b8fbf..80fa8253 100644 --- a/src/com/engine/organization/service/impl/StaffPlanServiceImpl.java +++ b/src/com/engine/organization/service/impl/StaffPlanServiceImpl.java @@ -15,17 +15,13 @@ import com.engine.organization.entity.staff.vo.StaffPlanTableVO; import com.engine.organization.mapper.comp.CompMapper; import com.engine.organization.mapper.staff.StaffPlanMapper; import com.engine.organization.service.StaffPlanService; -import com.engine.organization.util.MenuBtn; -import com.engine.organization.util.OrganizationAssert; -import com.engine.organization.util.OrganizationFormItemUtil; -import com.engine.organization.util.RefreshIsUsedUtil; +import com.engine.organization.util.*; import com.engine.organization.util.db.DBType; import com.engine.organization.util.db.MapperProxyFactory; import org.apache.commons.lang3.StringUtils; import weaver.conn.RecordSet; import weaver.general.StringUtil; import weaver.general.Util; -import weaver.hrm.HrmUserVarify; import java.util.*; @@ -37,6 +33,8 @@ import java.util.*; */ public class StaffPlanServiceImpl extends Service implements StaffPlanService { + private static final String RIGHT_NAME = "StaffPlan:All"; + private StaffPlanMapper getStaffPlanMapper() { return MapperProxyFactory.getProxy(StaffPlanMapper.class); } @@ -48,8 +46,9 @@ public class StaffPlanServiceImpl extends Service implements StaffPlanService { @Override public Map listPage(StaffPlanSearchParam params) { Map resultMap = new HashMap<>(); - resultMap.put("hasRight", hasRight()); - if (!hasRight()) { + boolean hasRight = HasRightUtil.hasRight(user, RIGHT_NAME, true); + resultMap.put("hasRight", hasRight); + if (!hasRight) { return resultMap; } // 刷新引用状态 @@ -67,7 +66,7 @@ public class StaffPlanServiceImpl extends Service implements StaffPlanService { @Override public int saveStaffPlan(StaffPlanSearchParam param) { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); List list = getStaffPlanMapper().listByNo(Util.null2String(param.getPlanNo())); OrganizationAssert.isEmpty(list, "编号不允许重复"); StaffPlanPO staffPlanPO = StaffPlanBO.convertParamToPO(param, (long) user.getUID()); @@ -76,28 +75,28 @@ public class StaffPlanServiceImpl extends Service implements StaffPlanService { @Override public int updateStaffPlan(StaffPlanSearchParam param) { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); StaffPlanPO staffPlanPO = StaffPlanBO.convertParamToPO(param, (long) user.getUID()); return getStaffPlanMapper().updateStaffPlan(staffPlanPO); } @Override public int updateForbiddenTagById(StaffPlanSearchParam params) { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); StaffPlanPO staffPlanPO = StaffPlanPO.builder().id(params.getId()).forbiddenTag(params.getForbiddenTag() ? 0 : 1).build(); return getStaffPlanMapper().updateForbiddenTagById(staffPlanPO); } @Override public int deleteByIds(Collection ids) { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); OrganizationAssert.notEmpty(ids, "请选择要删除的数据"); return getStaffPlanMapper().deleteByIds(ids); } @Override public Map getSearchCondition(Map params) { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); Map apiDatas = new HashMap<>(); List addGroups = new ArrayList<>(); List conditionItems = new ArrayList<>(); @@ -113,7 +112,7 @@ public class StaffPlanServiceImpl extends Service implements StaffPlanService { // 时间结束 SearchConditionItem timeEndItem = OrganizationFormItemUtil.datePickerItem(user, 2, 16, false, 2, "时间结束", "timeEnd"); // 适用公司 - SearchConditionItem companyIdtItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "适用公司", "162", "companyId", "compBrowser"); + SearchConditionItem companyIdtItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "适用公司", "161", "companyId", "compBrowser"); // 说明 SearchConditionItem descriptionItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "说明", "description"); // 状态 @@ -140,7 +139,7 @@ public class StaffPlanServiceImpl extends Service implements StaffPlanService { @Override public Map getForm(Map params) { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); Map apiDatas = new HashMap<>(); List selectItems = new ArrayList<>(); List addGroups = new ArrayList<>(); @@ -173,9 +172,9 @@ public class StaffPlanServiceImpl extends Service implements StaffPlanService { OrganizationAssert.notNull(staffPlanPO, "选择的数据不存在，或数据已删除"); planNoItem.setValue(staffPlanPO.getPlanNo()); planNameItem.setValue(staffPlanPO.getPlanName()); - planYearItem.setValue(staffPlanPO.getPlanYear()); - timeStartItem.setValue(staffPlanPO.getTimeStart()); - timeEndItem.setValue(staffPlanPO.getTimeEnd()); + planYearItem.setValue(staffPlanPO.getPlanYear() + ""); + timeStartItem.setValue(staffPlanPO.getTimeStart() + ""); + timeEndItem.setValue(staffPlanPO.getTimeEnd() + ""); BrowserBean browserBean = companyIdtItem.getBrowserConditionParam(); List> maps = getCompMapper().listCompsByIds(DeleteParam.builder().ids(staffPlanPO.getCompanyId()).build().getIds()); @@ -202,7 +201,7 @@ public class StaffPlanServiceImpl extends Service implements StaffPlanService { @Override public Map getHasRight() { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); return MenuBtn.getCommonBtnDatas(); } @@ -230,13 +229,13 @@ public class StaffPlanServiceImpl extends Service implements StaffPlanService { } Date timeStart = staffPlanPO.getTimeStart(); if (null != timeStart) { - sqlWhere += " AND t.time_start = '" + timeStart + "'"; + sqlWhere += " AND t.time_start >= '" + timeStart + "'"; } Date timeEnd = staffPlanPO.getTimeEnd(); if (null != timeEnd) { - sqlWhere += " AND t.time_end = '" + timeEnd + "'"; + sqlWhere += " AND t.time_end <= '" + timeEnd + "'"; } - String companyId = staffPlanPO.getDescription(); + String companyId = staffPlanPO.getCompanyId(); if (StringUtils.isNotBlank(companyId)) { sqlWhere += " AND t.companyId = '" + companyId + "'"; } @@ -252,12 +251,4 @@ public class StaffPlanServiceImpl extends Service implements StaffPlanService { return sqlWhere; } - /** - * 是否有该模块权限 - * - * @return - */ - private boolean hasRight() { - return HrmUserVarify.checkUserRight("StaffPlan:All", user); - } } diff --git a/src/com/engine/organization/service/impl/StaffServiceImpl.java b/src/com/engine/organization/service/impl/StaffServiceImpl.java index 8fe2b59f..9205e0da 100644 --- a/src/com/engine/organization/service/impl/StaffServiceImpl.java +++ b/src/com/engine/organization/service/impl/StaffServiceImpl.java @@ -18,17 +18,13 @@ import com.engine.organization.mapper.job.JobMapper; import com.engine.organization.mapper.staff.StaffMapper; import com.engine.organization.mapper.staff.StaffPlanMapper; import com.engine.organization.service.StaffService; -import com.engine.organization.util.MenuBtn; -import com.engine.organization.util.OrganizationAssert; -import com.engine.organization.util.OrganizationFormItemUtil; -import com.engine.organization.util.RefreshIsUsedUtil; +import com.engine.organization.util.*; import com.engine.organization.util.db.DBType; import com.engine.organization.util.db.MapperProxyFactory; import org.apache.commons.lang3.StringUtils; import weaver.conn.RecordSet; import weaver.general.StringUtil; import weaver.general.Util; -import weaver.hrm.HrmUserVarify; import java.util.*; @@ -39,6 +35,9 @@ import java.util.*; * @version: 1.0 */ public class StaffServiceImpl extends Service implements StaffService { + + private static final String RIGHT_NAME = "Staff:All"; + private StaffMapper getStaffMapper() { return MapperProxyFactory.getProxy(StaffMapper.class); } @@ -63,8 +62,9 @@ public class StaffServiceImpl extends Service implements StaffService { @Override public Map listPage(StaffSearchParam params) { Map resultMap = new HashMap<>(); - resultMap.put("hasRight", hasRight()); - if (!hasRight()) { + boolean hasRight = HasRightUtil.hasRight(user, RIGHT_NAME, true); + resultMap.put("hasRight", hasRight); + if (!hasRight) { return resultMap; } // 刷新引用状态 @@ -82,14 +82,14 @@ public class StaffServiceImpl extends Service implements StaffService { @Override public int saveStaff(StaffSearchParam param) { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); StaffPO staffPO = StaffBO.convertParamToPO(param, (long) user.getUID()); return getStaffMapper().insertIgnoreNull(staffPO); } @Override public int updateStaff(StaffSearchParam param) { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); StaffPO staffPlanPO = StaffBO.convertParamToPO(param, (long) user.getUID()); return getStaffMapper().updateStaff(staffPlanPO); } @@ -97,14 +97,14 @@ public class StaffServiceImpl extends Service implements StaffService { @Override public int deleteByIds(Collection ids) { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); OrganizationAssert.notEmpty(ids, "请选择要删除的数据"); return getStaffMapper().deleteByIds(ids); } @Override public Map getSearchCondition(Map params) { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); Map apiDatas = new HashMap<>(); List addGroups = new ArrayList<>(); List conditionItems = new ArrayList<>(); @@ -155,7 +155,7 @@ public class StaffServiceImpl extends Service implements StaffService { @Override public Map getForm(Map params) { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); Map apiDatas = new HashMap<>(); List selectItems = new ArrayList<>(); List addGroups = new ArrayList<>(); @@ -229,7 +229,7 @@ public class StaffServiceImpl extends Service implements StaffService { @Override public Map getHasRight() { - OrganizationAssert.isTrue(hasRight(), "暂无权限"); + HasRightUtil.hasRight(user, RIGHT_NAME, false); return MenuBtn.getCommonBtnDatas(); } @@ -291,12 +291,4 @@ public class StaffServiceImpl extends Service implements StaffService { return sqlWhere; } - /** - * 是否有该模块权限 - * - * @return - */ - private boolean hasRight() { - return HrmUserVarify.checkUserRight("Staff:All", user); - } } diff --git a/src/com/engine/organization/util/HasRightUtil.java b/src/com/engine/organization/util/HasRightUtil.java new file mode 100644 index 00000000..b313907d --- /dev/null +++ b/src/com/engine/organization/util/HasRightUtil.java @@ -0,0 +1,29 @@ +package com.engine.organization.util; + +import weaver.hrm.HrmUserVarify; +import weaver.hrm.User; + +/** + * @description: TODO + * @author:dxfeng + * @createTime: 2022/06/07 + * @version: 1.0 + */ +public class HasRightUtil { + + /** + * 判断是否拥有对应权限 + * + * @param user + * @param rightName + * @param isReturnFalse + * @return + */ + public static boolean hasRight(User user, String rightName, boolean isReturnFalse) { + boolean hasRight = HrmUserVarify.checkUserRight("Scheme:All", user); + if (!isReturnFalse) { + OrganizationAssert.isTrue(hasRight, "暂无权限访问"); + } + return hasRight; + } +} From 66f58913e924cf9eba682440cebbd248b0e9456a Mon Sep 17 00:00:00 2001 From: dxfeng Date: Tue, 7 Jun 2022 13:43:21 +0800 Subject: [PATCH 20/77] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=BC=96=E5=8F=B7=20BU?= =?UTF-8?q?G=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../transmethod/JobTransMethod.java | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/src/com/engine/organization/transmethod/JobTransMethod.java b/src/com/engine/organization/transmethod/JobTransMethod.java index 3c50bc77..042c53fc 100644 --- a/src/com/engine/organization/transmethod/JobTransMethod.java +++ b/src/com/engine/organization/transmethod/JobTransMethod.java @@ -1,5 +1,13 @@ package com.engine.organization.transmethod; +import com.engine.organization.entity.DeleteParam; +import com.engine.organization.mapper.job.JobMapper; +import com.engine.organization.util.db.MapperProxyFactory; + +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + /** * @description: TODO * @author:dxfeng @@ -9,18 +17,18 @@ package com.engine.organization.transmethod; public class JobTransMethod { public static String getSpanById(String planId) { - //JobMapper compMapper = MapperProxyFactory.getProxy(CompMapper.class); - //List> maps = compMapper.listCompsByIds(DeleteParam.builder().ids(planId).build().getIds()); - //String names = maps.stream().map(item -> (String) item.get("name")).collect(Collectors.joining(",")); - //return names; - return ""; + JobMapper jobMapper = MapperProxyFactory.getProxy(JobMapper.class); + List> maps = jobMapper.listJobsByIds(DeleteParam.builder().ids(planId).build().getIds()); + String names = maps.stream().map(item -> (String) item.get("name")).collect(Collectors.joining(",")); + return names; } public static String getIsKeySpan(String isKey) { - if ("1".equals(isKey)) + if ("1".equals(isKey)) { return "是"; - else + } else { return "否"; + } } } From ead937542395586485233e53cd77c11cf36ac8ca Mon Sep 17 00:00:00 2001 From: dxfeng Date: Tue, 7 Jun 2022 13:44:29 +0800 Subject: [PATCH 21/77] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=BC=96=E5=8F=B7=20BU?= =?UTF-8?q?G=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/organization/service/impl/StaffServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/engine/organization/service/impl/StaffServiceImpl.java b/src/com/engine/organization/service/impl/StaffServiceImpl.java index 9205e0da..4e21ea91 100644 --- a/src/com/engine/organization/service/impl/StaffServiceImpl.java +++ b/src/com/engine/organization/service/impl/StaffServiceImpl.java @@ -173,7 +173,7 @@ public class StaffServiceImpl extends Service implements StaffService { jobIdItem.setRules("required|string"); // 编制数 SearchConditionItem staffNumItem = OrganizationFormItemUtil.inputNumberItem(user, 2, 16, 3, "编制数", "staffNum"); - staffNumItem.setRules("required|int"); + staffNumItem.setRules("required"); // 控制策略 List selectOptions = new ArrayList<>(); SearchConditionOption option1 = new SearchConditionOption("1", "弱控"); From 6956c0847e69d755b0a2d5ba5c17bf1defbb4b7a Mon Sep 17 00:00:00 2001 From: dxfeng Date: Tue, 7 Jun 2022 14:57:17 +0800 Subject: [PATCH 22/77] =?UTF-8?q?=E6=9D=83=E9=99=90=E7=AE=A1=E7=90=86=20BU?= =?UTF-8?q?G=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/staff/param/StaffSearchParam.java | 5 +++ .../service/impl/CompServiceImpl.java | 2 -- .../service/impl/DepartmentServiceImpl.java | 5 --- .../service/impl/GradeServiceImpl.java | 3 -- .../service/impl/GroupServiceImpl.java | 2 -- .../service/impl/JobServiceImpl.java | 3 -- .../service/impl/LevelServiceImpl.java | 3 -- .../service/impl/PostInfoServiceImpl.java | 2 -- .../service/impl/PostServiceImpl.java | 1 - .../service/impl/SchemeServiceImpl.java | 2 -- .../service/impl/SequenceServiceImpl.java | 3 -- .../service/impl/StaffPlanServiceImpl.java | 7 ++-- .../service/impl/StaffServiceImpl.java | 35 ++++++++++--------- 13 files changed, 26 insertions(+), 47 deletions(-) diff --git a/src/com/engine/organization/entity/staff/param/StaffSearchParam.java b/src/com/engine/organization/entity/staff/param/StaffSearchParam.java index 711ea22e..1ff52b55 100644 --- a/src/com/engine/organization/entity/staff/param/StaffSearchParam.java +++ b/src/com/engine/organization/entity/staff/param/StaffSearchParam.java @@ -65,4 +65,9 @@ public class StaffSearchParam { * 说明 */ private String description; + + /** + * 方案名称 + */ + private String staffName; } diff --git a/src/com/engine/organization/service/impl/CompServiceImpl.java b/src/com/engine/organization/service/impl/CompServiceImpl.java index 3631dbe7..e704aaab 100644 --- a/src/com/engine/organization/service/impl/CompServiceImpl.java +++ b/src/com/engine/organization/service/impl/CompServiceImpl.java @@ -169,7 +169,6 @@ public class CompServiceImpl extends Service implements CompService { @Override public Map getSearchCondition(Map params) { - HasRightUtil.hasRight(user, RIGHT_NAME, false); Map apiDatas = new HashMap<>(); List addGroups = new ArrayList<>(); List conditionItems = new ArrayList<>(); @@ -212,7 +211,6 @@ public class CompServiceImpl extends Service implements CompService { @Override public Map getHasRight() { - HasRightUtil.hasRight(user, RIGHT_NAME, false); return MenuBtn.getDatasNoBtnColum(); } diff --git a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java index 908b9d43..e3bb2940 100644 --- a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java +++ b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java @@ -95,7 +95,6 @@ public class DepartmentServiceImpl extends Service implements DepartmentService @Override public PageInfo getDeptListByPid(QuerySingleDeptListParam param) { - HasRightUtil.hasRight(user, RIGHT_NAME, false); //1.查询分部下所有部门 //PageUtil.start(param.getCurrent(), param.getPageSize()); List departmentPOS = MapperProxyFactory.getProxy(DepartmentMapper.class).list(); @@ -111,7 +110,6 @@ public class DepartmentServiceImpl extends Service implements DepartmentService @Override public PageInfo getJobListByPid(QuerySingleDeptListParam param) { - HasRightUtil.hasRight(user, RIGHT_NAME, false); List jobPOS = MapperProxyFactory.getProxy(JobMapper.class).listAll(); PageInfo pageInfo = new PageInfo<>(jobPOS); List singleDeptTreeVOS = JobBO.buildSingleJobTreeVOS(jobPOS, param.getParentDept()); @@ -125,7 +123,6 @@ public class DepartmentServiceImpl extends Service implements DepartmentService @Override public Map getSearchTree(SearchTreeParams params) { - HasRightUtil.hasRight(user, RIGHT_NAME, false); String keyword = params.getKeyword(); String id = params.getId(); String type = Util.null2String(params.getType()); @@ -224,7 +221,6 @@ public class DepartmentServiceImpl extends Service implements DepartmentService @Override public Map getSearchCondition(Map params) { - HasRightUtil.hasRight(user, RIGHT_NAME, false); Map apiDatas = new HashMap<>(); List addGroups = new ArrayList<>(); List conditionItems = new ArrayList<>(); @@ -266,7 +262,6 @@ public class DepartmentServiceImpl extends Service implements DepartmentService @Override public Map getHasRight() { - HasRightUtil.hasRight(user, RIGHT_NAME, false); return MenuBtn.getDatasHasCopy(); } diff --git a/src/com/engine/organization/service/impl/GradeServiceImpl.java b/src/com/engine/organization/service/impl/GradeServiceImpl.java index bc4d9a69..c8fd008e 100644 --- a/src/com/engine/organization/service/impl/GradeServiceImpl.java +++ b/src/com/engine/organization/service/impl/GradeServiceImpl.java @@ -103,7 +103,6 @@ public class GradeServiceImpl extends Service implements GradeService { @Override public Map getSearchCondition(Map params) { - HasRightUtil.hasRight(user, RIGHT_NAME, false); Map apiDatas = new HashMap<>(); List addGroups = new ArrayList<>(); List conditionItems = new ArrayList<>(); @@ -171,13 +170,11 @@ public class GradeServiceImpl extends Service implements GradeService { @Override public Map getHasRight() { - HasRightUtil.hasRight(user, RIGHT_NAME, false); return MenuBtn.getCommonBtnDatas(); } @Override public Map getTabInfo() { - HasRightUtil.hasRight(user, RIGHT_NAME, false); Map apiDatas = new HashMap<>(); List topTabs = new ArrayList<>(); topTabs.add(TopTab.builder().color("#000000").groupId("flowAll").showcount(true).title("全部").viewCondition("-1").build()); diff --git a/src/com/engine/organization/service/impl/GroupServiceImpl.java b/src/com/engine/organization/service/impl/GroupServiceImpl.java index c34d97ce..82bf00b5 100644 --- a/src/com/engine/organization/service/impl/GroupServiceImpl.java +++ b/src/com/engine/organization/service/impl/GroupServiceImpl.java @@ -89,7 +89,6 @@ public class GroupServiceImpl extends Service implements GroupService { @Override public Map getHasRight() { - HasRightUtil.hasRight(user, RIGHT_NAME, false); Map btnDatas = new HashMap<>(); ArrayList topMenuList = new ArrayList<>(); ArrayList rightMenuList = new ArrayList<>(); @@ -104,7 +103,6 @@ public class GroupServiceImpl extends Service implements GroupService { @Override public Map getTabInfo() { - HasRightUtil.hasRight(user, RIGHT_NAME, false); Map apiDatas = new HashMap<>(); List topTabs = new ArrayList<>(); topTabs.add(TopTab.builder().title("总部信息").viewCondition("1").build()); diff --git a/src/com/engine/organization/service/impl/JobServiceImpl.java b/src/com/engine/organization/service/impl/JobServiceImpl.java index 0c61cb8d..a7938a9b 100644 --- a/src/com/engine/organization/service/impl/JobServiceImpl.java +++ b/src/com/engine/organization/service/impl/JobServiceImpl.java @@ -129,7 +129,6 @@ public class JobServiceImpl extends Service implements JobService { @Override public Map getSearchTree(SearchTreeParams params) { - HasRightUtil.hasRight(user, RIGHT_NAME, false); String keyword = params.getKeyword(); String id = params.getId(); String type = Util.null2String(params.getType()); @@ -186,13 +185,11 @@ public class JobServiceImpl extends Service implements JobService { @Override public Map getHasRight() { - HasRightUtil.hasRight(user, RIGHT_NAME, false); return MenuBtn.getDatasHasCopy(); } @Override public Map getSearchCondition() { - HasRightUtil.hasRight(user, RIGHT_NAME, false); Map apiDatas = new HashMap<>(); List addGroups = new ArrayList<>(); List conditionItems = new ArrayList<>(); diff --git a/src/com/engine/organization/service/impl/LevelServiceImpl.java b/src/com/engine/organization/service/impl/LevelServiceImpl.java index 9aad6c50..485c1a96 100644 --- a/src/com/engine/organization/service/impl/LevelServiceImpl.java +++ b/src/com/engine/organization/service/impl/LevelServiceImpl.java @@ -98,7 +98,6 @@ public class LevelServiceImpl extends Service implements LevelService { @Override public Map getSearchCondition(Map params) { - HasRightUtil.hasRight(user, RIGHT_NAME, false); Map apiDatas = new HashMap<>(); List addGroups = new ArrayList<>(); List conditionItems = new ArrayList<>(); @@ -157,13 +156,11 @@ public class LevelServiceImpl extends Service implements LevelService { @Override public Map getTableBtn() { - HasRightUtil.hasRight(user, RIGHT_NAME, false); return MenuBtn.getCommonBtnDatas(); } @Override public Map getTabInfo() { - HasRightUtil.hasRight(user, RIGHT_NAME, false); Map apiDatas = new HashMap<>(); List topTabs = new ArrayList<>(); topTabs.add(TopTab.builder().color("#000000").groupId("flowAll").showcount(true).title("全部").viewCondition("-1").build()); diff --git a/src/com/engine/organization/service/impl/PostInfoServiceImpl.java b/src/com/engine/organization/service/impl/PostInfoServiceImpl.java index 3558f08c..d28a5af9 100644 --- a/src/com/engine/organization/service/impl/PostInfoServiceImpl.java +++ b/src/com/engine/organization/service/impl/PostInfoServiceImpl.java @@ -99,7 +99,6 @@ public class PostInfoServiceImpl extends Service implements PostInfoService { @Override public Map getSearchCondition(Map params) { - HasRightUtil.hasRight(user, RIGHT_NAME, false); Map apiDatas = new HashMap<>(); List addGroups = new ArrayList<>(); List conditionItems = new ArrayList<>(); @@ -173,7 +172,6 @@ public class PostInfoServiceImpl extends Service implements PostInfoService { @Override public Map getHasRight() { - HasRightUtil.hasRight(user, RIGHT_NAME, false); return MenuBtn.getCommonBtnDatas(); } diff --git a/src/com/engine/organization/service/impl/PostServiceImpl.java b/src/com/engine/organization/service/impl/PostServiceImpl.java index f3dcca44..38696893 100644 --- a/src/com/engine/organization/service/impl/PostServiceImpl.java +++ b/src/com/engine/organization/service/impl/PostServiceImpl.java @@ -86,7 +86,6 @@ public class PostServiceImpl extends Service implements PostService { @Override public TreeData getTreeData() { - HasRightUtil.hasRight(user, RIGHT_NAME, false); ArrayList treeDataList = getPostMapper().getTreeData(); return TreeData.builder().children(treeDataList).title("全部类型").key("-1").build(); } diff --git a/src/com/engine/organization/service/impl/SchemeServiceImpl.java b/src/com/engine/organization/service/impl/SchemeServiceImpl.java index 9b4519cc..d6855797 100644 --- a/src/com/engine/organization/service/impl/SchemeServiceImpl.java +++ b/src/com/engine/organization/service/impl/SchemeServiceImpl.java @@ -94,7 +94,6 @@ public class SchemeServiceImpl extends Service implements SchemeService { @Override public Map getSearchCondition(Map params) { - HasRightUtil.hasRight(user, RIGHT_NAME, false); Map apiDatas = new HashMap<>(); List addGroups = new ArrayList<>(); List conditionItems = new ArrayList<>(); @@ -143,7 +142,6 @@ public class SchemeServiceImpl extends Service implements SchemeService { @Override public Map getTableBtn() { - HasRightUtil.hasRight(user, RIGHT_NAME, false); return MenuBtn.getCommonBtnDatas(); } diff --git a/src/com/engine/organization/service/impl/SequenceServiceImpl.java b/src/com/engine/organization/service/impl/SequenceServiceImpl.java index c95fcf6e..6cf76dcc 100644 --- a/src/com/engine/organization/service/impl/SequenceServiceImpl.java +++ b/src/com/engine/organization/service/impl/SequenceServiceImpl.java @@ -98,7 +98,6 @@ public class SequenceServiceImpl extends Service implements SequenceService { @Override public Map getSearchCondition(Map params) { - HasRightUtil.hasRight(user, RIGHT_NAME, false); Map apiDatas = new HashMap<>(); List addGroups = new ArrayList<>(); List conditionItems = new ArrayList<>(); @@ -157,13 +156,11 @@ public class SequenceServiceImpl extends Service implements SequenceService { @Override public Map getHasRight() { - HasRightUtil.hasRight(user, RIGHT_NAME, false); return MenuBtn.getCommonBtnDatas(); } @Override public Map getTabInfo() { - HasRightUtil.hasRight(user, RIGHT_NAME, false); Map apiDatas = new HashMap<>(); List topTabs = new ArrayList<>(); topTabs.add(TopTab.builder().color("#000000").groupId("flowAll").showcount(true).title("全部").viewCondition("-1").build()); diff --git a/src/com/engine/organization/service/impl/StaffPlanServiceImpl.java b/src/com/engine/organization/service/impl/StaffPlanServiceImpl.java index 80fa8253..4ef165ac 100644 --- a/src/com/engine/organization/service/impl/StaffPlanServiceImpl.java +++ b/src/com/engine/organization/service/impl/StaffPlanServiceImpl.java @@ -19,6 +19,7 @@ import com.engine.organization.util.*; import com.engine.organization.util.db.DBType; import com.engine.organization.util.db.MapperProxyFactory; import org.apache.commons.lang3.StringUtils; +import weaver.common.DateUtil; import weaver.conn.RecordSet; import weaver.general.StringUtil; import weaver.general.Util; @@ -96,7 +97,6 @@ public class StaffPlanServiceImpl extends Service implements StaffPlanService { @Override public Map getSearchCondition(Map params) { - HasRightUtil.hasRight(user, RIGHT_NAME, false); Map apiDatas = new HashMap<>(); List addGroups = new ArrayList<>(); List conditionItems = new ArrayList<>(); @@ -173,8 +173,8 @@ public class StaffPlanServiceImpl extends Service implements StaffPlanService { planNoItem.setValue(staffPlanPO.getPlanNo()); planNameItem.setValue(staffPlanPO.getPlanName()); planYearItem.setValue(staffPlanPO.getPlanYear() + ""); - timeStartItem.setValue(staffPlanPO.getTimeStart() + ""); - timeEndItem.setValue(staffPlanPO.getTimeEnd() + ""); + timeStartItem.setValue(DateUtil.getDate(staffPlanPO.getTimeStart())); + timeEndItem.setValue(DateUtil.getDate(staffPlanPO.getTimeEnd())); BrowserBean browserBean = companyIdtItem.getBrowserConditionParam(); List> maps = getCompMapper().listCompsByIds(DeleteParam.builder().ids(staffPlanPO.getCompanyId()).build().getIds()); @@ -201,7 +201,6 @@ public class StaffPlanServiceImpl extends Service implements StaffPlanService { @Override public Map getHasRight() { - HasRightUtil.hasRight(user, RIGHT_NAME, false); return MenuBtn.getCommonBtnDatas(); } diff --git a/src/com/engine/organization/service/impl/StaffServiceImpl.java b/src/com/engine/organization/service/impl/StaffServiceImpl.java index 4e21ea91..47b4c6db 100644 --- a/src/com/engine/organization/service/impl/StaffServiceImpl.java +++ b/src/com/engine/organization/service/impl/StaffServiceImpl.java @@ -70,8 +70,7 @@ public class StaffServiceImpl extends Service implements StaffService { // 刷新引用状态 RefreshIsUsedUtil.RefreshStaff("jcl_org_staff"); OrganizationWeaTable table = new OrganizationWeaTable<>(user, StaffTableVO.class); - StaffPO staffPO = StaffBO.convertParamToPO(params, (long) user.getUID()); - String sqlWhere = buildSqlWhere(staffPO); + String sqlWhere = buildSqlWhere(params); table.setSqlwhere(sqlWhere); WeaResultMsg result = new WeaResultMsg(false); result.putAll(table.makeDataResult()); @@ -104,7 +103,6 @@ public class StaffServiceImpl extends Service implements StaffService { @Override public Map getSearchCondition(Map params) { - HasRightUtil.hasRight(user, RIGHT_NAME, false); Map apiDatas = new HashMap<>(); List addGroups = new ArrayList<>(); List conditionItems = new ArrayList<>(); @@ -229,64 +227,67 @@ public class StaffServiceImpl extends Service implements StaffService { @Override public Map getHasRight() { - HasRightUtil.hasRight(user, RIGHT_NAME, false); return MenuBtn.getCommonBtnDatas(); } /** * 查询条件 * - * @param staffPO + * @param param * @return */ - private String buildSqlWhere(StaffPO staffPO) { + private String buildSqlWhere(StaffSearchParam param) { DBType dbType = DBType.get(new RecordSet().getDBType()); String sqlWhere = " where t.delete_type ='0' "; - Long planId = staffPO.getPlanId(); + Long planId = param.getPlanId(); if (null != planId) { sqlWhere += " AND t.plan_id = '" + planId + "'"; } - Long compId = staffPO.getCompId(); + Long compId = param.getCompId(); if (null != compId) { sqlWhere += " AND t.comp_id = '" + compId + "'"; } - Long deptId = staffPO.getDeptId(); + Long deptId = param.getDeptId(); if (null != deptId) { sqlWhere += " AND t.dept_id = '" + deptId + "'"; } - Long jobId = staffPO.getJobId(); + Long jobId = param.getJobId(); if (null != jobId) { sqlWhere += " AND t.job_id = '" + jobId + "'"; } - Integer staffNum = staffPO.getStaffNum(); + Integer staffNum = param.getStaffNum(); if (null != staffNum) { sqlWhere += " AND t.staff_num = '" + staffNum + "'"; } - Integer controlPolicy = staffPO.getControlPolicy(); + Integer controlPolicy = param.getControlPolicy(); if (null != controlPolicy) { sqlWhere += " AND t.control_policy = '" + controlPolicy + "'"; } - Integer permanentNum = staffPO.getPermanentNum(); + Integer permanentNum = param.getPermanentNum(); if (null != permanentNum) { sqlWhere += " AND t.permanent_num = '" + permanentNum + "'"; } - Integer freezeNum = staffPO.getFreezeNum(); + Integer freezeNum = param.getFreezeNum(); if (null != freezeNum) { sqlWhere += " AND t.freeze_num = '" + freezeNum + "'"; } - Integer lackStatus = staffPO.getLackStatus(); + Integer lackStatus = param.getLackStatus(); if (null != lackStatus) { sqlWhere += " AND t.lack_status = '" + lackStatus + "'"; } - String staffDesc = staffPO.getStaffDesc(); + String staffDesc = param.getStaffDesc(); if (StringUtils.isNotBlank(staffDesc)) { sqlWhere += " AND t.staff_desc " + dbType.like(staffDesc); } - String description = staffPO.getDescription(); + String description = param.getDescription(); if (StringUtils.isNotBlank(description)) { sqlWhere += " AND t.description " + dbType.like(description); } + String staffName = param.getStaffName(); + if (StringUtils.isNotBlank(staffName)) { + sqlWhere += " AND t.plan_id in ( select id from jcl_org_staffplan where plan_name " + dbType.like(staffName) + ") "; + } return sqlWhere; } From c0332d51ba7b31c8a5aa0148fe0b2046e448f3db Mon Sep 17 00:00:00 2001 From: dxfeng Date: Tue, 7 Jun 2022 15:39:45 +0800 Subject: [PATCH 23/77] =?UTF-8?q?=E6=9D=83=E9=99=90=E7=AE=A1=E7=90=86=20BU?= =?UTF-8?q?G=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../organization/service/impl/DepartmentServiceImpl.java | 5 ----- src/com/engine/organization/service/impl/JobServiceImpl.java | 3 --- 2 files changed, 8 deletions(-) diff --git a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java index e3bb2940..51a011e3 100644 --- a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java +++ b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java @@ -267,7 +267,6 @@ public class DepartmentServiceImpl extends Service implements DepartmentService @Override public Map getDeptBaseForm(Map params) { - HasRightUtil.hasRight(user, RIGHT_NAME, false); OrganizationAssert.notNull(params.get("viewAttr"), "请标识操作类型"); // 2编辑 1查看 @@ -303,7 +302,6 @@ public class DepartmentServiceImpl extends Service implements DepartmentService @Override public Map getSaveForm() { - HasRightUtil.hasRight(user, RIGHT_NAME, false); Map apiDatas = new HashMap<>(); List addGroups = new ArrayList<>(); List conditionItems = new ArrayList<>(); @@ -356,7 +354,6 @@ public class DepartmentServiceImpl extends Service implements DepartmentService */ @Override public List getCopyForm() { - HasRightUtil.hasRight(user, RIGHT_NAME, false); List addGroups = new ArrayList<>(); List condition = new ArrayList<>(); SearchConditionItem compBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, "复制到", "161", "company", "compBrowser"); @@ -408,7 +405,6 @@ public class DepartmentServiceImpl extends Service implements DepartmentService @Override public List getMergeForm(Long id) { - HasRightUtil.hasRight(user, RIGHT_NAME, false); List addGroups = new ArrayList<>(); List condition = new ArrayList<>(); SearchConditionItem deptBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, "合并到部门", "161", "department", "deptBrowser"); @@ -448,7 +444,6 @@ public class DepartmentServiceImpl extends Service implements DepartmentService @Override public List getMoveForm() { - HasRightUtil.hasRight(user, RIGHT_NAME, false); List addGroups = new ArrayList<>(); List condition = new ArrayList<>(); SearchConditionItem compBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "请选择公司/分部", "161", "company", "compBrowser"); diff --git a/src/com/engine/organization/service/impl/JobServiceImpl.java b/src/com/engine/organization/service/impl/JobServiceImpl.java index a7938a9b..cf8778a9 100644 --- a/src/com/engine/organization/service/impl/JobServiceImpl.java +++ b/src/com/engine/organization/service/impl/JobServiceImpl.java @@ -251,7 +251,6 @@ public class JobServiceImpl extends Service implements JobService { @Override public Map getSaveForm() { - HasRightUtil.hasRight(user, RIGHT_NAME, false); Map apiDatas = new HashMap<>(); List addGroups = new ArrayList<>(); List conditionItems = new ArrayList<>(); @@ -302,7 +301,6 @@ public class JobServiceImpl extends Service implements JobService { @Override public Map getJobBaseForm(Map params) { - HasRightUtil.hasRight(user, RIGHT_NAME, false); OrganizationAssert.notNull(params.get("viewAttr"), "请标识操作类型"); // 2编辑 1查看 @@ -441,7 +439,6 @@ public class JobServiceImpl extends Service implements JobService { @Override public Map getHrmListByJobId(Long jobId) { - HasRightUtil.hasRight(user, RIGHT_NAME, false); OrganizationWeaTable table = new OrganizationWeaTable<>(user, EmployeeTableVO.class); WeaResultMsg result = new WeaResultMsg(false); result.putAll(table.makeDataResult()); From 184580bb39dbf976875c2057ed3b50d05d21a5cd Mon Sep 17 00:00:00 2001 From: dxfeng Date: Tue, 7 Jun 2022 16:28:19 +0800 Subject: [PATCH 24/77] =?UTF-8?q?=E6=9D=83=E9=99=90=E7=AE=A1=E7=90=86=20BU?= =?UTF-8?q?G=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/organization/service/impl/GroupServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/com/engine/organization/service/impl/GroupServiceImpl.java b/src/com/engine/organization/service/impl/GroupServiceImpl.java index 82bf00b5..65e8b22e 100644 --- a/src/com/engine/organization/service/impl/GroupServiceImpl.java +++ b/src/com/engine/organization/service/impl/GroupServiceImpl.java @@ -98,6 +98,7 @@ public class GroupServiceImpl extends Service implements GroupService { // 编辑 rightMenuList.add(MenuBtn.builder().isTop("1").menuFun("doEdit").menuIcon("icon-coms-edit").menuName("编辑").type("BTN_EDIT").build()); btnDatas.put("rightMenu", rightMenuList); + btnDatas.put("hasRight", HasRightUtil.hasRight(user, RIGHT_NAME, true)); return btnDatas; } From 77d27801b4ff30ef37b38d2ac0e1ff6517a5cb10 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Wed, 8 Jun 2022 09:01:13 +0800 Subject: [PATCH 25/77] =?UTF-8?q?=E7=BC=96=E5=88=B6=E4=B8=8A=E6=8A=A5=20?= =?UTF-8?q?=E7=BC=96=E5=88=B6=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../organization/entity/staff/bo/StaffBO.java | 41 ++++++++ .../entity/staff/param/StaffSearchParam.java | 5 + .../entity/staff/po/StaffsPO.java | 50 ++++++++++ .../entity/staff/vo/StaffTableVO.java | 4 +- .../mapper/staff/StaffMapper.java | 10 ++ .../organization/mapper/staff/StaffMapper.xml | 14 +++ .../mapper/staff/StaffsMapper.java | 19 ++++ .../mapper/staff/StaffsMapper.xml | 95 +++++++++++++++++++ .../service/impl/StaffServiceImpl.java | 43 +++++++-- .../transmethod/StaffTransMethod.java | 28 ++++++ .../action/StaffChangeAction.java | 81 ++++++++++++++++ 11 files changed, 382 insertions(+), 8 deletions(-) create mode 100644 src/com/engine/organization/entity/staff/po/StaffsPO.java create mode 100644 src/com/engine/organization/mapper/staff/StaffsMapper.java create mode 100644 src/com/engine/organization/mapper/staff/StaffsMapper.xml create mode 100644 src/com/engine/organization/transmethod/StaffTransMethod.java create mode 100644 src/weaver/interfaces/organization/action/StaffChangeAction.java diff --git a/src/com/engine/organization/entity/staff/bo/StaffBO.java b/src/com/engine/organization/entity/staff/bo/StaffBO.java index aa8a3b56..23b0914d 100644 --- a/src/com/engine/organization/entity/staff/bo/StaffBO.java +++ b/src/com/engine/organization/entity/staff/bo/StaffBO.java @@ -2,6 +2,7 @@ package com.engine.organization.entity.staff.bo; import com.engine.organization.entity.staff.param.StaffSearchParam; import com.engine.organization.entity.staff.po.StaffPO; +import com.engine.organization.transmethod.StaffTransMethod; import java.util.Date; @@ -35,4 +36,44 @@ public class StaffBO { .creator(employeeId) .build(); } + + public static void buildStaffDesc(StaffPO staffPO) { + staffPO.setLackStatus(parseLackStatus(null == staffPO.getStaffNum() ? 0 : staffPO.getStaffNum(), null == staffPO.getPermanentNum() ? 0 : staffPO.getPermanentNum())); + StringBuilder sb = new StringBuilder(); + sb.append("编制数：").append(parseNull(staffPO.getStaffNum())) + .append(",在编数：").append(parseNull(staffPO.getPermanentNum())) + .append(",冻结数：").append(parseNull(staffPO.getFreezeNum())) + .append(",缺编状态：").append(StaffTransMethod.getLackSpan(staffPO.getLackStatus()+"")); + staffPO.setStaffDesc(sb.toString()); + + } + + + /** + * null 转换为 0 + * + * @param number + * @return + */ + private static Integer parseNull(Integer number) { + return null == number ? 0 : number; + + } + + /** + * 转换缺编状态 + * + * @param staffNum + * @param permanentNum + * @return + */ + private static int parseLackStatus(int staffNum, int permanentNum) { + if (staffNum == permanentNum) { + return 1; + } + if (staffNum > permanentNum) { + return 2; + } + return 3; + } } diff --git a/src/com/engine/organization/entity/staff/param/StaffSearchParam.java b/src/com/engine/organization/entity/staff/param/StaffSearchParam.java index 1ff52b55..1e004e5d 100644 --- a/src/com/engine/organization/entity/staff/param/StaffSearchParam.java +++ b/src/com/engine/organization/entity/staff/param/StaffSearchParam.java @@ -70,4 +70,9 @@ public class StaffSearchParam { * 方案名称 */ private String staffName; + + /** + * 调整数量 + */ + private Integer changeNum; } diff --git a/src/com/engine/organization/entity/staff/po/StaffsPO.java b/src/com/engine/organization/entity/staff/po/StaffsPO.java new file mode 100644 index 00000000..9654950c --- /dev/null +++ b/src/com/engine/organization/entity/staff/po/StaffsPO.java @@ -0,0 +1,50 @@ +package com.engine.organization.entity.staff.po; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +/** + * @description: TODO + * @author:dxfeng + * @createTime: 2022/06/07 + * @version: 1.0 + */ +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class StaffsPO { + /** + * 主键 + */ + private Long id; + /** + * 编制ID + */ + private Long staffId; + /** + * 业务类型 + */ + private Integer businessType; + /** + * 编制变动数 + */ + private Integer changeNum; + /** + * 业务来源 + */ + private Integer businessSource; + /** + * 关联流程 + */ + private Integer requestId; + + private Long creator; + private int deleteType; + private Date createTime; + private Date updateTime; +} diff --git a/src/com/engine/organization/entity/staff/vo/StaffTableVO.java b/src/com/engine/organization/entity/staff/vo/StaffTableVO.java index c8fab370..1c38d833 100644 --- a/src/com/engine/organization/entity/staff/vo/StaffTableVO.java +++ b/src/com/engine/organization/entity/staff/vo/StaffTableVO.java @@ -80,8 +80,8 @@ public class StaffTableVO { /** * 缺编状态 */ - @OrganizationTableColumn(text = "缺编状态", width = "10%", column = "lack_status") - private Integer lackStatus; + @OrganizationTableColumn(text = "缺编状态", width = "10%", column = "lack_status", transmethod = "com.engine.organization.transmethod.StaffTransMethod.getLackSpan") + private String lackStatus; /** * 编制描述 */ diff --git a/src/com/engine/organization/mapper/staff/StaffMapper.java b/src/com/engine/organization/mapper/staff/StaffMapper.java index 0d39e82c..53835363 100644 --- a/src/com/engine/organization/mapper/staff/StaffMapper.java +++ b/src/com/engine/organization/mapper/staff/StaffMapper.java @@ -23,6 +23,16 @@ public interface StaffMapper { */ StaffPO getStaffByID(@Param("id") long id); + /** + * 根据分部、部门、岗位查询编制 + * + * @param companyId + * @param departmentId + * @param jobId + * @return + */ + StaffPO getStaffByFilter(@Param("companyId") Long companyId, @Param("departmentId") Long departmentId, @Param("jobId") Long jobId); + /** * 插入编制方案 * diff --git a/src/com/engine/organization/mapper/staff/StaffMapper.xml b/src/com/engine/organization/mapper/staff/StaffMapper.xml index 137f2b2e..9426e52b 100644 --- a/src/com/engine/organization/mapper/staff/StaffMapper.xml +++ b/src/com/engine/organization/mapper/staff/StaffMapper.xml @@ -48,6 +48,20 @@ from jcl_org_staffs where delete_type = 0 + update jcl_org_staff diff --git a/src/com/engine/organization/mapper/staff/StaffsMapper.java b/src/com/engine/organization/mapper/staff/StaffsMapper.java new file mode 100644 index 00000000..e8ed90ef --- /dev/null +++ b/src/com/engine/organization/mapper/staff/StaffsMapper.java @@ -0,0 +1,19 @@ +package com.engine.organization.mapper.staff; + +import com.engine.organization.entity.staff.po.StaffsPO; + +/** + * @description: TODO + * @author:dxfeng + * @createTime: 2022/06/07 + * @version: 1.0 + */ +public interface StaffsMapper { + /** + * 插入编制方案 + * + * @param staffsPO + * @return + */ + int insertIgnoreNull(StaffsPO staffsPO); +} diff --git a/src/com/engine/organization/mapper/staff/StaffsMapper.xml b/src/com/engine/organization/mapper/staff/StaffsMapper.xml new file mode 100644 index 00000000..11695407 --- /dev/null +++ b/src/com/engine/organization/mapper/staff/StaffsMapper.xml @@ -0,0 +1,95 @@ + + + + + + + + + + + + + + + + + + + t + . + id + , t.staff_id + , t.business_type + , t.change_num + , t.business_source + , t.staff_num + , t.requestid + + + + + INSERT INTO jcl_org_staffs + + + creator, + + + delete_type, + + + create_time, + + + update_time, + + + staff_id, + + + business_type, + + + change_num, + + + business_source, + + + requestid, + + + + + #{creator}, + + + #{deleteType}, + + + #{createTime}, + + + #{updateTime}, + + + + #{staffId}, + + + #{businessType}, + + + #{changeNum}, + + + #{businessSource}, + + + #{requestId}, + + + + + \ No newline at end of file diff --git a/src/com/engine/organization/service/impl/StaffServiceImpl.java b/src/com/engine/organization/service/impl/StaffServiceImpl.java index 47b4c6db..ebbe9aa2 100644 --- a/src/com/engine/organization/service/impl/StaffServiceImpl.java +++ b/src/com/engine/organization/service/impl/StaffServiceImpl.java @@ -11,12 +11,14 @@ import com.engine.organization.entity.DeleteParam; import com.engine.organization.entity.staff.bo.StaffBO; import com.engine.organization.entity.staff.param.StaffSearchParam; import com.engine.organization.entity.staff.po.StaffPO; +import com.engine.organization.entity.staff.po.StaffsPO; import com.engine.organization.entity.staff.vo.StaffTableVO; import com.engine.organization.mapper.comp.CompMapper; import com.engine.organization.mapper.department.DepartmentMapper; import com.engine.organization.mapper.job.JobMapper; import com.engine.organization.mapper.staff.StaffMapper; import com.engine.organization.mapper.staff.StaffPlanMapper; +import com.engine.organization.mapper.staff.StaffsMapper; import com.engine.organization.service.StaffService; import com.engine.organization.util.*; import com.engine.organization.util.db.DBType; @@ -89,8 +91,25 @@ public class StaffServiceImpl extends Service implements StaffService { @Override public int updateStaff(StaffSearchParam param) { HasRightUtil.hasRight(user, RIGHT_NAME, false); - StaffPO staffPlanPO = StaffBO.convertParamToPO(param, (long) user.getUID()); - return getStaffMapper().updateStaff(staffPlanPO); + StaffPO staffByID = getStaffMapper().getStaffByID(param.getId()); + StaffPO staffPO = StaffBO.convertParamToPO(param, (long) user.getUID()); + + Integer changeNum = param.getChangeNum(); + if (null == changeNum) { + // 插入明细表数据 + StaffsPO staffsPO = StaffsPO.builder().staffId(staffPO.getId()).businessType(1).changeNum(staffPO.getStaffNum() - staffByID.getStaffNum()).businessSource(1).build(); + MapperProxyFactory.getProxy(StaffsMapper.class).insertIgnoreNull(staffsPO); + + } else { + // 插入明细表数据 + StaffsPO staffsPO = StaffsPO.builder().staffId(staffPO.getId()).businessType(2).changeNum(changeNum).businessSource(1).build(); + MapperProxyFactory.getProxy(StaffsMapper.class).insertIgnoreNull(staffsPO); + // 更新编制表 + staffPO.setStaffNum(staffPO.getStaffNum() + changeNum); + } + StaffBO.buildStaffDesc(staffPO); + // 更新主表 + return getStaffMapper().updateStaff(staffPO); } @@ -183,6 +202,9 @@ public class StaffServiceImpl extends Service implements StaffService { SearchConditionItem controlPolicyItem = OrganizationFormItemUtil.selectItem(user, selectOptions, 2, 16, 6, false, "控制策略", "controlPolicy"); controlPolicyItem.setViewAttr(3); controlPolicyItem.setRules("required|string"); + SearchConditionItem descriptionItem = OrganizationFormItemUtil.textareaItem(user, 2, 16, true, 2, 60, "描述说明", "description"); + + // 编辑状态下赋值操作 String id = Util.null2String(params.get("id")); @@ -196,22 +218,23 @@ public class StaffServiceImpl extends Service implements StaffService { planIdItem.setBrowserConditionParam(planIdItemBean); BrowserBean compIdItemBean = compIdItem.getBrowserConditionParam(); - List> compIdMaps = getCompMapper().listCompsByIds(DeleteParam.builder().ids(staffPO.getPlanId().toString()).build().getIds()); + List> compIdMaps = getCompMapper().listCompsByIds(DeleteParam.builder().ids(staffPO.getCompId().toString()).build().getIds()); compIdItemBean.setReplaceDatas(compIdMaps); compIdItem.setBrowserConditionParam(compIdItemBean); BrowserBean deptIdItemBean = deptIdItem.getBrowserConditionParam(); - List> deptIdMaps = getDepartmentMapper().listDeptsByIds(DeleteParam.builder().ids(staffPO.getPlanId().toString()).build().getIds()); + List> deptIdMaps = getDepartmentMapper().listDeptsByIds(DeleteParam.builder().ids(staffPO.getDeptId().toString()).build().getIds()); deptIdItemBean.setReplaceDatas(deptIdMaps); deptIdItem.setBrowserConditionParam(deptIdItemBean); BrowserBean jobIdItemBean = jobIdItem.getBrowserConditionParam(); - List> jobIdMaps = getJobMapper().listJobsByIds(DeleteParam.builder().ids(staffPO.getPlanId().toString()).build().getIds()); + List> jobIdMaps = getJobMapper().listJobsByIds(DeleteParam.builder().ids(staffPO.getJobId().toString()).build().getIds()); jobIdItemBean.setReplaceDatas(jobIdMaps); jobIdItem.setBrowserConditionParam(jobIdItemBean); staffNumItem.setValue(staffPO.getStaffNum()); - controlPolicyItem.setValue(staffPO.getControlPolicy()); + controlPolicyItem.setValue(staffPO.getControlPolicy()+""); + descriptionItem.setValue(staffPO.getDescription()); } selectItems.add(planIdItem); selectItems.add(compIdItem); @@ -219,6 +242,14 @@ public class StaffServiceImpl extends Service implements StaffService { selectItems.add(jobIdItem); selectItems.add(staffNumItem); selectItems.add(controlPolicyItem); + selectItems.add(descriptionItem); + String operateType = (String)params.get("operateType"); + if ("2".equals(operateType)) { + selectItems.forEach(item->item.setViewAttr(1)); + SearchConditionItem changeNumItem = OrganizationFormItemUtil.inputNumberItem(user, 2, 16, 3, "调整数量", "changeNum"); + staffNumItem.setRules("required"); + selectItems.add(changeNumItem); + } addGroups.add(new SearchConditionGroup("基本信息", true, selectItems)); apiDatas.put("condition", addGroups); diff --git a/src/com/engine/organization/transmethod/StaffTransMethod.java b/src/com/engine/organization/transmethod/StaffTransMethod.java new file mode 100644 index 00000000..0215a7ad --- /dev/null +++ b/src/com/engine/organization/transmethod/StaffTransMethod.java @@ -0,0 +1,28 @@ +package com.engine.organization.transmethod; + +/** + * @description: TODO + * @author:dxfeng + * @createTime: 2022/06/07 + * @version: 1.0 + */ +public class StaffTransMethod { + public static String getLackSpan(String lackStatus) { + String lackSpan = ""; + switch (lackStatus) { + case "1": + lackSpan = "缺编"; + break; + case "2": + lackSpan = "满员"; + break; + case "3": + lackSpan = "超编"; + break; + default: + break; + + } + return lackSpan; + } +} diff --git a/src/weaver/interfaces/organization/action/StaffChangeAction.java b/src/weaver/interfaces/organization/action/StaffChangeAction.java new file mode 100644 index 00000000..e21c26ca --- /dev/null +++ b/src/weaver/interfaces/organization/action/StaffChangeAction.java @@ -0,0 +1,81 @@ +package weaver.interfaces.organization.action; + +import com.engine.organization.entity.staff.bo.StaffBO; +import com.engine.organization.entity.staff.po.StaffPO; +import com.engine.organization.entity.staff.po.StaffsPO; +import com.engine.organization.mapper.staff.StaffMapper; +import com.engine.organization.mapper.staff.StaffsMapper; +import com.engine.organization.util.db.MapperProxyFactory; +import org.apache.commons.lang3.StringUtils; +import weaver.general.Util; +import weaver.interfaces.workflow.action.Action; +import weaver.soa.workflow.request.MainTableInfo; +import weaver.soa.workflow.request.Property; +import weaver.soa.workflow.request.RequestInfo; + +/** + * @description: TODO + * @author:dxfeng + * @createTime: 2022/06/07 + * @version: 1.0 + */ +public class StaffChangeAction implements Action { + @Override + public String execute(RequestInfo requestInfo) { + Integer requestid = Integer.parseInt(requestInfo.getRequestid()); + Long companyId = null; + Long departmentId = null; + Long jobId = null; + Integer changeNum = null; + Integer businessSource = null; + MainTableInfo mainTableInfo = requestInfo.getMainTableInfo(); + Property[] property = mainTableInfo.getProperty(); + // 取表单数据赋值 + for (int i = 0; i < property.length; i++) { + String name = property[i].getName(); + String value = Util.null2String(property[i].getValue()); + if (StringUtils.isNotBlank(name) && StringUtils.isNotBlank(value)) { + switch (name) { + case "fb": + companyId = Long.parseLong(value); + break; + case "bm": + departmentId = Long.parseLong(value); + break; + case "gw": + jobId = Long.parseLong(value); + + break; + case "bzbds": + changeNum = Integer.parseInt(value); + break; + case "ywly": + businessSource = Integer.parseInt(value); + break; + default: + break; + } + } + + } + + // 根据分部、部门、岗位 定位具体编制信息 + StaffPO staffPO = MapperProxyFactory.getProxy(StaffMapper.class).getStaffByFilter(companyId, departmentId, jobId); + if (null != staffPO) { + + // 插入明细表 + StaffsPO staffsPO = StaffsPO.builder().staffId(staffPO.getId()).businessType(2).changeNum(changeNum).businessSource(businessSource).requestId(requestid).build(); + MapperProxyFactory.getProxy(StaffsMapper.class).insertIgnoreNull(staffsPO); + + // 更新编制表 + staffPO.setStaffNum(staffPO.getStaffNum() + changeNum); + + StaffBO.buildStaffDesc(staffPO); + + MapperProxyFactory.getProxy(StaffMapper.class).updateStaff(staffPO); + } + + return null; + } + +} From 64cbb907e0c9b253c6e07e31da4ab5b0ce332914 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Wed, 8 Jun 2022 09:10:47 +0800 Subject: [PATCH 26/77] =?UTF-8?q?=E7=BC=96=E5=88=B6=E4=B8=8A=E6=8A=A5=20?= =?UTF-8?q?=E7=BC=96=E5=88=B6=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/organization/entity/staff/bo/StaffBO.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/engine/organization/entity/staff/bo/StaffBO.java b/src/com/engine/organization/entity/staff/bo/StaffBO.java index 23b0914d..2340e2b4 100644 --- a/src/com/engine/organization/entity/staff/bo/StaffBO.java +++ b/src/com/engine/organization/entity/staff/bo/StaffBO.java @@ -69,10 +69,10 @@ public class StaffBO { */ private static int parseLackStatus(int staffNum, int permanentNum) { if (staffNum == permanentNum) { - return 1; + return 2; } if (staffNum > permanentNum) { - return 2; + return 1; } return 3; } From 9877308b84311d44f72921fb17db075fad26fdbc Mon Sep 17 00:00:00 2001 From: dxfeng Date: Wed, 8 Jun 2022 10:25:47 +0800 Subject: [PATCH 27/77] =?UTF-8?q?=E7=BC=96=E5=88=B6=E4=B8=8A=E6=8A=A5=20?= =?UTF-8?q?=E7=BC=96=E5=88=B6=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../engine/organization/mapper/staff/StaffMapper.xml | 11 ++++++----- .../organization/action/StaffChangeAction.java | 11 ++++++----- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/com/engine/organization/mapper/staff/StaffMapper.xml b/src/com/engine/organization/mapper/staff/StaffMapper.xml index 9426e52b..af99fd66 100644 --- a/src/com/engine/organization/mapper/staff/StaffMapper.xml +++ b/src/com/engine/organization/mapper/staff/StaffMapper.xml @@ -48,9 +48,10 @@ from jcl_org_staffs where delete_type = 0 - + select + + from jcl_org_staff t where delete_type = 0 and comp_id = #{companyId} @@ -58,8 +59,8 @@ and dept_id = #{departmentId} - - and job_id = #{companyId} + + and job_id = #{jobId} diff --git a/src/weaver/interfaces/organization/action/StaffChangeAction.java b/src/weaver/interfaces/organization/action/StaffChangeAction.java index e21c26ca..f5d55a3e 100644 --- a/src/weaver/interfaces/organization/action/StaffChangeAction.java +++ b/src/weaver/interfaces/organization/action/StaffChangeAction.java @@ -12,6 +12,9 @@ import weaver.interfaces.workflow.action.Action; import weaver.soa.workflow.request.MainTableInfo; import weaver.soa.workflow.request.Property; import weaver.soa.workflow.request.RequestInfo; +import weaver.workflow.request.RequestManager; + +import java.util.Date; /** * @description: TODO @@ -27,7 +30,8 @@ public class StaffChangeAction implements Action { Long departmentId = null; Long jobId = null; Integer changeNum = null; - Integer businessSource = null; + RequestManager requestManager = requestInfo.getRequestManager(); + int creator = requestManager.getCreater(); MainTableInfo mainTableInfo = requestInfo.getMainTableInfo(); Property[] property = mainTableInfo.getProperty(); // 取表单数据赋值 @@ -49,9 +53,6 @@ public class StaffChangeAction implements Action { case "bzbds": changeNum = Integer.parseInt(value); break; - case "ywly": - businessSource = Integer.parseInt(value); - break; default: break; } @@ -64,7 +65,7 @@ public class StaffChangeAction implements Action { if (null != staffPO) { // 插入明细表 - StaffsPO staffsPO = StaffsPO.builder().staffId(staffPO.getId()).businessType(2).changeNum(changeNum).businessSource(businessSource).requestId(requestid).build(); + StaffsPO staffsPO = StaffsPO.builder().staffId(staffPO.getId()).businessType(2).changeNum(changeNum).businessSource(2).requestId(requestid).deleteType(0).creator((long) creator).createTime(new Date()).build(); MapperProxyFactory.getProxy(StaffsMapper.class).insertIgnoreNull(staffsPO); // 更新编制表 From ec4e92e11356bb1482b3ed72bd4d59f121b2349f Mon Sep 17 00:00:00 2001 From: dxfeng Date: Wed, 8 Jun 2022 10:38:04 +0800 Subject: [PATCH 28/77] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../organization/service/impl/GroupServiceImpl.java | 1 - .../organization/service/impl/StaffServiceImpl.java | 11 +++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/com/engine/organization/service/impl/GroupServiceImpl.java b/src/com/engine/organization/service/impl/GroupServiceImpl.java index 65e8b22e..0efe0a73 100644 --- a/src/com/engine/organization/service/impl/GroupServiceImpl.java +++ b/src/com/engine/organization/service/impl/GroupServiceImpl.java @@ -29,7 +29,6 @@ public class GroupServiceImpl extends Service implements GroupService { @Override public Map getGroupFormField(Map params) { - HasRightUtil.hasRight(user, RIGHT_NAME, false); Map apiDatas = new HashMap<>(); List selectItems = new ArrayList<>(); List addGroups = new ArrayList<>(); diff --git a/src/com/engine/organization/service/impl/StaffServiceImpl.java b/src/com/engine/organization/service/impl/StaffServiceImpl.java index ebbe9aa2..92fd35a5 100644 --- a/src/com/engine/organization/service/impl/StaffServiceImpl.java +++ b/src/com/engine/organization/service/impl/StaffServiceImpl.java @@ -107,6 +107,7 @@ public class StaffServiceImpl extends Service implements StaffService { // 更新编制表 staffPO.setStaffNum(staffPO.getStaffNum() + changeNum); } + OrganizationAssert.isFalse(staffPO.getStaffNum() < 0, "调整后编制数小于0，请更正"); StaffBO.buildStaffDesc(staffPO); // 更新主表 return getStaffMapper().updateStaff(staffPO); @@ -205,7 +206,6 @@ public class StaffServiceImpl extends Service implements StaffService { SearchConditionItem descriptionItem = OrganizationFormItemUtil.textareaItem(user, 2, 16, true, 2, 60, "描述说明", "description"); - // 编辑状态下赋值操作 String id = Util.null2String(params.get("id")); if (!StringUtil.isEmpty(id)) { @@ -233,7 +233,7 @@ public class StaffServiceImpl extends Service implements StaffService { jobIdItem.setBrowserConditionParam(jobIdItemBean); staffNumItem.setValue(staffPO.getStaffNum()); - controlPolicyItem.setValue(staffPO.getControlPolicy()+""); + controlPolicyItem.setValue(staffPO.getControlPolicy() + ""); descriptionItem.setValue(staffPO.getDescription()); } selectItems.add(planIdItem); @@ -243,9 +243,12 @@ public class StaffServiceImpl extends Service implements StaffService { selectItems.add(staffNumItem); selectItems.add(controlPolicyItem); selectItems.add(descriptionItem); - String operateType = (String)params.get("operateType"); + String operateType = (String) params.get("operateType"); if ("2".equals(operateType)) { - selectItems.forEach(item->item.setViewAttr(1)); + selectItems.forEach(item -> { + item.setViewAttr(1); + item.setRules(null); + }); SearchConditionItem changeNumItem = OrganizationFormItemUtil.inputNumberItem(user, 2, 16, 3, "调整数量", "changeNum"); staffNumItem.setRules("required"); selectItems.add(changeNumItem); From 80a33a77878676975702e159c98ba0ae0c49b8dd Mon Sep 17 00:00:00 2001 From: dxfeng Date: Wed, 8 Jun 2022 14:21:59 +0800 Subject: [PATCH 29/77] =?UTF-8?q?=E8=A1=A8=E7=BB=93=E6=9E=84=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=20BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/表结构SQL/MySQL.sql | 61 +------ docs/表结构SQL/Oracle.sql | 55 +------ docs/表结构SQL/SqlServer.sql | 149 ++++++------------ .../service/impl/JobServiceImpl.java | 1 + .../service/impl/TestServiceImpl.java | 3 +- .../organization/web/DemoController.java | 4 +- 6 files changed, 59 insertions(+), 214 deletions(-) diff --git a/docs/表结构SQL/MySQL.sql b/docs/表结构SQL/MySQL.sql index 637a8bb0..58ff63f3 100644 --- a/docs/表结构SQL/MySQL.sql +++ b/docs/表结构SQL/MySQL.sql @@ -134,6 +134,7 @@ CREATE TABLE JCL_FIELD_EXTENDINFO ( field_name_desc varchar(100) NULL, field_type varchar(1000) NULL, control_type int null, + browser_type varchar(100) NULL, extend_group_id int null, isenable int null, isrequired int null, @@ -152,7 +153,7 @@ CREATE TABLE JCL_FIELD_EXTENDINFO ( -- JCL_ORG_COMPEXT CREATE TABLE JCL_ORG_COMPEXT ( - id int auto_increment NOT NULL, + id int NOT NULL, creator int null, delete_type int null, create_time date null, @@ -193,7 +194,7 @@ CREATE TABLE JCL_ORG_DEPT ( -- JCL_ORG_DEPTEXT CREATE TABLE JCL_ORG_DEPTEXT ( - id int auto_increment NOT NULL, + id int NOT NULL, creator int null, delete_type int null, create_time date null, @@ -253,7 +254,7 @@ CREATE TABLE JCL_ORG_JOBDT ( -- JCL_ORG_JOBEXT CREATE TABLE JCL_ORG_JOBEXT ( - id int auto_increment NOT NULL, + id int NOT NULL, creator int null, delete_type int null, create_time date null, @@ -327,56 +328,4 @@ CREATE TABLE JCL_ORG_STAFFS ( create_time date null, update_time date null, CONSTRAINT JCL_ORG_STAFFS_PK PRIMARY KEY (id) -); - - ---JCL_CODERULE -CREATE TABLE JCL_CODERULE ( - id int auto_increment NOT NULL, - serial_type varchar(50) null, - serial_enable char(1) null, - oneself_type varchar(50) null, - creator int null, - delete_type int null, - create_time date null, - update_time date null, - CONSTRAINT JCL_CODERULE PRIMARY KEY (id) -); - ---JCL_CODERULE_DETAIL -CREATE TABLE JCL_CODERULE_DETAIL ( - id int auto_increment NOT NULL, - coderule_id int(11) null, - rule_type varchar(50) null, - rule_value varchar(255) null, - show_order int(11) null, - creator int null, - delete_type int null, - create_time date null, - update_time date null, - CONSTRAINT JCL_CODERULE_DETAIL PRIMARY KEY (id) -); - ---JCL_CODERULE_RESERVED -CREATE TABLE JCL_CODERULE_RESERVED ( - id int auto_increment NOT NULL, - coderule_id int(11) null, - reserved_code varchar(255) null, - reserved_desc varchar (1000) null, - creator int null, - delete_type int null, - create_time date null, - update_time date null, - CONSTRAINT JCL_CODERULE_RESERVED PRIMARY KEY (id) -); - - - - - - - - - - - +); \ No newline at end of file diff --git a/docs/表结构SQL/Oracle.sql b/docs/表结构SQL/Oracle.sql index 90aa5518..2f2c7aad 100644 --- a/docs/表结构SQL/Oracle.sql +++ b/docs/表结构SQL/Oracle.sql @@ -136,6 +136,7 @@ CREATE TABLE JCL_FIELD_EXTENDINFO ( FIELD_NAME_DESC NVARCHAR2(100) NULL, FIELD_TYPE NVARCHAR2(1000) NULL, CONTROL_TYPE NUMBER NULL, + BROWSER_TYPE NVARCHAR2(100) NULL, EXTEND_GROUP_ID NUMBER NULL, ISENABLE NUMBER NULL, ISREQUIRED NUMBER NULL, @@ -328,56 +329,4 @@ CREATE TABLE JCL_ORG_STAFFS ( CREATE_TIME DATE NULL, UPDATE_TIME DATE NULL, CONSTRAINT JCL_ORG_STAFFS_PK PRIMARY KEY (ID) -); - - ---JCL_CODERULE -create table JCL_CODERULE ( - ID NUMBER not null, - SERIAL_TYPE NVARCHAR2(50) null, - SERIAL_ENABLE CHAR(1) null, - ONESELF_TYPE NVARCHAR2(50) null, - CREATOR NUMBER null, - DELETE_TYPE NUMBER null, - CREATE_TIME DATE null, - UPDATE_TIME DATE null, - constraint JCL_CODERULE primary key (ID) -); - ---JCL_CODERULE_DETAIL -create table JCL_CODERULE_DETAIL ( - ID NUMBER not null, - CODERULE_ID NUMBER(11) null, - RULE_TYPE NVARCHAR2(50) null, - RULE_VALUE NVARCHAR2(255) null, - SHOW_ORDER NUMBER(11) null, - CREATOR NUMBER null, - DELETE_TYPE NUMBER null, - CREATE_TIME DATE null, - UPDATE_TIME DATE null, - constraint JCL_CODERULE_DETAIL primary key (ID) -); - ---JCL_CODERULE_RESERVED -CREATE TABLE JCL_CODERULE_RESERVED ( - ID NUMBER NOT NULL, - CODERULE_ID NUMBER(11) NULL, - RESERVED_CODE NVARCHAR2(255) NULL, - RESERVED_DESC NVARCHAR2 (1000) NULL, - CREATOR NUMBER NULL, - DELETE_TYPE NUMBER NULL, - CREATE_TIME DATE NULL, - UPDATE_TIME DATE NULL, - CONSTRAINT JCL_CODERULE_RESERVED PRIMARY KEY (ID) -); - - - - - - - - - - - +); \ No newline at end of file diff --git a/docs/表结构SQL/SqlServer.sql b/docs/表结构SQL/SqlServer.sql index a466c2c2..923e3cf2 100644 --- a/docs/表结构SQL/SqlServer.sql +++ b/docs/表结构SQL/SqlServer.sql @@ -8,8 +8,8 @@ CREATE TABLE JCL_ORG_SCHEME ( is_used int null, creator int null, delete_type int null, - create_time date null, - update_time date null, + create_time datetime null, + update_time datetime null, CONSTRAINT JCL_ORG_SCHEME_PK PRIMARY KEY (id) ); -- JCL_ORG_LEVEL @@ -23,8 +23,8 @@ CREATE TABLE JCL_ORG_LEVEL ( is_used int null, creator int null, delete_type int null, - create_time date null, - update_time date null, + create_time datetime null, + update_time datetime null, CONSTRAINT JCL_ORG_LEVEL_PK PRIMARY KEY (id) ); -- JCL_ORG_GRADE @@ -39,8 +39,8 @@ CREATE TABLE JCL_ORG_GRADE ( is_used int null, creator int null, delete_type int null, - create_time date null, - update_time date null, + create_time datetime null, + update_time datetime null, CONSTRAINT JCL_ORG_GRADE_PK PRIMARY KEY (id) ); @@ -55,8 +55,8 @@ CREATE TABLE JCL_ORG_SEQUENCE ( is_used int null, creator int null, delete_type int null, - create_time date null, - update_time date null, + create_time datetime null, + update_time datetime null, CONSTRAINT JCL_ORG_SEQUENCE_PK PRIMARY KEY (id) ); @@ -69,8 +69,8 @@ CREATE TABLE JCL_ORG_POST ( is_used int null, creator int null, delete_type int null, - create_time date null, - update_time date null, + create_time datetime null, + update_time datetime null, CONSTRAINT JCL_ORG_POST_PK PRIMARY KEY (id) ); @@ -88,8 +88,8 @@ CREATE TABLE JCL_ORG_POST_INFO ( is_used int null, creator int null, delete_type int null, - create_time date null, - update_time date null, + create_time datetime null, + update_time datetime null, CONSTRAINT JCL_ORG_POST_INFO_PK PRIMARY KEY (id) ); @@ -108,8 +108,8 @@ CREATE TABLE JCL_ORG_COMP ( is_used int null, creator int null, delete_type int null, - create_time date null, - update_time date null, + create_time datetime null, + update_time datetime null, CONSTRAINT JCL_ORG_COMP_PK PRIMARY KEY (id) ); @@ -120,8 +120,8 @@ CREATE TABLE JCL_FIELD_EXTENDGROUP ( group_name varchar(100) COLLATE Chinese_PRC_CI_AS NULL, creator int null, delete_type int null, - create_time date null, - update_time date null, + create_time datetime null, + update_time datetime null, CONSTRAINT JCL_FIELD_EXTENDGROUP_PK PRIMARY KEY (id) ); @@ -134,6 +134,7 @@ CREATE TABLE JCL_FIELD_EXTENDINFO ( field_name_desc varchar(100) COLLATE Chinese_PRC_CI_AS NULL, field_type varchar(1000) COLLATE Chinese_PRC_CI_AS NULL, control_type int null, + browser_type varchar(100) COLLATE Chinese_PRC_CI_AS NULL, extend_group_id int null, isenable int null, isrequired int null, @@ -145,18 +146,18 @@ CREATE TABLE JCL_FIELD_EXTENDINFO ( show_order int null, creator int null, delete_type int null, - create_time date null, - update_time date null, + create_time datetime null, + update_time datetime null, CONSTRAINT JCL_FIELD_EXTENDINFO_PK PRIMARY KEY (id) ); -- JCL_ORG_COMPEXT CREATE TABLE JCL_ORG_COMPEXT ( - id int IDENTITY(1,1) NOT NULL, + id int NOT NULL, creator int null, delete_type int null, - create_time date null, - update_time date null, + create_time datetime null, + update_time datetime null, CONSTRAINT JCL_ORG_COMPEXT_PK PRIMARY KEY (id) ); @@ -166,8 +167,8 @@ CREATE TABLE JCL_ORG_COMPEXT_DT1 ( mainid int NULL, creator int null, delete_type int null, - create_time date null, - update_time date null, + create_time datetime null, + update_time datetime null, CONSTRAINT JCL_ORG_COMPEXT_DT1_PK PRIMARY KEY (id) ); @@ -186,18 +187,18 @@ CREATE TABLE JCL_ORG_DEPT ( is_used int null, creator int null, delete_type int null, - create_time date null, - update_time date null, + create_time datetime null, + update_time datetime null, CONSTRAINT JCL_ORG_DEPT_PK PRIMARY KEY (id) ); -- JCL_ORG_DEPTEXT CREATE TABLE JCL_ORG_DEPTEXT ( - id int IDENTITY(1,1) NOT NULL, + id int NOT NULL, creator int null, delete_type int null, - create_time date null, - update_time date null, + create_time datetime null, + update_time datetime null, CONSTRAINT JCL_ORG_DEPTEXT_PK PRIMARY KEY (id) ); @@ -207,8 +208,8 @@ CREATE TABLE JCL_ORG_DEPTEXT_DT1 ( mainid int NULL, creator int null, delete_type int null, - create_time date null, - update_time date null, + create_time datetime null, + update_time datetime null, CONSTRAINT JCL_ORG_DEPTEXT_DT1_PK PRIMARY KEY (id) ); @@ -231,8 +232,8 @@ CREATE TABLE JCL_ORG_JOB ( is_used int null, creator int null, delete_type int null, - create_time date null, - update_time date null, + create_time datetime null, + update_time datetime null, CONSTRAINT JCL_ORG_JOB_PK PRIMARY KEY (id) ); @@ -246,18 +247,18 @@ CREATE TABLE JCL_ORG_JOBDT ( grade_id_span varchar(100) NULL, creator int null, delete_type int null, - create_time date null, - update_time date null, + create_time datetime null, + update_time datetime null, CONSTRAINT JCL_ORG_JOBDT_PK PRIMARY KEY (id) ); -- JCL_ORG_JOBEXT CREATE TABLE JCL_ORG_JOBEXT ( - id int IDENTITY(1,1) NOT NULL, + id int NOT NULL, creator int null, delete_type int null, - create_time date null, - update_time date null, + create_time datetime null, + update_time datetime null, CONSTRAINT JCL_ORG_JOBEXT_PK PRIMARY KEY (id) ); @@ -267,8 +268,8 @@ CREATE TABLE JCL_ORG_JOBEXT_DT1 ( mainid int NULL, creator int null, delete_type int null, - create_time date null, - update_time date null, + create_time datetime null, + update_time datetime null, CONSTRAINT JCL_ORG_JOBEXT_DT1_PK PRIMARY KEY (id) ); @@ -279,16 +280,16 @@ CREATE TABLE JCL_ORG_STAFFPLAN ( plan_no varchar(100) COLLATE Chinese_PRC_CI_AS NULL, plan_name varchar(100) COLLATE Chinese_PRC_CI_AS NULL, plan_year varchar(100) COLLATE Chinese_PRC_CI_AS NULL, - time_start date NULL, - time_end date NULL, + time_start datetime null, + time_end datetime null, company_id varchar(100) COLLATE Chinese_PRC_CI_AS NULL, description text NULL, forbidden_tag int NULL, is_used int null, creator int null, delete_type int null, - create_time date null, - update_time date null, + create_time datetime null, + update_time datetime null, CONSTRAINT JCL_ORG_STAFFPLAN_PK PRIMARY KEY (id) ); @@ -309,8 +310,8 @@ CREATE TABLE JCL_ORG_STAFF ( is_used int null, creator int null, delete_type int null, - create_time date null, - update_time date null, + create_time datetime null, + update_time datetime null, CONSTRAINT JCL_ORG_STAFF_PK PRIMARY KEY (id) ); @@ -324,59 +325,7 @@ CREATE TABLE JCL_ORG_STAFFS ( requestid int null, creator int null, delete_type int null, - create_time date null, - update_time date null, + create_time datetime null, + update_time datetime null, CONSTRAINT JCL_ORG_STAFFS_PK PRIMARY KEY (id) -); - - ---JCL_CODERULE -CREATE TABLE JCL_CODERULE ( - id int IDENTITY(1,1) NOT NULL, - serial_type varchar(50) null, - serial_enable char(1) null, - oneself_type varchar(50) null, - creator int null, - delete_type int null, - create_time date null, - update_time date null, - CONSTRAINT JCL_CODERULE PRIMARY KEY (id) -); - ---JCL_CODERULE_DETAIL -CREATE TABLE JCL_CODERULE_DETAIL ( - id int IDENTITY(1,1) NOT NULL, - coderule_id int(11) null, - rule_type varchar(50) null, - rule_value varchar(255) null, - show_order int(11) null, - creator int null, - delete_type int null, - create_time date null, - update_time date null, - CONSTRAINT JCL_CODERULE_DETAIL PRIMARY KEY (id) -); - ---JCL_CODERULE_RESERVED -CREATE TABLE JCL_CODERULE_RESERVED ( - id int IDENTITY(1,1) NOT NULL, - coderule_id int(11) null, - reserved_code varchar(255) null, - reserved_desc varchar (1000) null, - creator int null, - delete_type int null, - create_time date null, - update_time date null, - CONSTRAINT JCL_CODERULE_RESERVED PRIMARY KEY (id) -); - - - - - - - - - - - +); \ No newline at end of file diff --git a/src/com/engine/organization/service/impl/JobServiceImpl.java b/src/com/engine/organization/service/impl/JobServiceImpl.java index cf8778a9..d0799d13 100644 --- a/src/com/engine/organization/service/impl/JobServiceImpl.java +++ b/src/com/engine/organization/service/impl/JobServiceImpl.java @@ -284,6 +284,7 @@ public class JobServiceImpl extends Service implements JobService { isKeyOptions.add(noOption); SearchConditionItem isKeyItem = OrganizationFormItemUtil.selectItem(user, isKeyOptions, 2, 16, 6, false, "是否关键岗", "isKey"); isKeyItem.setDetailtype(3); + isKeyItem.setValue("0"); conditionItems.add(jobNoItem); conditionItems.add(jobNameItem); diff --git a/src/com/engine/organization/service/impl/TestServiceImpl.java b/src/com/engine/organization/service/impl/TestServiceImpl.java index 79fe00aa..8fd98088 100644 --- a/src/com/engine/organization/service/impl/TestServiceImpl.java +++ b/src/com/engine/organization/service/impl/TestServiceImpl.java @@ -2,7 +2,6 @@ package com.engine.organization.service.impl; import com.engine.organization.entity.po.Demo; import com.engine.organization.service.TestService; -import com.weaverboot.frame.ioc.anno.classAnno.WeaIocService; /** * @Author weaver_cl @@ -10,7 +9,7 @@ import com.weaverboot.frame.ioc.anno.classAnno.WeaIocService; * @Date 2022/4/28 * @Version V1.0 **/ -@WeaIocService +//@WeaIocService public class TestServiceImpl implements TestService { @Override diff --git a/src/com/engine/organization/web/DemoController.java b/src/com/engine/organization/web/DemoController.java index f8b65633..d1412977 100644 --- a/src/com/engine/organization/web/DemoController.java +++ b/src/com/engine/organization/web/DemoController.java @@ -5,7 +5,6 @@ import com.engine.organization.entity.po.Demo; import com.engine.organization.service.TestService; import com.engine.organization.util.response.ReturnResult; import com.engine.organization.wrapper.DemoWrapper; -import com.weaverboot.frame.ioc.anno.fieldAnno.WeaAutowired; import weaver.hrm.HrmUserVarify; import weaver.hrm.User; @@ -17,7 +16,6 @@ import javax.ws.rs.Produces; import javax.ws.rs.QueryParam; import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; -import java.util.List; /** * @Author weaver_cl @@ -48,7 +46,7 @@ public class DemoController { /** * 方案2 基于weaverboot 实现后端架构（推荐使用） */ - @WeaAutowired + //@WeaAutowired private TestService testService; @GET From 14725e499016fcbda67f056d5a5eb545b2d4af5d Mon Sep 17 00:00:00 2001 From: dxfeng Date: Wed, 8 Jun 2022 15:21:48 +0800 Subject: [PATCH 30/77] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/organization/service/impl/JobServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/engine/organization/service/impl/JobServiceImpl.java b/src/com/engine/organization/service/impl/JobServiceImpl.java index d0799d13..5d43d31c 100644 --- a/src/com/engine/organization/service/impl/JobServiceImpl.java +++ b/src/com/engine/organization/service/impl/JobServiceImpl.java @@ -658,7 +658,7 @@ public class JobServiceImpl extends Service implements JobService { BrowserBean browserBean = parentJobBrowserItem.getBrowserConditionParam(); List> deptMaps = getJobMapper().listJobsByIds(DeleteParam.builder().ids(jobPO.getParentJob().toString()).build().getIds()); browserBean.setReplaceDatas(deptMaps); - schemeBrowserItem.setBrowserConditionParam(browserBean); + parentJobBrowserItem.setBrowserConditionParam(browserBean); } // 查看，全部置为只读 From 497ed928e337d305deae1c41671e6ecfd9e94d5e Mon Sep 17 00:00:00 2001 From: dxfeng Date: Wed, 8 Jun 2022 15:52:46 +0800 Subject: [PATCH 31/77] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../organization/entity/staff/vo/StaffPlanTableVO.java | 10 ++++------ .../service/impl/StaffPlanServiceImpl.java | 8 ++++---- .../organization/transmethod/StaffPlanTransMethod.java | 8 ++++++++ 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/src/com/engine/organization/entity/staff/vo/StaffPlanTableVO.java b/src/com/engine/organization/entity/staff/vo/StaffPlanTableVO.java index 68f3ef9e..4b2ae5ad 100644 --- a/src/com/engine/organization/entity/staff/vo/StaffPlanTableVO.java +++ b/src/com/engine/organization/entity/staff/vo/StaffPlanTableVO.java @@ -7,8 +7,6 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import java.util.Date; - /** * @description: TODO * @author:dxfeng @@ -63,13 +61,13 @@ public class StaffPlanTableVO { /** * 时间开始 */ - @OrganizationTableColumn(text = "时间开始", width = "16%", column = "time_start") - private Date timeStart; + @OrganizationTableColumn(text = "时间开始", width = "16%", column = "time_start", transmethod = "com.engine.organization.transmethod.StaffPlanTransMethod.getFormatDateString") + private String timeStart; /** * 时间结束 */ - @OrganizationTableColumn(text = "时间结束", width = "16%", column = "time_end") - private Date timeEnd; + @OrganizationTableColumn(text = "时间结束", width = "16%", column = "time_end", transmethod = "com.engine.organization.transmethod.StaffPlanTransMethod.getFormatDateString") + private String timeEnd; /** * 状态 */ diff --git a/src/com/engine/organization/service/impl/StaffPlanServiceImpl.java b/src/com/engine/organization/service/impl/StaffPlanServiceImpl.java index 4ef165ac..0c2de1d6 100644 --- a/src/com/engine/organization/service/impl/StaffPlanServiceImpl.java +++ b/src/com/engine/organization/service/impl/StaffPlanServiceImpl.java @@ -160,8 +160,8 @@ public class StaffPlanServiceImpl extends Service implements StaffPlanService { SearchConditionItem timeEndItem = OrganizationFormItemUtil.datePickerItem(user, 2, 16, false, 3, "时间结束", "timeEnd"); timeEndItem.setRules("required|string"); // 适用公司 - SearchConditionItem companyIdtItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, "适用公司", "162", "companyId", "compBrowser"); - companyIdtItem.setRules("required|string"); + SearchConditionItem companyIdtItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "适用公司", "162", "companyId", "compBrowser"); + //companyIdtItem.setRules("required|string"); // 说明 SearchConditionItem descriptionItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "说明", "description"); @@ -173,8 +173,8 @@ public class StaffPlanServiceImpl extends Service implements StaffPlanService { planNoItem.setValue(staffPlanPO.getPlanNo()); planNameItem.setValue(staffPlanPO.getPlanName()); planYearItem.setValue(staffPlanPO.getPlanYear() + ""); - timeStartItem.setValue(DateUtil.getDate(staffPlanPO.getTimeStart())); - timeEndItem.setValue(DateUtil.getDate(staffPlanPO.getTimeEnd())); + timeStartItem.setValue(DateUtil.getDate(staffPlanPO.getTimeStart(),"yyyy-MM-dd")); + timeEndItem.setValue(DateUtil.getDate(staffPlanPO.getTimeEnd(),"yyyy-MM-dd")); BrowserBean browserBean = companyIdtItem.getBrowserConditionParam(); List> maps = getCompMapper().listCompsByIds(DeleteParam.builder().ids(staffPlanPO.getCompanyId()).build().getIds()); diff --git a/src/com/engine/organization/transmethod/StaffPlanTransMethod.java b/src/com/engine/organization/transmethod/StaffPlanTransMethod.java index deaedfeb..d1a92f5d 100644 --- a/src/com/engine/organization/transmethod/StaffPlanTransMethod.java +++ b/src/com/engine/organization/transmethod/StaffPlanTransMethod.java @@ -3,6 +3,7 @@ package com.engine.organization.transmethod; import com.engine.organization.entity.DeleteParam; import com.engine.organization.mapper.staff.StaffPlanMapper; import com.engine.organization.util.db.MapperProxyFactory; +import org.apache.commons.lang3.StringUtils; import java.util.List; import java.util.Map; @@ -22,4 +23,11 @@ public class StaffPlanTransMethod { String names = maps.stream().map(item -> (String) item.get("name")).collect(Collectors.joining(",")); return names; } + + public static String getFormatDateString(String dateStr) { + if (StringUtils.isNotBlank(dateStr)) { + return dateStr.substring(0, 10); + } + return ""; + } } From 2ee23d5e751f22da969560c98d4047b6950ce93b Mon Sep 17 00:00:00 2001 From: dxfeng Date: Wed, 8 Jun 2022 15:54:24 +0800 Subject: [PATCH 32/77] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../organization/service/impl/StaffPlanServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/engine/organization/service/impl/StaffPlanServiceImpl.java b/src/com/engine/organization/service/impl/StaffPlanServiceImpl.java index 0c2de1d6..4f398f59 100644 --- a/src/com/engine/organization/service/impl/StaffPlanServiceImpl.java +++ b/src/com/engine/organization/service/impl/StaffPlanServiceImpl.java @@ -160,8 +160,8 @@ public class StaffPlanServiceImpl extends Service implements StaffPlanService { SearchConditionItem timeEndItem = OrganizationFormItemUtil.datePickerItem(user, 2, 16, false, 3, "时间结束", "timeEnd"); timeEndItem.setRules("required|string"); // 适用公司 - SearchConditionItem companyIdtItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "适用公司", "162", "companyId", "compBrowser"); - //companyIdtItem.setRules("required|string"); + SearchConditionItem companyIdtItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, "适用公司", "162", "companyId", "compBrowser"); + companyIdtItem.setRules("required|string"); // 说明 SearchConditionItem descriptionItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "说明", "description"); From 49155c6893c5759a77c06023445ec1e071e06c47 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Fri, 10 Jun 2022 09:18:21 +0800 Subject: [PATCH 33/77] =?UTF-8?q?=E5=85=AC=E5=8F=B8/=E5=88=86=E9=83=A8=20?= =?UTF-8?q?=E4=B8=BB=E8=A1=A8=E3=80=81=E6=8B=93=E5=B1=95=E8=A1=A8=E5=8A=A8?= =?UTF-8?q?=E6=80=81=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5=E3=80=81=E5=8A=A8?= =?UTF-8?q?=E6=80=81=E5=88=86=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/extend/po/ExtendGroupPO.java | 5 + .../organization/mapper/extend/ExtMapper.java | 8 +- .../organization/mapper/extend/ExtMapper.xml | 8 +- .../mapper/extend/ExtendGroupMapper.java | 21 ++- .../mapper/extend/ExtendGroupMapper.xml | 21 ++- .../organization/service/CompService.java | 2 +- .../organization/service/ExtService.java | 14 +- .../service/impl/CompServiceImpl.java | 176 ++++-------------- .../service/impl/ExtServiceImpl.java | 50 ++++- .../organization/web/CompController.java | 3 +- .../organization/wrapper/CompWrapper.java | 2 +- 11 files changed, 149 insertions(+), 161 deletions(-) diff --git a/src/com/engine/organization/entity/extend/po/ExtendGroupPO.java b/src/com/engine/organization/entity/extend/po/ExtendGroupPO.java index 5c840aa2..5786466e 100644 --- a/src/com/engine/organization/entity/extend/po/ExtendGroupPO.java +++ b/src/com/engine/organization/entity/extend/po/ExtendGroupPO.java @@ -33,6 +33,11 @@ public class ExtendGroupPO { */ private String groupName; + /** + * 所属分组 + */ + private Long pid; + private Long creator; private int deleteType; private Date createTime; diff --git a/src/com/engine/organization/mapper/extend/ExtMapper.java b/src/com/engine/organization/mapper/extend/ExtMapper.java index da7b11d5..a30f3511 100644 --- a/src/com/engine/organization/mapper/extend/ExtMapper.java +++ b/src/com/engine/organization/mapper/extend/ExtMapper.java @@ -19,7 +19,7 @@ public interface ExtMapper { * @param id * @return */ - Map listCompExt(@Param("tableName") String tableName, @Param("fields") String fields, @Param("id") long id); + Map listExt(@Param("tableName") String tableName, @Param("fields") String fields, @Param("id") long id); /** * 判断当前数据是否存在 @@ -28,7 +28,7 @@ public interface ExtMapper { * @param id * @return */ - int countCompExtById(@Param("tableName") String tableName, @Param("id") long id); + int countExtById(@Param("tableName") String tableName, @Param("id") long id); /** * 插入主表拓展表 @@ -36,7 +36,7 @@ public interface ExtMapper { * @param map * @return */ - int insertCompExt(@Param("tableName") String tableName, @Param("map") Map map); + int insertExt(@Param("tableName") String tableName, @Param("map") Map map); /** * 更新主表拓展表 @@ -44,5 +44,5 @@ public interface ExtMapper { * @param map * @return */ - int updateCompExt(@Param("tableName") String tableName, @Param("id") long id, @Param("map") Map map); + int updateExt(@Param("tableName") String tableName, @Param("id") long id, @Param("map") Map map); } diff --git a/src/com/engine/organization/mapper/extend/ExtMapper.xml b/src/com/engine/organization/mapper/extend/ExtMapper.xml index 40b9672f..612c228b 100644 --- a/src/com/engine/organization/mapper/extend/ExtMapper.xml +++ b/src/com/engine/organization/mapper/extend/ExtMapper.xml @@ -3,7 +3,7 @@ - + insert into ${tableName} ( ${key} @@ -16,7 +16,7 @@ ) - + update ${tableName} set ${key} = #{value} @@ -24,14 +24,14 @@ where id = #{id} - select ${fields} from ${tableName} where delete_type = 0 and id = #{id} - select count(1) from ${tableName} where delete_type = 0 diff --git a/src/com/engine/organization/mapper/extend/ExtendGroupMapper.java b/src/com/engine/organization/mapper/extend/ExtendGroupMapper.java index 05a32cfc..3c1df2e9 100644 --- a/src/com/engine/organization/mapper/extend/ExtendGroupMapper.java +++ b/src/com/engine/organization/mapper/extend/ExtendGroupMapper.java @@ -3,6 +3,7 @@ package com.engine.organization.mapper.extend; import com.engine.organization.entity.extend.po.ExtendGroupPO; import org.apache.ibatis.annotations.Param; +import java.util.Collection; import java.util.List; /** @@ -15,10 +16,26 @@ public interface ExtendGroupMapper { /** * 列表查询 * - * @param groupType + * @param extendType * @return */ - List listByType(@Param("groupType") String groupType); + List listByType(@Param("extendType") String extendType); + + /** + * 根据ID 查询数据 + * + * @param ids + * @return + */ + List listGroupByIds(@Param("ids") Collection ids); + + /** + * 根据ID 查询数据 + * + * @param pid + * @return + */ + List listGroupByPid(@Param("pid") Long pid); /** * 根据ID查询分组名称 diff --git a/src/com/engine/organization/mapper/extend/ExtendGroupMapper.xml b/src/com/engine/organization/mapper/extend/ExtendGroupMapper.xml index ba748796..25167c29 100644 --- a/src/com/engine/organization/mapper/extend/ExtendGroupMapper.xml +++ b/src/com/engine/organization/mapper/extend/ExtendGroupMapper.xml @@ -16,6 +16,7 @@ t . id + , t.pid , t.extend_type , t.group_name , t.creator @@ -38,7 +39,25 @@ + + diff --git a/src/com/engine/organization/service/CompService.java b/src/com/engine/organization/service/CompService.java index e01ec585..302105f5 100644 --- a/src/com/engine/organization/service/CompService.java +++ b/src/com/engine/organization/service/CompService.java @@ -27,7 +27,7 @@ public interface CompService { * @param params * @return */ - int saveBaseComp(CompSearchParam params); + int saveBaseComp(Map params); /** * 更新禁用标记 diff --git a/src/com/engine/organization/service/ExtService.java b/src/com/engine/organization/service/ExtService.java index 4165b5b9..38b8ac4e 100644 --- a/src/com/engine/organization/service/ExtService.java +++ b/src/com/engine/organization/service/ExtService.java @@ -16,7 +16,7 @@ import java.util.Map; public interface ExtService { /** - * 组装主表拓展表表单 + * 组装主表、主表拓展表表单 * * @param user * @param extendType @@ -28,6 +28,18 @@ public interface ExtService { */ List getExtForm(User user, String extendType, String tableName, int viewAttr, long id, String groupId); + /** + * 组装主表新增表单 + * + * @param user + * @param extendType + * @param tableName + * @param viewAttr + * @param groupId + * @return + */ + List getExtSaveForm(User user, String extendType, String tableName, int viewAttr, String groupId, String autoNoField, String serialType); + /** * 组装明细表表单 * diff --git a/src/com/engine/organization/service/impl/CompServiceImpl.java b/src/com/engine/organization/service/impl/CompServiceImpl.java index e704aaab..d6fab6c1 100644 --- a/src/com/engine/organization/service/impl/CompServiceImpl.java +++ b/src/com/engine/organization/service/impl/CompServiceImpl.java @@ -2,7 +2,6 @@ package com.engine.organization.service.impl; import com.alibaba.fastjson.JSONObject; -import com.api.browser.bean.BrowserBean; import com.api.browser.bean.SearchConditionGroup; import com.api.browser.bean.SearchConditionItem; import com.api.browser.bean.SearchConditionOption; @@ -12,13 +11,13 @@ import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; import com.engine.hrm.entity.RuleCodeType; import com.engine.organization.component.OrganizationWeaTable; -import com.engine.organization.entity.codesetting.po.CodeRulePO; import com.engine.organization.entity.company.bo.CompBO; import com.engine.organization.entity.company.dto.CompListDTO; import com.engine.organization.entity.company.param.CompSearchParam; import com.engine.organization.entity.company.po.CompPO; -import com.engine.organization.mapper.codesetting.CodeRuleMapper; +import com.engine.organization.entity.extend.po.ExtendGroupPO; import com.engine.organization.mapper.comp.CompMapper; +import com.engine.organization.mapper.extend.ExtMapper; import com.engine.organization.mapper.extend.ExtendGroupMapper; import com.engine.organization.service.CompService; import com.engine.organization.service.ExtService; @@ -31,11 +30,10 @@ import com.engine.organization.util.db.MapperProxyFactory; import com.engine.organization.util.page.Column; import com.engine.organization.util.page.PageInfo; import com.engine.organization.util.page.PageUtil; -import weaver.crm.Maint.SectorInfoComInfo; +import org.apache.commons.collections.CollectionUtils; import weaver.general.StringUtil; import weaver.general.Util; import weaver.hrm.User; -import weaver.hrm.resource.ResourceComInfo; import java.util.*; import java.util.stream.Collectors; @@ -54,6 +52,10 @@ public class CompServiceImpl extends Service implements CompService { * 3：岗位 */ private static final String EXTEND_TYPE = "1"; + /** + * 主表表名 + */ + private static final String JCL_ORG_COMP = "JCL_ORG_COMP"; /** * 主表拓展表 */ @@ -65,6 +67,11 @@ public class CompServiceImpl extends Service implements CompService { private static final String RIGHT_NAME = "Company:All"; + /** + * 公司/分部主表title指定ID + */ + private static final Long GROUP_ID = -1L; + private CompMapper getCompMapper() { return MapperProxyFactory.getProxy(CompMapper.class); } @@ -126,14 +133,19 @@ public class CompServiceImpl extends Service implements CompService { } @Override - public int saveBaseComp(CompSearchParam params) { + public int saveBaseComp(Map params) { HasRightUtil.hasRight(user, RIGHT_NAME, false); - // 自动编号 - params.setCompNo(CodeRuleUtil.generateCode(RuleCodeType.SUBCOMPANY, params.getCompNo())); - List list = getCompMapper().listByNo(Util.null2String(params.getCompNo())); + String compNo = (String) params.get("comp_no"); + compNo = CodeRuleUtil.generateCode(RuleCodeType.SUBCOMPANY, compNo); + List list = getCompMapper().listByNo(Util.null2String(compNo)); OrganizationAssert.isEmpty(list, "编号不允许重复"); - CompPO compPO = CompBO.convertParamToPO(params, (long) user.getUID()); - return getCompMapper().insertIgnoreNull(compPO); + params.put("comp_no", compNo); + params.put("forbidden_tag", 0); + params.put("creator", user.getUID()); + params.put("delete_type", 0); + params.put("create_time", new Date()); + params.put("update_time", new Date()); + return MapperProxyFactory.getProxy(ExtMapper.class).insertExt(JCL_ORG_COMP, params); } @Override @@ -149,9 +161,12 @@ public class CompServiceImpl extends Service implements CompService { CompSearchParam searchParam = JSONObject.parseObject(JSONObject.toJSONString(params), CompSearchParam.class); String groupId = (String) params.get("viewCondition"); CompPO compPO = CompBO.convertParamToPO(searchParam, (long) user.getUID()); + if ("0".equals(groupId)) { + groupId = GROUP_ID.toString(); + } int updateCount = 0; // 更新主表数据 - updateCount += getCompMapper().updateBaseComp(compPO); + updateCount += getExtService(user).updateExtForm(user, EXTEND_TYPE, JCL_ORG_COMP, params, groupId, compPO.getId()); // 更新主表拓展表 updateCount += getExtService(user).updateExtForm(user, EXTEND_TYPE, JCL_ORG_COMPEXT, params, groupId, compPO.getId()); //更新明细表 @@ -228,10 +243,14 @@ public class CompServiceImpl extends Service implements CompService { buttonsMap.put("hasSave", true); List addGroups = new ArrayList<>(); - if (StringUtil.isEmpty(groupId) || "0".equals(groupId)) { - addGroups.add(new SearchConditionGroup("基本信息", true, getBaseForm(viewAttr, id))); - } else { - addGroups.add(new SearchConditionGroup(getExtendGroupMapper().getGroupNameById(groupId), true, getExtService(user).getExtForm(user, EXTEND_TYPE, JCL_ORG_COMPEXT, viewAttr, id, groupId))); + if ("0".equals(groupId)) { + groupId = GROUP_ID.toString(); + } + List extendGroupPOS = getExtendGroupMapper().listGroupByPid(Long.parseLong(groupId)); + if (CollectionUtils.isNotEmpty(extendGroupPOS)) { + for (ExtendGroupPO extendGroupPO : extendGroupPOS) { + addGroups.add(new SearchConditionGroup(extendGroupPO.getGroupName(), true, getExtService(user).getExtForm(user, EXTEND_TYPE + "", Integer.parseInt(groupId) >= 0 ? JCL_ORG_COMPEXT : JCL_ORG_COMP, viewAttr, id, extendGroupPO.getId().toString()))); + } } HashMap resultMap = new HashMap<>(); @@ -255,91 +274,17 @@ public class CompServiceImpl extends Service implements CompService { HasRightUtil.hasRight(user, RIGHT_NAME, false); Map apiDatas = new HashMap<>(); List addGroups = new ArrayList<>(); - List conditionItems = new ArrayList<>(); - // 编号 - SearchConditionItem compNoItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 3, 50, "编号", "compNo"); - compNoItem.setRules("required|string"); - // 判断是否开启自动编号 - CodeRulePO codeRuleByType = MapperProxyFactory.getProxy(CodeRuleMapper.class).getCodeRuleByType(RuleCodeType.SUBCOMPANY.getValue()); - if (null != codeRuleByType && "1".equals(codeRuleByType.getSerialEnable())) { - compNoItem.setViewAttr(2); - compNoItem.setHelpfulTip("编号为空,则按照指定规则自动生成编号"); - compNoItem.setRules(""); + List extendGroupPOS = getExtendGroupMapper().listGroupByPid(GROUP_ID); + if (CollectionUtils.isNotEmpty(extendGroupPOS)) { + for (ExtendGroupPO extendGroupPO : extendGroupPOS) { + addGroups.add(new SearchConditionGroup(extendGroupPO.getGroupName(), true, getExtService(user).getExtSaveForm(user, EXTEND_TYPE + "", JCL_ORG_COMP, 2, extendGroupPO.getId().toString(), "comp_no", RuleCodeType.SUBCOMPANY.getValue()))); + } } - getSameFormItem(conditionItems, compNoItem, null); - addGroups.add(new SearchConditionGroup("基本信息", true, conditionItems)); apiDatas.put("condition", addGroups); - return apiDatas; } - /** - * 新增、编辑表单，相同属性 - * - * @param conditionItems - * @param compNoItem - */ - private void getSameFormItem(List conditionItems, SearchConditionItem compNoItem, Long id) { - // 名称 - SearchConditionItem compNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 3, 50, "名称", "compName"); - compNameItem.setRules("required|string"); - // 简称 - SearchConditionItem compNameShortItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 3, 50, "简称", "compNameShort"); - compNameShortItem.setRules("required|string"); - // 上级公司 - SearchConditionItem compBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "上级公司", "161", "parentCompany", "compBrowser"); - // 组织机构代码 - SearchConditionItem orgCodeItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 3, 50, "组织机构代码", "orgCode"); - orgCodeItem.setRules("required|string"); - // 行业 - SearchConditionItem industryItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "行业", "63", "industry", ""); - // 负责人 - SearchConditionItem compPrincipalItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, "负责人", "1", "compPrincipal", ""); - compPrincipalItem.setRules("required|string"); - // 说明 - SearchConditionItem descriptionItem = OrganizationFormItemUtil.textareaItem(user, 2, 16, true, 2, 60, "说明", "description"); - - conditionItems.add(compNoItem); - conditionItems.add(compNameItem); - conditionItems.add(compNameShortItem); - conditionItems.add(compBrowserItem); - conditionItems.add(orgCodeItem); - conditionItems.add(industryItem); - conditionItems.add(compPrincipalItem); - conditionItems.add(descriptionItem); - - if (null == id) { - return; - } - // 赋值 - CompPO compPO = getCompMapper().listById(id); - OrganizationAssert.notNull(compPO, "数据不存在或数据已删除"); - compNoItem.setValue(compPO.getCompNo()); - compNameItem.setValue(compPO.getCompName()); - compNameShortItem.setValue(compPO.getCompNameShort()); - - // compBrowserItem - if (null != compPO.getParentCompany()) { - BrowserBean compBrowserBean = compBrowserItem.getBrowserConditionParam(); - compBrowserBean.setReplaceDatas(creatReplaceDatas(compPO.getParentCompany(), getCompMapper().listById(compPO.getParentCompany()).getCompName())); - compBrowserItem.setBrowserConditionParam(compBrowserBean); - } - orgCodeItem.setValue(compPO.getOrgCode()); - // industryItem - BrowserBean industryBean = industryItem.getBrowserConditionParam(); - industryBean.setReplaceDatas(creatReplaceDatas(compPO.getIndustry(), new SectorInfoComInfo().getSectorInfoname(compPO.getIndustry() + ""))); - industryItem.setBrowserConditionParam(industryBean); - try { - // compPrincipalItem - BrowserBean PrincipalBean = compPrincipalItem.getBrowserConditionParam(); - PrincipalBean.setReplaceDatas(creatReplaceDatas(compPO.getCompPrincipal(), new ResourceComInfo().getLastname(compPO.getCompPrincipal() + ""))); - compPrincipalItem.setBrowserConditionParam(PrincipalBean); - } catch (Exception e) { - throw new RuntimeException(e); - } - descriptionItem.setValue(compPO.getDescription()); - } /** * 是否为搜索查询 @@ -358,45 +303,4 @@ public class CompServiceImpl extends Service implements CompService { && null == compPO.getForbiddenTag()); } - - /** - * 浏览按钮类型赋值转换 - * - * @param id - * @param name - * @return - */ - private List> creatReplaceDatas(Object id, Object name) { - List> datas = new ArrayList<>(); - Map map = new HashMap<>(); - map.put("id", id); - map.put("name", name); - datas.add(map); - return datas; - - } - - - /** - * 基本信息基础表单 - * - * @param viewAttr - * @param id - * @return - */ - private List getBaseForm(int viewAttr, long id) { - List conditionItems = new ArrayList<>(); - // 编号 - SearchConditionItem compNoItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 1, 50, "编号", "compNo"); - getSameFormItem(conditionItems, compNoItem, id); - // 查看，全部置位只读 - if (1 == viewAttr) { - for (SearchConditionItem item : conditionItems) { - item.setViewAttr(viewAttr); - } - } - return conditionItems; - } - - } diff --git a/src/com/engine/organization/service/impl/ExtServiceImpl.java b/src/com/engine/organization/service/impl/ExtServiceImpl.java index 17841f76..06e1fced 100644 --- a/src/com/engine/organization/service/impl/ExtServiceImpl.java +++ b/src/com/engine/organization/service/impl/ExtServiceImpl.java @@ -3,8 +3,11 @@ package com.engine.organization.service.impl; import com.api.browser.bean.SearchConditionItem; import com.engine.core.impl.Service; import com.engine.organization.entity.TopTab; +import com.engine.organization.entity.codesetting.po.CodeRulePO; import com.engine.organization.entity.extend.bo.ExtendInfoBO; +import com.engine.organization.entity.extend.po.ExtendGroupPO; import com.engine.organization.entity.extend.po.ExtendInfoPO; +import com.engine.organization.mapper.codesetting.CodeRuleMapper; import com.engine.organization.mapper.extend.ExtDTMapper; import com.engine.organization.mapper.extend.ExtMapper; import com.engine.organization.mapper.extend.ExtendGroupMapper; @@ -61,8 +64,7 @@ public class ExtServiceImpl extends Service implements ExtService { OrganizationAssert.notNull(groupId, "请选择对应的拓展页"); List infoPOList = getExtendInfoMapper().listFields(extendType, groupId, tableName); String fields = infoPOList.stream().map(ExtendInfoPO::getFieldName).collect(Collectors.joining(",")); - infoPOList.stream().map(ExtendInfoPO::getFieldName).collect(Collectors.joining(",")); - Map compExtMap = getExtMapper().listCompExt(tableName, fields, id); + Map compExtMap = getExtMapper().listExt(tableName, fields, id); // 组装拓展页内容 for (ExtendInfoPO extendInfoPO : infoPOList) { SearchConditionItem item = ExtendInfoBO.getSearchConditionItem(user, viewAttr, extendInfoPO, null == compExtMap ? null : compExtMap.get(extendInfoPO.getFieldName())); @@ -76,6 +78,35 @@ public class ExtServiceImpl extends Service implements ExtService { return conditionItems; } + @Override + public List getExtSaveForm(User user, String extendType, String tableName, int viewAttr, String groupId, String autoNoField, String serialType) { + List conditionItems = new ArrayList<>(); + + // 2编辑 1查看 + OrganizationAssert.notNull(groupId, "请选择对应的拓展页"); + List infoPOList = getExtendInfoMapper().listFields(extendType, groupId, tableName); + // 组装拓展页内容 + for (ExtendInfoPO extendInfoPO : infoPOList) { + SearchConditionItem item = ExtendInfoBO.getSearchConditionItem(user, viewAttr, extendInfoPO, null); + item.setFieldcol(16); + if (1 == extendInfoPO.getIsrequired()) { + item.setViewAttr(3); + item.setRules("required|string"); + } + if (extendInfoPO.getFieldName().equals(autoNoField)) { + // 判断是否开启自动编号 + CodeRulePO codeRuleByType = MapperProxyFactory.getProxy(CodeRuleMapper.class).getCodeRuleByType(serialType); + if (null != codeRuleByType && "1".equals(codeRuleByType.getSerialEnable())) { + item.setViewAttr(2); + item.setHelpfulTip("编号为空,则按照指定规则自动生成编号"); + item.setRules(""); + } + } + conditionItems.add(item); + } + return conditionItems; + } + @Override public List> getExtendTables(User user, String extendType, String tableName, long id, int viewAttr, boolean showLabel) { List> tables = new ArrayList<>(); @@ -116,11 +147,12 @@ public class ExtServiceImpl extends Service implements ExtService { */ public List getTabInfo(String extendType, String tableName) { List topTabs = new ArrayList<>(); - // 基本信息 - topTabs.add(TopTab.builder().color("#000000").groupId("0").showcount(false).title("基本信息").viewCondition("0").build()); - List infoPOList = getExtendInfoMapper().listFields(extendType, "", tableName); - List extendGroups = infoPOList.stream().map(ExtendInfoPO::getExtendGroupId).collect(Collectors.toList()); + List infoPOList1 = getExtendInfoMapper().listFields(extendType, "", tableName.toLowerCase().replace("ext", "")); + infoPOList.addAll(infoPOList1); + List ids = infoPOList.stream().map(ExtendInfoPO::getExtendGroupId).collect(Collectors.toList()); + List extendGroupPOS = getExtendGroupMapper().listGroupByIds(ids); + Set extendGroups = extendGroupPOS.stream().map(ExtendGroupPO::getPid).collect(Collectors.toSet()); // 拓展信息 if (CollectionUtils.isNotEmpty(extendGroups)) { for (Long groupId : extendGroups) { @@ -140,17 +172,17 @@ public class ExtServiceImpl extends Service implements ExtService { map.put(dtField, params.get(dtField)); } // 判断更新还是插入 - int count = getExtMapper().countCompExtById(tableName, id); + int count = getExtMapper().countExtById(tableName, id); if (count > 0) { map.put("update_time", new Date()); - updateBaseComp = getExtMapper().updateCompExt(tableName, id, map); + updateBaseComp = getExtMapper().updateExt(tableName, id, map); } else { map.put("creator", user.getUID()); map.put("delete_type", 0); map.put("create_time", new Date()); map.put("update_time", new Date()); map.put("id", id); - updateBaseComp = getExtMapper().insertCompExt(tableName, map); + updateBaseComp = getExtMapper().insertExt(tableName, map); } return updateBaseComp; } diff --git a/src/com/engine/organization/web/CompController.java b/src/com/engine/organization/web/CompController.java index 365fcc49..c2a9e23d 100644 --- a/src/com/engine/organization/web/CompController.java +++ b/src/com/engine/organization/web/CompController.java @@ -57,13 +57,12 @@ public class CompController { * * @param request * @param response - * @param params * @return */ @POST @Path("/saveBaseComp") @Produces(MediaType.APPLICATION_JSON) - public ReturnResult saveBaseComp(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody CompSearchParam params) { + public ReturnResult saveBaseComp(@Context HttpServletRequest request, @Context HttpServletResponse response,@RequestBody Map params) { try { User user = HrmUserVarify.getUser(request, response); return ReturnResult.successed(getCompWrapper(user).saveBaseComp(params)); diff --git a/src/com/engine/organization/wrapper/CompWrapper.java b/src/com/engine/organization/wrapper/CompWrapper.java index 6e63ba43..d6fed552 100644 --- a/src/com/engine/organization/wrapper/CompWrapper.java +++ b/src/com/engine/organization/wrapper/CompWrapper.java @@ -38,7 +38,7 @@ public class CompWrapper extends Service { * @param params * @return */ - public int saveBaseComp(CompSearchParam params) { + public int saveBaseComp(Map params) { return getCompService(user).saveBaseComp(params); } From 3a075f4ec6cc368d94e5fca2bb3ce852e9b36525 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Mon, 13 Jun 2022 13:48:03 +0800 Subject: [PATCH 34/77] =?UTF-8?q?=E5=85=AC=E5=8F=B8/=E5=88=86=E9=83=A8=20?= =?UTF-8?q?=E4=B8=BB=E8=A1=A8=E3=80=81=E6=8B=93=E5=B1=95=E8=A1=A8=E5=8A=A8?= =?UTF-8?q?=E6=80=81=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5=E3=80=81=E5=8A=A8?= =?UTF-8?q?=E6=80=81=E5=88=86=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/SelectOptionParam.java | 39 +++++++ .../entity/company/bo/CompBO.java | 15 ++- .../entity/extend/ExtendInfoOperateType.java | 24 ++++ .../entity/extend/bo/ExtendInfoBO.java | 108 +++++++----------- .../entity/extend/po/ExtendInfoPO.java | 4 +- .../mapper/extend/ExtendInfoMapper.java | 2 +- .../mapper/extend/ExtendInfoMapper.xml | 6 + .../organization/service/ExtService.java | 2 +- .../service/impl/CompServiceImpl.java | 2 +- .../service/impl/ExtServiceImpl.java | 30 +++-- .../service/impl/JobServiceImpl.java | 4 +- 11 files changed, 148 insertions(+), 88 deletions(-) create mode 100644 src/com/engine/organization/entity/SelectOptionParam.java create mode 100644 src/com/engine/organization/entity/extend/ExtendInfoOperateType.java diff --git a/src/com/engine/organization/entity/SelectOptionParam.java b/src/com/engine/organization/entity/SelectOptionParam.java new file mode 100644 index 00000000..7e27c490 --- /dev/null +++ b/src/com/engine/organization/entity/SelectOptionParam.java @@ -0,0 +1,39 @@ +package com.engine.organization.entity; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.api.browser.bean.SearchConditionOption; +import org.apache.commons.lang.StringUtils; + +import java.util.ArrayList; +import java.util.List; + +/** + * @description: TODO + * @author:dxfeng + * @createTime: 2022/06/13 + * @version: 1.0 + */ +public class SelectOptionParam { + + /** + * 下拉框Json转换 + * + * @param datas + * @return + */ + public static List convertJsonToListOption(String datas) { + List selectOptions = new ArrayList<>(); + if (StringUtils.isNotBlank(datas)) { + JSONArray objectArray = JSON.parseArray(datas); + int size = objectArray.size(); + for (int i = 0; i < size; i++) { + JSONObject jsonObject = (JSONObject) objectArray.get(i); + SearchConditionOption option = new SearchConditionOption(jsonObject.getString("key"), jsonObject.getString("option")); + selectOptions.add(option); + } + } + return selectOptions; + } +} diff --git a/src/com/engine/organization/entity/company/bo/CompBO.java b/src/com/engine/organization/entity/company/bo/CompBO.java index a66cc2bd..a2726072 100644 --- a/src/com/engine/organization/entity/company/bo/CompBO.java +++ b/src/com/engine/organization/entity/company/bo/CompBO.java @@ -26,7 +26,20 @@ public class CompBO { Map poMaps = list.stream().collect(Collectors.toMap(CompPO::getId, item -> item)); - List dtoList = list.stream().map(e -> CompListDTO.builder().id(e.getId()).compNo(e.getCompNo()).compName(e.getCompName()).compNameShort(e.getCompNameShort()).parentCompany(e.getParentCompany()).parentCompName(null == poMaps.get(e.getParentCompany()) ? "" : poMaps.get(e.getParentCompany()).getCompName()).orgCode(e.getOrgCode()).industry(new SectorInfoComInfo().getSectorInfoname(e.getIndustry() + "")).compPrincipal(getUserNameById(e.getCompPrincipal() + "")).forbiddenTag(e.getForbiddenTag()).build()).collect(Collectors.toList()); + List dtoList = list.stream().map(e -> + CompListDTO + .builder() + .id(e.getId()) + .compNo(e.getCompNo()) + .compName(e.getCompName()) + .compNameShort(e.getCompNameShort()) + .parentCompany(e.getParentCompany()) + .parentCompName(null == poMaps.get(e.getParentCompany()) ? "" : poMaps.get(e.getParentCompany()).getCompName()) + .orgCode(e.getOrgCode()) + .industry(new SectorInfoComInfo().getSectorInfoname(e.getIndustry() + "")) + .compPrincipal(getUserNameById(e.getCompPrincipal() + "")) + .forbiddenTag(e.getForbiddenTag()) + .build()).collect(Collectors.toList()); Map> collects = dtoList.stream().filter(item -> null != item.getParentCompany() && 0 != item.getParentCompany()).collect(Collectors.groupingBy(CompListDTO::getParentCompany)); // 处理被引用数据 List usedIds = MapperProxyFactory.getProxy(CompMapper.class).listUsedId(); diff --git a/src/com/engine/organization/entity/extend/ExtendInfoOperateType.java b/src/com/engine/organization/entity/extend/ExtendInfoOperateType.java new file mode 100644 index 00000000..f39633e0 --- /dev/null +++ b/src/com/engine/organization/entity/extend/ExtendInfoOperateType.java @@ -0,0 +1,24 @@ +package com.engine.organization.entity.extend; + +/** + * @description: TODO + * @author:dxfeng + * @createTime: 2022/06/13 + * @version: 1.0 + */ +public enum ExtendInfoOperateType { + LIST("list"), + SEARCH("search"), + EDIT("edit"), + ADD("add"); + + private String value; + + ExtendInfoOperateType(String value) { + this.value = value; + } + + public String getValue() { + return value; + } +} diff --git a/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java b/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java index 192c1ae6..89a4a2f6 100644 --- a/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java +++ b/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java @@ -3,6 +3,7 @@ package com.engine.organization.entity.extend.bo; import com.api.browser.bean.BrowserBean; import com.api.browser.bean.BrowserValueInfo; import com.api.browser.bean.SearchConditionItem; +import com.api.browser.bean.SearchConditionOption; import com.api.browser.service.BrowserValueInfoService; import com.api.browser.util.BrowserInitUtil; import com.api.browser.util.ConditionFactory; @@ -11,6 +12,7 @@ import com.api.hrm.bean.FieldItem; import com.api.hrm.util.FieldType; import com.api.hrm.util.ServiceUtil; import com.engine.kq.cmd.shiftmanagement.toolkit.ShiftManagementToolKit; +import com.engine.organization.entity.SelectOptionParam; import com.engine.organization.entity.extend.po.ExtendInfoPO; import com.engine.organization.util.OrganizationFormItemUtil; import com.engine.sensitive.biz.SensitiveWordTypeComInfo; @@ -114,7 +116,7 @@ public class ExtendInfoBO { // 浏览按钮特殊处理 if (FieldType.BROWSER.equals(fieldItem.getType())) { - BrowserBean browserConditionParam = OrganizationFormItemUtil.browserItem(user, 2, 16, fieldItem.getViewAttr(), false, extendInfoPO.getFieldNameDesc(), extendInfoPO.getBrowserType(), extendInfoPO.getFieldName(), extendInfoPO.getCustomBrowserId()).getBrowserConditionParam(); + BrowserBean browserConditionParam = OrganizationFormItemUtil.browserItem(user, 2, 16, fieldItem.getViewAttr(), false, extendInfoPO.getFieldNameDesc(), extendInfoPO.getBrowserType(), extendInfoPO.getFieldName(), extendInfoPO.getCustomValue()).getBrowserConditionParam(); fieldItem.setBrowserConditionParam(browserConditionParam); } @@ -163,7 +165,7 @@ public class ExtendInfoBO { String fieldlabel = Util.null2String(extendInfoPO.getFieldNameDesc());//字段显示名 String fieldhtmltype = Util.null2String(extendInfoPO.getControlType());//字段类型 String detailtype = Util.null2String(extendInfoPO.getBrowserType());//字段二级类型（浏览框--单人力） - String dmlurl = Util.null2String(""); + String customValue = Util.null2String(extendInfoPO.getCustomValue()); boolean isQuickSearch = true; boolean isScope = false; @@ -176,7 +178,7 @@ public class ExtendInfoBO { } else if (detailtype.equals("2")) {//数字 searchConditionItem = conditionFactory.createCondition(ConditionType.INPUTNUMBER, fieldlabel, fieldname, isQuickSearch); } else { - searchConditionItem = conditionFactory.createCondition(ConditionType.INPUT, fieldlabel, fieldname, isQuickSearch); + searchConditionItem = conditionFactory.createCondition(ConditionType.INPUT, "25034", fieldname, isQuickSearch); } } else if (fieldhtmltype.equals("2")) {//多行文本框 searchConditionItem = conditionFactory.createCondition(ConditionType.TEXTAREA, fieldlabel, fieldname); @@ -212,25 +214,25 @@ public class ExtendInfoBO { searchConditionItem = conditionFactory.createCondition(ConditionType.TIMERANGEPICKER, fieldlabel, domkey); searchConditionItem.setValue(fieldvalue); } else { - //if (detailtype.equals("161") || detailtype.equals("162") || detailtype.equals("256") || detailtype.equals("257")) { - // BrowserBean browserbean = new BrowserBean(detailtype + ""); - // BrowserInitUtil browserInitUtil = new BrowserInitUtil(); - // String fielddbtype = dmlurl; - // if (!dmlurl.startsWith("browser.")) { - // fielddbtype = "browser." + dmlurl; - // } - // if (detailtype.equals("161") || detailtype.equals("162")) { - // browserInitUtil.initCustomizeBrow(browserbean, fielddbtype, Util.getIntValue(detailtype), user.getUID()); - // } else { - // browserbean.getDataParams().put("cube_treeid", dmlurl); - // browserbean.getDataParams().put("currenttime", System.currentTimeMillis()); - // browserInitUtil.initBrowser(browserbean, user.getLanguage()); - // } - // searchConditionItem = new SearchConditionItem(ConditionType.BROWSER, SystemEnv.getHtmlLabelNames(fieldlabel, user.getLanguage()), new String[]{fieldname}, browserbean); - //} else { - searchConditionItem = conditionFactory.createCondition(ConditionType.BROWSER, fieldlabel, fieldname, detailtype); - //} - // searchConditionItem.getBrowserConditionParam().setHideVirtualOrg(hrmFieldBean.getHideVirtualOrg()); + if (detailtype.equals("161") || detailtype.equals("162") || detailtype.equals("256") || detailtype.equals("257")) { + BrowserBean browserbean = new BrowserBean(detailtype + ""); + BrowserInitUtil browserInitUtil = new BrowserInitUtil(); + String fielddbtype = customValue; + if (!customValue.startsWith("browser.")) { + fielddbtype = "browser." + customValue; + } + if (detailtype.equals("161") || detailtype.equals("162")) { + browserInitUtil.initCustomizeBrow(browserbean, fielddbtype, Util.getIntValue(detailtype), user.getUID()); + } else { + browserbean.getDataParams().put("cube_treeid", customValue); + browserbean.getDataParams().put("currenttime", System.currentTimeMillis()); + browserInitUtil.initBrowser(browserbean, user.getLanguage()); + } + searchConditionItem = new SearchConditionItem(ConditionType.BROWSER, fieldlabel, new String[]{fieldname}, browserbean); + } else { + searchConditionItem = conditionFactory.createCondition(ConditionType.BROWSER, fieldlabel, fieldname, detailtype); + } + //searchConditionItem.getBrowserConditionParam().setHideVirtualOrg(hrmFieldBean.getHideVirtualOrg()); List> replaceDatas = new ArrayList>(); String tmpFieldValue = Util.null2String(fieldvalue); if (detailtype.equals("mkqshift")) { @@ -260,7 +262,9 @@ public class ExtendInfoBO { for (int i = 0; fieldvalues != null && i < fieldvalues.size(); i++) { BrowserValueInfo valueInfo = fieldvalues.get(i); String fieldshowname = valueInfo.getName(); - if (fieldshowname.length() == 0) continue; + if (fieldshowname.length() == 0) { + continue; + } Map replaceData = new HashMap(); replaceData.put("id", valueInfo.getId()); replaceData.put("name", fieldshowname); @@ -268,7 +272,7 @@ public class ExtendInfoBO { } } else { if (tmpFieldValue.length() > 0) { - String fieldshowname = hrmFieldManager.getFieldvalue(user, dmlurl, Util.getIntValue(fieldid), Util.getIntValue(fieldhtmltype), Util.getIntValue(detailtype), tmpFieldValue, 0); + String fieldshowname = hrmFieldManager.getFieldvalue(user, customValue, Util.getIntValue(fieldid), Util.getIntValue(fieldhtmltype), Util.getIntValue(detailtype), tmpFieldValue, 0); String[] fieldvalues = Util.splitString(tmpFieldValue, ","); String[] fieldshownames = Util.splitString(fieldshowname, ","); if (detailtype.equals("257")) { @@ -281,7 +285,9 @@ public class ExtendInfoBO { if (fieldvalues.length != fieldshownames.length) { break; } - if (Util.null2String(fieldshownames[i]).length() == 0) continue; + if (Util.null2String(fieldshownames[i]).length() == 0) { + continue; + } Map replaceData = new HashMap(); replaceData.put("id", fieldvalues[i]); replaceData.put("name", fieldshownames[i]); @@ -298,49 +304,15 @@ public class ExtendInfoBO { } } else if (fieldhtmltype.equals("5")) { //选择框 - // List statusOptions = hrmFieldBean.getSelectOption(); - // if (statusOptions == null) statusOptions = new ArrayList(); - // try { - // if (fieldid.length() > 0) { - // rs = new RecordSet(); - // char flag = Util.getSeparator(); - // if (hrmFieldBean.getIsFormField()) { - // if (Util.null2String(hrmFieldBean.getIssystem()).equals("1")) { - // rs.executeProc("hrm_selectitembyid_new", "" + fieldid + flag + 1); - // } else { - // rs.executeProc("cus_selectitembyid_new", "" + fieldid + flag + 1); - // } - // } else { - // if (fieldname.startsWith("column_")) { - // rs.executeProc("cus_selectitembyid_new", "" + fieldid + flag + 1); - // } else { - // rs.executeProc("hrm_searchselectitembyid", fieldid); - // } - // } - // while (rs.next()) { - // String tmpselectvalue = Util.null2String(rs.getString("selectvalue")); - // String tmpselectname = Util.toScreen(rs.getString("selectname"), user.getLanguage()); - // if (Util.null2String(rs.getString("cancel")).equals("1")) continue; - // boolean isDefault = Util.null2String(rs.getString("isdefault")).equals("y"); - // if (!isDefault) { - // isDefault = Util.null2String(rs.getString("hrm_isdefault")).equals("1"); - // } - // SearchConditionOption searchConditionOption = new SearchConditionOption(tmpselectvalue, tmpselectname, isDefault); - // if (!statusOptions.contains(searchConditionOption)) { - // statusOptions.add(searchConditionOption); - // } - // } - // } - // } catch (Exception e) { - // writeLog(e); - // } - // searchConditionItem = conditionFactory.createCondition(ConditionType.SELECT, fieldlabel, fieldname, statusOptions); - // if (detailtype.equals("") || detailtype.equals("0")) { - // detailtype = "1"; - // } - // searchConditionItem.setKey(Util.null2String(fieldvalue)); - // searchConditionItem.setValue(fieldvalue); - // searchConditionItem.setDetailtype(Util.getIntValue(detailtype, 3)); + + List searchConditionOptions = SelectOptionParam.convertJsonToListOption(customValue); + searchConditionItem = conditionFactory.createCondition(ConditionType.SELECT, fieldlabel, fieldname, searchConditionOptions); + if (detailtype.equals("") || detailtype.equals("0")) { + detailtype = "1"; + } + searchConditionItem.setKey(Util.null2String(fieldvalue)); + searchConditionItem.setValue(fieldvalue+""); + searchConditionItem.setDetailtype(Util.getIntValue(detailtype, 3)); } else if (fieldhtmltype.equals("6")) {//附件 if (fieldname.equals("resourceimageid")) { searchConditionItem = conditionFactory.createCondition(ConditionType.RESOURCEIMG, fieldlabel, fieldname, isQuickSearch); diff --git a/src/com/engine/organization/entity/extend/po/ExtendInfoPO.java b/src/com/engine/organization/entity/extend/po/ExtendInfoPO.java index f7b4d707..536e134d 100644 --- a/src/com/engine/organization/entity/extend/po/ExtendInfoPO.java +++ b/src/com/engine/organization/entity/extend/po/ExtendInfoPO.java @@ -100,9 +100,9 @@ public class ExtendInfoPO { private Integer browserShow; /** - * 自定义浏览按钮标识 + * 自定义标识 */ - private String customBrowserId; + private String customValue; /** * 显示顺序 diff --git a/src/com/engine/organization/mapper/extend/ExtendInfoMapper.java b/src/com/engine/organization/mapper/extend/ExtendInfoMapper.java index 287411ce..5eaebf97 100644 --- a/src/com/engine/organization/mapper/extend/ExtendInfoMapper.java +++ b/src/com/engine/organization/mapper/extend/ExtendInfoMapper.java @@ -20,5 +20,5 @@ public interface ExtendInfoMapper { * @param tableName * @return */ - List listFields(@Param("extendType") String extendType, @Param("extendGroupId") String extendGroupId, @Param("tableName") String tableName); + List listFields(@Param("extendType") String extendType, @Param("extendGroupId") String extendGroupId, @Param("tableName") String tableName,@Param("operateType")String operateType); } diff --git a/src/com/engine/organization/mapper/extend/ExtendInfoMapper.xml b/src/com/engine/organization/mapper/extend/ExtendInfoMapper.xml index 5d9855cc..b1d8f92e 100644 --- a/src/com/engine/organization/mapper/extend/ExtendInfoMapper.xml +++ b/src/com/engine/organization/mapper/extend/ExtendInfoMapper.xml @@ -18,6 +18,7 @@ + @@ -45,6 +46,7 @@ , t.edit_show , t.add_show , t.browser_show + , t.custom_value , t.show_order , t.creator , t.delete_type @@ -68,6 +70,10 @@ and table_name = #{tableName} + + and ${operateType}_show = 1 + + order by show_order diff --git a/src/com/engine/organization/service/ExtService.java b/src/com/engine/organization/service/ExtService.java index 38b8ac4e..4bad1a7c 100644 --- a/src/com/engine/organization/service/ExtService.java +++ b/src/com/engine/organization/service/ExtService.java @@ -26,7 +26,7 @@ public interface ExtService { * @param groupId * @return */ - List getExtForm(User user, String extendType, String tableName, int viewAttr, long id, String groupId); + List getExtForm(User user, String extendType, String tableName, int viewAttr, long id, String groupId, String... readOnlyFields); /** * 组装主表新增表单 diff --git a/src/com/engine/organization/service/impl/CompServiceImpl.java b/src/com/engine/organization/service/impl/CompServiceImpl.java index d6fab6c1..07bd4551 100644 --- a/src/com/engine/organization/service/impl/CompServiceImpl.java +++ b/src/com/engine/organization/service/impl/CompServiceImpl.java @@ -249,7 +249,7 @@ public class CompServiceImpl extends Service implements CompService { List extendGroupPOS = getExtendGroupMapper().listGroupByPid(Long.parseLong(groupId)); if (CollectionUtils.isNotEmpty(extendGroupPOS)) { for (ExtendGroupPO extendGroupPO : extendGroupPOS) { - addGroups.add(new SearchConditionGroup(extendGroupPO.getGroupName(), true, getExtService(user).getExtForm(user, EXTEND_TYPE + "", Integer.parseInt(groupId) >= 0 ? JCL_ORG_COMPEXT : JCL_ORG_COMP, viewAttr, id, extendGroupPO.getId().toString()))); + addGroups.add(new SearchConditionGroup(extendGroupPO.getGroupName(), true, getExtService(user).getExtForm(user, EXTEND_TYPE + "", Integer.parseInt(groupId) >= 0 ? JCL_ORG_COMPEXT : JCL_ORG_COMP, viewAttr, id, extendGroupPO.getId().toString(),"comp_no"))); } } diff --git a/src/com/engine/organization/service/impl/ExtServiceImpl.java b/src/com/engine/organization/service/impl/ExtServiceImpl.java index 06e1fced..eb0a6c3c 100644 --- a/src/com/engine/organization/service/impl/ExtServiceImpl.java +++ b/src/com/engine/organization/service/impl/ExtServiceImpl.java @@ -4,6 +4,7 @@ import com.api.browser.bean.SearchConditionItem; import com.engine.core.impl.Service; import com.engine.organization.entity.TopTab; import com.engine.organization.entity.codesetting.po.CodeRulePO; +import com.engine.organization.entity.extend.ExtendInfoOperateType; import com.engine.organization.entity.extend.bo.ExtendInfoBO; import com.engine.organization.entity.extend.po.ExtendGroupPO; import com.engine.organization.entity.extend.po.ExtendInfoPO; @@ -57,21 +58,26 @@ public class ExtServiceImpl extends Service implements ExtService { @Override - public List getExtForm(User user, String extendType, String tableName, int viewAttr, long id, String groupId) { + public List getExtForm(User user, String extendType, String tableName, int viewAttr, long id, String groupId, String... readOnlyFields) { List conditionItems = new ArrayList<>(); // 2编辑 1查看 OrganizationAssert.notNull(groupId, "请选择对应的拓展页"); - List infoPOList = getExtendInfoMapper().listFields(extendType, groupId, tableName); + List infoPOList = getExtendInfoMapper().listFields(extendType, groupId, tableName, ExtendInfoOperateType.EDIT.getValue()); String fields = infoPOList.stream().map(ExtendInfoPO::getFieldName).collect(Collectors.joining(",")); Map compExtMap = getExtMapper().listExt(tableName, fields, id); + List readOnlyFieldList = Arrays.asList(readOnlyFields); // 组装拓展页内容 for (ExtendInfoPO extendInfoPO : infoPOList) { SearchConditionItem item = ExtendInfoBO.getSearchConditionItem(user, viewAttr, extendInfoPO, null == compExtMap ? null : compExtMap.get(extendInfoPO.getFieldName())); item.setFieldcol(16); - if (2 == viewAttr && 1 == extendInfoPO.getIsrequired()) { - item.setViewAttr(3); - item.setRules("required|string"); + if (2 == viewAttr) { + if (readOnlyFieldList.contains(extendInfoPO.getFieldName())) { + item.setViewAttr(1); + } else if (1 == extendInfoPO.getIsrequired()) { + item.setViewAttr(3); + item.setRules("required|string"); + } } conditionItems.add(item); } @@ -84,7 +90,7 @@ public class ExtServiceImpl extends Service implements ExtService { // 2编辑 1查看 OrganizationAssert.notNull(groupId, "请选择对应的拓展页"); - List infoPOList = getExtendInfoMapper().listFields(extendType, groupId, tableName); + List infoPOList = getExtendInfoMapper().listFields(extendType, groupId, tableName, ExtendInfoOperateType.ADD.getValue()); // 组装拓展页内容 for (ExtendInfoPO extendInfoPO : infoPOList) { SearchConditionItem item = ExtendInfoBO.getSearchConditionItem(user, viewAttr, extendInfoPO, null); @@ -111,7 +117,7 @@ public class ExtServiceImpl extends Service implements ExtService { public List> getExtendTables(User user, String extendType, String tableName, long id, int viewAttr, boolean showLabel) { List> tables = new ArrayList<>(); // 查询所有分布模块，拓展明细表信息 - List infoPOList = getExtendInfoMapper().listFields(extendType, "", tableName); + List infoPOList = getExtendInfoMapper().listFields(extendType, "", tableName, ""); Map> groupMap = infoPOList.stream().collect(Collectors.groupingBy(ExtendInfoPO::getExtendGroupId)); // 遍历Map,组装数据 for (Map.Entry> entry : groupMap.entrySet()) { @@ -147,8 +153,8 @@ public class ExtServiceImpl extends Service implements ExtService { */ public List getTabInfo(String extendType, String tableName) { List topTabs = new ArrayList<>(); - List infoPOList = getExtendInfoMapper().listFields(extendType, "", tableName); - List infoPOList1 = getExtendInfoMapper().listFields(extendType, "", tableName.toLowerCase().replace("ext", "")); + List infoPOList = getExtendInfoMapper().listFields(extendType, "", tableName, ExtendInfoOperateType.EDIT.getValue()); + List infoPOList1 = getExtendInfoMapper().listFields(extendType, "", tableName.toLowerCase().replace("ext", ""), ExtendInfoOperateType.EDIT.getValue()); infoPOList.addAll(infoPOList1); List ids = infoPOList.stream().map(ExtendInfoPO::getExtendGroupId).collect(Collectors.toList()); List extendGroupPOS = getExtendGroupMapper().listGroupByIds(ids); @@ -165,7 +171,7 @@ public class ExtServiceImpl extends Service implements ExtService { @Override public int updateExtForm(User user, String extendType, String tableName, Map params, String groupId, Long id) { int updateBaseComp; - List extInfoPOList = getExtendInfoMapper().listFields(extendType, groupId, tableName); + List extInfoPOList = getExtendInfoMapper().listFields(extendType, groupId, tableName, ""); List extFields = extInfoPOList.stream().map(ExtendInfoPO::getFieldName).collect(Collectors.toList()); Map map = new HashMap<>(); for (String dtField : extFields) { @@ -189,7 +195,7 @@ public class ExtServiceImpl extends Service implements ExtService { @Override public void updateExtDT(User user, String extendType, String tableName, Map params, Long id) { - List dtInfoPOList = getExtendInfoMapper().listFields(extendType, "", tableName); + List dtInfoPOList = getExtendInfoMapper().listFields(extendType, "", tableName, ""); List groupIds = dtInfoPOList.stream().map(ExtendInfoPO::getExtendGroupId).distinct().collect(Collectors.toList()); Map> poMaps = dtInfoPOList.stream().collect(Collectors.groupingBy(ExtendInfoPO::getExtendGroupId)); // 删除原有明细表数据 @@ -201,7 +207,7 @@ public class ExtServiceImpl extends Service implements ExtService { for (int i = 0; i < rowNum; i++) { Map map = new HashMap<>(); for (ExtendInfoPO extendInfoPO : filterS) { - if (BROWSER_TYPE == extendInfoPO.getControlType()) { + if (BROWSER_TYPE.equals(extendInfoPO.getControlType())) { map.put(extendInfoPO.getFieldName() + "span", params.get(extendInfoPO.getFieldName() + "span_" + i)); } map.put(extendInfoPO.getFieldName(), params.get(extendInfoPO.getFieldName() + "_" + i)); diff --git a/src/com/engine/organization/service/impl/JobServiceImpl.java b/src/com/engine/organization/service/impl/JobServiceImpl.java index 5d43d31c..27f025bc 100644 --- a/src/com/engine/organization/service/impl/JobServiceImpl.java +++ b/src/com/engine/organization/service/impl/JobServiceImpl.java @@ -334,8 +334,8 @@ public class JobServiceImpl extends Service implements JobService { tableMap.put("tabname", "职等职级"); Map tabinfoMap = new HashMap<>(); List infoPOList = new ArrayList<>(); - infoPOList.add(ExtendInfoPO.builder().fieldName("gradeId").fieldNameDesc("职级").controlType(3).isrequired(1).browserType("161").customBrowserId("gradeBrowser").build()); - infoPOList.add(ExtendInfoPO.builder().fieldName("levelId").fieldNameDesc("职等").controlType(3).isrequired(1).browserType("162").customBrowserId("levelBrowser").build()); + infoPOList.add(ExtendInfoPO.builder().fieldName("gradeId").fieldNameDesc("职级").controlType(3).isrequired(1).browserType("161").customValue("gradeBrowser").build()); + infoPOList.add(ExtendInfoPO.builder().fieldName("levelId").fieldNameDesc("职等").controlType(3).isrequired(1).browserType("162").customValue("levelBrowser").build()); tabinfoMap.put("columns", ExtendInfoBO.convertInfoListToTable(user, infoPOList, viewAttr, false)); tabinfoMap.put("rownum", "rownum"); // 去除null 元素 From 0dc034c66e14e309f17a1f47001594a2efb53862 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Mon, 13 Jun 2022 17:22:34 +0800 Subject: [PATCH 35/77] =?UTF-8?q?=E9=83=A8=E9=97=A8=E3=80=81=E5=B2=97?= =?UTF-8?q?=E4=BD=8D=20=E4=B8=BB=E8=A1=A8=E3=80=81=E6=8B=93=E5=B1=95?= =?UTF-8?q?=E8=A1=A8=E5=8A=A8=E6=80=81=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E3=80=81=E5=8A=A8=E6=80=81=E5=88=86=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/DepartmentService.java | 2 +- .../organization/service/JobService.java | 2 +- .../service/impl/CompServiceImpl.java | 18 +- .../service/impl/DepartmentServiceImpl.java | 188 ++++------------ .../service/impl/ExtServiceImpl.java | 34 ++- .../service/impl/JobServiceImpl.java | 212 ++++-------------- .../web/DepartmentController.java | 2 +- .../organization/web/JobController.java | 2 +- .../wrapper/DepartmentWrapper.java | 2 +- .../organization/wrapper/JobWrapper.java | 2 +- 10 files changed, 119 insertions(+), 345 deletions(-) diff --git a/src/com/engine/organization/service/DepartmentService.java b/src/com/engine/organization/service/DepartmentService.java index a4261e2d..eca115ed 100644 --- a/src/com/engine/organization/service/DepartmentService.java +++ b/src/com/engine/organization/service/DepartmentService.java @@ -58,7 +58,7 @@ public interface DepartmentService { * @param params * @return */ - int saveBaseForm(DeptSearchParam params); + int saveBaseForm(Map params); /** * 更新禁用标记 diff --git a/src/com/engine/organization/service/JobService.java b/src/com/engine/organization/service/JobService.java index be3ae804..5af4ff3e 100644 --- a/src/com/engine/organization/service/JobService.java +++ b/src/com/engine/organization/service/JobService.java @@ -63,7 +63,7 @@ public interface JobService { * @param params * @return */ - int saveBaseForm(JobSearchParam params); + int saveBaseForm(Map params); /** * 更新主表、拓展表、明细表 diff --git a/src/com/engine/organization/service/impl/CompServiceImpl.java b/src/com/engine/organization/service/impl/CompServiceImpl.java index 07bd4551..57a21d7d 100644 --- a/src/com/engine/organization/service/impl/CompServiceImpl.java +++ b/src/com/engine/organization/service/impl/CompServiceImpl.java @@ -17,7 +17,6 @@ import com.engine.organization.entity.company.param.CompSearchParam; import com.engine.organization.entity.company.po.CompPO; import com.engine.organization.entity.extend.po.ExtendGroupPO; import com.engine.organization.mapper.comp.CompMapper; -import com.engine.organization.mapper.extend.ExtMapper; import com.engine.organization.mapper.extend.ExtendGroupMapper; import com.engine.organization.service.CompService; import com.engine.organization.service.ExtService; @@ -140,12 +139,8 @@ public class CompServiceImpl extends Service implements CompService { List list = getCompMapper().listByNo(Util.null2String(compNo)); OrganizationAssert.isEmpty(list, "编号不允许重复"); params.put("comp_no", compNo); - params.put("forbidden_tag", 0); - params.put("creator", user.getUID()); - params.put("delete_type", 0); - params.put("create_time", new Date()); - params.put("update_time", new Date()); - return MapperProxyFactory.getProxy(ExtMapper.class).insertExt(JCL_ORG_COMP, params); + + return getExtService(user).updateExtForm(user, EXTEND_TYPE, JCL_ORG_COMP, params, "", null); } @Override @@ -160,17 +155,16 @@ public class CompServiceImpl extends Service implements CompService { HasRightUtil.hasRight(user, RIGHT_NAME, false); CompSearchParam searchParam = JSONObject.parseObject(JSONObject.toJSONString(params), CompSearchParam.class); String groupId = (String) params.get("viewCondition"); - CompPO compPO = CompBO.convertParamToPO(searchParam, (long) user.getUID()); if ("0".equals(groupId)) { groupId = GROUP_ID.toString(); } int updateCount = 0; // 更新主表数据 - updateCount += getExtService(user).updateExtForm(user, EXTEND_TYPE, JCL_ORG_COMP, params, groupId, compPO.getId()); + updateCount += getExtService(user).updateExtForm(user, EXTEND_TYPE, JCL_ORG_COMP, params, "", searchParam.getId()); // 更新主表拓展表 - updateCount += getExtService(user).updateExtForm(user, EXTEND_TYPE, JCL_ORG_COMPEXT, params, groupId, compPO.getId()); + updateCount += getExtService(user).updateExtForm(user, EXTEND_TYPE, JCL_ORG_COMPEXT, params, groupId, searchParam.getId()); //更新明细表 - getExtService(user).updateExtDT(user, EXTEND_TYPE, JCL_ORG_COMPEXT_DT1, params, compPO.getId()); + getExtService(user).updateExtDT(user, EXTEND_TYPE, JCL_ORG_COMPEXT_DT1, params, searchParam.getId()); return updateCount; } @@ -249,7 +243,7 @@ public class CompServiceImpl extends Service implements CompService { List extendGroupPOS = getExtendGroupMapper().listGroupByPid(Long.parseLong(groupId)); if (CollectionUtils.isNotEmpty(extendGroupPOS)) { for (ExtendGroupPO extendGroupPO : extendGroupPOS) { - addGroups.add(new SearchConditionGroup(extendGroupPO.getGroupName(), true, getExtService(user).getExtForm(user, EXTEND_TYPE + "", Integer.parseInt(groupId) >= 0 ? JCL_ORG_COMPEXT : JCL_ORG_COMP, viewAttr, id, extendGroupPO.getId().toString(),"comp_no"))); + addGroups.add(new SearchConditionGroup(extendGroupPO.getGroupName(), true, getExtService(user).getExtForm(user, EXTEND_TYPE + "", Integer.parseInt(groupId) >= 0 ? JCL_ORG_COMPEXT : JCL_ORG_COMP, viewAttr, id, extendGroupPO.getId().toString(), "comp_no"))); } } diff --git a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java index 51a011e3..cd373178 100644 --- a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java +++ b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java @@ -1,7 +1,6 @@ package com.engine.organization.service.impl; import com.alibaba.fastjson.JSONObject; -import com.api.browser.bean.BrowserBean; import com.api.browser.bean.SearchConditionGroup; import com.api.browser.bean.SearchConditionItem; import com.api.browser.bean.SearchConditionOption; @@ -11,7 +10,6 @@ import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; import com.engine.hrm.entity.RuleCodeType; import com.engine.organization.component.OrganizationWeaTable; -import com.engine.organization.entity.codesetting.po.CodeRulePO; import com.engine.organization.entity.company.bo.CompBO; import com.engine.organization.entity.company.po.CompPO; import com.engine.organization.entity.department.bo.DepartmentBO; @@ -19,12 +17,12 @@ import com.engine.organization.entity.department.dto.DepartmentListDTO; import com.engine.organization.entity.department.param.*; import com.engine.organization.entity.department.po.DepartmentPO; import com.engine.organization.entity.department.vo.SingleDeptTreeVO; +import com.engine.organization.entity.extend.po.ExtendGroupPO; import com.engine.organization.entity.job.bo.JobBO; import com.engine.organization.entity.job.po.JobPO; import com.engine.organization.entity.job.vo.SingleJobTreeVO; import com.engine.organization.entity.searchtree.SearchTree; import com.engine.organization.entity.searchtree.SearchTreeParams; -import com.engine.organization.mapper.codesetting.CodeRuleMapper; import com.engine.organization.mapper.comp.CompMapper; import com.engine.organization.mapper.department.DepartmentMapper; import com.engine.organization.mapper.extend.ExtendGroupMapper; @@ -64,6 +62,10 @@ public class DepartmentServiceImpl extends Service implements DepartmentService * 3：岗位 */ private static final String EXTEND_TYPE = "2"; + /** + * 主表 + */ + private static final String JCL_ORG_DEPT = "JCL_ORG_DEPT"; /** * 主表拓展表 */ @@ -75,6 +77,11 @@ public class DepartmentServiceImpl extends Service implements DepartmentService private static final String RIGHT_NAME = "Department:All"; + /** + * 部门主表title指定ID + */ + private static final Long GROUP_ID = -2L; + private DepartmentMapper getDepartmentMapper() { return MapperProxyFactory.getProxy(DepartmentMapper.class); @@ -178,14 +185,15 @@ public class DepartmentServiceImpl extends Service implements DepartmentService } @Override - public int saveBaseForm(DeptSearchParam params) { + public int saveBaseForm(Map params) { HasRightUtil.hasRight(user, RIGHT_NAME, false); - // 自动编号 - params.setDeptNo(CodeRuleUtil.generateCode(RuleCodeType.DEPARTMENT, params.getDeptNo())); - List list = getDepartmentMapper().listByNo(Util.null2String(params.getDeptNo())); + String deptNo = (String) params.get("dept_no"); + deptNo = CodeRuleUtil.generateCode(RuleCodeType.DEPARTMENT, deptNo); + List list = getDepartmentMapper().listByNo(Util.null2String(deptNo)); OrganizationAssert.isEmpty(list, "编号不允许重复"); - DepartmentPO departmentPO = DepartmentBO.convertParamsToPO(params, user.getUID()); - return getDepartmentMapper().insertIgnoreNull(departmentPO); + params.put("dept_no", deptNo); + + return getExtService(user).updateExtForm(user, EXTEND_TYPE, JCL_ORG_DEPT, params, "", null); } @Override @@ -200,14 +208,16 @@ public class DepartmentServiceImpl extends Service implements DepartmentService HasRightUtil.hasRight(user, RIGHT_NAME, false); DeptSearchParam searchParam = JSONObject.parseObject(JSONObject.toJSONString(params), DeptSearchParam.class); String groupId = (String) params.get("viewCondition"); - DepartmentPO departmentPO = DepartmentBO.convertParamsToPO(searchParam, user.getUID()); + if ("0".equals(groupId)) { + groupId = GROUP_ID.toString(); + } int updateCount = 0; // 更新主表数据 - updateCount += getDepartmentMapper().updateBaseDept(departmentPO); + updateCount += getExtService(user).updateExtForm(user, EXTEND_TYPE, JCL_ORG_DEPT, params, "", searchParam.getId()); // 更新主表拓展表 - updateCount += getExtService(user).updateExtForm(user, EXTEND_TYPE, JCL_ORG_DEPTEXT, params, groupId, departmentPO.getId()); + updateCount += getExtService(user).updateExtForm(user, EXTEND_TYPE, JCL_ORG_DEPTEXT, params, groupId, searchParam.getId()); //更新明细表 - getExtService(user).updateExtDT(user, EXTEND_TYPE, JCL_ORG_DEPTEXT_DT1, params, departmentPO.getId()); + getExtService(user).updateExtDT(user, EXTEND_TYPE, JCL_ORG_DEPTEXT_DT1, params, searchParam.getId()); return updateCount; } @@ -279,10 +289,15 @@ public class DepartmentServiceImpl extends Service implements DepartmentService buttonsMap.put("hasSave", true); List addGroups = new ArrayList<>(); - if (StringUtil.isEmpty(groupId) || "0".equals(groupId)) { - addGroups.add(new SearchConditionGroup("基本信息", true, getBaseForm(viewAttr, id))); - } else { - addGroups.add(new SearchConditionGroup(getExtendGroupMapper().getGroupNameById(groupId), true, getExtService(user).getExtForm(user, EXTEND_TYPE, JCL_ORG_DEPTEXT, viewAttr, id, groupId))); + + if ("0".equals(groupId)) { + groupId = GROUP_ID.toString(); + } + List extendGroupPOS = getExtendGroupMapper().listGroupByPid(Long.parseLong(groupId)); + if (org.apache.commons.collections.CollectionUtils.isNotEmpty(extendGroupPOS)) { + for (ExtendGroupPO extendGroupPO : extendGroupPOS) { + addGroups.add(new SearchConditionGroup(extendGroupPO.getGroupName(), true, getExtService(user).getExtForm(user, EXTEND_TYPE + "", Integer.parseInt(groupId) >= 0 ? JCL_ORG_DEPTEXT : JCL_ORG_DEPT, viewAttr, id, extendGroupPO.getId().toString(), "dept_no"))); + } } HashMap resultMap = new HashMap<>(); @@ -302,48 +317,16 @@ public class DepartmentServiceImpl extends Service implements DepartmentService @Override public Map getSaveForm() { + HasRightUtil.hasRight(user, RIGHT_NAME, false); Map apiDatas = new HashMap<>(); List addGroups = new ArrayList<>(); - List conditionItems = new ArrayList<>(); - // 编号 - SearchConditionItem deptNoItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 3, 50, "编号", "deptNo"); - deptNoItem.setRules("required|string"); - CodeRulePO codeRuleByType = MapperProxyFactory.getProxy(CodeRuleMapper.class).getCodeRuleByType(RuleCodeType.DEPARTMENT.getValue()); - if (null != codeRuleByType && "1".equals(codeRuleByType.getSerialEnable())) { - deptNoItem.setViewAttr(2); - deptNoItem.setRules(""); - deptNoItem.setHelpfulTip("编号为空,则按照指定规则自动生成编号"); + List extendGroupPOS = getExtendGroupMapper().listGroupByPid(GROUP_ID); + if (org.apache.commons.collections.CollectionUtils.isNotEmpty(extendGroupPOS)) { + for (ExtendGroupPO extendGroupPO : extendGroupPOS) { + addGroups.add(new SearchConditionGroup(extendGroupPO.getGroupName(), true, getExtService(user).getExtSaveForm(user, EXTEND_TYPE + "", JCL_ORG_DEPT, 2, extendGroupPO.getId().toString(), "dept_no", RuleCodeType.DEPARTMENT.getValue()))); + } } - // 名称 - SearchConditionItem deptNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 3, 50, "名称", "departmentName"); - deptNameItem.setRules("required|string"); - // 简称 - SearchConditionItem deptNameShortItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 3, 50, "简称", "deptNameShort"); - deptNameShortItem.setRules("required|string"); - // 所属分部 - SearchConditionItem compBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "所属分部", "161", "parentComp", "compBrowser"); - //上级部门 - SearchConditionItem deptBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "上级部门", "161", "parentDept", "deptBrowser"); - // 部门负责人 - SearchConditionItem deptPrincipalItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "部门负责人", "1", "deptPrincipal", ""); - // 显示顺序 - SearchConditionItem showOrderItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 3, 50, "显示顺序", "showOrder"); - // 说明 - SearchConditionItem descriptionItem = OrganizationFormItemUtil.textareaItem(user, 2, 16, true, 2, 60, "说明", "description"); - - conditionItems.add(deptNoItem); - conditionItems.add(deptNameItem); - conditionItems.add(deptNameShortItem); - conditionItems.add(compBrowserItem); - conditionItems.add(deptBrowserItem); - conditionItems.add(deptPrincipalItem); - conditionItems.add(showOrderItem); - conditionItems.add(descriptionItem); - - - addGroups.add(new SearchConditionGroup("基本信息", true, conditionItems)); apiDatas.put("condition", addGroups); - return apiDatas; } @@ -512,101 +495,6 @@ public class DepartmentServiceImpl extends Service implements DepartmentService return !(StringUtil.isEmpty(departmentPO.getDeptNo()) && StringUtil.isEmpty(departmentPO.getDeptName()) && StringUtil.isEmpty(departmentPO.getDeptNameShort()) && null == departmentPO.getParentComp() && null == departmentPO.getParentDept() && null == departmentPO.getDeptPrincipal() && null == departmentPO.getShowOrder() && null == departmentPO.getForbiddenTag()); } - /** - * 基本信息基础表单 - * - * @param viewAttr - * @param id - * @return - */ - private List getBaseForm(int viewAttr, long id) { - List conditionItems = new ArrayList<>(); - // 编号 - SearchConditionItem deptNoItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 1, 50, "编号", "deptNo"); - // 名称 - SearchConditionItem deptNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 3, 50, "名称", "departmentName"); - deptNameItem.setRules("required|string"); - // 简称 - SearchConditionItem deptNameShortItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 3, 50, "简称", "deptNameShort"); - deptNameShortItem.setRules("required|string"); - // 所属分部 - SearchConditionItem parentCompBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "所属分部", "161", "parentComp", "compBrowser"); - // 上级部门 - SearchConditionItem parentDeptBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "上级部门", "161", "parentDept", "deptBrowser"); - // 部门负责人 - SearchConditionItem deptPrincipalBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "部门负责人", "1", "deptPrincipal", ""); - // 显示顺序 - SearchConditionItem showOrderItem = OrganizationFormItemUtil.inputNumberItem(user, 2, 16, 2, "显示顺序", "showOrder"); - // 说明 - SearchConditionItem descriptionItem = OrganizationFormItemUtil.textareaItem(user, 2, 16, true, 2, 60, "说明", "description"); - - - conditionItems.add(deptNoItem); - conditionItems.add(deptNameItem); - conditionItems.add(deptNameShortItem); - conditionItems.add(parentCompBrowserItem); - conditionItems.add(parentDeptBrowserItem); - conditionItems.add(deptPrincipalBrowserItem); - conditionItems.add(showOrderItem); - conditionItems.add(descriptionItem); - - - // 编辑、查看状态赋值,设置只读状态 - - // 赋值 - DepartmentPO departmentPO = getDepartmentMapper().getDeptById(id); - OrganizationAssert.notNull(departmentPO, "数据不存在或数据已删除"); - deptNoItem.setValue(departmentPO.getDeptNo()); - deptNameItem.setValue(departmentPO.getDeptName()); - deptNameShortItem.setValue(departmentPO.getDeptNameShort()); - - // parentCompBrowserItem - if (null != departmentPO.getParentComp()) { - BrowserBean browserBean = parentCompBrowserItem.getBrowserConditionParam(); - browserBean.setReplaceDatas(creatReplaceDatas(departmentPO.getParentComp(), getCompMapper().listById(departmentPO.getParentComp()).getCompName())); - parentCompBrowserItem.setBrowserConditionParam(browserBean); - } - // parentDeptBrowserItem - if (null != departmentPO.getParentDept()) { - BrowserBean browserBean = parentDeptBrowserItem.getBrowserConditionParam(); - browserBean.setReplaceDatas(creatReplaceDatas(departmentPO.getParentDept(), getDepartmentMapper().getDeptById(departmentPO.getParentDept()).getDeptName())); - parentDeptBrowserItem.setBrowserConditionParam(browserBean); - } - // deptPrincipalBrowserItem - if (null != departmentPO.getDeptPrincipal()) { - BrowserBean browserBean = deptPrincipalBrowserItem.getBrowserConditionParam(); - browserBean.setReplaceDatas(creatReplaceDatas(departmentPO.getDeptPrincipal(), DepartmentBO.getEmployeeNameById(departmentPO.getDeptPrincipal()))); - deptPrincipalBrowserItem.setBrowserConditionParam(browserBean); - } - showOrderItem.setValue(departmentPO.getShowOrder()); - descriptionItem.setValue(departmentPO.getDescription()); - - // 查看，全部置位只读 - if (1 == viewAttr) { - for (SearchConditionItem item : conditionItems) { - item.setViewAttr(viewAttr); - } - } - return conditionItems; - } - - /** - * 浏览按钮类型赋值转换 - * - * @param id - * @param name - * @return - */ - private List> creatReplaceDatas(Object id, Object name) { - List> datas = new ArrayList<>(); - Map map = new HashMap<>(); - map.put("id", id); - map.put("name", name); - datas.add(map); - return datas; - - } - /** * 根据keyword查询数据 diff --git a/src/com/engine/organization/service/impl/ExtServiceImpl.java b/src/com/engine/organization/service/impl/ExtServiceImpl.java index eb0a6c3c..10388cea 100644 --- a/src/com/engine/organization/service/impl/ExtServiceImpl.java +++ b/src/com/engine/organization/service/impl/ExtServiceImpl.java @@ -17,6 +17,7 @@ import com.engine.organization.service.ExtService; import com.engine.organization.util.OrganizationAssert; import com.engine.organization.util.db.MapperProxyFactory; import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; import weaver.general.Util; import weaver.hrm.User; @@ -171,23 +172,36 @@ public class ExtServiceImpl extends Service implements ExtService { @Override public int updateExtForm(User user, String extendType, String tableName, Map params, String groupId, Long id) { int updateBaseComp; - List extInfoPOList = getExtendInfoMapper().listFields(extendType, groupId, tableName, ""); - List extFields = extInfoPOList.stream().map(ExtendInfoPO::getFieldName).collect(Collectors.toList()); + List extInfoPOList = getExtendInfoMapper().listFields(extendType, groupId, tableName, ExtendInfoOperateType.EDIT.getValue()); Map map = new HashMap<>(); - for (String dtField : extFields) { - map.put(dtField, params.get(dtField)); + for (ExtendInfoPO extendInfoPO : extInfoPOList) { + String key = extendInfoPO.getFieldName(); + Object value = params.get(extendInfoPO.getFieldName()); + if ("int".equals(extendInfoPO.getFieldType()) && StringUtils.isEmpty((String) value)) { + value = null; + } + map.put(key, value); } - // 判断更新还是插入 - int count = getExtMapper().countExtById(tableName, id); - if (count > 0) { - map.put("update_time", new Date()); - updateBaseComp = getExtMapper().updateExt(tableName, id, map); + if (null != id) { + // 判断更新还是插入 + int count = getExtMapper().countExtById(tableName, id); + if (count > 0) { + map.put("update_time", new Date()); + updateBaseComp = getExtMapper().updateExt(tableName, id, map); + } else { + map.put("creator", user.getUID()); + map.put("delete_type", 0); + map.put("create_time", new Date()); + map.put("update_time", new Date()); + map.put("id", id); + updateBaseComp = getExtMapper().insertExt(tableName, map); + } } else { + map.put("forbidden_tag", 0); map.put("creator", user.getUID()); map.put("delete_type", 0); map.put("create_time", new Date()); map.put("update_time", new Date()); - map.put("id", id); updateBaseComp = getExtMapper().insertExt(tableName, map); } return updateBaseComp; diff --git a/src/com/engine/organization/service/impl/JobServiceImpl.java b/src/com/engine/organization/service/impl/JobServiceImpl.java index 27f025bc..3d14c887 100644 --- a/src/com/engine/organization/service/impl/JobServiceImpl.java +++ b/src/com/engine/organization/service/impl/JobServiceImpl.java @@ -1,7 +1,6 @@ package com.engine.organization.service.impl; import com.alibaba.fastjson.JSONObject; -import com.api.browser.bean.BrowserBean; import com.api.browser.bean.SearchConditionGroup; import com.api.browser.bean.SearchConditionItem; import com.api.browser.bean.SearchConditionOption; @@ -12,13 +11,13 @@ import com.engine.core.impl.Service; import com.engine.hrm.entity.RuleCodeType; import com.engine.organization.component.OrganizationWeaTable; import com.engine.organization.entity.DeleteParam; -import com.engine.organization.entity.codesetting.po.CodeRulePO; import com.engine.organization.entity.company.bo.CompBO; import com.engine.organization.entity.company.po.CompPO; import com.engine.organization.entity.department.bo.DepartmentBO; import com.engine.organization.entity.department.po.DepartmentPO; import com.engine.organization.entity.employee.vo.EmployeeTableVO; import com.engine.organization.entity.extend.bo.ExtendInfoBO; +import com.engine.organization.entity.extend.po.ExtendGroupPO; import com.engine.organization.entity.extend.po.ExtendInfoPO; import com.engine.organization.entity.job.bo.JobBO; import com.engine.organization.entity.job.dto.JobListDTO; @@ -28,7 +27,6 @@ import com.engine.organization.entity.job.po.JobPO; import com.engine.organization.entity.scheme.po.GradePO; import com.engine.organization.entity.searchtree.SearchTree; import com.engine.organization.entity.searchtree.SearchTreeParams; -import com.engine.organization.mapper.codesetting.CodeRuleMapper; import com.engine.organization.mapper.comp.CompMapper; import com.engine.organization.mapper.department.DepartmentMapper; import com.engine.organization.mapper.extend.ExtendGroupMapper; @@ -83,6 +81,10 @@ public class JobServiceImpl extends Service implements JobService { * 3：岗位 */ private static final String EXTEND_TYPE = "3"; + /** + * 主表 + */ + private static final String JCL_ORG_JOB = "JCL_ORG_JOB"; /** * 主表拓展表 */ @@ -94,6 +96,11 @@ public class JobServiceImpl extends Service implements JobService { private static final String RIGHT_NAME = "Job:All"; + /** + * 岗位主表title指定ID + */ + private static final Long GROUP_ID = -3L; + private JobMapper getJobMapper() { return MapperProxyFactory.getProxy(JobMapper.class); } @@ -251,51 +258,15 @@ public class JobServiceImpl extends Service implements JobService { @Override public Map getSaveForm() { + HasRightUtil.hasRight(user, RIGHT_NAME, false); Map apiDatas = new HashMap<>(); List addGroups = new ArrayList<>(); - List conditionItems = new ArrayList<>(); - // 编号 - SearchConditionItem jobNoItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 3, 50, "编号", "jobNo"); - jobNoItem.setRules("required|string"); - CodeRulePO codeRuleByType = MapperProxyFactory.getProxy(CodeRuleMapper.class).getCodeRuleByType(RuleCodeType.JOBTITLES.getValue()); - if (null != codeRuleByType && "1".equals(codeRuleByType.getSerialEnable())) { - jobNoItem.setViewAttr(2); - jobNoItem.setRules(""); - jobNoItem.setHelpfulTip("编号为空,则按照指定规则自动生成编号"); + List extendGroupPOS = getExtendGroupMapper().listGroupByPid(GROUP_ID); + if (org.apache.commons.collections.CollectionUtils.isNotEmpty(extendGroupPOS)) { + for (ExtendGroupPO extendGroupPO : extendGroupPOS) { + addGroups.add(new SearchConditionGroup(extendGroupPO.getGroupName(), true, getExtService(user).getExtSaveForm(user, EXTEND_TYPE + "", JCL_ORG_JOB, 2, extendGroupPO.getId().toString(), "job_no", RuleCodeType.JOBTITLES.getValue()))); + } } - // 名称 - SearchConditionItem jobNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 3, 50, "名称", "jobName"); - jobNameItem.setRules("required|string"); - // 所属分部 - SearchConditionItem parentCompBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "所属分部", "161", "parentComp", "compBrowser"); - // 所属部门 - SearchConditionItem parentDeptBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "所属部门", "161", "parentDept", "deptBrowser"); - // 岗位序列 - SearchConditionItem sequenceBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "岗位序列", "161", "sequenceId", "sequenceBrowser"); - // 等级方案 - SearchConditionItem schemeBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "等级方案", "161", "schemeId", "schemeBrowser"); - // 上级岗位 - SearchConditionItem parentJobBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "上级岗位", "161", "parentJob", "jobBrowser"); - // 是否关键岗 - List isKeyOptions = new ArrayList<>(); - SearchConditionOption yesOption = new SearchConditionOption("0", "否"); - SearchConditionOption noOption = new SearchConditionOption("1", "是"); - isKeyOptions.add(yesOption); - isKeyOptions.add(noOption); - SearchConditionItem isKeyItem = OrganizationFormItemUtil.selectItem(user, isKeyOptions, 2, 16, 6, false, "是否关键岗", "isKey"); - isKeyItem.setDetailtype(3); - isKeyItem.setValue("0"); - - conditionItems.add(jobNoItem); - conditionItems.add(jobNameItem); - conditionItems.add(parentCompBrowserItem); - conditionItems.add(parentDeptBrowserItem); - conditionItems.add(sequenceBrowserItem); - conditionItems.add(schemeBrowserItem); - conditionItems.add(parentJobBrowserItem); - conditionItems.add(isKeyItem); - - addGroups.add(new SearchConditionGroup("基本信息", true, conditionItems)); apiDatas.put("condition", addGroups); return apiDatas; } @@ -314,12 +285,15 @@ public class JobServiceImpl extends Service implements JobService { buttonsMap.put("hasSave", true); List addGroups = new ArrayList<>(); - if (StringUtil.isEmpty(groupId) || "0".equals(groupId)) { - addGroups.add(new SearchConditionGroup("基本信息", true, getBaseForm(viewAttr, id))); - } else { - addGroups.add(new SearchConditionGroup(getExtendGroupMapper().getGroupNameById(groupId), true, getExtService(user).getExtForm(user, EXTEND_TYPE, JCL_ORG_JOBEXT, viewAttr, id, groupId))); + if ("0".equals(groupId)) { + groupId = GROUP_ID.toString(); + } + List extendGroupPOS = getExtendGroupMapper().listGroupByPid(Long.parseLong(groupId)); + if (org.apache.commons.collections.CollectionUtils.isNotEmpty(extendGroupPOS)) { + for (ExtendGroupPO extendGroupPO : extendGroupPOS) { + addGroups.add(new SearchConditionGroup(extendGroupPO.getGroupName(), true, getExtService(user).getExtForm(user, EXTEND_TYPE + "", Integer.parseInt(groupId) >= 0 ? JCL_ORG_JOBEXT : JCL_ORG_JOB, viewAttr, id, extendGroupPO.getId().toString(), "job_no"))); + } } - HashMap resultMap = new HashMap<>(); resultMap.put("buttons", buttonsMap); resultMap.put("conditions", addGroups); @@ -356,15 +330,21 @@ public class JobServiceImpl extends Service implements JobService { } @Override - public int saveBaseForm(JobSearchParam params) { + public int saveBaseForm(Map params) { HasRightUtil.hasRight(user, RIGHT_NAME, false); + JobSearchParam searchParam = JSONObject.parseObject(JSONObject.toJSONString(params), JobSearchParam.class); + // 处理自动编号 - params.setJobNo(CodeRuleUtil.generateCode(RuleCodeType.JOBTITLES, params.getJobNo())); - List list = getJobMapper().listByNo(Util.null2String(params.getJobNo())); + searchParam.setJobNo(CodeRuleUtil.generateCode(RuleCodeType.JOBTITLES, searchParam.getJobNo())); + List list = getJobMapper().listByNo(Util.null2String(searchParam.getJobNo())); OrganizationAssert.isEmpty(list, "编号不允许重复"); - JobPO jobPO = JobBO.convertParamsToPO(params, user.getUID()); + JobPO jobPO = JobBO.convertParamsToPO(searchParam, user.getUID()); jobPO.setIsKey(null == jobPO.getIsKey() ? 0 : jobPO.getIsKey()); int insertCount = getJobMapper().insertIgnoreNull(jobPO); + params.put("job_no", jobPO.getJobNo()); + params.put("is_key", jobPO.getIsKey()); + + getExtService(user).updateExtForm(user, EXTEND_TYPE, JCL_ORG_JOB, params, "", jobPO.getId()); if (null != jobPO.getSchemeId()) { // 插入明细表信息 // 根据等级方案查询职等、职级 @@ -383,24 +363,28 @@ public class JobServiceImpl extends Service implements JobService { HasRightUtil.hasRight(user, RIGHT_NAME, false); JobSearchParam searchParam = JSONObject.parseObject(JSONObject.toJSONString(params), JobSearchParam.class); String groupId = (String) params.get("viewCondition"); - JobPO jobPO = JobBO.convertParamsToPO(searchParam, user.getUID()); - jobPO.setIsKey(null == jobPO.getIsKey() ? 0 : jobPO.getIsKey()); + searchParam.setIsKey(null == searchParam.getIsKey() ? 0 : searchParam.getIsKey()); + if ("0".equals(groupId)) { + groupId = GROUP_ID.toString(); + } int updateCount = 0; // 更新主表数据 - updateCount += getJobMapper().updateBaseJob(jobPO); + params.put("is_key", searchParam.getIsKey()); + updateCount += getExtService(user).updateExtForm(user, EXTEND_TYPE, JCL_ORG_JOB, params, "", searchParam.getId()); + // 更新主表拓展表 - updateCount += getExtService(user).updateExtForm(user, EXTEND_TYPE, JCL_ORG_JOBEXT, params, groupId, jobPO.getId()); + updateCount += getExtService(user).updateExtForm(user, EXTEND_TYPE, JCL_ORG_JOBEXT, params, groupId, searchParam.getId()); // 更新明细表 - getJobDTMapper().deleteByIds(jobPO.getId()); + getJobDTMapper().deleteByIds(searchParam.getId()); int rowNum = Util.getIntValue((String) params.get("rownum")); for (int i = 0; i < rowNum; i++) { String levelId = (String) params.get("levelId_" + i); String gradeId = (String) params.get("gradeId_" + i); String levelIdspan = (String) params.get("levelIdspan_" + i); String gradeIdspan = (String) params.get("gradeIdspan_" + i); - getJobDTMapper().insertIgnoreNull(JobDTPO.builder().levelId(levelId).gradeId(gradeId).levelIdspan(levelIdspan).gradeIdspan(gradeIdspan).mainId(jobPO.getId()).creator((long) user.getUID()).deleteType(0).createTime(new Date()).updateTime(new Date()).build()); + getJobDTMapper().insertIgnoreNull(JobDTPO.builder().levelId(levelId).gradeId(gradeId).levelIdspan(levelIdspan).gradeIdspan(gradeIdspan).mainId(searchParam.getId()).creator((long) user.getUID()).deleteType(0).createTime(new Date()).updateTime(new Date()).build()); } - getExtService(user).updateExtDT(user, EXTEND_TYPE, JCL_ORG_JOBEXT_DT1, params, jobPO.getId()); + getExtService(user).updateExtDT(user, EXTEND_TYPE, JCL_ORG_JOBEXT_DT1, params, searchParam.getId()); return updateCount; } @@ -564,112 +548,6 @@ public class JobServiceImpl extends Service implements JobService { && null == jobPO.getForbiddenTag(); } - /** - * 基本信息基础表单 - * - * @param viewAttr - * @param id - * @return - */ - private List getBaseForm(int viewAttr, long id) { - List conditionItems = new ArrayList<>(); - // 编号 - SearchConditionItem jobNoItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 1, 50, "编号", "jobNo"); - // 名称 - SearchConditionItem jobNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 3, 50, "名称", "jobName"); - jobNameItem.setRules("required|string"); - // 所属分部 - SearchConditionItem parentCompBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "所属分部", "161", "parentComp", "compBrowser"); - // 所属部门 - SearchConditionItem parentDeptBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "所属部门", "161", "parentDept", "deptBrowser"); - // 岗位序列 - SearchConditionItem sequenceBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "岗位序列", "161", "sequenceId", "sequenceBrowser"); - // 等级方案 - SearchConditionItem schemeBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, "等级方案", "161", "schemeId", "schemeBrowser"); - // 上级岗位 - SearchConditionItem parentJobBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "上级岗位", "161", "parentJob", "jobBrowser"); - // 是否关键岗 - List isKeyOptions = new ArrayList<>(); - SearchConditionOption yesOption = new SearchConditionOption("0", "否"); - SearchConditionOption noOption = new SearchConditionOption("1", "是"); - isKeyOptions.add(yesOption); - isKeyOptions.add(noOption); - SearchConditionItem isKeyItem = OrganizationFormItemUtil.selectItem(user, isKeyOptions, 2, 16, 6, false, "是否关键岗", "isKey"); - isKeyItem.setDetailtype(3); - // 工作地点 - SearchConditionItem workplaceItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "工作地点", "workplace"); - // 工作概述 - SearchConditionItem descriptionItem = OrganizationFormItemUtil.textareaItem(user, 2, 16, false, 2, 50, "工作概述", "description"); - // 任职职责 - SearchConditionItem workDutyItem = OrganizationFormItemUtil.textareaItem(user, 2, 16, false, 2, 50, "任职职责", "workDuty"); - // 工作权限 - SearchConditionItem workAuthorityItem = OrganizationFormItemUtil.textareaItem(user, 2, 16, false, 2, 50, "工作权限", "workAuthority"); - - conditionItems.add(jobNoItem); - conditionItems.add(jobNameItem); - conditionItems.add(parentCompBrowserItem); - conditionItems.add(parentDeptBrowserItem); - conditionItems.add(sequenceBrowserItem); - conditionItems.add(schemeBrowserItem); - conditionItems.add(parentJobBrowserItem); - conditionItems.add(isKeyItem); - conditionItems.add(workplaceItem); - conditionItems.add(descriptionItem); - conditionItems.add(workDutyItem); - conditionItems.add(workAuthorityItem); - - - // 编辑、查看状态赋值,设置只读状态 - JobPO jobPO = getJobMapper().getJobById(id); - OrganizationAssert.notNull(jobPO, "数据不存在或数据已删除"); - jobNoItem.setValue(jobPO.getJobNo()); - jobNameItem.setValue(jobPO.getJobName()); - isKeyItem.setValue(null == jobPO.getIsKey() ? "0" : jobPO.getIsKey() + ""); - workplaceItem.setValue(jobPO.getWorkplace()); - descriptionItem.setValue(jobPO.getDescription()); - workDutyItem.setValue(jobPO.getWorkDuty()); - workAuthorityItem.setValue(jobPO.getWorkAuthority()); - - if (null != jobPO.getParentComp()) { - BrowserBean browserBean = parentCompBrowserItem.getBrowserConditionParam(); - List> compMaps = getCompMapper().listCompsByIds(DeleteParam.builder().ids(jobPO.getParentComp().toString()).build().getIds()); - browserBean.setReplaceDatas(compMaps); - parentCompBrowserItem.setBrowserConditionParam(browserBean); - } - if (null != jobPO.getParentDept()) { - BrowserBean browserBean = parentDeptBrowserItem.getBrowserConditionParam(); - List> deptMaps = getDepartmentMapper().listDeptsByIds(DeleteParam.builder().ids(jobPO.getParentDept().toString()).build().getIds()); - browserBean.setReplaceDatas(deptMaps); - parentDeptBrowserItem.setBrowserConditionParam(browserBean); - } - if (null != jobPO.getSequenceId()) { - BrowserBean browserBean = sequenceBrowserItem.getBrowserConditionParam(); - List> deptMaps = getSequenceMapper().listSequencesByIds(DeleteParam.builder().ids(jobPO.getSequenceId().toString()).build().getIds()); - browserBean.setReplaceDatas(deptMaps); - sequenceBrowserItem.setBrowserConditionParam(browserBean); - } - if (null != jobPO.getSchemeId()) { - BrowserBean browserBean = schemeBrowserItem.getBrowserConditionParam(); - List> deptMaps = getSchemeMapper().listSchemesByIds(DeleteParam.builder().ids(jobPO.getSchemeId().toString()).build().getIds()); - browserBean.setReplaceDatas(deptMaps); - schemeBrowserItem.setBrowserConditionParam(browserBean); - } - if (null != jobPO.getParentJob()) { - BrowserBean browserBean = parentJobBrowserItem.getBrowserConditionParam(); - List> deptMaps = getJobMapper().listJobsByIds(DeleteParam.builder().ids(jobPO.getParentJob().toString()).build().getIds()); - browserBean.setReplaceDatas(deptMaps); - parentJobBrowserItem.setBrowserConditionParam(browserBean); - } - - // 查看，全部置为只读 - if (1 == viewAttr) { - for (SearchConditionItem item : conditionItems) { - item.setViewAttr(viewAttr); - } - } - return conditionItems; - } - /** * 获取待删除数据的子级元素 * diff --git a/src/com/engine/organization/web/DepartmentController.java b/src/com/engine/organization/web/DepartmentController.java index 2f85fc96..6c92051b 100644 --- a/src/com/engine/organization/web/DepartmentController.java +++ b/src/com/engine/organization/web/DepartmentController.java @@ -111,7 +111,7 @@ public class DepartmentController { @POST @Path("/saveBaseForm") @Produces(MediaType.APPLICATION_JSON) - public ReturnResult saveBaseComp(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody DeptSearchParam params) { + public ReturnResult saveBaseComp(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody Map params) { try { User user = HrmUserVarify.getUser(request, response); return ReturnResult.successed(getDepartmentWrapper(user).saveBaseForm(params)); diff --git a/src/com/engine/organization/web/JobController.java b/src/com/engine/organization/web/JobController.java index 686b162e..83b7d77b 100644 --- a/src/com/engine/organization/web/JobController.java +++ b/src/com/engine/organization/web/JobController.java @@ -120,7 +120,7 @@ public class JobController { @POST @Path("/saveBaseForm") @Produces(MediaType.APPLICATION_JSON) - public ReturnResult saveBaseComp(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody JobSearchParam params) { + public ReturnResult saveBaseComp(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody Map params) { try { User user = HrmUserVarify.getUser(request, response); return ReturnResult.successed(getJobWrapper(user).saveBaseForm(params)); diff --git a/src/com/engine/organization/wrapper/DepartmentWrapper.java b/src/com/engine/organization/wrapper/DepartmentWrapper.java index d8596edf..93a5871b 100644 --- a/src/com/engine/organization/wrapper/DepartmentWrapper.java +++ b/src/com/engine/organization/wrapper/DepartmentWrapper.java @@ -79,7 +79,7 @@ public class DepartmentWrapper extends Service { * @param params * @return */ - public int saveBaseForm(DeptSearchParam params) { + public int saveBaseForm(Map params) { return getDepartmentService(user).saveBaseForm(params); } diff --git a/src/com/engine/organization/wrapper/JobWrapper.java b/src/com/engine/organization/wrapper/JobWrapper.java index 4d5b0bf6..b16874f4 100644 --- a/src/com/engine/organization/wrapper/JobWrapper.java +++ b/src/com/engine/organization/wrapper/JobWrapper.java @@ -89,7 +89,7 @@ public class JobWrapper extends Service { * @param params * @return */ - public int saveBaseForm(JobSearchParam params) { + public int saveBaseForm(Map params) { return getJobService(user).saveBaseForm(params); } From 5c79263ead0baaf0903e1396cb8ec1f3aa458c8f Mon Sep 17 00:00:00 2001 From: dxfeng Date: Mon, 13 Jun 2022 17:44:59 +0800 Subject: [PATCH 36/77] =?UTF-8?q?=E8=A1=A8=E7=BB=93=E6=9E=84=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/表结构SQL/MySQL.sql | 6 ++++-- docs/表结构SQL/Oracle.sql | 8 +++++--- docs/表结构SQL/SqlServer.sql | 6 ++++-- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/docs/表结构SQL/MySQL.sql b/docs/表结构SQL/MySQL.sql index 58ff63f3..3dc7dd8d 100644 --- a/docs/表结构SQL/MySQL.sql +++ b/docs/表结构SQL/MySQL.sql @@ -116,6 +116,7 @@ CREATE TABLE JCL_ORG_COMP ( -- JCL_FIELD_EXTENDGROUP CREATE TABLE JCL_FIELD_EXTENDGROUP ( id int auto_increment NOT NULL, + pid int null, extend_type int null, group_name varchar(100) NULL, creator int null, @@ -135,6 +136,7 @@ CREATE TABLE JCL_FIELD_EXTENDINFO ( field_type varchar(1000) NULL, control_type int null, browser_type varchar(100) NULL, + custom_value text null, extend_group_id int null, isenable int null, isrequired int null, @@ -243,8 +245,8 @@ CREATE TABLE JCL_ORG_JOBDT ( mainid int NULL, level_id varchar(100) NULL, grade_id varchar(100) NULL, - level_id_span varchar(100) NULL, - grade_id_span varchar(100) NULL, + level_id_span varchar(1000) NULL, + grade_id_span varchar(1000) NULL, creator int null, delete_type int null, create_time date null, diff --git a/docs/表结构SQL/Oracle.sql b/docs/表结构SQL/Oracle.sql index 2f2c7aad..ac642a30 100644 --- a/docs/表结构SQL/Oracle.sql +++ b/docs/表结构SQL/Oracle.sql @@ -118,7 +118,8 @@ CREATE TABLE JCL_ORG_COMP ( -- JCL_FIELD_EXTENDGROUP CREATE TABLE JCL_FIELD_EXTENDGROUP ( ID NUMBER NOT NULL, - EXTEND_TYPE NUMBER NULL, + PID NUMBER NULL, + EXTEND_TYPE NUMBER NULL, GROUP_NAME NVARCHAR2(100) NULL, CREATOR NUMBER NULL, DELETE_TYPE NUMBER NULL, @@ -136,6 +137,7 @@ CREATE TABLE JCL_FIELD_EXTENDINFO ( FIELD_NAME_DESC NVARCHAR2(100) NULL, FIELD_TYPE NVARCHAR2(1000) NULL, CONTROL_TYPE NUMBER NULL, + CUSTOM_VALUE NVARCHAR2(1000) NULL, BROWSER_TYPE NVARCHAR2(100) NULL, EXTEND_GROUP_ID NUMBER NULL, ISENABLE NUMBER NULL, @@ -245,8 +247,8 @@ CREATE TABLE JCL_ORG_JOBDT ( MAINID NUMBER NULL, LEVEL_ID NVARCHAR2(100) NULL, GRADE_ID NVARCHAR2(100) NULL, - LEVEL_ID_SPAN NVARCHAR2(100) NULL, - GRADE_ID_SPAN NVARCHAR2(100) NULL, + LEVEL_ID_SPAN NVARCHAR2(1000) NULL, + GRADE_ID_SPAN NVARCHAR2(1000) NULL, CREATOR NUMBER NULL, DELETE_TYPE NUMBER NULL, CREATE_TIME DATE NULL, diff --git a/docs/表结构SQL/SqlServer.sql b/docs/表结构SQL/SqlServer.sql index 923e3cf2..909b3fa3 100644 --- a/docs/表结构SQL/SqlServer.sql +++ b/docs/表结构SQL/SqlServer.sql @@ -116,6 +116,7 @@ CREATE TABLE JCL_ORG_COMP ( -- JCL_FIELD_EXTENDGROUP CREATE TABLE JCL_FIELD_EXTENDGROUP ( id int IDENTITY(1,1) NOT NULL, + pid int null, extend_type int null, group_name varchar(100) COLLATE Chinese_PRC_CI_AS NULL, creator int null, @@ -134,6 +135,7 @@ CREATE TABLE JCL_FIELD_EXTENDINFO ( field_name_desc varchar(100) COLLATE Chinese_PRC_CI_AS NULL, field_type varchar(1000) COLLATE Chinese_PRC_CI_AS NULL, control_type int null, + custom_value text null, browser_type varchar(100) COLLATE Chinese_PRC_CI_AS NULL, extend_group_id int null, isenable int null, @@ -243,8 +245,8 @@ CREATE TABLE JCL_ORG_JOBDT ( mainid int NULL, level_id varchar(100) NULL, grade_id varchar(100) NULL, - level_id_span varchar(100) NULL, - grade_id_span varchar(100) NULL, + level_id_span varchar(1000) NULL, + grade_id_span varchar(1000) NULL, creator int null, delete_type int null, create_time datetime null, From 7256a94abd6743c070d499971c5e52276f70cd4f Mon Sep 17 00:00:00 2001 From: Chengliang <1546584672@qq.com> Date: Tue, 14 Jun 2022 09:36:47 +0800 Subject: [PATCH 37/77] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E5=90=8E=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/FieldDefinedController.java | 13 ++++++ .../entity/fieldset/TypeTreeDTO.java | 36 ++++++++++++++++ .../service/FieldDefinedService.java | 17 ++++++++ .../service/impl/FieldDefinedServiceImpl.java | 21 ++++++++++ .../web/FieldDefinedController.java | 42 +++++++++++++++++++ .../wrapper/FieldDefinedWrapper.java | 30 +++++++++++++ 6 files changed, 159 insertions(+) create mode 100644 src/com/api/organization/web/FieldDefinedController.java create mode 100644 src/com/engine/organization/entity/fieldset/TypeTreeDTO.java create mode 100644 src/com/engine/organization/service/FieldDefinedService.java create mode 100644 src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java create mode 100644 src/com/engine/organization/web/FieldDefinedController.java create mode 100644 src/com/engine/organization/wrapper/FieldDefinedWrapper.java diff --git a/src/com/api/organization/web/FieldDefinedController.java b/src/com/api/organization/web/FieldDefinedController.java new file mode 100644 index 00000000..fbe82a67 --- /dev/null +++ b/src/com/api/organization/web/FieldDefinedController.java @@ -0,0 +1,13 @@ +package com.api.organization.web; + +import javax.ws.rs.Path; + +/** + * @Author weaver_cl + * @Description: TODO + * @Date 2022/6/13 + * @Version V1.0 + **/ +@Path("/bs/hrmorganization/fieldDefined") +public class FieldDefinedController extends com.engine.organization.web.FieldDefinedController { +} diff --git a/src/com/engine/organization/entity/fieldset/TypeTreeDTO.java b/src/com/engine/organization/entity/fieldset/TypeTreeDTO.java new file mode 100644 index 00000000..f8c07e5f --- /dev/null +++ b/src/com/engine/organization/entity/fieldset/TypeTreeDTO.java @@ -0,0 +1,36 @@ +package com.engine.organization.entity.fieldset; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Author weaver_cl + * @Description: TODO + * @Date 2022/6/13 + * @Version V1.0 + **/ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class TypeTreeDTO { + + private boolean addChild; + + private boolean canCanceled; + + private boolean canClick; + + private String domid; + + private boolean hasGroup; + + private boolean haschild; + + private boolean isLeaf; + + private boolean isParent; + +} diff --git a/src/com/engine/organization/service/FieldDefinedService.java b/src/com/engine/organization/service/FieldDefinedService.java new file mode 100644 index 00000000..11efbcea --- /dev/null +++ b/src/com/engine/organization/service/FieldDefinedService.java @@ -0,0 +1,17 @@ +package com.engine.organization.service; + +import com.engine.organization.entity.fieldset.TypeTreeDTO; + +import java.util.List; + +/** + * @Author weaver_cl + * @Description: TODO + * @Date 2022/6/13 + * @Version V1.0 + **/ +public interface FieldDefinedService { + + List getTree(String moduleName); + +} diff --git a/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java b/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java new file mode 100644 index 00000000..26ed3bc9 --- /dev/null +++ b/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java @@ -0,0 +1,21 @@ +package com.engine.organization.service.impl; + +import com.engine.core.impl.Service; +import com.engine.organization.entity.fieldset.TypeTreeDTO; +import com.engine.organization.service.FieldDefinedService; + +import java.util.List; + +/** + * @Author weaver_cl + * @Description: TODO + * @Date 2022/6/13 + * @Version V1.0 + **/ +public class FieldDefinedServiceImpl extends Service implements FieldDefinedService { + + @Override + public List getTree(String moduleName) { + return null; + } +} diff --git a/src/com/engine/organization/web/FieldDefinedController.java b/src/com/engine/organization/web/FieldDefinedController.java new file mode 100644 index 00000000..9c4cbe7f --- /dev/null +++ b/src/com/engine/organization/web/FieldDefinedController.java @@ -0,0 +1,42 @@ +package com.engine.organization.web; + +import com.engine.common.util.ServiceUtil; +import com.engine.organization.util.response.ReturnResult; +import com.engine.organization.wrapper.FieldDefinedWrapper; +import weaver.hrm.HrmUserVarify; +import weaver.hrm.User; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.Produces; +import javax.ws.rs.core.Context; +import javax.ws.rs.core.MediaType; + +/** + * @Author weaver_cl + * @Description: TODO + * @Date 2022/6/13 + * @Version V1.0 + **/ +public class FieldDefinedController { + + private FieldDefinedWrapper getFieldDefinedWrapper(User user) { + return ServiceUtil.getService(FieldDefinedWrapper.class,user); + } + + @GET + @Path("/{moduleName}/getTree") + @Produces(MediaType.APPLICATION_JSON) + public ReturnResult getHasRight(@Context HttpServletRequest request, @Context HttpServletResponse response, + @PathParam("moduleName") String moduleName) { + try { + User user = HrmUserVarify.getUser(request, response); + return ReturnResult.successed(getFieldDefinedWrapper(user).getTree(moduleName)); + } catch (Exception e) { + return ReturnResult.exceptionHandle(e.getMessage()); + } + } +} diff --git a/src/com/engine/organization/wrapper/FieldDefinedWrapper.java b/src/com/engine/organization/wrapper/FieldDefinedWrapper.java new file mode 100644 index 00000000..f68ac6fc --- /dev/null +++ b/src/com/engine/organization/wrapper/FieldDefinedWrapper.java @@ -0,0 +1,30 @@ +package com.engine.organization.wrapper; + +import com.engine.common.util.ServiceUtil; +import com.engine.core.impl.Service; +import com.engine.organization.entity.fieldset.TypeTreeDTO; +import com.engine.organization.service.FieldDefinedService; +import com.engine.organization.service.impl.FieldDefinedServiceImpl; +import com.engine.organization.util.response.ReturnResult; +import weaver.hrm.User; + +import java.util.List; + +/** + * @Author weaver_cl + * @Description: TODO + * @Date 2022/6/13 + * @Version V1.0 + **/ +public class FieldDefinedWrapper extends Service { + + private FieldDefinedService getFieldDefinedService(User user) { + return ServiceUtil.getService(FieldDefinedServiceImpl.class,user); + } + + + public ReturnResult getTree(String moduleName) { + List treeDTOS = getFieldDefinedService(user).getTree(moduleName); + return ReturnResult.successed(); + } +} From fadd2577cbd9826fbff2bc260b9e607a1b9bf4fb Mon Sep 17 00:00:00 2001 From: Chengliang <1546584672@qq.com> Date: Tue, 14 Jun 2022 11:07:48 +0800 Subject: [PATCH 38/77] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/CodeSettingController.java | 2 +- .../api/organization/web/CompController.java | 2 +- .../api/organization/web/DemoController.java | 2 +- .../web/DepartmentController.java | 2 +- .../web/FieldDefinedController.java | 2 +- .../api/organization/web/GradeController.java | 2 +- .../api/organization/web/GroupController.java | 2 +- .../api/organization/web/JobController.java | 2 +- .../api/organization/web/LevelController.java | 2 +- .../api/organization/web/PostController.java | 2 +- .../organization/web/PostInfoController.java | 2 +- .../organization/web/SchemeController.java | 2 +- .../organization/web/SequenceController.java | 2 +- .../api/organization/web/StaffController.java | 2 +- .../organization/web/StaffPlanController.java | 2 +- .../annotation/CheckboxPopedom.java | 2 +- .../engine/organization/annotation/Log.java | 2 +- .../annotation/OperatePopedom.java | 2 +- .../annotation/OrganizationTable.java | 2 +- .../annotation/OrganizationTableColumn.java | 2 +- .../annotation/OrganizationTableOperate.java | 2 +- .../organization/entity/DeleteParam.java | 2 +- .../organization/entity/LoggerContext.java | 2 +- .../entity/SelectOptionParam.java | 2 +- .../engine/organization/entity/TopTab.java | 2 +- .../engine/organization/entity/TreeData.java | 2 +- .../entity/codesetting/bo/CodeSettingBO.java | 2 +- .../codesetting/param/CodeBaseParam.java | 2 +- .../param/CodeSaveDetailParam.java | 2 +- .../codesetting/param/CodeSaveParam.java | 2 +- .../codesetting/po/CodeRuleDetailPO.java | 2 +- .../entity/codesetting/po/CodeRulePO.java | 2 +- .../codesetting/po/CodeRuleReservedPO.java | 2 +- .../entity/company/bo/CompBO.java | 2 +- .../entity/company/dto/CompListDTO.java | 2 +- .../entity/company/param/CompSearchParam.java | 2 +- .../entity/company/po/CompPO.java | 2 +- .../entity/department/bo/DepartmentBO.java | 2 +- .../department/dto/DepartmentListDTO.java | 2 +- .../param/DepartmentMergeParam.java | 2 +- .../department/param/DepartmentMoveParam.java | 2 +- .../department/param/DeptCopyParam.java | 2 +- .../department/param/DeptSearchParam.java | 2 +- .../param/QuerySingleDeptListParam.java | 2 +- .../entity/department/po/DepartmentPO.java | 2 +- .../department/vo/SingleDeptTreeVO.java | 2 +- .../entity/employee/Employee.java | 2 +- .../entity/employee/vo/EmployeeTableVO.java | 2 +- .../entity/extend/ExtendInfoOperateType.java | 2 +- .../entity/extend/bo/ExtendInfoBO.java | 2 +- .../entity/extend/po/ExtendGroupPO.java | 2 +- .../entity/extend/po/ExtendInfoPO.java | 2 +- .../entity/fieldset/TypeTreeDTO.java | 32 +++++++++++- .../organization/entity/job/bo/JobBO.java | 2 +- .../entity/job/dto/JobListDTO.java | 2 +- .../entity/job/param/JobCopyParam.java | 2 +- .../entity/job/param/JobSearchParam.java | 2 +- .../organization/entity/job/po/JobDTPO.java | 2 +- .../organization/entity/job/po/JobPO.java | 2 +- .../entity/job/vo/SingleJobTreeVO.java | 2 +- .../engine/organization/entity/po/Demo.java | 2 +- .../entity/postion/dto/PostDTO.java | 2 +- .../entity/postion/dto/PostInfoDTO.java | 2 +- .../postion/param/PostInfoSearchParam.java | 2 +- .../entity/postion/po/PostInfoPO.java | 2 +- .../entity/postion/po/PostPO.java | 2 +- .../entity/postion/vo/PostInfoTableVO.java | 2 +- .../entity/scheme/dto/GradeDTO.java | 2 +- .../entity/scheme/dto/LevelDTO.java | 2 +- .../entity/scheme/dto/SchemeDTO.java | 2 +- .../entity/scheme/param/GradeSearchParam.java | 2 +- .../entity/scheme/param/LevelSearchParam.java | 2 +- .../scheme/param/SchemeSearchParam.java | 2 +- .../entity/scheme/po/GradePO.java | 2 +- .../entity/scheme/po/LevelPO.java | 2 +- .../entity/scheme/vo/GradeTableVO.java | 2 +- .../entity/searchtree/SearchTree.java | 2 +- .../entity/searchtree/SearchTreeParams.java | 2 +- .../entity/sequence/dto/SequenceDTO.java | 2 +- .../sequence/param/SequenceSearchParam.java | 2 +- .../entity/sequence/po/SequencePO.java | 2 +- .../entity/sequence/vo/SequenceTableVO.java | 2 +- .../organization/entity/staff/bo/StaffBO.java | 2 +- .../entity/staff/bo/StaffPlanBO.java | 2 +- .../staff/param/StaffPlanSearchParam.java | 2 +- .../entity/staff/param/StaffSearchParam.java | 2 +- .../organization/entity/staff/po/StaffPO.java | 2 +- .../entity/staff/po/StaffPlanPO.java | 2 +- .../entity/staff/po/StaffsPO.java | 2 +- .../entity/staff/vo/StaffPlanTableVO.java | 2 +- .../entity/staff/vo/StaffTableVO.java | 2 +- .../organization/enums/DeleteTypeEnum.java | 2 +- .../organization/enums/OperateTypeEnum.java | 2 +- .../enums/OrganizationTypeEnum.java | 12 +++++ .../organization/enums/RuleCodeTypeEnum.java | 2 +- .../OrganizationRunTimeException.java | 2 +- .../organization/mapper/DemoMapper.java | 2 +- .../mapper/SISLog/SISLogMapper.java | 2 +- .../codesetting/CodeRuleDetailMapper.java | 2 +- .../mapper/codesetting/CodeRuleMapper.java | 2 +- .../mapper/common/RefreshUseMapper.java | 2 +- .../organization/mapper/comp/CompMapper.java | 2 +- .../mapper/department/DepartmentMapper.java | 2 +- .../mapper/employee/EmployeeMapper.java | 2 +- .../mapper/extend/ExtDTMapper.java | 2 +- .../organization/mapper/extend/ExtMapper.java | 2 +- .../mapper/extend/ExtendGroupMapper.java | 2 +- .../mapper/extend/ExtendInfoMapper.java | 2 +- .../organization/mapper/job/JobDTMapper.java | 2 +- .../organization/mapper/job/JobMapper.java | 2 +- .../mapper/post/PostInfoMapper.java | 2 +- .../organization/mapper/post/PostMapper.java | 2 +- .../mapper/scheme/GradeMapper.java | 2 +- .../mapper/scheme/LevelMapper.java | 2 +- .../mapper/scheme/SchemeMapper.java | 2 +- .../mapper/sequence/SequenceMapper.java | 2 +- .../mapper/staff/StaffMapper.java | 2 +- .../mapper/staff/StaffPlanMapper.java | 2 +- .../mapper/staff/StaffsMapper.java | 2 +- .../service/CodeSettingService.java | 2 +- .../organization/service/CompService.java | 2 +- .../organization/service/DemoService.java | 2 +- .../service/DepartmentService.java | 2 +- .../organization/service/ExtService.java | 2 +- .../service/FieldDefinedService.java | 4 +- .../organization/service/GradeService.java | 2 +- .../organization/service/GroupService.java | 2 +- .../organization/service/JobService.java | 2 +- .../organization/service/LevelService.java | 2 +- .../organization/service/PostInfoService.java | 2 +- .../organization/service/PostService.java | 2 +- .../organization/service/SchemeService.java | 2 +- .../organization/service/SequenceService.java | 2 +- .../service/StaffPlanService.java | 2 +- .../organization/service/StaffService.java | 2 +- .../organization/service/TestService.java | 2 +- .../service/impl/CodeSettingServiceImpl.java | 2 +- .../service/impl/CompServiceImpl.java | 2 +- .../service/impl/DemoServiceImpl.java | 2 +- .../service/impl/DepartmentServiceImpl.java | 2 +- .../service/impl/ExtServiceImpl.java | 2 +- .../service/impl/FieldDefinedServiceImpl.java | 7 ++- .../service/impl/GradeServiceImpl.java | 2 +- .../service/impl/GroupServiceImpl.java | 2 +- .../service/impl/JobServiceImpl.java | 2 +- .../service/impl/LevelServiceImpl.java | 2 +- .../service/impl/PostInfoServiceImpl.java | 2 +- .../service/impl/PostServiceImpl.java | 2 +- .../service/impl/SchemeServiceImpl.java | 2 +- .../service/impl/SequenceServiceImpl.java | 2 +- .../service/impl/StaffPlanServiceImpl.java | 2 +- .../service/impl/StaffServiceImpl.java | 2 +- .../service/impl/TestServiceImpl.java | 2 +- .../transmethod/CompTransMethod.java | 2 +- .../transmethod/DepartmentTransMethod.java | 2 +- .../transmethod/JobTransMethod.java | 2 +- .../transmethod/LevelTransMethod.java | 2 +- .../transmethod/StaffPlanTransMethod.java | 2 +- .../transmethod/StaffTransMethod.java | 2 +- .../engine/organization/util/ConfigTrans.java | 2 +- .../organization/util/HasRightUtil.java | 2 +- .../engine/organization/util/HrmI18nUtil.java | 2 +- .../engine/organization/util/LogAspect.java | 2 +- .../organization/util/OrganizationAssert.java | 2 +- .../util/OrganizationEnumUtil.java | 51 +++++++++++++++++++ .../util/OrganizationFormItemUtil.java | 2 +- .../organization/util/RefreshIsUsedUtil.java | 2 +- .../util/coderule/CodeRuleUtil.java | 2 +- .../util/response/ReturnResult.java | 2 +- .../util/tree/SearchTreeUtil.java | 2 +- .../web/CodeSettingController.java | 2 +- .../organization/web/CompController.java | 2 +- .../organization/web/DemoController.java | 2 +- .../web/DepartmentController.java | 2 +- .../web/FieldDefinedController.java | 2 +- .../organization/web/GradeController.java | 2 +- .../organization/web/GroupController.java | 2 +- .../organization/web/JobController.java | 2 +- .../organization/web/LevelController.java | 2 +- .../organization/web/PostController.java | 2 +- .../organization/web/PostInfoController.java | 2 +- .../organization/web/SchemeController.java | 2 +- .../organization/web/SequenceController.java | 2 +- .../organization/web/StaffController.java | 2 +- .../organization/web/StaffPlanController.java | 2 +- .../wrapper/CodeSettingWrapper.java | 2 +- .../organization/wrapper/CompWrapper.java | 2 +- .../organization/wrapper/DemoWrapper.java | 2 +- .../wrapper/DepartmentWrapper.java | 2 +- .../wrapper/FieldDefinedWrapper.java | 2 +- .../organization/wrapper/GradeWrapper.java | 2 +- .../organization/wrapper/GroupWrapper.java | 2 +- .../organization/wrapper/JobWrapper.java | 2 +- .../organization/wrapper/LevelWrapper.java | 2 +- .../organization/wrapper/PostInfoWrapper.java | 2 +- .../organization/wrapper/PostWrapper.java | 2 +- .../organization/wrapper/SchemeWrapper.java | 2 +- .../organization/wrapper/SequenceWrapper.java | 2 +- .../wrapper/StaffPlanWrapper.java | 2 +- .../organization/wrapper/StaffWrapper.java | 2 +- .../action/StaffChangeAction.java | 2 +- 201 files changed, 297 insertions(+), 201 deletions(-) create mode 100644 src/com/engine/organization/enums/OrganizationTypeEnum.java create mode 100644 src/com/engine/organization/util/OrganizationEnumUtil.java diff --git a/src/com/api/organization/web/CodeSettingController.java b/src/com/api/organization/web/CodeSettingController.java index cf313578..b9d10b54 100644 --- a/src/com/api/organization/web/CodeSettingController.java +++ b/src/com/api/organization/web/CodeSettingController.java @@ -4,7 +4,7 @@ import javax.ws.rs.Path; /** * @Author weaver_cl - * @Description: TODO + * @Description: * @Date 2022/5/30 * @Version V1.0 **/ diff --git a/src/com/api/organization/web/CompController.java b/src/com/api/organization/web/CompController.java index 093fa968..582c31e3 100644 --- a/src/com/api/organization/web/CompController.java +++ b/src/com/api/organization/web/CompController.java @@ -3,7 +3,7 @@ package com.api.organization.web; import javax.ws.rs.Path; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/17 * @version: 1.0 diff --git a/src/com/api/organization/web/DemoController.java b/src/com/api/organization/web/DemoController.java index f8e72094..d27f10a9 100644 --- a/src/com/api/organization/web/DemoController.java +++ b/src/com/api/organization/web/DemoController.java @@ -4,7 +4,7 @@ import javax.ws.rs.Path; /** * @Author weaver_cl - * @Description: TODO + * @Description: * @Date 2022/4/26 * @Version V1.0 **/ diff --git a/src/com/api/organization/web/DepartmentController.java b/src/com/api/organization/web/DepartmentController.java index b79f621a..86d91a66 100644 --- a/src/com/api/organization/web/DepartmentController.java +++ b/src/com/api/organization/web/DepartmentController.java @@ -4,7 +4,7 @@ import javax.ws.rs.Path; /** * @Author weaver_cl - * @Description: TODO + * @Description: * @Date 2022/5/20 * @Version V1.0 **/ diff --git a/src/com/api/organization/web/FieldDefinedController.java b/src/com/api/organization/web/FieldDefinedController.java index fbe82a67..6d42fd0c 100644 --- a/src/com/api/organization/web/FieldDefinedController.java +++ b/src/com/api/organization/web/FieldDefinedController.java @@ -4,7 +4,7 @@ import javax.ws.rs.Path; /** * @Author weaver_cl - * @Description: TODO + * @Description: * @Date 2022/6/13 * @Version V1.0 **/ diff --git a/src/com/api/organization/web/GradeController.java b/src/com/api/organization/web/GradeController.java index d116f3e1..389d763e 100644 --- a/src/com/api/organization/web/GradeController.java +++ b/src/com/api/organization/web/GradeController.java @@ -3,7 +3,7 @@ package com.api.organization.web; import javax.ws.rs.Path; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/11 * @version: 1.0 diff --git a/src/com/api/organization/web/GroupController.java b/src/com/api/organization/web/GroupController.java index fe147c93..61304304 100644 --- a/src/com/api/organization/web/GroupController.java +++ b/src/com/api/organization/web/GroupController.java @@ -4,7 +4,7 @@ import javax.ws.rs.Path; /** * - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/16 * @version: 1.0 diff --git a/src/com/api/organization/web/JobController.java b/src/com/api/organization/web/JobController.java index 7ac87cfc..d3b47a9c 100644 --- a/src/com/api/organization/web/JobController.java +++ b/src/com/api/organization/web/JobController.java @@ -3,7 +3,7 @@ package com.api.organization.web; import javax.ws.rs.Path; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/27 * @version: 1.0 diff --git a/src/com/api/organization/web/LevelController.java b/src/com/api/organization/web/LevelController.java index 019b2529..d952e5e6 100644 --- a/src/com/api/organization/web/LevelController.java +++ b/src/com/api/organization/web/LevelController.java @@ -4,7 +4,7 @@ import javax.ws.rs.Path; /** * - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/10 * @version: 1.0 diff --git a/src/com/api/organization/web/PostController.java b/src/com/api/organization/web/PostController.java index 195a23b8..19e8ec0d 100644 --- a/src/com/api/organization/web/PostController.java +++ b/src/com/api/organization/web/PostController.java @@ -4,7 +4,7 @@ import javax.ws.rs.Path; /** * - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/13 * @version: 1.0 diff --git a/src/com/api/organization/web/PostInfoController.java b/src/com/api/organization/web/PostInfoController.java index 701e6646..39336d71 100644 --- a/src/com/api/organization/web/PostInfoController.java +++ b/src/com/api/organization/web/PostInfoController.java @@ -4,7 +4,7 @@ import javax.ws.rs.Path; /** * - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/13 * @version: 1.0 diff --git a/src/com/api/organization/web/SchemeController.java b/src/com/api/organization/web/SchemeController.java index 81b153ae..39b1e08c 100644 --- a/src/com/api/organization/web/SchemeController.java +++ b/src/com/api/organization/web/SchemeController.java @@ -4,7 +4,7 @@ import javax.ws.rs.Path; /** * - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/10 * @version: 1.0 diff --git a/src/com/api/organization/web/SequenceController.java b/src/com/api/organization/web/SequenceController.java index 66fd1118..4aadacd2 100644 --- a/src/com/api/organization/web/SequenceController.java +++ b/src/com/api/organization/web/SequenceController.java @@ -4,7 +4,7 @@ import javax.ws.rs.Path; /** * - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/12 * @version: 1.0 diff --git a/src/com/api/organization/web/StaffController.java b/src/com/api/organization/web/StaffController.java index 1377ab14..f406ba99 100644 --- a/src/com/api/organization/web/StaffController.java +++ b/src/com/api/organization/web/StaffController.java @@ -3,7 +3,7 @@ package com.api.organization.web; import javax.ws.rs.Path; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/25 * @version: 1.0 diff --git a/src/com/api/organization/web/StaffPlanController.java b/src/com/api/organization/web/StaffPlanController.java index 2eb02710..5435cf96 100644 --- a/src/com/api/organization/web/StaffPlanController.java +++ b/src/com/api/organization/web/StaffPlanController.java @@ -3,7 +3,7 @@ package com.api.organization.web; import javax.ws.rs.Path; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/25 * @version: 1.0 diff --git a/src/com/engine/organization/annotation/CheckboxPopedom.java b/src/com/engine/organization/annotation/CheckboxPopedom.java index 14c8bf08..199cb6e0 100644 --- a/src/com/engine/organization/annotation/CheckboxPopedom.java +++ b/src/com/engine/organization/annotation/CheckboxPopedom.java @@ -4,7 +4,7 @@ import java.lang.annotation.*; /** * @Author weaver_cl - * @Description: TODO + * @Description: * @Date 2022/5/30 * @Version V1.0 **/ diff --git a/src/com/engine/organization/annotation/Log.java b/src/com/engine/organization/annotation/Log.java index 124c5ea7..9ef0d9e0 100644 --- a/src/com/engine/organization/annotation/Log.java +++ b/src/com/engine/organization/annotation/Log.java @@ -6,7 +6,7 @@ import java.lang.annotation.*; /** * @Author dxfeng - * @Description: TODO + * @Description: * @Date 2022/5/9 * @Version V1.0 **/ diff --git a/src/com/engine/organization/annotation/OperatePopedom.java b/src/com/engine/organization/annotation/OperatePopedom.java index 7822389a..d86f9b3f 100644 --- a/src/com/engine/organization/annotation/OperatePopedom.java +++ b/src/com/engine/organization/annotation/OperatePopedom.java @@ -4,7 +4,7 @@ import java.lang.annotation.*; /** * @Author weaver_cl - * @Description: TODO + * @Description: * @Date 2022/5/30 * @Version V1.0 **/ diff --git a/src/com/engine/organization/annotation/OrganizationTable.java b/src/com/engine/organization/annotation/OrganizationTable.java index f6cec4a3..ec6d14bb 100644 --- a/src/com/engine/organization/annotation/OrganizationTable.java +++ b/src/com/engine/organization/annotation/OrganizationTable.java @@ -8,7 +8,7 @@ import java.lang.annotation.*; /** * @Author dxfeng - * @Description: TODO + * @Description: * @Date 2022/5/9 * @Version V1.0 **/ diff --git a/src/com/engine/organization/annotation/OrganizationTableColumn.java b/src/com/engine/organization/annotation/OrganizationTableColumn.java index 7467de68..852f228f 100644 --- a/src/com/engine/organization/annotation/OrganizationTableColumn.java +++ b/src/com/engine/organization/annotation/OrganizationTableColumn.java @@ -4,7 +4,7 @@ import java.lang.annotation.*; /** * @Author dxfeng - * @Description: TODO + * @Description: * @Date 2022/5/9 * @Version V1.0 **/ diff --git a/src/com/engine/organization/annotation/OrganizationTableOperate.java b/src/com/engine/organization/annotation/OrganizationTableOperate.java index 89f3f63e..e1d718fc 100644 --- a/src/com/engine/organization/annotation/OrganizationTableOperate.java +++ b/src/com/engine/organization/annotation/OrganizationTableOperate.java @@ -4,7 +4,7 @@ import java.lang.annotation.*; /** * @Author dxfeng - * @Description: TODO + * @Description: * @Date 2022/5/9 * @Version V1.0 **/ diff --git a/src/com/engine/organization/entity/DeleteParam.java b/src/com/engine/organization/entity/DeleteParam.java index 8ce69e88..724745d0 100644 --- a/src/com/engine/organization/entity/DeleteParam.java +++ b/src/com/engine/organization/entity/DeleteParam.java @@ -13,7 +13,7 @@ import java.util.stream.Collectors; /** * @Author dxfeng - * @Description: TODO + * @description: * @Date 2022/5/9 * @Version V1.0 **/ diff --git a/src/com/engine/organization/entity/LoggerContext.java b/src/com/engine/organization/entity/LoggerContext.java index 1d8c3699..4db04287 100644 --- a/src/com/engine/organization/entity/LoggerContext.java +++ b/src/com/engine/organization/entity/LoggerContext.java @@ -11,7 +11,7 @@ import java.util.Date; /** * @Author weaver_cl - * @Description: TODO 日志实体类 hr_log + * @description: 日志实体类 hr_log * @Date 2022/4/27 * @Version V1.0 **/ diff --git a/src/com/engine/organization/entity/SelectOptionParam.java b/src/com/engine/organization/entity/SelectOptionParam.java index 7e27c490..9c2b38ab 100644 --- a/src/com/engine/organization/entity/SelectOptionParam.java +++ b/src/com/engine/organization/entity/SelectOptionParam.java @@ -10,7 +10,7 @@ import java.util.ArrayList; import java.util.List; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/06/13 * @version: 1.0 diff --git a/src/com/engine/organization/entity/TopTab.java b/src/com/engine/organization/entity/TopTab.java index ae7ffa82..d731f57f 100644 --- a/src/com/engine/organization/entity/TopTab.java +++ b/src/com/engine/organization/entity/TopTab.java @@ -6,7 +6,7 @@ import lombok.Data; import lombok.NoArgsConstructor; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/11 * @version: 1.0 diff --git a/src/com/engine/organization/entity/TreeData.java b/src/com/engine/organization/entity/TreeData.java index a34c09de..45655ac6 100644 --- a/src/com/engine/organization/entity/TreeData.java +++ b/src/com/engine/organization/entity/TreeData.java @@ -8,7 +8,7 @@ import lombok.NoArgsConstructor; import java.util.ArrayList; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/13 * @version: 1.0 diff --git a/src/com/engine/organization/entity/codesetting/bo/CodeSettingBO.java b/src/com/engine/organization/entity/codesetting/bo/CodeSettingBO.java index 57b705f9..eb170cb8 100644 --- a/src/com/engine/organization/entity/codesetting/bo/CodeSettingBO.java +++ b/src/com/engine/organization/entity/codesetting/bo/CodeSettingBO.java @@ -15,7 +15,7 @@ import java.util.stream.Collectors; /** * @Author weaver_cl - * @Description: TODO + * @Description: * @Date 2022/5/31 * @Version V1.0 **/ diff --git a/src/com/engine/organization/entity/codesetting/param/CodeBaseParam.java b/src/com/engine/organization/entity/codesetting/param/CodeBaseParam.java index 640a161b..c7ce06e6 100644 --- a/src/com/engine/organization/entity/codesetting/param/CodeBaseParam.java +++ b/src/com/engine/organization/entity/codesetting/param/CodeBaseParam.java @@ -7,7 +7,7 @@ import lombok.NoArgsConstructor; /** * @Author weaver_cl - * @Description: TODO + * @Description: * @Date 2022/5/31 * @Version V1.0 **/ diff --git a/src/com/engine/organization/entity/codesetting/param/CodeSaveDetailParam.java b/src/com/engine/organization/entity/codesetting/param/CodeSaveDetailParam.java index 05ee0786..4f6b8660 100644 --- a/src/com/engine/organization/entity/codesetting/param/CodeSaveDetailParam.java +++ b/src/com/engine/organization/entity/codesetting/param/CodeSaveDetailParam.java @@ -8,7 +8,7 @@ import lombok.NoArgsConstructor; /** * @Author weaver_cl - * @Description: TODO + * @Description: * @Date 2022/5/31 * @Version V1.0 **/ diff --git a/src/com/engine/organization/entity/codesetting/param/CodeSaveParam.java b/src/com/engine/organization/entity/codesetting/param/CodeSaveParam.java index 37681351..8cfd6871 100644 --- a/src/com/engine/organization/entity/codesetting/param/CodeSaveParam.java +++ b/src/com/engine/organization/entity/codesetting/param/CodeSaveParam.java @@ -9,7 +9,7 @@ import java.util.List; /** * @Author weaver_cl - * @Description: TODO + * @Description: * @Date 2022/5/31 * @Version V1.0 **/ diff --git a/src/com/engine/organization/entity/codesetting/po/CodeRuleDetailPO.java b/src/com/engine/organization/entity/codesetting/po/CodeRuleDetailPO.java index fbf8a47f..3a5826bd 100644 --- a/src/com/engine/organization/entity/codesetting/po/CodeRuleDetailPO.java +++ b/src/com/engine/organization/entity/codesetting/po/CodeRuleDetailPO.java @@ -9,7 +9,7 @@ import java.util.Date; /** * @Author weaver_cl - * @Description: TODO + * @Description: * @Date 2022/5/30 * @Version V1.0 **/ diff --git a/src/com/engine/organization/entity/codesetting/po/CodeRulePO.java b/src/com/engine/organization/entity/codesetting/po/CodeRulePO.java index 7c54bf92..24449e0d 100644 --- a/src/com/engine/organization/entity/codesetting/po/CodeRulePO.java +++ b/src/com/engine/organization/entity/codesetting/po/CodeRulePO.java @@ -9,7 +9,7 @@ import java.util.Date; /** * @Author weaver_cl - * @Description: TODO + * @Description: * @Date 2022/5/30 * @Version V1.0 **/ diff --git a/src/com/engine/organization/entity/codesetting/po/CodeRuleReservedPO.java b/src/com/engine/organization/entity/codesetting/po/CodeRuleReservedPO.java index 68ec3c93..01ac3ddf 100644 --- a/src/com/engine/organization/entity/codesetting/po/CodeRuleReservedPO.java +++ b/src/com/engine/organization/entity/codesetting/po/CodeRuleReservedPO.java @@ -9,7 +9,7 @@ import java.util.Date; /** * @Author weaver_cl - * @Description: TODO + * @Description: * @Date 2022/5/31 * @Version V1.0 **/ diff --git a/src/com/engine/organization/entity/company/bo/CompBO.java b/src/com/engine/organization/entity/company/bo/CompBO.java index a2726072..38ce339b 100644 --- a/src/com/engine/organization/entity/company/bo/CompBO.java +++ b/src/com/engine/organization/entity/company/bo/CompBO.java @@ -15,7 +15,7 @@ import java.util.*; import java.util.stream.Collectors; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/16 * @version: 1.0 diff --git a/src/com/engine/organization/entity/company/dto/CompListDTO.java b/src/com/engine/organization/entity/company/dto/CompListDTO.java index c456611a..1e630d21 100644 --- a/src/com/engine/organization/entity/company/dto/CompListDTO.java +++ b/src/com/engine/organization/entity/company/dto/CompListDTO.java @@ -11,7 +11,7 @@ import lombok.NoArgsConstructor; import java.util.List; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/16 * @version: 1.0 diff --git a/src/com/engine/organization/entity/company/param/CompSearchParam.java b/src/com/engine/organization/entity/company/param/CompSearchParam.java index 1aa114cc..a82c93b3 100644 --- a/src/com/engine/organization/entity/company/param/CompSearchParam.java +++ b/src/com/engine/organization/entity/company/param/CompSearchParam.java @@ -7,7 +7,7 @@ import lombok.Data; import lombok.NoArgsConstructor; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/16 * @version: 1.0 diff --git a/src/com/engine/organization/entity/company/po/CompPO.java b/src/com/engine/organization/entity/company/po/CompPO.java index 1acd4ab3..f23ab7cb 100644 --- a/src/com/engine/organization/entity/company/po/CompPO.java +++ b/src/com/engine/organization/entity/company/po/CompPO.java @@ -8,7 +8,7 @@ import lombok.NoArgsConstructor; import java.util.Date; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/16 * @version: 1.0 diff --git a/src/com/engine/organization/entity/department/bo/DepartmentBO.java b/src/com/engine/organization/entity/department/bo/DepartmentBO.java index 749eb557..1a960959 100644 --- a/src/com/engine/organization/entity/department/bo/DepartmentBO.java +++ b/src/com/engine/organization/entity/department/bo/DepartmentBO.java @@ -16,7 +16,7 @@ import java.util.stream.Collectors; /** * @Author weaver_cl - * @Description: TODO + * @description: * @Date 2022/5/20 * @Version V1.0 **/ diff --git a/src/com/engine/organization/entity/department/dto/DepartmentListDTO.java b/src/com/engine/organization/entity/department/dto/DepartmentListDTO.java index 6be4c2f7..b7c24e29 100644 --- a/src/com/engine/organization/entity/department/dto/DepartmentListDTO.java +++ b/src/com/engine/organization/entity/department/dto/DepartmentListDTO.java @@ -13,7 +13,7 @@ import java.util.List; /** * @Author weaver_cl - * @Description: TODO + * @description: * @Date 2022/5/19 * @Version V1.0 **/ diff --git a/src/com/engine/organization/entity/department/param/DepartmentMergeParam.java b/src/com/engine/organization/entity/department/param/DepartmentMergeParam.java index 4436d87c..e4468c7b 100644 --- a/src/com/engine/organization/entity/department/param/DepartmentMergeParam.java +++ b/src/com/engine/organization/entity/department/param/DepartmentMergeParam.java @@ -6,7 +6,7 @@ import lombok.Data; import lombok.NoArgsConstructor; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/06/02 * @version: 1.0 diff --git a/src/com/engine/organization/entity/department/param/DepartmentMoveParam.java b/src/com/engine/organization/entity/department/param/DepartmentMoveParam.java index 7f4aa4b1..a3aee686 100644 --- a/src/com/engine/organization/entity/department/param/DepartmentMoveParam.java +++ b/src/com/engine/organization/entity/department/param/DepartmentMoveParam.java @@ -6,7 +6,7 @@ import lombok.Data; import lombok.NoArgsConstructor; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/06/02 * @version: 1.0 diff --git a/src/com/engine/organization/entity/department/param/DeptCopyParam.java b/src/com/engine/organization/entity/department/param/DeptCopyParam.java index d7954280..057cf0fb 100644 --- a/src/com/engine/organization/entity/department/param/DeptCopyParam.java +++ b/src/com/engine/organization/entity/department/param/DeptCopyParam.java @@ -6,7 +6,7 @@ import lombok.Data; import lombok.NoArgsConstructor; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/06/01 * @version: 1.0 diff --git a/src/com/engine/organization/entity/department/param/DeptSearchParam.java b/src/com/engine/organization/entity/department/param/DeptSearchParam.java index 36f8eec2..1eaff53c 100644 --- a/src/com/engine/organization/entity/department/param/DeptSearchParam.java +++ b/src/com/engine/organization/entity/department/param/DeptSearchParam.java @@ -7,7 +7,7 @@ import lombok.Data; import lombok.NoArgsConstructor; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/23 * @version: 1.0 diff --git a/src/com/engine/organization/entity/department/param/QuerySingleDeptListParam.java b/src/com/engine/organization/entity/department/param/QuerySingleDeptListParam.java index e3120cb3..2845d015 100644 --- a/src/com/engine/organization/entity/department/param/QuerySingleDeptListParam.java +++ b/src/com/engine/organization/entity/department/param/QuerySingleDeptListParam.java @@ -8,7 +8,7 @@ import lombok.NoArgsConstructor; /** * @Author weaver_cl - * @Description: TODO + * @description: * @Date 2022/5/20 * @Version V1.0 **/ diff --git a/src/com/engine/organization/entity/department/po/DepartmentPO.java b/src/com/engine/organization/entity/department/po/DepartmentPO.java index c93a2ae3..aef54892 100644 --- a/src/com/engine/organization/entity/department/po/DepartmentPO.java +++ b/src/com/engine/organization/entity/department/po/DepartmentPO.java @@ -9,7 +9,7 @@ import java.util.Date; /** * @Author weaver_cl - * @Description: TODO + * @description: * @Date 2022/5/19 * @Version V1.0 **/ diff --git a/src/com/engine/organization/entity/department/vo/SingleDeptTreeVO.java b/src/com/engine/organization/entity/department/vo/SingleDeptTreeVO.java index c1536203..319d1f26 100644 --- a/src/com/engine/organization/entity/department/vo/SingleDeptTreeVO.java +++ b/src/com/engine/organization/entity/department/vo/SingleDeptTreeVO.java @@ -12,7 +12,7 @@ import java.util.List; /** * @Author weaver_cl - * @Description: TODO + * @description: * @Date 2022/5/20 * @Version V1.0 **/ diff --git a/src/com/engine/organization/entity/employee/Employee.java b/src/com/engine/organization/entity/employee/Employee.java index d64979c6..17258d83 100644 --- a/src/com/engine/organization/entity/employee/Employee.java +++ b/src/com/engine/organization/entity/employee/Employee.java @@ -7,7 +7,7 @@ import lombok.NoArgsConstructor; /** * @Author weaver_cl - * @Description: TODO + * @description: * @Date 2022/5/20 * @Version V1.0 **/ diff --git a/src/com/engine/organization/entity/employee/vo/EmployeeTableVO.java b/src/com/engine/organization/entity/employee/vo/EmployeeTableVO.java index b493b975..ed1c9e78 100644 --- a/src/com/engine/organization/entity/employee/vo/EmployeeTableVO.java +++ b/src/com/engine/organization/entity/employee/vo/EmployeeTableVO.java @@ -1,7 +1,7 @@ package com.engine.organization.entity.employee.vo; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/31 * @version: 1.0 diff --git a/src/com/engine/organization/entity/extend/ExtendInfoOperateType.java b/src/com/engine/organization/entity/extend/ExtendInfoOperateType.java index f39633e0..2f1046d5 100644 --- a/src/com/engine/organization/entity/extend/ExtendInfoOperateType.java +++ b/src/com/engine/organization/entity/extend/ExtendInfoOperateType.java @@ -1,7 +1,7 @@ package com.engine.organization.entity.extend; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/06/13 * @version: 1.0 diff --git a/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java b/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java index 89a4a2f6..bd3a85c3 100644 --- a/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java +++ b/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java @@ -28,7 +28,7 @@ import java.util.List; import java.util.Map; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/19 * @version: 1.0 diff --git a/src/com/engine/organization/entity/extend/po/ExtendGroupPO.java b/src/com/engine/organization/entity/extend/po/ExtendGroupPO.java index 5786466e..166ed4ac 100644 --- a/src/com/engine/organization/entity/extend/po/ExtendGroupPO.java +++ b/src/com/engine/organization/entity/extend/po/ExtendGroupPO.java @@ -8,7 +8,7 @@ import lombok.NoArgsConstructor; import java.util.Date; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/18 * @version: 1.0 diff --git a/src/com/engine/organization/entity/extend/po/ExtendInfoPO.java b/src/com/engine/organization/entity/extend/po/ExtendInfoPO.java index 536e134d..d58a7f8b 100644 --- a/src/com/engine/organization/entity/extend/po/ExtendInfoPO.java +++ b/src/com/engine/organization/entity/extend/po/ExtendInfoPO.java @@ -8,7 +8,7 @@ import lombok.NoArgsConstructor; import java.util.Date; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/19 * @version: 1.0 diff --git a/src/com/engine/organization/entity/fieldset/TypeTreeDTO.java b/src/com/engine/organization/entity/fieldset/TypeTreeDTO.java index f8c07e5f..fb4e8bdb 100644 --- a/src/com/engine/organization/entity/fieldset/TypeTreeDTO.java +++ b/src/com/engine/organization/entity/fieldset/TypeTreeDTO.java @@ -5,9 +5,11 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.util.List; + /** * @Author weaver_cl - * @Description: TODO + * @description: * @Date 2022/6/13 * @Version V1.0 **/ @@ -17,20 +19,48 @@ import lombok.NoArgsConstructor; @AllArgsConstructor public class TypeTreeDTO { + //是否可以增加子节点 默认都为false private boolean addChild; private boolean canCanceled; + //当前节点是否可点击 private boolean canClick; + //树id private String domid; + //是否存在分组title private boolean hasGroup; + //是否有子节点 private boolean haschild; + //是否是叶子节点 private boolean isLeaf; + //是否是父节点 private boolean isParent; + //是否默认选中 + private boolean isSelected; + + //是否展示 + private String isShow; + + //是否默认展开 + private boolean isopen; + + //键 + private String key; + + //树名称 + private String name; + + //子节点 + private List subs; + + // + private int viewAttr; + } diff --git a/src/com/engine/organization/entity/job/bo/JobBO.java b/src/com/engine/organization/entity/job/bo/JobBO.java index db506256..5e8bec08 100644 --- a/src/com/engine/organization/entity/job/bo/JobBO.java +++ b/src/com/engine/organization/entity/job/bo/JobBO.java @@ -13,7 +13,7 @@ import java.util.*; import java.util.stream.Collectors; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/30 * @version: 1.0 diff --git a/src/com/engine/organization/entity/job/dto/JobListDTO.java b/src/com/engine/organization/entity/job/dto/JobListDTO.java index 040b3279..28b7c573 100644 --- a/src/com/engine/organization/entity/job/dto/JobListDTO.java +++ b/src/com/engine/organization/entity/job/dto/JobListDTO.java @@ -12,7 +12,7 @@ import lombok.NoArgsConstructor; import java.util.List; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/30 * @version: 1.0 diff --git a/src/com/engine/organization/entity/job/param/JobCopyParam.java b/src/com/engine/organization/entity/job/param/JobCopyParam.java index 2057508e..b958e8a4 100644 --- a/src/com/engine/organization/entity/job/param/JobCopyParam.java +++ b/src/com/engine/organization/entity/job/param/JobCopyParam.java @@ -6,7 +6,7 @@ import lombok.Data; import lombok.NoArgsConstructor; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/06/01 * @version: 1.0 diff --git a/src/com/engine/organization/entity/job/param/JobSearchParam.java b/src/com/engine/organization/entity/job/param/JobSearchParam.java index 6e0525ef..c1da3d3b 100644 --- a/src/com/engine/organization/entity/job/param/JobSearchParam.java +++ b/src/com/engine/organization/entity/job/param/JobSearchParam.java @@ -7,7 +7,7 @@ import lombok.Data; import lombok.NoArgsConstructor; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/30 * @version: 1.0 diff --git a/src/com/engine/organization/entity/job/po/JobDTPO.java b/src/com/engine/organization/entity/job/po/JobDTPO.java index a259cfbe..3c8f2c74 100644 --- a/src/com/engine/organization/entity/job/po/JobDTPO.java +++ b/src/com/engine/organization/entity/job/po/JobDTPO.java @@ -8,7 +8,7 @@ import lombok.NoArgsConstructor; import java.util.Date; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/31 * @version: 1.0 diff --git a/src/com/engine/organization/entity/job/po/JobPO.java b/src/com/engine/organization/entity/job/po/JobPO.java index 20d224bd..a99bb164 100644 --- a/src/com/engine/organization/entity/job/po/JobPO.java +++ b/src/com/engine/organization/entity/job/po/JobPO.java @@ -8,7 +8,7 @@ import lombok.NoArgsConstructor; import java.util.Date; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/30 * @version: 1.0 diff --git a/src/com/engine/organization/entity/job/vo/SingleJobTreeVO.java b/src/com/engine/organization/entity/job/vo/SingleJobTreeVO.java index f9a09068..56e2b718 100644 --- a/src/com/engine/organization/entity/job/vo/SingleJobTreeVO.java +++ b/src/com/engine/organization/entity/job/vo/SingleJobTreeVO.java @@ -11,7 +11,7 @@ import lombok.NoArgsConstructor; import java.util.List; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/06/02 * @version: 1.0 diff --git a/src/com/engine/organization/entity/po/Demo.java b/src/com/engine/organization/entity/po/Demo.java index 41d0388a..f572caff 100644 --- a/src/com/engine/organization/entity/po/Demo.java +++ b/src/com/engine/organization/entity/po/Demo.java @@ -9,7 +9,7 @@ import java.util.Date; /** * @Author weaver_cl - * @Description: TODO + * @description: * @Date 2022/4/26 * @Version V1.0 **/ diff --git a/src/com/engine/organization/entity/postion/dto/PostDTO.java b/src/com/engine/organization/entity/postion/dto/PostDTO.java index c06fd8ac..51de900f 100644 --- a/src/com/engine/organization/entity/postion/dto/PostDTO.java +++ b/src/com/engine/organization/entity/postion/dto/PostDTO.java @@ -5,7 +5,7 @@ import com.engine.organization.entity.postion.po.PostPO; import java.util.Date; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/13 * @version: 1.0 diff --git a/src/com/engine/organization/entity/postion/dto/PostInfoDTO.java b/src/com/engine/organization/entity/postion/dto/PostInfoDTO.java index a21c6de3..bfdf7d76 100644 --- a/src/com/engine/organization/entity/postion/dto/PostInfoDTO.java +++ b/src/com/engine/organization/entity/postion/dto/PostInfoDTO.java @@ -6,7 +6,7 @@ import com.engine.organization.entity.postion.po.PostInfoPO; import java.util.Date; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/13 * @version: 1.0 diff --git a/src/com/engine/organization/entity/postion/param/PostInfoSearchParam.java b/src/com/engine/organization/entity/postion/param/PostInfoSearchParam.java index fa309dff..93de6af8 100644 --- a/src/com/engine/organization/entity/postion/param/PostInfoSearchParam.java +++ b/src/com/engine/organization/entity/postion/param/PostInfoSearchParam.java @@ -6,7 +6,7 @@ import lombok.Data; import lombok.NoArgsConstructor; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/13 * @version: 1.0 diff --git a/src/com/engine/organization/entity/postion/po/PostInfoPO.java b/src/com/engine/organization/entity/postion/po/PostInfoPO.java index d780e7f3..6fdcf20e 100644 --- a/src/com/engine/organization/entity/postion/po/PostInfoPO.java +++ b/src/com/engine/organization/entity/postion/po/PostInfoPO.java @@ -8,7 +8,7 @@ import lombok.NoArgsConstructor; import java.util.Date; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/13 * @version: 1.0 diff --git a/src/com/engine/organization/entity/postion/po/PostPO.java b/src/com/engine/organization/entity/postion/po/PostPO.java index 0767a090..e9f07b1f 100644 --- a/src/com/engine/organization/entity/postion/po/PostPO.java +++ b/src/com/engine/organization/entity/postion/po/PostPO.java @@ -8,7 +8,7 @@ import lombok.NoArgsConstructor; import java.util.Date; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/13 * @version: 1.0 diff --git a/src/com/engine/organization/entity/postion/vo/PostInfoTableVO.java b/src/com/engine/organization/entity/postion/vo/PostInfoTableVO.java index 62d6dc16..58bd87d5 100644 --- a/src/com/engine/organization/entity/postion/vo/PostInfoTableVO.java +++ b/src/com/engine/organization/entity/postion/vo/PostInfoTableVO.java @@ -9,7 +9,7 @@ import lombok.Data; import lombok.NoArgsConstructor; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/13 * @version: 1.0 diff --git a/src/com/engine/organization/entity/scheme/dto/GradeDTO.java b/src/com/engine/organization/entity/scheme/dto/GradeDTO.java index f6f0699d..8156d597 100644 --- a/src/com/engine/organization/entity/scheme/dto/GradeDTO.java +++ b/src/com/engine/organization/entity/scheme/dto/GradeDTO.java @@ -11,7 +11,7 @@ import java.util.Date; /** * @Author dxfeng - * @Description: TODO + * @description: * @Date 2022/5/11 * @Version V1.0 **/ diff --git a/src/com/engine/organization/entity/scheme/dto/LevelDTO.java b/src/com/engine/organization/entity/scheme/dto/LevelDTO.java index 4bf86d20..62fab86e 100644 --- a/src/com/engine/organization/entity/scheme/dto/LevelDTO.java +++ b/src/com/engine/organization/entity/scheme/dto/LevelDTO.java @@ -11,7 +11,7 @@ import java.util.Date; /** * @Author dxfeng - * @Description: TODO + * @description: * @Date 2022/5/9 * @Version V1.0 **/ diff --git a/src/com/engine/organization/entity/scheme/dto/SchemeDTO.java b/src/com/engine/organization/entity/scheme/dto/SchemeDTO.java index b442cf71..3c54ec7e 100644 --- a/src/com/engine/organization/entity/scheme/dto/SchemeDTO.java +++ b/src/com/engine/organization/entity/scheme/dto/SchemeDTO.java @@ -11,7 +11,7 @@ import java.util.Date; import java.util.Map; /** * @Author dxfeng - * @Description: TODO + * @description: * @Date 2022/5/9 * @Version V1.0 **/ diff --git a/src/com/engine/organization/entity/scheme/param/GradeSearchParam.java b/src/com/engine/organization/entity/scheme/param/GradeSearchParam.java index 81ed4b4c..bf7aac27 100644 --- a/src/com/engine/organization/entity/scheme/param/GradeSearchParam.java +++ b/src/com/engine/organization/entity/scheme/param/GradeSearchParam.java @@ -7,7 +7,7 @@ import lombok.NoArgsConstructor; /** * @Author dxfeng - * @Description: TODO + * @description: * @Date 2022/5/11 * @Version V1.0 **/ diff --git a/src/com/engine/organization/entity/scheme/param/LevelSearchParam.java b/src/com/engine/organization/entity/scheme/param/LevelSearchParam.java index b4e5bf13..33d40a40 100644 --- a/src/com/engine/organization/entity/scheme/param/LevelSearchParam.java +++ b/src/com/engine/organization/entity/scheme/param/LevelSearchParam.java @@ -7,7 +7,7 @@ import lombok.NoArgsConstructor; /** * @Author dxfeng - * @Description: TODO + * @description: * @Date 2022/5/9 * @Version V1.0 **/ diff --git a/src/com/engine/organization/entity/scheme/param/SchemeSearchParam.java b/src/com/engine/organization/entity/scheme/param/SchemeSearchParam.java index 18a3112a..84d53a8d 100644 --- a/src/com/engine/organization/entity/scheme/param/SchemeSearchParam.java +++ b/src/com/engine/organization/entity/scheme/param/SchemeSearchParam.java @@ -7,7 +7,7 @@ import lombok.NoArgsConstructor; /** * @Author dxfeng - * @Description: TODO + * @description: * @Date 2022/5/9 * @Version V1.0 **/ diff --git a/src/com/engine/organization/entity/scheme/po/GradePO.java b/src/com/engine/organization/entity/scheme/po/GradePO.java index 3d1a435f..511a8521 100644 --- a/src/com/engine/organization/entity/scheme/po/GradePO.java +++ b/src/com/engine/organization/entity/scheme/po/GradePO.java @@ -8,7 +8,7 @@ import lombok.NoArgsConstructor; import java.util.Date; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/11 * @version: 1.0 diff --git a/src/com/engine/organization/entity/scheme/po/LevelPO.java b/src/com/engine/organization/entity/scheme/po/LevelPO.java index 3a1e9819..4616c707 100644 --- a/src/com/engine/organization/entity/scheme/po/LevelPO.java +++ b/src/com/engine/organization/entity/scheme/po/LevelPO.java @@ -9,7 +9,7 @@ import java.util.Date; /** * - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/09 * @version: 1.0 diff --git a/src/com/engine/organization/entity/scheme/vo/GradeTableVO.java b/src/com/engine/organization/entity/scheme/vo/GradeTableVO.java index 6f61a22e..ef037941 100644 --- a/src/com/engine/organization/entity/scheme/vo/GradeTableVO.java +++ b/src/com/engine/organization/entity/scheme/vo/GradeTableVO.java @@ -8,7 +8,7 @@ import lombok.Data; import lombok.NoArgsConstructor; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/11 * @version: 1.0 diff --git a/src/com/engine/organization/entity/searchtree/SearchTree.java b/src/com/engine/organization/entity/searchtree/SearchTree.java index d15d125c..14c98631 100644 --- a/src/com/engine/organization/entity/searchtree/SearchTree.java +++ b/src/com/engine/organization/entity/searchtree/SearchTree.java @@ -4,7 +4,7 @@ import com.api.hrm.bean.TreeNode; import lombok.Data; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/26 * @version: 1.0 diff --git a/src/com/engine/organization/entity/searchtree/SearchTreeParams.java b/src/com/engine/organization/entity/searchtree/SearchTreeParams.java index 46d9959f..bc1b08f2 100644 --- a/src/com/engine/organization/entity/searchtree/SearchTreeParams.java +++ b/src/com/engine/organization/entity/searchtree/SearchTreeParams.java @@ -3,7 +3,7 @@ package com.engine.organization.entity.searchtree; import lombok.Data; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/26 * @version: 1.0 diff --git a/src/com/engine/organization/entity/sequence/dto/SequenceDTO.java b/src/com/engine/organization/entity/sequence/dto/SequenceDTO.java index 1a9cfa77..175b0b56 100644 --- a/src/com/engine/organization/entity/sequence/dto/SequenceDTO.java +++ b/src/com/engine/organization/entity/sequence/dto/SequenceDTO.java @@ -11,7 +11,7 @@ import java.util.Date; /** * @Author dxfeng - * @Description: TODO + * @description: * @Date 2022/5/11 * @Version V1.0 **/ diff --git a/src/com/engine/organization/entity/sequence/param/SequenceSearchParam.java b/src/com/engine/organization/entity/sequence/param/SequenceSearchParam.java index d7b29951..bff55778 100644 --- a/src/com/engine/organization/entity/sequence/param/SequenceSearchParam.java +++ b/src/com/engine/organization/entity/sequence/param/SequenceSearchParam.java @@ -7,7 +7,7 @@ import lombok.NoArgsConstructor; /** * @Author dxfeng - * @Description: TODO + * @description: * @Date 2022/5/12 * @Version V1.0 **/ diff --git a/src/com/engine/organization/entity/sequence/po/SequencePO.java b/src/com/engine/organization/entity/sequence/po/SequencePO.java index df6db25a..0e568fbb 100644 --- a/src/com/engine/organization/entity/sequence/po/SequencePO.java +++ b/src/com/engine/organization/entity/sequence/po/SequencePO.java @@ -8,7 +8,7 @@ import lombok.NoArgsConstructor; import java.util.Date; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/12 * @version: 1.0 diff --git a/src/com/engine/organization/entity/sequence/vo/SequenceTableVO.java b/src/com/engine/organization/entity/sequence/vo/SequenceTableVO.java index 0c1b404b..b061d363 100644 --- a/src/com/engine/organization/entity/sequence/vo/SequenceTableVO.java +++ b/src/com/engine/organization/entity/sequence/vo/SequenceTableVO.java @@ -8,7 +8,7 @@ import lombok.Data; import lombok.NoArgsConstructor; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/12 * @version: 1.0 diff --git a/src/com/engine/organization/entity/staff/bo/StaffBO.java b/src/com/engine/organization/entity/staff/bo/StaffBO.java index 2340e2b4..2fc56f5b 100644 --- a/src/com/engine/organization/entity/staff/bo/StaffBO.java +++ b/src/com/engine/organization/entity/staff/bo/StaffBO.java @@ -7,7 +7,7 @@ import com.engine.organization.transmethod.StaffTransMethod; import java.util.Date; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/25 * @version: 1.0 diff --git a/src/com/engine/organization/entity/staff/bo/StaffPlanBO.java b/src/com/engine/organization/entity/staff/bo/StaffPlanBO.java index b8acb6f1..c102902e 100644 --- a/src/com/engine/organization/entity/staff/bo/StaffPlanBO.java +++ b/src/com/engine/organization/entity/staff/bo/StaffPlanBO.java @@ -8,7 +8,7 @@ import weaver.general.StringUtil; import java.util.Date; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/25 * @version: 1.0 diff --git a/src/com/engine/organization/entity/staff/param/StaffPlanSearchParam.java b/src/com/engine/organization/entity/staff/param/StaffPlanSearchParam.java index 3e40f0ea..533fca14 100644 --- a/src/com/engine/organization/entity/staff/param/StaffPlanSearchParam.java +++ b/src/com/engine/organization/entity/staff/param/StaffPlanSearchParam.java @@ -6,7 +6,7 @@ import lombok.Data; import lombok.NoArgsConstructor; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/25 * @version: 1.0 diff --git a/src/com/engine/organization/entity/staff/param/StaffSearchParam.java b/src/com/engine/organization/entity/staff/param/StaffSearchParam.java index 1e004e5d..95773df5 100644 --- a/src/com/engine/organization/entity/staff/param/StaffSearchParam.java +++ b/src/com/engine/organization/entity/staff/param/StaffSearchParam.java @@ -6,7 +6,7 @@ import lombok.Data; import lombok.NoArgsConstructor; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/25 * @version: 1.0 diff --git a/src/com/engine/organization/entity/staff/po/StaffPO.java b/src/com/engine/organization/entity/staff/po/StaffPO.java index 3a813954..992d5ee7 100644 --- a/src/com/engine/organization/entity/staff/po/StaffPO.java +++ b/src/com/engine/organization/entity/staff/po/StaffPO.java @@ -8,7 +8,7 @@ import lombok.NoArgsConstructor; import java.util.Date; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/25 * @version: 1.0 diff --git a/src/com/engine/organization/entity/staff/po/StaffPlanPO.java b/src/com/engine/organization/entity/staff/po/StaffPlanPO.java index 7092df4a..4b11d365 100644 --- a/src/com/engine/organization/entity/staff/po/StaffPlanPO.java +++ b/src/com/engine/organization/entity/staff/po/StaffPlanPO.java @@ -8,7 +8,7 @@ import lombok.NoArgsConstructor; import java.util.Date; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/24 * @version: 1.0 diff --git a/src/com/engine/organization/entity/staff/po/StaffsPO.java b/src/com/engine/organization/entity/staff/po/StaffsPO.java index 9654950c..a68211ad 100644 --- a/src/com/engine/organization/entity/staff/po/StaffsPO.java +++ b/src/com/engine/organization/entity/staff/po/StaffsPO.java @@ -8,7 +8,7 @@ import lombok.NoArgsConstructor; import java.util.Date; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/06/07 * @version: 1.0 diff --git a/src/com/engine/organization/entity/staff/vo/StaffPlanTableVO.java b/src/com/engine/organization/entity/staff/vo/StaffPlanTableVO.java index 4b2ae5ad..01bae639 100644 --- a/src/com/engine/organization/entity/staff/vo/StaffPlanTableVO.java +++ b/src/com/engine/organization/entity/staff/vo/StaffPlanTableVO.java @@ -8,7 +8,7 @@ import lombok.Data; import lombok.NoArgsConstructor; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/25 * @version: 1.0 diff --git a/src/com/engine/organization/entity/staff/vo/StaffTableVO.java b/src/com/engine/organization/entity/staff/vo/StaffTableVO.java index 1c38d833..165d3632 100644 --- a/src/com/engine/organization/entity/staff/vo/StaffTableVO.java +++ b/src/com/engine/organization/entity/staff/vo/StaffTableVO.java @@ -8,7 +8,7 @@ import lombok.Data; import lombok.NoArgsConstructor; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/25 * @version: 1.0 diff --git a/src/com/engine/organization/enums/DeleteTypeEnum.java b/src/com/engine/organization/enums/DeleteTypeEnum.java index 92a833ba..0d693ffb 100644 --- a/src/com/engine/organization/enums/DeleteTypeEnum.java +++ b/src/com/engine/organization/enums/DeleteTypeEnum.java @@ -2,7 +2,7 @@ package com.engine.organization.enums; /** * @Author weaver_cl - * @Description: TODO + * @description: * @Date 2022/4/28 * @Version V1.0 **/ diff --git a/src/com/engine/organization/enums/OperateTypeEnum.java b/src/com/engine/organization/enums/OperateTypeEnum.java index b8b1505e..f4d4c4fa 100644 --- a/src/com/engine/organization/enums/OperateTypeEnum.java +++ b/src/com/engine/organization/enums/OperateTypeEnum.java @@ -2,7 +2,7 @@ package com.engine.organization.enums; /** * @Author weaver_cl - * @Description: TODO + * @description: * @Date 2022/4/28 * @Version V1.0 **/ diff --git a/src/com/engine/organization/enums/OrganizationTypeEnum.java b/src/com/engine/organization/enums/OrganizationTypeEnum.java new file mode 100644 index 00000000..fbe85d52 --- /dev/null +++ b/src/com/engine/organization/enums/OrganizationTypeEnum.java @@ -0,0 +1,12 @@ +package com.engine.organization.enums; + +/** + * @Author weaver_cl + * @description: + * @Date 2022/6/14 + * @Version V1.0 + **/ +public enum OrganizationTypeEnum { + + +} diff --git a/src/com/engine/organization/enums/RuleCodeTypeEnum.java b/src/com/engine/organization/enums/RuleCodeTypeEnum.java index a8988d3b..c662a202 100644 --- a/src/com/engine/organization/enums/RuleCodeTypeEnum.java +++ b/src/com/engine/organization/enums/RuleCodeTypeEnum.java @@ -3,7 +3,7 @@ package com.engine.organization.enums; /** * @Author weaver_cl - * @Description: TODO + * @description: * @Date 2022/5/31 * @Version V1.0 **/ diff --git a/src/com/engine/organization/exception/OrganizationRunTimeException.java b/src/com/engine/organization/exception/OrganizationRunTimeException.java index fba75ba0..2715a997 100644 --- a/src/com/engine/organization/exception/OrganizationRunTimeException.java +++ b/src/com/engine/organization/exception/OrganizationRunTimeException.java @@ -2,7 +2,7 @@ package com.engine.organization.exception; /** * @Author weaver_cl - * @Description: TODO + * @description: * @Date 2022/4/26 * @Version V1.0 **/ diff --git a/src/com/engine/organization/mapper/DemoMapper.java b/src/com/engine/organization/mapper/DemoMapper.java index f44b7ce1..8cbb8844 100644 --- a/src/com/engine/organization/mapper/DemoMapper.java +++ b/src/com/engine/organization/mapper/DemoMapper.java @@ -7,7 +7,7 @@ import java.util.List; /** * @Author weaver_cl - * @Description: TODO + * @description: * @Date 2022/3/9 * @Version V1.0 **/ diff --git a/src/com/engine/organization/mapper/SISLog/SISLogMapper.java b/src/com/engine/organization/mapper/SISLog/SISLogMapper.java index 4999c0d4..55a51ca8 100644 --- a/src/com/engine/organization/mapper/SISLog/SISLogMapper.java +++ b/src/com/engine/organization/mapper/SISLog/SISLogMapper.java @@ -4,7 +4,7 @@ import com.engine.organization.entity.LoggerContext; /** * @Author weaver_cl - * @Description: TODO + * @description: * @Date 2022/4/28 * @Version V1.0 **/ diff --git a/src/com/engine/organization/mapper/codesetting/CodeRuleDetailMapper.java b/src/com/engine/organization/mapper/codesetting/CodeRuleDetailMapper.java index 5f3a57a7..5ade0998 100644 --- a/src/com/engine/organization/mapper/codesetting/CodeRuleDetailMapper.java +++ b/src/com/engine/organization/mapper/codesetting/CodeRuleDetailMapper.java @@ -7,7 +7,7 @@ import java.util.List; /** * @Author weaver_cl - * @Description: TODO + * @description: * @Date 2022/5/31 * @Version V1.0 **/ diff --git a/src/com/engine/organization/mapper/codesetting/CodeRuleMapper.java b/src/com/engine/organization/mapper/codesetting/CodeRuleMapper.java index b42bcdd9..1c9ce8bb 100644 --- a/src/com/engine/organization/mapper/codesetting/CodeRuleMapper.java +++ b/src/com/engine/organization/mapper/codesetting/CodeRuleMapper.java @@ -5,7 +5,7 @@ import org.apache.ibatis.annotations.Param; /** * @Author weaver_cl - * @Description: TODO + * @description: * @Date 2022/5/31 * @Version V1.0 **/ diff --git a/src/com/engine/organization/mapper/common/RefreshUseMapper.java b/src/com/engine/organization/mapper/common/RefreshUseMapper.java index 8d34418b..e25fa705 100644 --- a/src/com/engine/organization/mapper/common/RefreshUseMapper.java +++ b/src/com/engine/organization/mapper/common/RefreshUseMapper.java @@ -5,7 +5,7 @@ import org.apache.ibatis.annotations.Param; import java.util.Collection; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/06/01 * @version: 1.0 diff --git a/src/com/engine/organization/mapper/comp/CompMapper.java b/src/com/engine/organization/mapper/comp/CompMapper.java index 55c8e024..33477e2a 100644 --- a/src/com/engine/organization/mapper/comp/CompMapper.java +++ b/src/com/engine/organization/mapper/comp/CompMapper.java @@ -8,7 +8,7 @@ import java.util.List; import java.util.Map; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/16 * @version: 1.0 diff --git a/src/com/engine/organization/mapper/department/DepartmentMapper.java b/src/com/engine/organization/mapper/department/DepartmentMapper.java index c481f4be..0df6b635 100644 --- a/src/com/engine/organization/mapper/department/DepartmentMapper.java +++ b/src/com/engine/organization/mapper/department/DepartmentMapper.java @@ -9,7 +9,7 @@ import java.util.Map; /** * @Author weaver_cl - * @Description: TODO + * @description: * @Date 2022/5/20 * @Version V1.0 **/ diff --git a/src/com/engine/organization/mapper/employee/EmployeeMapper.java b/src/com/engine/organization/mapper/employee/EmployeeMapper.java index 261976ae..bac40ab8 100644 --- a/src/com/engine/organization/mapper/employee/EmployeeMapper.java +++ b/src/com/engine/organization/mapper/employee/EmployeeMapper.java @@ -5,7 +5,7 @@ import org.apache.ibatis.annotations.Param; /** * @Author weaver_cl - * @Description: TODO + * @description: * @Date 2022/5/20 * @Version V1.0 **/ diff --git a/src/com/engine/organization/mapper/extend/ExtDTMapper.java b/src/com/engine/organization/mapper/extend/ExtDTMapper.java index baf68619..47737dc8 100644 --- a/src/com/engine/organization/mapper/extend/ExtDTMapper.java +++ b/src/com/engine/organization/mapper/extend/ExtDTMapper.java @@ -6,7 +6,7 @@ import java.util.List; import java.util.Map; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/20 * @version: 1.0 diff --git a/src/com/engine/organization/mapper/extend/ExtMapper.java b/src/com/engine/organization/mapper/extend/ExtMapper.java index a30f3511..1a258c10 100644 --- a/src/com/engine/organization/mapper/extend/ExtMapper.java +++ b/src/com/engine/organization/mapper/extend/ExtMapper.java @@ -5,7 +5,7 @@ import org.apache.ibatis.annotations.Param; import java.util.Map; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/20 * @version: 1.0 diff --git a/src/com/engine/organization/mapper/extend/ExtendGroupMapper.java b/src/com/engine/organization/mapper/extend/ExtendGroupMapper.java index 3c1df2e9..02e217ac 100644 --- a/src/com/engine/organization/mapper/extend/ExtendGroupMapper.java +++ b/src/com/engine/organization/mapper/extend/ExtendGroupMapper.java @@ -7,7 +7,7 @@ import java.util.Collection; import java.util.List; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/18 * @version: 1.0 diff --git a/src/com/engine/organization/mapper/extend/ExtendInfoMapper.java b/src/com/engine/organization/mapper/extend/ExtendInfoMapper.java index 5eaebf97..1e93229d 100644 --- a/src/com/engine/organization/mapper/extend/ExtendInfoMapper.java +++ b/src/com/engine/organization/mapper/extend/ExtendInfoMapper.java @@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/19 * @version: 1.0 diff --git a/src/com/engine/organization/mapper/job/JobDTMapper.java b/src/com/engine/organization/mapper/job/JobDTMapper.java index 77c37b70..f8a1d2ea 100644 --- a/src/com/engine/organization/mapper/job/JobDTMapper.java +++ b/src/com/engine/organization/mapper/job/JobDTMapper.java @@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/31 * @version: 1.0 diff --git a/src/com/engine/organization/mapper/job/JobMapper.java b/src/com/engine/organization/mapper/job/JobMapper.java index 607ef8b6..d9cc3f66 100644 --- a/src/com/engine/organization/mapper/job/JobMapper.java +++ b/src/com/engine/organization/mapper/job/JobMapper.java @@ -9,7 +9,7 @@ import java.util.List; import java.util.Map; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/24 * @version: 1.0 diff --git a/src/com/engine/organization/mapper/post/PostInfoMapper.java b/src/com/engine/organization/mapper/post/PostInfoMapper.java index baca0ec0..9beeb3f8 100644 --- a/src/com/engine/organization/mapper/post/PostInfoMapper.java +++ b/src/com/engine/organization/mapper/post/PostInfoMapper.java @@ -11,7 +11,7 @@ import java.util.Map; /** * @Author dxfeng - * @Description: TODO + * @description: * @Date 2022/5/13 * @Version V1.0 **/ diff --git a/src/com/engine/organization/mapper/post/PostMapper.java b/src/com/engine/organization/mapper/post/PostMapper.java index 7132e17b..0ec48e85 100644 --- a/src/com/engine/organization/mapper/post/PostMapper.java +++ b/src/com/engine/organization/mapper/post/PostMapper.java @@ -13,7 +13,7 @@ import java.util.Map; /** * @Author dxfeng - * @Description: TODO + * @description: * @Date 2022/5/13 * @Version V1.0 **/ diff --git a/src/com/engine/organization/mapper/scheme/GradeMapper.java b/src/com/engine/organization/mapper/scheme/GradeMapper.java index 0cc97450..eb1fa65a 100644 --- a/src/com/engine/organization/mapper/scheme/GradeMapper.java +++ b/src/com/engine/organization/mapper/scheme/GradeMapper.java @@ -9,7 +9,7 @@ import java.util.List; /** * @Author dxfeng - * @Description: TODO + * @description: * @Date 2022/5/11 * @Version V1.0 **/ diff --git a/src/com/engine/organization/mapper/scheme/LevelMapper.java b/src/com/engine/organization/mapper/scheme/LevelMapper.java index 95f2fc6e..8258dc5e 100644 --- a/src/com/engine/organization/mapper/scheme/LevelMapper.java +++ b/src/com/engine/organization/mapper/scheme/LevelMapper.java @@ -11,7 +11,7 @@ import java.util.Map; /** * @Author dxfeng - * @Description: TODO + * @description: * @Date 2022/5/9 * @Version V1.0 **/ diff --git a/src/com/engine/organization/mapper/scheme/SchemeMapper.java b/src/com/engine/organization/mapper/scheme/SchemeMapper.java index 080af6ba..e3f6ec68 100644 --- a/src/com/engine/organization/mapper/scheme/SchemeMapper.java +++ b/src/com/engine/organization/mapper/scheme/SchemeMapper.java @@ -11,7 +11,7 @@ import java.util.Map; /** * @Author dxfeng - * @Description: TODO + * @description: * @Date 2022/5/9 * @Version V1.0 **/ diff --git a/src/com/engine/organization/mapper/sequence/SequenceMapper.java b/src/com/engine/organization/mapper/sequence/SequenceMapper.java index d65c01fd..9d53fd71 100644 --- a/src/com/engine/organization/mapper/sequence/SequenceMapper.java +++ b/src/com/engine/organization/mapper/sequence/SequenceMapper.java @@ -11,7 +11,7 @@ import java.util.Map; /** * @Author dxfeng - * @Description: TODO + * @description: * @Date 2022/5/12 * @Version V1.0 **/ diff --git a/src/com/engine/organization/mapper/staff/StaffMapper.java b/src/com/engine/organization/mapper/staff/StaffMapper.java index 53835363..a2ffa394 100644 --- a/src/com/engine/organization/mapper/staff/StaffMapper.java +++ b/src/com/engine/organization/mapper/staff/StaffMapper.java @@ -9,7 +9,7 @@ import java.util.List; /** * @Author dxfeng - * @Description: TODO + * @description: * @Date 2022/5/25 * @Version V1.0 **/ diff --git a/src/com/engine/organization/mapper/staff/StaffPlanMapper.java b/src/com/engine/organization/mapper/staff/StaffPlanMapper.java index e9046142..2317f4d5 100644 --- a/src/com/engine/organization/mapper/staff/StaffPlanMapper.java +++ b/src/com/engine/organization/mapper/staff/StaffPlanMapper.java @@ -10,7 +10,7 @@ import java.util.Map; /** * @Author dxfeng - * @Description: TODO + * @description: * @Date 2022/5/25 * @Version V1.0 **/ diff --git a/src/com/engine/organization/mapper/staff/StaffsMapper.java b/src/com/engine/organization/mapper/staff/StaffsMapper.java index e8ed90ef..6b7636c5 100644 --- a/src/com/engine/organization/mapper/staff/StaffsMapper.java +++ b/src/com/engine/organization/mapper/staff/StaffsMapper.java @@ -3,7 +3,7 @@ package com.engine.organization.mapper.staff; import com.engine.organization.entity.staff.po.StaffsPO; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/06/07 * @version: 1.0 diff --git a/src/com/engine/organization/service/CodeSettingService.java b/src/com/engine/organization/service/CodeSettingService.java index 35358237..9c5d1362 100644 --- a/src/com/engine/organization/service/CodeSettingService.java +++ b/src/com/engine/organization/service/CodeSettingService.java @@ -5,7 +5,7 @@ import com.engine.organization.util.response.ReturnResult; /** * @Author weaver_cl - * @Description: TODO + * @description: * @Date 2022/5/30 * @Version V1.0 **/ diff --git a/src/com/engine/organization/service/CompService.java b/src/com/engine/organization/service/CompService.java index 302105f5..c6f16a79 100644 --- a/src/com/engine/organization/service/CompService.java +++ b/src/com/engine/organization/service/CompService.java @@ -6,7 +6,7 @@ import java.util.Collection; import java.util.Map; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/16 * @version: 1.0 diff --git a/src/com/engine/organization/service/DemoService.java b/src/com/engine/organization/service/DemoService.java index a2ee0596..863f1d01 100644 --- a/src/com/engine/organization/service/DemoService.java +++ b/src/com/engine/organization/service/DemoService.java @@ -6,7 +6,7 @@ import java.util.List; /** * @Author weaver_cl - * @Description: TODO + * @description: * @Date 2022/4/27 * @Version V1.0 **/ diff --git a/src/com/engine/organization/service/DepartmentService.java b/src/com/engine/organization/service/DepartmentService.java index eca115ed..176e31ae 100644 --- a/src/com/engine/organization/service/DepartmentService.java +++ b/src/com/engine/organization/service/DepartmentService.java @@ -13,7 +13,7 @@ import java.util.Map; /** * @Author weaver_cl - * @Description: TODO + * @description: * @Date 2022/5/20 * @Version V1.0 **/ diff --git a/src/com/engine/organization/service/ExtService.java b/src/com/engine/organization/service/ExtService.java index 4bad1a7c..6574500c 100644 --- a/src/com/engine/organization/service/ExtService.java +++ b/src/com/engine/organization/service/ExtService.java @@ -8,7 +8,7 @@ import java.util.List; import java.util.Map; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/24 * @version: 1.0 diff --git a/src/com/engine/organization/service/FieldDefinedService.java b/src/com/engine/organization/service/FieldDefinedService.java index 11efbcea..87617db1 100644 --- a/src/com/engine/organization/service/FieldDefinedService.java +++ b/src/com/engine/organization/service/FieldDefinedService.java @@ -6,12 +6,12 @@ import java.util.List; /** * @Author weaver_cl - * @Description: TODO + * @description: * @Date 2022/6/13 * @Version V1.0 **/ public interface FieldDefinedService { List getTree(String moduleName); - + } diff --git a/src/com/engine/organization/service/GradeService.java b/src/com/engine/organization/service/GradeService.java index 426a436a..93a63251 100644 --- a/src/com/engine/organization/service/GradeService.java +++ b/src/com/engine/organization/service/GradeService.java @@ -6,7 +6,7 @@ import java.util.Collection; import java.util.Map; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/11 * @version: 1.0 diff --git a/src/com/engine/organization/service/GroupService.java b/src/com/engine/organization/service/GroupService.java index fc02bf8e..7a9dd0c3 100644 --- a/src/com/engine/organization/service/GroupService.java +++ b/src/com/engine/organization/service/GroupService.java @@ -3,7 +3,7 @@ package com.engine.organization.service; import java.util.Map; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/16 * @version: 1.0 diff --git a/src/com/engine/organization/service/JobService.java b/src/com/engine/organization/service/JobService.java index 5af4ff3e..57ff8c5d 100644 --- a/src/com/engine/organization/service/JobService.java +++ b/src/com/engine/organization/service/JobService.java @@ -7,7 +7,7 @@ import java.util.Collection; import java.util.Map; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/26 * @version: 1.0 diff --git a/src/com/engine/organization/service/LevelService.java b/src/com/engine/organization/service/LevelService.java index 9cf15c3e..dff80c24 100644 --- a/src/com/engine/organization/service/LevelService.java +++ b/src/com/engine/organization/service/LevelService.java @@ -6,7 +6,7 @@ import java.util.Collection; import java.util.Map; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/10 * @version: 1.0 diff --git a/src/com/engine/organization/service/PostInfoService.java b/src/com/engine/organization/service/PostInfoService.java index 9aa6a1c5..3377a9a0 100644 --- a/src/com/engine/organization/service/PostInfoService.java +++ b/src/com/engine/organization/service/PostInfoService.java @@ -6,7 +6,7 @@ import java.util.Collection; import java.util.Map; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/13 * @version: 1.0 diff --git a/src/com/engine/organization/service/PostService.java b/src/com/engine/organization/service/PostService.java index 2c06122e..7a606e2b 100644 --- a/src/com/engine/organization/service/PostService.java +++ b/src/com/engine/organization/service/PostService.java @@ -7,7 +7,7 @@ import java.util.Collection; import java.util.Map; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/13 * @version: 1.0 diff --git a/src/com/engine/organization/service/SchemeService.java b/src/com/engine/organization/service/SchemeService.java index c3c28023..ced25c40 100644 --- a/src/com/engine/organization/service/SchemeService.java +++ b/src/com/engine/organization/service/SchemeService.java @@ -7,7 +7,7 @@ import java.util.Map; /** * @Author dxfeng - * @Description: TODO + * @description: * @Date 2022/5/9 * @Version V1.0 **/ diff --git a/src/com/engine/organization/service/SequenceService.java b/src/com/engine/organization/service/SequenceService.java index 335d97b5..90d03775 100644 --- a/src/com/engine/organization/service/SequenceService.java +++ b/src/com/engine/organization/service/SequenceService.java @@ -6,7 +6,7 @@ import java.util.Collection; import java.util.Map; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/12 * @version: 1.0 diff --git a/src/com/engine/organization/service/StaffPlanService.java b/src/com/engine/organization/service/StaffPlanService.java index 2935e1ef..a5d1d45e 100644 --- a/src/com/engine/organization/service/StaffPlanService.java +++ b/src/com/engine/organization/service/StaffPlanService.java @@ -6,7 +6,7 @@ import java.util.Collection; import java.util.Map; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/25 * @version: 1.0 diff --git a/src/com/engine/organization/service/StaffService.java b/src/com/engine/organization/service/StaffService.java index f38a16f6..2090dbf1 100644 --- a/src/com/engine/organization/service/StaffService.java +++ b/src/com/engine/organization/service/StaffService.java @@ -6,7 +6,7 @@ import java.util.Collection; import java.util.Map; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/25 * @version: 1.0 diff --git a/src/com/engine/organization/service/TestService.java b/src/com/engine/organization/service/TestService.java index 3af4b3e2..64c131c1 100644 --- a/src/com/engine/organization/service/TestService.java +++ b/src/com/engine/organization/service/TestService.java @@ -5,7 +5,7 @@ import com.engine.organization.entity.po.Demo; /** * @Author weaver_cl - * @Description: TODO + * @description: * @Date 2022/4/28 * @Version V1.0 **/ diff --git a/src/com/engine/organization/service/impl/CodeSettingServiceImpl.java b/src/com/engine/organization/service/impl/CodeSettingServiceImpl.java index 47fa87da..a55965fa 100644 --- a/src/com/engine/organization/service/impl/CodeSettingServiceImpl.java +++ b/src/com/engine/organization/service/impl/CodeSettingServiceImpl.java @@ -26,7 +26,7 @@ import java.util.Map; /** * @Author weaver_cl - * @Description: TODO + * @description: * @Date 2022/5/30 * @Version V1.0 **/ diff --git a/src/com/engine/organization/service/impl/CompServiceImpl.java b/src/com/engine/organization/service/impl/CompServiceImpl.java index 57a21d7d..409637ed 100644 --- a/src/com/engine/organization/service/impl/CompServiceImpl.java +++ b/src/com/engine/organization/service/impl/CompServiceImpl.java @@ -38,7 +38,7 @@ import java.util.*; import java.util.stream.Collectors; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/16 * @version: 1.0 diff --git a/src/com/engine/organization/service/impl/DemoServiceImpl.java b/src/com/engine/organization/service/impl/DemoServiceImpl.java index 62e9a6d5..d5adcd73 100644 --- a/src/com/engine/organization/service/impl/DemoServiceImpl.java +++ b/src/com/engine/organization/service/impl/DemoServiceImpl.java @@ -18,7 +18,7 @@ import java.util.List; /** * @Author weaver_cl - * @Description: TODO + * @description: * @Date 2022/4/27 * @Version V1.0 **/ diff --git a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java index cd373178..72f2ba4a 100644 --- a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java +++ b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java @@ -49,7 +49,7 @@ import java.util.stream.Collectors; /** * @Author weaver_cl - * @Description: TODO + * @description: * @Date 2022/5/20 * @Version V1.0 **/ diff --git a/src/com/engine/organization/service/impl/ExtServiceImpl.java b/src/com/engine/organization/service/impl/ExtServiceImpl.java index 10388cea..24c42183 100644 --- a/src/com/engine/organization/service/impl/ExtServiceImpl.java +++ b/src/com/engine/organization/service/impl/ExtServiceImpl.java @@ -25,7 +25,7 @@ import java.util.*; import java.util.stream.Collectors; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/24 * @version: 1.0 diff --git a/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java b/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java index 26ed3bc9..f77ff2ae 100644 --- a/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java +++ b/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java @@ -4,11 +4,12 @@ import com.engine.core.impl.Service; import com.engine.organization.entity.fieldset.TypeTreeDTO; import com.engine.organization.service.FieldDefinedService; +import java.util.ArrayList; import java.util.List; /** * @Author weaver_cl - * @Description: TODO + * @Description: * @Date 2022/6/13 * @Version V1.0 **/ @@ -16,6 +17,8 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ @Override public List getTree(String moduleName) { - return null; + List typeTreeDTOS = new ArrayList<>(); + //int extendType = + return typeTreeDTOS; } } diff --git a/src/com/engine/organization/service/impl/GradeServiceImpl.java b/src/com/engine/organization/service/impl/GradeServiceImpl.java index c8fd008e..c217bb8e 100644 --- a/src/com/engine/organization/service/impl/GradeServiceImpl.java +++ b/src/com/engine/organization/service/impl/GradeServiceImpl.java @@ -28,7 +28,7 @@ import java.util.*; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/11 * @version: 1.0 diff --git a/src/com/engine/organization/service/impl/GroupServiceImpl.java b/src/com/engine/organization/service/impl/GroupServiceImpl.java index 0efe0a73..1588052c 100644 --- a/src/com/engine/organization/service/impl/GroupServiceImpl.java +++ b/src/com/engine/organization/service/impl/GroupServiceImpl.java @@ -19,7 +19,7 @@ import java.util.List; import java.util.Map; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/16 * @version: 1.0 diff --git a/src/com/engine/organization/service/impl/JobServiceImpl.java b/src/com/engine/organization/service/impl/JobServiceImpl.java index 3d14c887..7bb7f1b8 100644 --- a/src/com/engine/organization/service/impl/JobServiceImpl.java +++ b/src/com/engine/organization/service/impl/JobServiceImpl.java @@ -57,7 +57,7 @@ import java.util.*; import java.util.stream.Collectors; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/26 * @version: 1.0 diff --git a/src/com/engine/organization/service/impl/LevelServiceImpl.java b/src/com/engine/organization/service/impl/LevelServiceImpl.java index 485c1a96..01ff55dd 100644 --- a/src/com/engine/organization/service/impl/LevelServiceImpl.java +++ b/src/com/engine/organization/service/impl/LevelServiceImpl.java @@ -27,7 +27,7 @@ import java.util.*; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/10 * @version: 1.0 diff --git a/src/com/engine/organization/service/impl/PostInfoServiceImpl.java b/src/com/engine/organization/service/impl/PostInfoServiceImpl.java index d28a5af9..1a0f7565 100644 --- a/src/com/engine/organization/service/impl/PostInfoServiceImpl.java +++ b/src/com/engine/organization/service/impl/PostInfoServiceImpl.java @@ -29,7 +29,7 @@ import java.util.*; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/13 * @version: 1.0 diff --git a/src/com/engine/organization/service/impl/PostServiceImpl.java b/src/com/engine/organization/service/impl/PostServiceImpl.java index 38696893..9bb6f26a 100644 --- a/src/com/engine/organization/service/impl/PostServiceImpl.java +++ b/src/com/engine/organization/service/impl/PostServiceImpl.java @@ -18,7 +18,7 @@ import weaver.general.Util; import java.util.*; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/13 * @version: 1.0 diff --git a/src/com/engine/organization/service/impl/SchemeServiceImpl.java b/src/com/engine/organization/service/impl/SchemeServiceImpl.java index d6855797..3ee3c742 100644 --- a/src/com/engine/organization/service/impl/SchemeServiceImpl.java +++ b/src/com/engine/organization/service/impl/SchemeServiceImpl.java @@ -23,7 +23,7 @@ import java.util.*; /** * @Author dxfeng - * @Description: TODO + * @description: * @Date 2022/5/9 * @Version V1.0 **/ diff --git a/src/com/engine/organization/service/impl/SequenceServiceImpl.java b/src/com/engine/organization/service/impl/SequenceServiceImpl.java index 6cf76dcc..01aae2e1 100644 --- a/src/com/engine/organization/service/impl/SequenceServiceImpl.java +++ b/src/com/engine/organization/service/impl/SequenceServiceImpl.java @@ -27,7 +27,7 @@ import java.util.*; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/12 * @version: 1.0 diff --git a/src/com/engine/organization/service/impl/StaffPlanServiceImpl.java b/src/com/engine/organization/service/impl/StaffPlanServiceImpl.java index 4f398f59..766b161d 100644 --- a/src/com/engine/organization/service/impl/StaffPlanServiceImpl.java +++ b/src/com/engine/organization/service/impl/StaffPlanServiceImpl.java @@ -27,7 +27,7 @@ import weaver.general.Util; import java.util.*; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/25 * @version: 1.0 diff --git a/src/com/engine/organization/service/impl/StaffServiceImpl.java b/src/com/engine/organization/service/impl/StaffServiceImpl.java index 92fd35a5..feae82bd 100644 --- a/src/com/engine/organization/service/impl/StaffServiceImpl.java +++ b/src/com/engine/organization/service/impl/StaffServiceImpl.java @@ -31,7 +31,7 @@ import weaver.general.Util; import java.util.*; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/25 * @version: 1.0 diff --git a/src/com/engine/organization/service/impl/TestServiceImpl.java b/src/com/engine/organization/service/impl/TestServiceImpl.java index 8fd98088..c4646859 100644 --- a/src/com/engine/organization/service/impl/TestServiceImpl.java +++ b/src/com/engine/organization/service/impl/TestServiceImpl.java @@ -5,7 +5,7 @@ import com.engine.organization.service.TestService; /** * @Author weaver_cl - * @Description: TODO + * @description: * @Date 2022/4/28 * @Version V1.0 **/ diff --git a/src/com/engine/organization/transmethod/CompTransMethod.java b/src/com/engine/organization/transmethod/CompTransMethod.java index a6e5bec3..cbe1df11 100644 --- a/src/com/engine/organization/transmethod/CompTransMethod.java +++ b/src/com/engine/organization/transmethod/CompTransMethod.java @@ -9,7 +9,7 @@ import java.util.Map; import java.util.stream.Collectors; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/25 * @version: 1.0 diff --git a/src/com/engine/organization/transmethod/DepartmentTransMethod.java b/src/com/engine/organization/transmethod/DepartmentTransMethod.java index 8174029b..d490418f 100644 --- a/src/com/engine/organization/transmethod/DepartmentTransMethod.java +++ b/src/com/engine/organization/transmethod/DepartmentTransMethod.java @@ -9,7 +9,7 @@ import java.util.Map; import java.util.stream.Collectors; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/25 * @version: 1.0 diff --git a/src/com/engine/organization/transmethod/JobTransMethod.java b/src/com/engine/organization/transmethod/JobTransMethod.java index 042c53fc..76d3ae1e 100644 --- a/src/com/engine/organization/transmethod/JobTransMethod.java +++ b/src/com/engine/organization/transmethod/JobTransMethod.java @@ -9,7 +9,7 @@ import java.util.Map; import java.util.stream.Collectors; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/25 * @version: 1.0 diff --git a/src/com/engine/organization/transmethod/LevelTransMethod.java b/src/com/engine/organization/transmethod/LevelTransMethod.java index aa5fb18d..d6ac9ee7 100644 --- a/src/com/engine/organization/transmethod/LevelTransMethod.java +++ b/src/com/engine/organization/transmethod/LevelTransMethod.java @@ -9,7 +9,7 @@ import java.util.Map; import java.util.stream.Collectors; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/12 * @version: 1.0 diff --git a/src/com/engine/organization/transmethod/StaffPlanTransMethod.java b/src/com/engine/organization/transmethod/StaffPlanTransMethod.java index d1a92f5d..f15bd9f0 100644 --- a/src/com/engine/organization/transmethod/StaffPlanTransMethod.java +++ b/src/com/engine/organization/transmethod/StaffPlanTransMethod.java @@ -10,7 +10,7 @@ import java.util.Map; import java.util.stream.Collectors; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/25 * @version: 1.0 diff --git a/src/com/engine/organization/transmethod/StaffTransMethod.java b/src/com/engine/organization/transmethod/StaffTransMethod.java index 0215a7ad..88949cbe 100644 --- a/src/com/engine/organization/transmethod/StaffTransMethod.java +++ b/src/com/engine/organization/transmethod/StaffTransMethod.java @@ -1,7 +1,7 @@ package com.engine.organization.transmethod; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/06/07 * @version: 1.0 diff --git a/src/com/engine/organization/util/ConfigTrans.java b/src/com/engine/organization/util/ConfigTrans.java index f97eb711..0efbc1b9 100644 --- a/src/com/engine/organization/util/ConfigTrans.java +++ b/src/com/engine/organization/util/ConfigTrans.java @@ -6,7 +6,7 @@ import java.util.List; /** * @Author weaver_cl - * @Description: TODO + * @description: * @Date 2022/5/27 * @Version V1.0 **/ diff --git a/src/com/engine/organization/util/HasRightUtil.java b/src/com/engine/organization/util/HasRightUtil.java index b313907d..dfb08ed6 100644 --- a/src/com/engine/organization/util/HasRightUtil.java +++ b/src/com/engine/organization/util/HasRightUtil.java @@ -4,7 +4,7 @@ import weaver.hrm.HrmUserVarify; import weaver.hrm.User; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/06/07 * @version: 1.0 diff --git a/src/com/engine/organization/util/HrmI18nUtil.java b/src/com/engine/organization/util/HrmI18nUtil.java index 39f81790..ad67f0d3 100644 --- a/src/com/engine/organization/util/HrmI18nUtil.java +++ b/src/com/engine/organization/util/HrmI18nUtil.java @@ -2,7 +2,7 @@ package com.engine.organization.util; /** * @Author weaver_cl - * @Description: TODO 多语言工具类 + * @description: 多语言工具类 * @Date 2022/3/9 * @Version V1.0 **/ diff --git a/src/com/engine/organization/util/LogAspect.java b/src/com/engine/organization/util/LogAspect.java index 8962dcb6..41be247c 100644 --- a/src/com/engine/organization/util/LogAspect.java +++ b/src/com/engine/organization/util/LogAspect.java @@ -17,7 +17,7 @@ import java.util.concurrent.Executors; /** * @Author weaver_cl - * @Description: TODO 日志切面操作 + * @description: 日志切面操作 * @Date 2022/4/27 * @Version V1.0 **/ diff --git a/src/com/engine/organization/util/OrganizationAssert.java b/src/com/engine/organization/util/OrganizationAssert.java index eb3e9368..b25e1d96 100644 --- a/src/com/engine/organization/util/OrganizationAssert.java +++ b/src/com/engine/organization/util/OrganizationAssert.java @@ -9,7 +9,7 @@ import java.util.Map; /** * @Author weaver_cl - * @Description: TODO + * @description: * @Date 2022/4/26 * @Version V1.0 **/ diff --git a/src/com/engine/organization/util/OrganizationEnumUtil.java b/src/com/engine/organization/util/OrganizationEnumUtil.java new file mode 100644 index 00000000..0bd03999 --- /dev/null +++ b/src/com/engine/organization/util/OrganizationEnumUtil.java @@ -0,0 +1,51 @@ +package com.engine.organization.util; + +import com.engine.salary.enums.BaseEnum; +import com.engine.salary.enums.sicategory.PaymentScopeEnum; +import org.apache.commons.lang.StringUtils; + +import java.util.Arrays; +import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; + +/** + * @Author weaver_cl + * @description: + * @Date 2022/6/14 + * @Version V1.0 + **/ +public class OrganizationEnumUtil { + /** + * 根据枚举的value获取枚举对象 + * + * @param value 枚举中的value + * @param list + * @param T + * @param + * @return + */ + @SuppressWarnings("unchecked") + public static T enumMatchByValue(Integer value, BaseEnum[] list, Class> T) { + return (T) Arrays.stream(list).filter(item -> Objects.equals(item.getValue(), value)).findFirst().get(); + } + + /** + * 枚举数组转字符串 + * + * @param list + * @return + */ + public static String enumArrToString(BaseEnum[] list) { + List collect = Arrays.stream(list).map(item -> String.valueOf(item.getValue())).collect(Collectors.toList()); + return StringUtils.join(collect, ","); + } + + public static PaymentScopeEnum[] stringToEnums(String values, String charSequence) { + String[] arr = values.split(charSequence); + PaymentScopeEnum[] enumConstants = PaymentScopeEnum.values(); + List collect = Arrays.stream(arr) + .map(item -> Arrays.stream(enumConstants).filter(s -> Objects.equals(String.valueOf(s.getValue()), item)).findFirst().get()).collect(Collectors.toList()); + return collect.toArray(new PaymentScopeEnum[collect.size()]); + } +} diff --git a/src/com/engine/organization/util/OrganizationFormItemUtil.java b/src/com/engine/organization/util/OrganizationFormItemUtil.java index 4e468e57..3096622e 100644 --- a/src/com/engine/organization/util/OrganizationFormItemUtil.java +++ b/src/com/engine/organization/util/OrganizationFormItemUtil.java @@ -14,7 +14,7 @@ import java.util.Map; /** * @Author dxfeng - * @Description: TODO + * @description: * @Date 2022/5/9 * @Version V1.0 **/ diff --git a/src/com/engine/organization/util/RefreshIsUsedUtil.java b/src/com/engine/organization/util/RefreshIsUsedUtil.java index c37cbc3d..5f256ebd 100644 --- a/src/com/engine/organization/util/RefreshIsUsedUtil.java +++ b/src/com/engine/organization/util/RefreshIsUsedUtil.java @@ -16,7 +16,7 @@ import java.util.Objects; import java.util.stream.Collectors; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/06/01 * @version: 1.0 diff --git a/src/com/engine/organization/util/coderule/CodeRuleUtil.java b/src/com/engine/organization/util/coderule/CodeRuleUtil.java index 0571c7db..465b4fbc 100644 --- a/src/com/engine/organization/util/coderule/CodeRuleUtil.java +++ b/src/com/engine/organization/util/coderule/CodeRuleUtil.java @@ -4,7 +4,7 @@ import com.engine.hrm.entity.RuleCodeType; import com.engine.hrm.util.CodeRuleManager; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/06/06 * @version: 1.0 diff --git a/src/com/engine/organization/util/response/ReturnResult.java b/src/com/engine/organization/util/response/ReturnResult.java index 81e7567c..f011e61f 100644 --- a/src/com/engine/organization/util/response/ReturnResult.java +++ b/src/com/engine/organization/util/response/ReturnResult.java @@ -2,7 +2,7 @@ package com.engine.organization.util.response; /** * @Author weaver_cl - * @Description: TODO + * @description: * @Date 2022/4/26 * @Version V1.0 **/ diff --git a/src/com/engine/organization/util/tree/SearchTreeUtil.java b/src/com/engine/organization/util/tree/SearchTreeUtil.java index 497e12d4..763eea85 100644 --- a/src/com/engine/organization/util/tree/SearchTreeUtil.java +++ b/src/com/engine/organization/util/tree/SearchTreeUtil.java @@ -10,7 +10,7 @@ import java.util.*; import java.util.stream.Collectors; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/06/06 * @version: 1.0 diff --git a/src/com/engine/organization/web/CodeSettingController.java b/src/com/engine/organization/web/CodeSettingController.java index a9090350..23413eb6 100644 --- a/src/com/engine/organization/web/CodeSettingController.java +++ b/src/com/engine/organization/web/CodeSettingController.java @@ -16,7 +16,7 @@ import javax.ws.rs.core.MediaType; /** * @Author weaver_cl - * @Description: TODO + * @description: * @Date 2022/5/30 * @Version V1.0 **/ diff --git a/src/com/engine/organization/web/CompController.java b/src/com/engine/organization/web/CompController.java index c2a9e23d..fd10e420 100644 --- a/src/com/engine/organization/web/CompController.java +++ b/src/com/engine/organization/web/CompController.java @@ -21,7 +21,7 @@ import javax.ws.rs.core.MediaType; import java.util.Map; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/16 * @version: 1.0 diff --git a/src/com/engine/organization/web/DemoController.java b/src/com/engine/organization/web/DemoController.java index d1412977..3a8b5d6e 100644 --- a/src/com/engine/organization/web/DemoController.java +++ b/src/com/engine/organization/web/DemoController.java @@ -19,7 +19,7 @@ import javax.ws.rs.core.MediaType; /** * @Author weaver_cl - * @Description: TODO + * @description: * @Date 2022/4/26 * @Version V1.0 **/ diff --git a/src/com/engine/organization/web/DepartmentController.java b/src/com/engine/organization/web/DepartmentController.java index 6c92051b..58ee9955 100644 --- a/src/com/engine/organization/web/DepartmentController.java +++ b/src/com/engine/organization/web/DepartmentController.java @@ -25,7 +25,7 @@ import java.util.Map; /** * @Author weaver_cl - * @Description: TODO + * @description: * @Date 2022/5/20 * @Version V1.0 **/ diff --git a/src/com/engine/organization/web/FieldDefinedController.java b/src/com/engine/organization/web/FieldDefinedController.java index 9c4cbe7f..c4bd43ef 100644 --- a/src/com/engine/organization/web/FieldDefinedController.java +++ b/src/com/engine/organization/web/FieldDefinedController.java @@ -17,7 +17,7 @@ import javax.ws.rs.core.MediaType; /** * @Author weaver_cl - * @Description: TODO + * @description: * @Date 2022/6/13 * @Version V1.0 **/ diff --git a/src/com/engine/organization/web/GradeController.java b/src/com/engine/organization/web/GradeController.java index 78228099..55bce20d 100644 --- a/src/com/engine/organization/web/GradeController.java +++ b/src/com/engine/organization/web/GradeController.java @@ -21,7 +21,7 @@ import javax.ws.rs.core.MediaType; import java.util.Map; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/11 * @version: 1.0 diff --git a/src/com/engine/organization/web/GroupController.java b/src/com/engine/organization/web/GroupController.java index be6a5b9e..674dfe4b 100644 --- a/src/com/engine/organization/web/GroupController.java +++ b/src/com/engine/organization/web/GroupController.java @@ -19,7 +19,7 @@ import javax.ws.rs.core.MediaType; import java.util.Map; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/16 * @version: 1.0 diff --git a/src/com/engine/organization/web/JobController.java b/src/com/engine/organization/web/JobController.java index 83b7d77b..789aa392 100644 --- a/src/com/engine/organization/web/JobController.java +++ b/src/com/engine/organization/web/JobController.java @@ -22,7 +22,7 @@ import javax.ws.rs.core.MediaType; import java.util.Map; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/27 * @version: 1.0 diff --git a/src/com/engine/organization/web/LevelController.java b/src/com/engine/organization/web/LevelController.java index 772c13cc..fad3db68 100644 --- a/src/com/engine/organization/web/LevelController.java +++ b/src/com/engine/organization/web/LevelController.java @@ -21,7 +21,7 @@ import javax.ws.rs.core.MediaType; import java.util.Map; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/10 * @version: 1.0 diff --git a/src/com/engine/organization/web/PostController.java b/src/com/engine/organization/web/PostController.java index 245f0baa..f5e15d43 100644 --- a/src/com/engine/organization/web/PostController.java +++ b/src/com/engine/organization/web/PostController.java @@ -21,7 +21,7 @@ import javax.ws.rs.core.MediaType; import java.util.Map; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/13 * @version: 1.0 diff --git a/src/com/engine/organization/web/PostInfoController.java b/src/com/engine/organization/web/PostInfoController.java index a2c5ae1e..a3e0ca70 100644 --- a/src/com/engine/organization/web/PostInfoController.java +++ b/src/com/engine/organization/web/PostInfoController.java @@ -21,7 +21,7 @@ import javax.ws.rs.core.MediaType; import java.util.Map; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/13 * @version: 1.0 diff --git a/src/com/engine/organization/web/SchemeController.java b/src/com/engine/organization/web/SchemeController.java index 1852d1b7..d6f815a0 100644 --- a/src/com/engine/organization/web/SchemeController.java +++ b/src/com/engine/organization/web/SchemeController.java @@ -22,7 +22,7 @@ import java.util.Map; /** * @Author dxfeng - * @Description: TODO + * @description: * @Date 2022/5/9 * @Version V1.0 **/ diff --git a/src/com/engine/organization/web/SequenceController.java b/src/com/engine/organization/web/SequenceController.java index 557bba6b..d87116cb 100644 --- a/src/com/engine/organization/web/SequenceController.java +++ b/src/com/engine/organization/web/SequenceController.java @@ -21,7 +21,7 @@ import javax.ws.rs.core.MediaType; import java.util.Map; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/12 * @version: 1.0 diff --git a/src/com/engine/organization/web/StaffController.java b/src/com/engine/organization/web/StaffController.java index 9f93a9d9..bd342fdc 100644 --- a/src/com/engine/organization/web/StaffController.java +++ b/src/com/engine/organization/web/StaffController.java @@ -23,7 +23,7 @@ import javax.ws.rs.core.MediaType; import java.util.Map; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/25 * @version: 1.0 diff --git a/src/com/engine/organization/web/StaffPlanController.java b/src/com/engine/organization/web/StaffPlanController.java index b3e593cc..91463cab 100644 --- a/src/com/engine/organization/web/StaffPlanController.java +++ b/src/com/engine/organization/web/StaffPlanController.java @@ -23,7 +23,7 @@ import javax.ws.rs.core.MediaType; import java.util.Map; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/25 * @version: 1.0 diff --git a/src/com/engine/organization/wrapper/CodeSettingWrapper.java b/src/com/engine/organization/wrapper/CodeSettingWrapper.java index a65bc52a..1ac60a5e 100644 --- a/src/com/engine/organization/wrapper/CodeSettingWrapper.java +++ b/src/com/engine/organization/wrapper/CodeSettingWrapper.java @@ -10,7 +10,7 @@ import weaver.hrm.User; /** * @Author weaver_cl - * @Description: TODO + * @description: * @Date 2022/5/30 * @Version V1.0 **/ diff --git a/src/com/engine/organization/wrapper/CompWrapper.java b/src/com/engine/organization/wrapper/CompWrapper.java index d6fed552..6363ee2b 100644 --- a/src/com/engine/organization/wrapper/CompWrapper.java +++ b/src/com/engine/organization/wrapper/CompWrapper.java @@ -11,7 +11,7 @@ import java.util.Collection; import java.util.Map; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/16 * @version: 1.0 diff --git a/src/com/engine/organization/wrapper/DemoWrapper.java b/src/com/engine/organization/wrapper/DemoWrapper.java index affe8c5b..d2a6a32e 100644 --- a/src/com/engine/organization/wrapper/DemoWrapper.java +++ b/src/com/engine/organization/wrapper/DemoWrapper.java @@ -12,7 +12,7 @@ import java.util.List; /** * @Author weaver_cl - * @Description: TODO + * @description: * @Date 2022/4/26 * @Version V1.0 **/ diff --git a/src/com/engine/organization/wrapper/DepartmentWrapper.java b/src/com/engine/organization/wrapper/DepartmentWrapper.java index 93a5871b..197e9f1a 100644 --- a/src/com/engine/organization/wrapper/DepartmentWrapper.java +++ b/src/com/engine/organization/wrapper/DepartmentWrapper.java @@ -19,7 +19,7 @@ import java.util.Map; /** * @Author weaver_cl - * @Description: TODO + * @description: * @Date 2022/5/20 * @Version V1.0 **/ diff --git a/src/com/engine/organization/wrapper/FieldDefinedWrapper.java b/src/com/engine/organization/wrapper/FieldDefinedWrapper.java index f68ac6fc..673b12d2 100644 --- a/src/com/engine/organization/wrapper/FieldDefinedWrapper.java +++ b/src/com/engine/organization/wrapper/FieldDefinedWrapper.java @@ -12,7 +12,7 @@ import java.util.List; /** * @Author weaver_cl - * @Description: TODO + * @description: * @Date 2022/6/13 * @Version V1.0 **/ diff --git a/src/com/engine/organization/wrapper/GradeWrapper.java b/src/com/engine/organization/wrapper/GradeWrapper.java index 0afffe26..3eaf1216 100644 --- a/src/com/engine/organization/wrapper/GradeWrapper.java +++ b/src/com/engine/organization/wrapper/GradeWrapper.java @@ -12,7 +12,7 @@ import java.util.Collection; import java.util.Map; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/11 * @version: 1.0 diff --git a/src/com/engine/organization/wrapper/GroupWrapper.java b/src/com/engine/organization/wrapper/GroupWrapper.java index f56a4a86..ec205f9f 100644 --- a/src/com/engine/organization/wrapper/GroupWrapper.java +++ b/src/com/engine/organization/wrapper/GroupWrapper.java @@ -9,7 +9,7 @@ import weaver.hrm.User; import java.util.Map; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/16 * @version: 1.0 diff --git a/src/com/engine/organization/wrapper/JobWrapper.java b/src/com/engine/organization/wrapper/JobWrapper.java index b16874f4..9eab4a7c 100644 --- a/src/com/engine/organization/wrapper/JobWrapper.java +++ b/src/com/engine/organization/wrapper/JobWrapper.java @@ -15,7 +15,7 @@ import weaver.hrm.User; import java.util.*; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/27 * @version: 1.0 diff --git a/src/com/engine/organization/wrapper/LevelWrapper.java b/src/com/engine/organization/wrapper/LevelWrapper.java index bfe46899..20c733e0 100644 --- a/src/com/engine/organization/wrapper/LevelWrapper.java +++ b/src/com/engine/organization/wrapper/LevelWrapper.java @@ -12,7 +12,7 @@ import java.util.Collection; import java.util.Map; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/10 * @version: 1.0 diff --git a/src/com/engine/organization/wrapper/PostInfoWrapper.java b/src/com/engine/organization/wrapper/PostInfoWrapper.java index 8db4a99a..579863e3 100644 --- a/src/com/engine/organization/wrapper/PostInfoWrapper.java +++ b/src/com/engine/organization/wrapper/PostInfoWrapper.java @@ -12,7 +12,7 @@ import java.util.Collection; import java.util.Map; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/13 * @version: 1.0 diff --git a/src/com/engine/organization/wrapper/PostWrapper.java b/src/com/engine/organization/wrapper/PostWrapper.java index e47e6112..7457c0a5 100644 --- a/src/com/engine/organization/wrapper/PostWrapper.java +++ b/src/com/engine/organization/wrapper/PostWrapper.java @@ -13,7 +13,7 @@ import java.util.Collection; import java.util.Map; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/13 * @version: 1.0 diff --git a/src/com/engine/organization/wrapper/SchemeWrapper.java b/src/com/engine/organization/wrapper/SchemeWrapper.java index 1e3c0388..fbb0d6ab 100644 --- a/src/com/engine/organization/wrapper/SchemeWrapper.java +++ b/src/com/engine/organization/wrapper/SchemeWrapper.java @@ -13,7 +13,7 @@ import java.util.Map; /** * @Author dxfeng - * @Description: TODO + * @description: * @Date 2022/5/9 * @Version V1.0 **/ diff --git a/src/com/engine/organization/wrapper/SequenceWrapper.java b/src/com/engine/organization/wrapper/SequenceWrapper.java index 26990dc4..7715d247 100644 --- a/src/com/engine/organization/wrapper/SequenceWrapper.java +++ b/src/com/engine/organization/wrapper/SequenceWrapper.java @@ -12,7 +12,7 @@ import java.util.Collection; import java.util.Map; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/12 * @version: 1.0 diff --git a/src/com/engine/organization/wrapper/StaffPlanWrapper.java b/src/com/engine/organization/wrapper/StaffPlanWrapper.java index 8881ea1c..dbf96297 100644 --- a/src/com/engine/organization/wrapper/StaffPlanWrapper.java +++ b/src/com/engine/organization/wrapper/StaffPlanWrapper.java @@ -12,7 +12,7 @@ import java.util.Collection; import java.util.Map; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/25 * @version: 1.0 diff --git a/src/com/engine/organization/wrapper/StaffWrapper.java b/src/com/engine/organization/wrapper/StaffWrapper.java index dec481eb..e781782c 100644 --- a/src/com/engine/organization/wrapper/StaffWrapper.java +++ b/src/com/engine/organization/wrapper/StaffWrapper.java @@ -11,7 +11,7 @@ import java.util.Collection; import java.util.Map; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/05/25 * @version: 1.0 diff --git a/src/weaver/interfaces/organization/action/StaffChangeAction.java b/src/weaver/interfaces/organization/action/StaffChangeAction.java index f5d55a3e..33be3335 100644 --- a/src/weaver/interfaces/organization/action/StaffChangeAction.java +++ b/src/weaver/interfaces/organization/action/StaffChangeAction.java @@ -17,7 +17,7 @@ import weaver.workflow.request.RequestManager; import java.util.Date; /** - * @description: TODO + * @description: * @author:dxfeng * @createTime: 2022/06/07 * @version: 1.0 From bbe5a11f5de1ff81cd014d10ce988fb56988eb7e Mon Sep 17 00:00:00 2001 From: dxfeng Date: Tue, 14 Jun 2022 11:17:39 +0800 Subject: [PATCH 39/77] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/SelectOptionParam.java | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/com/engine/organization/entity/SelectOptionParam.java b/src/com/engine/organization/entity/SelectOptionParam.java index 7e27c490..8690b3be 100644 --- a/src/com/engine/organization/entity/SelectOptionParam.java +++ b/src/com/engine/organization/entity/SelectOptionParam.java @@ -1,16 +1,13 @@ package com.engine.organization.entity; -import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.api.browser.bean.SearchConditionOption; -import org.apache.commons.lang.StringUtils; import java.util.ArrayList; import java.util.List; /** - * @description: TODO * @author:dxfeng * @createTime: 2022/06/13 * @version: 1.0 @@ -20,16 +17,21 @@ public class SelectOptionParam { /** * 下拉框Json转换 * - * @param datas + * @param customValue * @return */ - public static List convertJsonToListOption(String datas) { + public static List convertJsonToListOption(String customValue) { List selectOptions = new ArrayList<>(); - if (StringUtils.isNotBlank(datas)) { - JSONArray objectArray = JSON.parseArray(datas); - int size = objectArray.size(); + JSONArray objects = JSONObject.parseArray(customValue); + if (objects.size() < 3) { + return selectOptions; + } + JSONObject o = (JSONObject) objects.get(2); + JSONArray datas = o.getJSONArray("datas"); + if (!datas.isEmpty()) { + int size = datas.size(); for (int i = 0; i < size; i++) { - JSONObject jsonObject = (JSONObject) objectArray.get(i); + JSONObject jsonObject = (JSONObject) datas.get(i); SearchConditionOption option = new SearchConditionOption(jsonObject.getString("key"), jsonObject.getString("option")); selectOptions.add(option); } From c3d5c507839b4b0c4b5d0f359458f23335771aeb Mon Sep 17 00:00:00 2001 From: Chengliang <1546584672@qq.com> Date: Tue, 14 Jun 2022 11:37:27 +0800 Subject: [PATCH 40/77] =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../engine/organization/enums/BaseEnum.java | 18 ++++++++++++++++++ .../service/FieldDefinedService.java | 1 + .../util/OrganizationEnumUtil.java | 11 ++--------- 3 files changed, 21 insertions(+), 9 deletions(-) create mode 100644 src/com/engine/organization/enums/BaseEnum.java diff --git a/src/com/engine/organization/enums/BaseEnum.java b/src/com/engine/organization/enums/BaseEnum.java new file mode 100644 index 00000000..edb5764e --- /dev/null +++ b/src/com/engine/organization/enums/BaseEnum.java @@ -0,0 +1,18 @@ +package com.engine.organization.enums; + +/** + * @Author weaver_cl + * @Description: + * @Date 2022/6/14 + * @Version V1.0 + **/ +public interface BaseEnum { + + String name(); + + T getValue(); + + Integer getLabelId(); + + String getDefaultLabel(); +} diff --git a/src/com/engine/organization/service/FieldDefinedService.java b/src/com/engine/organization/service/FieldDefinedService.java index 87617db1..083a5228 100644 --- a/src/com/engine/organization/service/FieldDefinedService.java +++ b/src/com/engine/organization/service/FieldDefinedService.java @@ -12,6 +12,7 @@ import java.util.List; **/ public interface FieldDefinedService { + List getTree(String moduleName); } diff --git a/src/com/engine/organization/util/OrganizationEnumUtil.java b/src/com/engine/organization/util/OrganizationEnumUtil.java index 0bd03999..9eaecc3f 100644 --- a/src/com/engine/organization/util/OrganizationEnumUtil.java +++ b/src/com/engine/organization/util/OrganizationEnumUtil.java @@ -1,7 +1,6 @@ package com.engine.organization.util; -import com.engine.salary.enums.BaseEnum; -import com.engine.salary.enums.sicategory.PaymentScopeEnum; +import com.engine.organization.enums.BaseEnum; import org.apache.commons.lang.StringUtils; import java.util.Arrays; @@ -41,11 +40,5 @@ public class OrganizationEnumUtil { return StringUtils.join(collect, ","); } - public static PaymentScopeEnum[] stringToEnums(String values, String charSequence) { - String[] arr = values.split(charSequence); - PaymentScopeEnum[] enumConstants = PaymentScopeEnum.values(); - List collect = Arrays.stream(arr) - .map(item -> Arrays.stream(enumConstants).filter(s -> Objects.equals(String.valueOf(s.getValue()), item)).findFirst().get()).collect(Collectors.toList()); - return collect.toArray(new PaymentScopeEnum[collect.size()]); - } + } From 2ed79cc994ee9e8155cbf699271ce5c9ceeb895a Mon Sep 17 00:00:00 2001 From: dxfeng Date: Tue, 14 Jun 2022 13:58:58 +0800 Subject: [PATCH 41/77] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=88=86=E7=BB=84=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/表结构SQL/MySQL.sql | 14 +++++ docs/表结构SQL/Oracle.sql | 14 +++++ docs/表结构SQL/SqlServer.sql | 14 +++++ .../entity/extend/po/ExtendTitlePO.java | 49 ++++++++++++++++ .../mapper/extend/ExtendTitleMapper.java | 24 ++++++++ .../mapper/extend/ExtendTitleMapper.xml | 57 +++++++++++++++++++ .../service/impl/CompServiceImpl.java | 26 ++++----- .../service/impl/ExtServiceImpl.java | 16 +++--- 8 files changed, 194 insertions(+), 20 deletions(-) create mode 100644 src/com/engine/organization/entity/extend/po/ExtendTitlePO.java create mode 100644 src/com/engine/organization/mapper/extend/ExtendTitleMapper.java create mode 100644 src/com/engine/organization/mapper/extend/ExtendTitleMapper.xml diff --git a/docs/表结构SQL/MySQL.sql b/docs/表结构SQL/MySQL.sql index 3dc7dd8d..fe065481 100644 --- a/docs/表结构SQL/MySQL.sql +++ b/docs/表结构SQL/MySQL.sql @@ -126,6 +126,20 @@ CREATE TABLE JCL_FIELD_EXTENDGROUP ( CONSTRAINT JCL_FIELD_EXTENDGROUP_PK PRIMARY KEY (id) ); +-- JCL_FIELD_EXTENDTITLE +create table JCL_FIELD_EXTENDTITLE ( + id int auto_increment not null, + group_id int null, + title varchar(100) null, + show_order int null, + is_show int null, + creator int null, + delete_type int null, + create_time date null, + update_time date null, + constraint JCL_FIELD_EXTENDTITLE_PK primary key (id) +); + -- JCL_FIELD_EXTENDINFO CREATE TABLE JCL_FIELD_EXTENDINFO ( id int auto_increment NOT NULL, diff --git a/docs/表结构SQL/Oracle.sql b/docs/表结构SQL/Oracle.sql index ac642a30..cc122eac 100644 --- a/docs/表结构SQL/Oracle.sql +++ b/docs/表结构SQL/Oracle.sql @@ -128,6 +128,20 @@ CREATE TABLE JCL_FIELD_EXTENDGROUP ( CONSTRAINT JCL_FIELD_EXTENDGROUP_PK PRIMARY KEY (ID) ); +-- JCL_FIELD_EXTENDTITLE +CREATE TABLE JCL_FIELD_EXTENDTITLE ( + ID NUMBER NOT NULL, + GROUP_ID NUMBER NULL, + TITLE VARCHAR(100) NULL, + SHOW_ORDER NUMBER NULL, + IS_SHOW NUMBER NULL, + CREATOR NUMBER NULL, + DELETE_TYPE NUMBER NULL, + CREATE_TIME DATE NULL, + UPDATE_TIME DATE NULL, + CONSTRAINT JCL_FIELD_EXTENDTITLE_PK PRIMARY KEY (ID) +); + -- JCL_FIELD_EXTENDINFO CREATE TABLE JCL_FIELD_EXTENDINFO ( ID NUMBER NOT NULL, diff --git a/docs/表结构SQL/SqlServer.sql b/docs/表结构SQL/SqlServer.sql index 909b3fa3..f164c0cd 100644 --- a/docs/表结构SQL/SqlServer.sql +++ b/docs/表结构SQL/SqlServer.sql @@ -126,6 +126,20 @@ CREATE TABLE JCL_FIELD_EXTENDGROUP ( CONSTRAINT JCL_FIELD_EXTENDGROUP_PK PRIMARY KEY (id) ); +-- JCL_FIELD_EXTENDTITLE +create table JCL_FIELD_EXTENDTITLE ( + id int IDENTITY(1,1) NOT NULL, + group_id int null, + title varchar(100) COLLATE Chinese_PRC_CI_AS NULL, + show_order int null, + is_show int null, + creator int null, + delete_type int null, + create_time date null, + update_time date null, + CONSTRAINT JCL_FIELD_EXTENDTITLE_PK PRIMARY KEY (id) +); + -- JCL_FIELD_EXTENDINFO CREATE TABLE JCL_FIELD_EXTENDINFO ( id int IDENTITY(1,1) NOT NULL, diff --git a/src/com/engine/organization/entity/extend/po/ExtendTitlePO.java b/src/com/engine/organization/entity/extend/po/ExtendTitlePO.java new file mode 100644 index 00000000..7d7b5406 --- /dev/null +++ b/src/com/engine/organization/entity/extend/po/ExtendTitlePO.java @@ -0,0 +1,49 @@ +package com.engine.organization.entity.extend.po; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +/** + * @author:dxfeng + * @createTime: 2022/06/14 + * @version: 1.0 + */ +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class ExtendTitlePO { + /** + * 主键 + */ + private Long id; + + /** + * 分组标识 + */ + private Long groupid; + + /** + * 分组名称 + */ + private String title; + /** + * 展示排序 + */ + private Integer showOrder; + + /** + * 是否展示 + */ + private Integer isShow; + + + private Integer creator; + private Integer deleteType; + private Date createTime; + private Date updateTime; +} diff --git a/src/com/engine/organization/mapper/extend/ExtendTitleMapper.java b/src/com/engine/organization/mapper/extend/ExtendTitleMapper.java new file mode 100644 index 00000000..a6e0c700 --- /dev/null +++ b/src/com/engine/organization/mapper/extend/ExtendTitleMapper.java @@ -0,0 +1,24 @@ +package com.engine.organization.mapper.extend; + +import com.engine.organization.entity.extend.po.ExtendTitlePO; +import org.apache.ibatis.annotations.Param; + +import java.util.Collection; +import java.util.List; + +/** + * @author:dxfeng + * @createTime: 2022/06/14 + * @version: 1.0 + */ +public interface ExtendTitleMapper { + /** + * 根据分组类型获取标题信息 + * + * @param groupId + * @return + */ + List getTitlesByGroupID(@Param("groupId") String groupId); + + List getTitlesByIds(@Param("ids") Collection ids); +} diff --git a/src/com/engine/organization/mapper/extend/ExtendTitleMapper.xml b/src/com/engine/organization/mapper/extend/ExtendTitleMapper.xml new file mode 100644 index 00000000..f5ccee0d --- /dev/null +++ b/src/com/engine/organization/mapper/extend/ExtendTitleMapper.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + t + . + id + , t.group_id + , t.title + , show_order + , is_show + , t.creator + , t.delete_type + , t.create_time + , t.update_time + + + + + + + + \ No newline at end of file diff --git a/src/com/engine/organization/service/impl/CompServiceImpl.java b/src/com/engine/organization/service/impl/CompServiceImpl.java index 409637ed..4c2235a3 100644 --- a/src/com/engine/organization/service/impl/CompServiceImpl.java +++ b/src/com/engine/organization/service/impl/CompServiceImpl.java @@ -15,9 +15,9 @@ import com.engine.organization.entity.company.bo.CompBO; import com.engine.organization.entity.company.dto.CompListDTO; import com.engine.organization.entity.company.param.CompSearchParam; import com.engine.organization.entity.company.po.CompPO; -import com.engine.organization.entity.extend.po.ExtendGroupPO; +import com.engine.organization.entity.extend.po.ExtendTitlePO; import com.engine.organization.mapper.comp.CompMapper; -import com.engine.organization.mapper.extend.ExtendGroupMapper; +import com.engine.organization.mapper.extend.ExtendTitleMapper; import com.engine.organization.service.CompService; import com.engine.organization.service.ExtService; import com.engine.organization.util.HasRightUtil; @@ -75,8 +75,8 @@ public class CompServiceImpl extends Service implements CompService { return MapperProxyFactory.getProxy(CompMapper.class); } - private ExtendGroupMapper getExtendGroupMapper() { - return MapperProxyFactory.getProxy(ExtendGroupMapper.class); + private ExtendTitleMapper getExtendTitleMapper() { + return MapperProxyFactory.getProxy(ExtendTitleMapper.class); } private ExtService getExtService(User user) { @@ -187,7 +187,6 @@ public class CompServiceImpl extends Service implements CompService { SearchConditionItem compNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "名称", "compName"); // 简称 SearchConditionItem compNameShortItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "简称", "compNameShort"); - // TODO // 上级公司 SearchConditionItem compBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "上级公司", "161", "parentCompany", "compBrowser"); // 组织机构代码 @@ -240,10 +239,11 @@ public class CompServiceImpl extends Service implements CompService { if ("0".equals(groupId)) { groupId = GROUP_ID.toString(); } - List extendGroupPOS = getExtendGroupMapper().listGroupByPid(Long.parseLong(groupId)); - if (CollectionUtils.isNotEmpty(extendGroupPOS)) { - for (ExtendGroupPO extendGroupPO : extendGroupPOS) { - addGroups.add(new SearchConditionGroup(extendGroupPO.getGroupName(), true, getExtService(user).getExtForm(user, EXTEND_TYPE + "", Integer.parseInt(groupId) >= 0 ? JCL_ORG_COMPEXT : JCL_ORG_COMP, viewAttr, id, extendGroupPO.getId().toString(), "comp_no"))); + List extendTitles = getExtendTitleMapper().getTitlesByGroupID(groupId); + + if (CollectionUtils.isNotEmpty(extendTitles)) { + for (ExtendTitlePO extendTitle : extendTitles) { + addGroups.add(new SearchConditionGroup(extendTitle.getTitle(), true, getExtService(user).getExtForm(user, EXTEND_TYPE + "", Integer.parseInt(groupId) >= 0 ? JCL_ORG_COMPEXT : JCL_ORG_COMP, viewAttr, id, extendTitle.getId() + "", "comp_no"))); } } @@ -268,10 +268,10 @@ public class CompServiceImpl extends Service implements CompService { HasRightUtil.hasRight(user, RIGHT_NAME, false); Map apiDatas = new HashMap<>(); List addGroups = new ArrayList<>(); - List extendGroupPOS = getExtendGroupMapper().listGroupByPid(GROUP_ID); - if (CollectionUtils.isNotEmpty(extendGroupPOS)) { - for (ExtendGroupPO extendGroupPO : extendGroupPOS) { - addGroups.add(new SearchConditionGroup(extendGroupPO.getGroupName(), true, getExtService(user).getExtSaveForm(user, EXTEND_TYPE + "", JCL_ORG_COMP, 2, extendGroupPO.getId().toString(), "comp_no", RuleCodeType.SUBCOMPANY.getValue()))); + List extendTitles = getExtendTitleMapper().getTitlesByGroupID(GROUP_ID + ""); + if (CollectionUtils.isNotEmpty(extendTitles)) { + for (ExtendTitlePO extendTitle : extendTitles) { + addGroups.add(new SearchConditionGroup(extendTitle.getTitle(), true, getExtService(user).getExtSaveForm(user, EXTEND_TYPE + "", JCL_ORG_COMP, 2, extendTitle.getId() + "", "comp_no", RuleCodeType.SUBCOMPANY.getValue()))); } } apiDatas.put("condition", addGroups); diff --git a/src/com/engine/organization/service/impl/ExtServiceImpl.java b/src/com/engine/organization/service/impl/ExtServiceImpl.java index 24c42183..4f2ea7c1 100644 --- a/src/com/engine/organization/service/impl/ExtServiceImpl.java +++ b/src/com/engine/organization/service/impl/ExtServiceImpl.java @@ -6,13 +6,10 @@ import com.engine.organization.entity.TopTab; import com.engine.organization.entity.codesetting.po.CodeRulePO; import com.engine.organization.entity.extend.ExtendInfoOperateType; import com.engine.organization.entity.extend.bo.ExtendInfoBO; -import com.engine.organization.entity.extend.po.ExtendGroupPO; import com.engine.organization.entity.extend.po.ExtendInfoPO; +import com.engine.organization.entity.extend.po.ExtendTitlePO; import com.engine.organization.mapper.codesetting.CodeRuleMapper; -import com.engine.organization.mapper.extend.ExtDTMapper; -import com.engine.organization.mapper.extend.ExtMapper; -import com.engine.organization.mapper.extend.ExtendGroupMapper; -import com.engine.organization.mapper.extend.ExtendInfoMapper; +import com.engine.organization.mapper.extend.*; import com.engine.organization.service.ExtService; import com.engine.organization.util.OrganizationAssert; import com.engine.organization.util.db.MapperProxyFactory; @@ -49,6 +46,10 @@ public class ExtServiceImpl extends Service implements ExtService { return MapperProxyFactory.getProxy(ExtendGroupMapper.class); } + private ExtendTitleMapper getExtendTitleMapper() { + return MapperProxyFactory.getProxy(ExtendTitleMapper.class); + } + private ExtDTMapper getExtDTMapper() { return MapperProxyFactory.getProxy(ExtDTMapper.class); } @@ -158,8 +159,9 @@ public class ExtServiceImpl extends Service implements ExtService { List infoPOList1 = getExtendInfoMapper().listFields(extendType, "", tableName.toLowerCase().replace("ext", ""), ExtendInfoOperateType.EDIT.getValue()); infoPOList.addAll(infoPOList1); List ids = infoPOList.stream().map(ExtendInfoPO::getExtendGroupId).collect(Collectors.toList()); - List extendGroupPOS = getExtendGroupMapper().listGroupByIds(ids); - Set extendGroups = extendGroupPOS.stream().map(ExtendGroupPO::getPid).collect(Collectors.toSet()); + List extendTitles = getExtendTitleMapper().getTitlesByIds(ids); + Set extendGroups = extendTitles.stream().map(ExtendTitlePO::getGroupid).collect(Collectors.toSet()); + // 拓展信息 if (CollectionUtils.isNotEmpty(extendGroups)) { for (Long groupId : extendGroups) { From 5b0864d50356e97049f186684d22d0a81f0086c8 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Tue, 14 Jun 2022 14:31:52 +0800 Subject: [PATCH 42/77] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=88=86=E7=BB=84=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/extend/ExtendTitleMapper.java | 2 +- .../mapper/extend/ExtendTitleMapper.xml | 2 +- .../service/impl/CompServiceImpl.java | 4 +-- .../service/impl/DepartmentServiceImpl.java | 25 +++++++------- .../service/impl/JobServiceImpl.java | 34 +++++++------------ 5 files changed, 29 insertions(+), 38 deletions(-) diff --git a/src/com/engine/organization/mapper/extend/ExtendTitleMapper.java b/src/com/engine/organization/mapper/extend/ExtendTitleMapper.java index a6e0c700..c825c5ad 100644 --- a/src/com/engine/organization/mapper/extend/ExtendTitleMapper.java +++ b/src/com/engine/organization/mapper/extend/ExtendTitleMapper.java @@ -18,7 +18,7 @@ public interface ExtendTitleMapper { * @param groupId * @return */ - List getTitlesByGroupID(@Param("groupId") String groupId); + List getTitlesByGroupID(@Param("groupId") Long groupId); List getTitlesByIds(@Param("ids") Collection ids); } diff --git a/src/com/engine/organization/mapper/extend/ExtendTitleMapper.xml b/src/com/engine/organization/mapper/extend/ExtendTitleMapper.xml index f5ccee0d..36599d59 100644 --- a/src/com/engine/organization/mapper/extend/ExtendTitleMapper.xml +++ b/src/com/engine/organization/mapper/extend/ExtendTitleMapper.xml @@ -34,7 +34,7 @@ FROM jcl_field_extendtitle t WHERE t.delete_type = 0 - + and group_id = #{groupId} order by show_order diff --git a/src/com/engine/organization/service/impl/CompServiceImpl.java b/src/com/engine/organization/service/impl/CompServiceImpl.java index 4c2235a3..f7bc2409 100644 --- a/src/com/engine/organization/service/impl/CompServiceImpl.java +++ b/src/com/engine/organization/service/impl/CompServiceImpl.java @@ -239,7 +239,7 @@ public class CompServiceImpl extends Service implements CompService { if ("0".equals(groupId)) { groupId = GROUP_ID.toString(); } - List extendTitles = getExtendTitleMapper().getTitlesByGroupID(groupId); + List extendTitles = getExtendTitleMapper().getTitlesByGroupID(Long.parseLong(groupId)); if (CollectionUtils.isNotEmpty(extendTitles)) { for (ExtendTitlePO extendTitle : extendTitles) { @@ -268,7 +268,7 @@ public class CompServiceImpl extends Service implements CompService { HasRightUtil.hasRight(user, RIGHT_NAME, false); Map apiDatas = new HashMap<>(); List addGroups = new ArrayList<>(); - List extendTitles = getExtendTitleMapper().getTitlesByGroupID(GROUP_ID + ""); + List extendTitles = getExtendTitleMapper().getTitlesByGroupID(GROUP_ID); if (CollectionUtils.isNotEmpty(extendTitles)) { for (ExtendTitlePO extendTitle : extendTitles) { addGroups.add(new SearchConditionGroup(extendTitle.getTitle(), true, getExtService(user).getExtSaveForm(user, EXTEND_TYPE + "", JCL_ORG_COMP, 2, extendTitle.getId() + "", "comp_no", RuleCodeType.SUBCOMPANY.getValue()))); diff --git a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java index 72f2ba4a..71f97b2c 100644 --- a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java +++ b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java @@ -17,7 +17,7 @@ import com.engine.organization.entity.department.dto.DepartmentListDTO; import com.engine.organization.entity.department.param.*; import com.engine.organization.entity.department.po.DepartmentPO; import com.engine.organization.entity.department.vo.SingleDeptTreeVO; -import com.engine.organization.entity.extend.po.ExtendGroupPO; +import com.engine.organization.entity.extend.po.ExtendTitlePO; import com.engine.organization.entity.job.bo.JobBO; import com.engine.organization.entity.job.po.JobPO; import com.engine.organization.entity.job.vo.SingleJobTreeVO; @@ -25,7 +25,7 @@ import com.engine.organization.entity.searchtree.SearchTree; import com.engine.organization.entity.searchtree.SearchTreeParams; import com.engine.organization.mapper.comp.CompMapper; import com.engine.organization.mapper.department.DepartmentMapper; -import com.engine.organization.mapper.extend.ExtendGroupMapper; +import com.engine.organization.mapper.extend.ExtendTitleMapper; import com.engine.organization.mapper.job.JobMapper; import com.engine.organization.service.DepartmentService; import com.engine.organization.service.ExtService; @@ -91,8 +91,8 @@ public class DepartmentServiceImpl extends Service implements DepartmentService return MapperProxyFactory.getProxy(CompMapper.class); } - private ExtendGroupMapper getExtendGroupMapper() { - return MapperProxyFactory.getProxy(ExtendGroupMapper.class); + private ExtendTitleMapper getExtendTitleMapper() { + return MapperProxyFactory.getProxy(ExtendTitleMapper.class); } private ExtService getExtService(User user) { @@ -293,10 +293,10 @@ public class DepartmentServiceImpl extends Service implements DepartmentService if ("0".equals(groupId)) { groupId = GROUP_ID.toString(); } - List extendGroupPOS = getExtendGroupMapper().listGroupByPid(Long.parseLong(groupId)); - if (org.apache.commons.collections.CollectionUtils.isNotEmpty(extendGroupPOS)) { - for (ExtendGroupPO extendGroupPO : extendGroupPOS) { - addGroups.add(new SearchConditionGroup(extendGroupPO.getGroupName(), true, getExtService(user).getExtForm(user, EXTEND_TYPE + "", Integer.parseInt(groupId) >= 0 ? JCL_ORG_DEPTEXT : JCL_ORG_DEPT, viewAttr, id, extendGroupPO.getId().toString(), "dept_no"))); + List extendTitles = getExtendTitleMapper().getTitlesByGroupID(Long.parseLong(groupId)); + if (CollectionUtils.isNotEmpty(extendTitles)) { + for (ExtendTitlePO extendTitle : extendTitles) { + addGroups.add(new SearchConditionGroup(extendTitle.getTitle(), true, getExtService(user).getExtForm(user, EXTEND_TYPE + "", Integer.parseInt(groupId) >= 0 ? JCL_ORG_DEPTEXT : JCL_ORG_DEPT, viewAttr, id, extendTitle.getId().toString(), "dept_no"))); } } @@ -320,10 +320,11 @@ public class DepartmentServiceImpl extends Service implements DepartmentService HasRightUtil.hasRight(user, RIGHT_NAME, false); Map apiDatas = new HashMap<>(); List addGroups = new ArrayList<>(); - List extendGroupPOS = getExtendGroupMapper().listGroupByPid(GROUP_ID); - if (org.apache.commons.collections.CollectionUtils.isNotEmpty(extendGroupPOS)) { - for (ExtendGroupPO extendGroupPO : extendGroupPOS) { - addGroups.add(new SearchConditionGroup(extendGroupPO.getGroupName(), true, getExtService(user).getExtSaveForm(user, EXTEND_TYPE + "", JCL_ORG_DEPT, 2, extendGroupPO.getId().toString(), "dept_no", RuleCodeType.DEPARTMENT.getValue()))); + List extendTitles = getExtendTitleMapper().getTitlesByGroupID(GROUP_ID); + + if (CollectionUtils.isNotEmpty(extendTitles)) { + for (ExtendTitlePO extendTitle : extendTitles) { + addGroups.add(new SearchConditionGroup(extendTitle.getTitle(), true, getExtService(user).getExtSaveForm(user, EXTEND_TYPE + "", JCL_ORG_DEPT, 2, extendTitle.getId().toString(), "dept_no", RuleCodeType.DEPARTMENT.getValue()))); } } apiDatas.put("condition", addGroups); diff --git a/src/com/engine/organization/service/impl/JobServiceImpl.java b/src/com/engine/organization/service/impl/JobServiceImpl.java index 7bb7f1b8..f38a2abd 100644 --- a/src/com/engine/organization/service/impl/JobServiceImpl.java +++ b/src/com/engine/organization/service/impl/JobServiceImpl.java @@ -17,8 +17,8 @@ import com.engine.organization.entity.department.bo.DepartmentBO; import com.engine.organization.entity.department.po.DepartmentPO; import com.engine.organization.entity.employee.vo.EmployeeTableVO; import com.engine.organization.entity.extend.bo.ExtendInfoBO; -import com.engine.organization.entity.extend.po.ExtendGroupPO; import com.engine.organization.entity.extend.po.ExtendInfoPO; +import com.engine.organization.entity.extend.po.ExtendTitlePO; import com.engine.organization.entity.job.bo.JobBO; import com.engine.organization.entity.job.dto.JobListDTO; import com.engine.organization.entity.job.param.JobSearchParam; @@ -29,13 +29,11 @@ import com.engine.organization.entity.searchtree.SearchTree; import com.engine.organization.entity.searchtree.SearchTreeParams; import com.engine.organization.mapper.comp.CompMapper; import com.engine.organization.mapper.department.DepartmentMapper; -import com.engine.organization.mapper.extend.ExtendGroupMapper; +import com.engine.organization.mapper.extend.ExtendTitleMapper; import com.engine.organization.mapper.job.JobDTMapper; import com.engine.organization.mapper.job.JobMapper; import com.engine.organization.mapper.scheme.GradeMapper; import com.engine.organization.mapper.scheme.LevelMapper; -import com.engine.organization.mapper.scheme.SchemeMapper; -import com.engine.organization.mapper.sequence.SequenceMapper; import com.engine.organization.service.ExtService; import com.engine.organization.service.JobService; import com.engine.organization.util.HasRightUtil; @@ -117,16 +115,8 @@ public class JobServiceImpl extends Service implements JobService { return MapperProxyFactory.getProxy(DepartmentMapper.class); } - private SequenceMapper getSequenceMapper() { - return MapperProxyFactory.getProxy(SequenceMapper.class); - } - - private SchemeMapper getSchemeMapper() { - return MapperProxyFactory.getProxy(SchemeMapper.class); - } - - private ExtendGroupMapper getExtendGroupMapper() { - return MapperProxyFactory.getProxy(ExtendGroupMapper.class); + private ExtendTitleMapper getExtendTitleMapper() { + return MapperProxyFactory.getProxy(ExtendTitleMapper.class); } private ExtService getExtService(User user) { @@ -261,10 +251,10 @@ public class JobServiceImpl extends Service implements JobService { HasRightUtil.hasRight(user, RIGHT_NAME, false); Map apiDatas = new HashMap<>(); List addGroups = new ArrayList<>(); - List extendGroupPOS = getExtendGroupMapper().listGroupByPid(GROUP_ID); - if (org.apache.commons.collections.CollectionUtils.isNotEmpty(extendGroupPOS)) { - for (ExtendGroupPO extendGroupPO : extendGroupPOS) { - addGroups.add(new SearchConditionGroup(extendGroupPO.getGroupName(), true, getExtService(user).getExtSaveForm(user, EXTEND_TYPE + "", JCL_ORG_JOB, 2, extendGroupPO.getId().toString(), "job_no", RuleCodeType.JOBTITLES.getValue()))); + List extendTitles = getExtendTitleMapper().getTitlesByGroupID(GROUP_ID); + if (CollectionUtils.isNotEmpty(extendTitles)) { + for (ExtendTitlePO extendTitle : extendTitles) { + addGroups.add(new SearchConditionGroup(extendTitle.getTitle(), true, getExtService(user).getExtSaveForm(user, EXTEND_TYPE + "", JCL_ORG_JOB, 2, extendTitle.getId().toString(), "job_no", RuleCodeType.JOBTITLES.getValue()))); } } apiDatas.put("condition", addGroups); @@ -288,10 +278,10 @@ public class JobServiceImpl extends Service implements JobService { if ("0".equals(groupId)) { groupId = GROUP_ID.toString(); } - List extendGroupPOS = getExtendGroupMapper().listGroupByPid(Long.parseLong(groupId)); - if (org.apache.commons.collections.CollectionUtils.isNotEmpty(extendGroupPOS)) { - for (ExtendGroupPO extendGroupPO : extendGroupPOS) { - addGroups.add(new SearchConditionGroup(extendGroupPO.getGroupName(), true, getExtService(user).getExtForm(user, EXTEND_TYPE + "", Integer.parseInt(groupId) >= 0 ? JCL_ORG_JOBEXT : JCL_ORG_JOB, viewAttr, id, extendGroupPO.getId().toString(), "job_no"))); + List extendTitles = getExtendTitleMapper().getTitlesByGroupID(GROUP_ID); + if (CollectionUtils.isNotEmpty(extendTitles)) { + for (ExtendTitlePO extendTitle : extendTitles) { + addGroups.add(new SearchConditionGroup(extendTitle.getTitle(), true, getExtService(user).getExtForm(user, EXTEND_TYPE + "", Integer.parseInt(groupId) >= 0 ? JCL_ORG_JOBEXT : JCL_ORG_JOB, viewAttr, id, extendTitle.getId().toString(), "job_no"))); } } HashMap resultMap = new HashMap<>(); From 9259596e5465da39b9fe9ffb8755d589915183e9 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Tue, 14 Jun 2022 15:29:22 +0800 Subject: [PATCH 43/77] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=20getTabInfo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/extend/po/ExtendTitlePO.java | 4 +- .../mapper/extend/ExtendInfoMapper.java | 2 + .../mapper/extend/ExtendInfoMapper.xml | 6 +++ .../mapper/extend/ExtendTitleMapper.xml | 2 +- .../service/FieldDefinedService.java | 11 ++++- .../service/impl/ExtServiceImpl.java | 2 +- .../service/impl/FieldDefinedServiceImpl.java | 47 +++++++++++++++++++ .../web/FieldDefinedController.java | 18 ++++++- .../wrapper/FieldDefinedWrapper.java | 13 ++++- 9 files changed, 98 insertions(+), 7 deletions(-) diff --git a/src/com/engine/organization/entity/extend/po/ExtendTitlePO.java b/src/com/engine/organization/entity/extend/po/ExtendTitlePO.java index 7d7b5406..7aa2c96f 100644 --- a/src/com/engine/organization/entity/extend/po/ExtendTitlePO.java +++ b/src/com/engine/organization/entity/extend/po/ExtendTitlePO.java @@ -25,7 +25,7 @@ public class ExtendTitlePO { /** * 分组标识 */ - private Long groupid; + private Long groupId; /** * 分组名称 @@ -39,7 +39,7 @@ public class ExtendTitlePO { /** * 是否展示 */ - private Integer isShow; + private String isShow; private Integer creator; diff --git a/src/com/engine/organization/mapper/extend/ExtendInfoMapper.java b/src/com/engine/organization/mapper/extend/ExtendInfoMapper.java index 1e93229d..fba88e97 100644 --- a/src/com/engine/organization/mapper/extend/ExtendInfoMapper.java +++ b/src/com/engine/organization/mapper/extend/ExtendInfoMapper.java @@ -21,4 +21,6 @@ public interface ExtendInfoMapper { * @return */ List listFields(@Param("extendType") String extendType, @Param("extendGroupId") String extendGroupId, @Param("tableName") String tableName,@Param("operateType")String operateType); + + int countFieldsByGroupId(@Param("groupId") Long groupId); } diff --git a/src/com/engine/organization/mapper/extend/ExtendInfoMapper.xml b/src/com/engine/organization/mapper/extend/ExtendInfoMapper.xml index b1d8f92e..b9a5d089 100644 --- a/src/com/engine/organization/mapper/extend/ExtendInfoMapper.xml +++ b/src/com/engine/organization/mapper/extend/ExtendInfoMapper.xml @@ -75,6 +75,12 @@ order by show_order + \ No newline at end of file diff --git a/src/com/engine/organization/mapper/extend/ExtendTitleMapper.xml b/src/com/engine/organization/mapper/extend/ExtendTitleMapper.xml index 36599d59..e39e32f5 100644 --- a/src/com/engine/organization/mapper/extend/ExtendTitleMapper.xml +++ b/src/com/engine/organization/mapper/extend/ExtendTitleMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/src/com/engine/organization/service/FieldDefinedService.java b/src/com/engine/organization/service/FieldDefinedService.java index 083a5228..2ecc15de 100644 --- a/src/com/engine/organization/service/FieldDefinedService.java +++ b/src/com/engine/organization/service/FieldDefinedService.java @@ -3,6 +3,7 @@ package com.engine.organization.service; import com.engine.organization.entity.fieldset.TypeTreeDTO; import java.util.List; +import java.util.Map; /** * @Author weaver_cl @@ -12,7 +13,15 @@ import java.util.List; **/ public interface FieldDefinedService { - + List getTree(String moduleName); + /** + * 获取标题分组 + * + * @param groupType + * @return + */ + Map getTabInfo(String groupType); + } diff --git a/src/com/engine/organization/service/impl/ExtServiceImpl.java b/src/com/engine/organization/service/impl/ExtServiceImpl.java index 4f2ea7c1..904a9021 100644 --- a/src/com/engine/organization/service/impl/ExtServiceImpl.java +++ b/src/com/engine/organization/service/impl/ExtServiceImpl.java @@ -160,7 +160,7 @@ public class ExtServiceImpl extends Service implements ExtService { infoPOList.addAll(infoPOList1); List ids = infoPOList.stream().map(ExtendInfoPO::getExtendGroupId).collect(Collectors.toList()); List extendTitles = getExtendTitleMapper().getTitlesByIds(ids); - Set extendGroups = extendTitles.stream().map(ExtendTitlePO::getGroupid).collect(Collectors.toSet()); + Set extendGroups = extendTitles.stream().map(ExtendTitlePO::getGroupId).collect(Collectors.toSet()); // 拓展信息 if (CollectionUtils.isNotEmpty(extendGroups)) { diff --git a/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java b/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java index f77ff2ae..6be33e5d 100644 --- a/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java +++ b/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java @@ -1,11 +1,18 @@ package com.engine.organization.service.impl; import com.engine.core.impl.Service; +import com.engine.organization.entity.extend.po.ExtendTitlePO; import com.engine.organization.entity.fieldset.TypeTreeDTO; +import com.engine.organization.mapper.extend.ExtendInfoMapper; +import com.engine.organization.mapper.extend.ExtendTitleMapper; import com.engine.organization.service.FieldDefinedService; +import com.engine.organization.util.OrganizationAssert; +import com.engine.organization.util.db.MapperProxyFactory; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** * @Author weaver_cl @@ -14,6 +21,13 @@ import java.util.List; * @Version V1.0 **/ public class FieldDefinedServiceImpl extends Service implements FieldDefinedService { + private ExtendTitleMapper getExtendTitleMapper() { + return MapperProxyFactory.getProxy(ExtendTitleMapper.class); + } + + private ExtendInfoMapper getExtendInfoMapper() { + return MapperProxyFactory.getProxy(ExtendInfoMapper.class); + } @Override public List getTree(String moduleName) { @@ -21,4 +35,37 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ //int extendType = return typeTreeDTOS; } + + @Override + public Map getTabInfo(String groupType) { + OrganizationAssert.notBlank(groupType, "分组信息有误，请确认"); + Map datas = new HashMap<>(); + Long groupId = Long.parseLong(groupType); + List extendTitleList = getExtendTitleMapper().getTitlesByGroupID(groupId); + List> tabs = new ArrayList<>(); + int idx = 1; + for (ExtendTitlePO extendTitle : extendTitleList) { + Map tab = new HashMap<>(); + tab.put("tabkey", idx++); + tab.put("title", extendTitle.getTitle()); + tab.put("isShow", extendTitle.getIsShow()); + tab.put("groupid", extendTitle.getGroupId()); + tab.put("viewAttr", extendTitle.getGroupId() < 0 ? 1 : 2); + tab.put("editable", editTable(extendTitle.getId())); + tabs.add(tab); + } + datas.put("status", "1"); + datas.put("tabs", tabs); + return datas; + } + + /** + * 判断该分组下是否有字段 + * + * @param id + * @return + */ + private boolean editTable(Long id) { + return getExtendInfoMapper().countFieldsByGroupId(id) > 0; + } } diff --git a/src/com/engine/organization/web/FieldDefinedController.java b/src/com/engine/organization/web/FieldDefinedController.java index c4bd43ef..d1cfaafa 100644 --- a/src/com/engine/organization/web/FieldDefinedController.java +++ b/src/com/engine/organization/web/FieldDefinedController.java @@ -1,5 +1,6 @@ package com.engine.organization.web; +import com.engine.common.util.ParamUtil; import com.engine.common.util.ServiceUtil; import com.engine.organization.util.response.ReturnResult; import com.engine.organization.wrapper.FieldDefinedWrapper; @@ -14,6 +15,7 @@ import javax.ws.rs.PathParam; import javax.ws.rs.Produces; import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; +import java.util.Map; /** * @Author weaver_cl @@ -24,7 +26,7 @@ import javax.ws.rs.core.MediaType; public class FieldDefinedController { private FieldDefinedWrapper getFieldDefinedWrapper(User user) { - return ServiceUtil.getService(FieldDefinedWrapper.class,user); + return ServiceUtil.getService(FieldDefinedWrapper.class, user); } @GET @@ -39,4 +41,18 @@ public class FieldDefinedController { return ReturnResult.exceptionHandle(e.getMessage()); } } + + @GET + @Path("/getTabInfo") + @Produces(MediaType.APPLICATION_JSON) + public ReturnResult getTabInfo(@Context HttpServletRequest request, @Context HttpServletResponse response) { + try { + User user = HrmUserVarify.getUser(request, response); + Map map = ParamUtil.request2Map(request); + String groupType = (String) map.get("groupType"); + return ReturnResult.successed(getFieldDefinedWrapper(user).getTabInfo(groupType)); + } catch (Exception e) { + return ReturnResult.exceptionHandle(e.getMessage()); + } + } } diff --git a/src/com/engine/organization/wrapper/FieldDefinedWrapper.java b/src/com/engine/organization/wrapper/FieldDefinedWrapper.java index 673b12d2..e81c9468 100644 --- a/src/com/engine/organization/wrapper/FieldDefinedWrapper.java +++ b/src/com/engine/organization/wrapper/FieldDefinedWrapper.java @@ -9,6 +9,7 @@ import com.engine.organization.util.response.ReturnResult; import weaver.hrm.User; import java.util.List; +import java.util.Map; /** * @Author weaver_cl @@ -19,7 +20,7 @@ import java.util.List; public class FieldDefinedWrapper extends Service { private FieldDefinedService getFieldDefinedService(User user) { - return ServiceUtil.getService(FieldDefinedServiceImpl.class,user); + return ServiceUtil.getService(FieldDefinedServiceImpl.class, user); } @@ -27,4 +28,14 @@ public class FieldDefinedWrapper extends Service { List treeDTOS = getFieldDefinedService(user).getTree(moduleName); return ReturnResult.successed(); } + + /** + * 获取标题分组 + * + * @param groupType + * @return + */ + public Map getTabInfo(String groupType) { + return getFieldDefinedService(user).getTabInfo(groupType); + } } From 6b1ce95b48f125caade1acfc1b4c35db45d73996 Mon Sep 17 00:00:00 2001 From: Chengliang <1546584672@qq.com> Date: Tue, 14 Jun 2022 16:10:26 +0800 Subject: [PATCH 44/77] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E9=A1=B5=E9=9D=A2=E6=A0=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/extend/bo/ExtendGroupBO.java | 57 +++++++++++++++++++ .../entity/extend/po/ExtendGroupPO.java | 4 +- .../{TypeTreeDTO.java => vo/TypeTreeVO.java} | 15 +++-- .../organization/enums/ModuleTypeEnum.java | 44 ++++++++++++++ .../enums/OrganizationTypeEnum.java | 12 ---- .../mapper/extend/ExtendGroupMapper.java | 2 +- .../service/FieldDefinedService.java | 7 ++- .../service/impl/FieldDefinedServiceImpl.java | 16 ++++-- .../web/FieldDefinedController.java | 7 ++- .../wrapper/FieldDefinedWrapper.java | 9 +-- 10 files changed, 137 insertions(+), 36 deletions(-) create mode 100644 src/com/engine/organization/entity/extend/bo/ExtendGroupBO.java rename src/com/engine/organization/entity/fieldset/{TypeTreeDTO.java => vo/TypeTreeVO.java} (79%) create mode 100644 src/com/engine/organization/enums/ModuleTypeEnum.java delete mode 100644 src/com/engine/organization/enums/OrganizationTypeEnum.java diff --git a/src/com/engine/organization/entity/extend/bo/ExtendGroupBO.java b/src/com/engine/organization/entity/extend/bo/ExtendGroupBO.java new file mode 100644 index 00000000..b2976b53 --- /dev/null +++ b/src/com/engine/organization/entity/extend/bo/ExtendGroupBO.java @@ -0,0 +1,57 @@ +package com.engine.organization.entity.extend.bo; + +import com.engine.organization.entity.extend.po.ExtendGroupPO; +import com.engine.organization.entity.fieldset.vo.TypeTreeVO; +import org.apache.commons.collections.CollectionUtils; + +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * @Author weaver_cl + * @Description: + * @Date 2022/6/14 + * @Version V1.0 + **/ +public class ExtendGroupBO { + + public static List buildTypeTree(List extendGroupPOS) { + + if(CollectionUtils.isEmpty(extendGroupPOS)){ + return Collections.emptyList(); + } + + List typeTreeVOS = extendGroupPOS.stream().map(e -> + TypeTreeVO.builder() + .addChild(e.getId() >= 0) + .canClick(true) + .domid(String.valueOf(e.getId())) + .hasGroup(isHasGroup(e.getId())) + .haschild(getHasChild(e.getId())) + .isShow(e.getIsShow()) + .key(e.getId()) + .name(e.getGroupName()) + .viewAttr(e.getId() <= 0 ? 1 : 2) + .pid(e.getPid()) + .build()).collect(Collectors.toList()); + + //获取非一级 + Map> collects = typeTreeVOS.stream().filter(item -> item.getPid() != null).collect(Collectors.groupingBy(TypeTreeVO ::getPid)); + + return typeTreeVOS.stream().peek(e -> e.setSubs(collects.get(e.getKey()))).filter(item -> item.getPid() == null).collect(Collectors.toList()); + + } + + + + private static boolean getHasChild(Long id) { + return true; + } + + + private static boolean isHasGroup(Long id) { + return true; + } +} diff --git a/src/com/engine/organization/entity/extend/po/ExtendGroupPO.java b/src/com/engine/organization/entity/extend/po/ExtendGroupPO.java index 166ed4ac..1c9404d7 100644 --- a/src/com/engine/organization/entity/extend/po/ExtendGroupPO.java +++ b/src/com/engine/organization/entity/extend/po/ExtendGroupPO.java @@ -34,10 +34,12 @@ public class ExtendGroupPO { private String groupName; /** - * 所属分组 + * 父级 */ private Long pid; + private String isShow; + private Long creator; private int deleteType; private Date createTime; diff --git a/src/com/engine/organization/entity/fieldset/TypeTreeDTO.java b/src/com/engine/organization/entity/fieldset/vo/TypeTreeVO.java similarity index 79% rename from src/com/engine/organization/entity/fieldset/TypeTreeDTO.java rename to src/com/engine/organization/entity/fieldset/vo/TypeTreeVO.java index fb4e8bdb..7f8cf125 100644 --- a/src/com/engine/organization/entity/fieldset/TypeTreeDTO.java +++ b/src/com/engine/organization/entity/fieldset/vo/TypeTreeVO.java @@ -1,4 +1,4 @@ -package com.engine.organization.entity.fieldset; +package com.engine.organization.entity.fieldset.vo; import lombok.AllArgsConstructor; import lombok.Builder; @@ -17,9 +17,9 @@ import java.util.List; @Builder @NoArgsConstructor @AllArgsConstructor -public class TypeTreeDTO { +public class TypeTreeVO { - //是否可以增加子节点 默认都为false + //是否可以增加子节点 private boolean addChild; private boolean canCanceled; @@ -30,7 +30,7 @@ public class TypeTreeDTO { //树id private String domid; - //是否存在分组title + //是否存在分组 private boolean hasGroup; //是否有子节点 @@ -52,15 +52,18 @@ public class TypeTreeDTO { private boolean isopen; //键 - private String key; + private Long key; //树名称 private String name; //子节点 - private List subs; + private List subs; // private int viewAttr; + //父节点id + private Long pid; + } diff --git a/src/com/engine/organization/enums/ModuleTypeEnum.java b/src/com/engine/organization/enums/ModuleTypeEnum.java new file mode 100644 index 00000000..15ee1269 --- /dev/null +++ b/src/com/engine/organization/enums/ModuleTypeEnum.java @@ -0,0 +1,44 @@ +package com.engine.organization.enums; + +import com.engine.salary.enums.BaseEnum; + +/** + * @Author weaver_cl + * @Description: + * @Date 2022/6/14 + * @Version V1.0 + **/ +public enum ModuleTypeEnum implements BaseEnum { + + subcompanyfielddefined(1, "分部", -84967), + departmentfielddefined(2, "部门", -84967), + jobfielddefined(3, "岗位", -84967), + resourcefielddefined(4, "人员", -84967); + + private int value; + + private String defaultLabel; + + private int labelId; + + ModuleTypeEnum(int value, String defaultLabel, int labelId) { + this.value = value; + this.defaultLabel = defaultLabel; + this.labelId = labelId; + } + + @Override + public Integer getValue() { + return value; + } + + @Override + public Integer getLabelId() { + return labelId; + } + + @Override + public String getDefaultLabel() { + return defaultLabel; + } +} diff --git a/src/com/engine/organization/enums/OrganizationTypeEnum.java b/src/com/engine/organization/enums/OrganizationTypeEnum.java deleted file mode 100644 index fbe85d52..00000000 --- a/src/com/engine/organization/enums/OrganizationTypeEnum.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.engine.organization.enums; - -/** - * @Author weaver_cl - * @description: - * @Date 2022/6/14 - * @Version V1.0 - **/ -public enum OrganizationTypeEnum { - - -} diff --git a/src/com/engine/organization/mapper/extend/ExtendGroupMapper.java b/src/com/engine/organization/mapper/extend/ExtendGroupMapper.java index 02e217ac..5e9f00fb 100644 --- a/src/com/engine/organization/mapper/extend/ExtendGroupMapper.java +++ b/src/com/engine/organization/mapper/extend/ExtendGroupMapper.java @@ -19,7 +19,7 @@ public interface ExtendGroupMapper { * @param extendType * @return */ - List listByType(@Param("extendType") String extendType); + List listByType(@Param("extendType") Integer extendType); /** * 根据ID 查询数据 diff --git a/src/com/engine/organization/service/FieldDefinedService.java b/src/com/engine/organization/service/FieldDefinedService.java index 083a5228..422a9332 100644 --- a/src/com/engine/organization/service/FieldDefinedService.java +++ b/src/com/engine/organization/service/FieldDefinedService.java @@ -1,6 +1,7 @@ package com.engine.organization.service; -import com.engine.organization.entity.fieldset.TypeTreeDTO; +import com.engine.organization.entity.fieldset.vo.TypeTreeVO; +import com.engine.organization.enums.ModuleTypeEnum; import java.util.List; @@ -12,7 +13,7 @@ import java.util.List; **/ public interface FieldDefinedService { - - List getTree(String moduleName); + + List getTree(ModuleTypeEnum moduleTypeEnum); } diff --git a/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java b/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java index f77ff2ae..d9d0bc78 100644 --- a/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java +++ b/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java @@ -1,10 +1,14 @@ package com.engine.organization.service.impl; import com.engine.core.impl.Service; -import com.engine.organization.entity.fieldset.TypeTreeDTO; +import com.engine.organization.entity.extend.bo.ExtendGroupBO; +import com.engine.organization.entity.extend.po.ExtendGroupPO; +import com.engine.organization.entity.fieldset.vo.TypeTreeVO; +import com.engine.organization.enums.ModuleTypeEnum; +import com.engine.organization.mapper.extend.ExtendGroupMapper; import com.engine.organization.service.FieldDefinedService; +import com.engine.organization.util.db.MapperProxyFactory; -import java.util.ArrayList; import java.util.List; /** @@ -16,9 +20,9 @@ import java.util.List; public class FieldDefinedServiceImpl extends Service implements FieldDefinedService { @Override - public List getTree(String moduleName) { - List typeTreeDTOS = new ArrayList<>(); - //int extendType = - return typeTreeDTOS; + public List getTree(ModuleTypeEnum moduleTypeEnum) { + Integer extendType = moduleTypeEnum.getValue(); + List extendGroupPOS = MapperProxyFactory.getProxy(ExtendGroupMapper.class).listByType(extendType); + return ExtendGroupBO.buildTypeTree(extendGroupPOS); } } diff --git a/src/com/engine/organization/web/FieldDefinedController.java b/src/com/engine/organization/web/FieldDefinedController.java index c4bd43ef..bdac0654 100644 --- a/src/com/engine/organization/web/FieldDefinedController.java +++ b/src/com/engine/organization/web/FieldDefinedController.java @@ -1,6 +1,7 @@ package com.engine.organization.web; import com.engine.common.util.ServiceUtil; +import com.engine.organization.enums.ModuleTypeEnum; import com.engine.organization.util.response.ReturnResult; import com.engine.organization.wrapper.FieldDefinedWrapper; import weaver.hrm.HrmUserVarify; @@ -28,13 +29,13 @@ public class FieldDefinedController { } @GET - @Path("/{moduleName}/getTree") + @Path("/{moduleTypeEnum}/getTree") @Produces(MediaType.APPLICATION_JSON) public ReturnResult getHasRight(@Context HttpServletRequest request, @Context HttpServletResponse response, - @PathParam("moduleName") String moduleName) { + @PathParam("moduleTypeEnum") ModuleTypeEnum moduleTypeEnum) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getFieldDefinedWrapper(user).getTree(moduleName)); + return getFieldDefinedWrapper(user).getTree(moduleTypeEnum); } catch (Exception e) { return ReturnResult.exceptionHandle(e.getMessage()); } diff --git a/src/com/engine/organization/wrapper/FieldDefinedWrapper.java b/src/com/engine/organization/wrapper/FieldDefinedWrapper.java index 673b12d2..3f9a2a89 100644 --- a/src/com/engine/organization/wrapper/FieldDefinedWrapper.java +++ b/src/com/engine/organization/wrapper/FieldDefinedWrapper.java @@ -2,7 +2,8 @@ package com.engine.organization.wrapper; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; -import com.engine.organization.entity.fieldset.TypeTreeDTO; +import com.engine.organization.entity.fieldset.vo.TypeTreeVO; +import com.engine.organization.enums.ModuleTypeEnum; import com.engine.organization.service.FieldDefinedService; import com.engine.organization.service.impl.FieldDefinedServiceImpl; import com.engine.organization.util.response.ReturnResult; @@ -23,8 +24,8 @@ public class FieldDefinedWrapper extends Service { } - public ReturnResult getTree(String moduleName) { - List treeDTOS = getFieldDefinedService(user).getTree(moduleName); - return ReturnResult.successed(); + public ReturnResult getTree(ModuleTypeEnum moduleTypeEnum) { + List treeDTOS = getFieldDefinedService(user).getTree(moduleTypeEnum); + return ReturnResult.successed(treeDTOS); } } From a7e561909767140d15f62aa2b0b1c015e1a15aff Mon Sep 17 00:00:00 2001 From: dxfeng Date: Tue, 14 Jun 2022 17:53:49 +0800 Subject: [PATCH 45/77] =?UTF-8?q?=E7=BB=86=E5=8C=96=E5=88=86=E7=BB=84?= =?UTF-8?q?=E3=80=81=E6=A0=87=E9=A2=98=E3=80=81=E5=90=8D=E5=AD=97=E8=A1=A8?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=90=AF=E7=94=A8=EF=BC=9B=20=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E8=A1=A8=E6=8C=89=E7=85=A7=E4=B8=8A=E4=B8=8B=E7=BA=A7?= =?UTF-8?q?=E5=85=B3=E7=B3=BB=E5=B1=95=E7=A4=BA=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/extend/ExtendGroupMapper.xml | 4 ++-- .../mapper/extend/ExtendTitleMapper.xml | 4 ++-- .../organization/service/ExtService.java | 3 +-- .../service/FieldDefinedService.java | 8 +++++++ .../service/impl/CompServiceImpl.java | 2 +- .../service/impl/DepartmentServiceImpl.java | 2 +- .../service/impl/ExtServiceImpl.java | 23 +++++++++++++------ .../service/impl/FieldDefinedServiceImpl.java | 15 ++++++++++++ .../service/impl/JobServiceImpl.java | 2 +- 9 files changed, 47 insertions(+), 16 deletions(-) diff --git a/src/com/engine/organization/mapper/extend/ExtendGroupMapper.xml b/src/com/engine/organization/mapper/extend/ExtendGroupMapper.xml index 25167c29..16fa249a 100644 --- a/src/com/engine/organization/mapper/extend/ExtendGroupMapper.xml +++ b/src/com/engine/organization/mapper/extend/ExtendGroupMapper.xml @@ -31,7 +31,7 @@ FROM jcl_field_extendgroup t - WHERE t.delete_type = 0 + WHERE t.delete_type = 0 and t.is_show = 1 and extend_type = #{extendType} @@ -56,7 +56,7 @@ select from jcl_field_extendgroup t - WHERE t.delete_type = 0 + WHERE t.delete_type = 0 and t.is_show = 1 and t.pid= #{pid} diff --git a/src/com/engine/organization/mapper/extend/ExtendTitleMapper.xml b/src/com/engine/organization/mapper/extend/ExtendTitleMapper.xml index e39e32f5..fff58b22 100644 --- a/src/com/engine/organization/mapper/extend/ExtendTitleMapper.xml +++ b/src/com/engine/organization/mapper/extend/ExtendTitleMapper.xml @@ -33,7 +33,7 @@ FROM jcl_field_extendtitle t - WHERE t.delete_type = 0 + WHERE t.delete_type = 0 and t.is_show = 1 and group_id = #{groupId} @@ -45,7 +45,7 @@ FROM jcl_field_extendtitle t - WHERE t.delete_type = 0 + WHERE t.delete_type = 0 and t.is_show = 1 AND id IN #{id} diff --git a/src/com/engine/organization/service/ExtService.java b/src/com/engine/organization/service/ExtService.java index 6574500c..af0e8484 100644 --- a/src/com/engine/organization/service/ExtService.java +++ b/src/com/engine/organization/service/ExtService.java @@ -51,8 +51,7 @@ public interface ExtService { * @param showLabel * @return */ - List> getExtendTables(User user, String extendType, String tableName, long id, int viewAttr, boolean showLabel); - + List> getExtendTables(User user, String extendType, Long groupId,String tableName, long id, int viewAttr, boolean showLabel); /** * 拓展页面分组 * diff --git a/src/com/engine/organization/service/FieldDefinedService.java b/src/com/engine/organization/service/FieldDefinedService.java index 2ecc15de..48010e12 100644 --- a/src/com/engine/organization/service/FieldDefinedService.java +++ b/src/com/engine/organization/service/FieldDefinedService.java @@ -24,4 +24,12 @@ public interface FieldDefinedService { */ Map getTabInfo(String groupType); + /** + * 保存自定义字段 + * + * @param data + * @return + */ + int saveFields(String data); + } diff --git a/src/com/engine/organization/service/impl/CompServiceImpl.java b/src/com/engine/organization/service/impl/CompServiceImpl.java index f7bc2409..6410d187 100644 --- a/src/com/engine/organization/service/impl/CompServiceImpl.java +++ b/src/com/engine/organization/service/impl/CompServiceImpl.java @@ -254,7 +254,7 @@ public class CompServiceImpl extends Service implements CompService { // 拓展页面分组 resultMap.put("tabInfo", getExtService(user).getTabInfo(EXTEND_TYPE, JCL_ORG_COMPEXT)); // 处理明细表 - resultMap.put("tables", getExtService(user).getExtendTables(user, EXTEND_TYPE, JCL_ORG_COMPEXT_DT1, id, viewAttr, false)); + resultMap.put("tables", getExtService(user).getExtendTables(user, EXTEND_TYPE, Long.parseLong(groupId), JCL_ORG_COMPEXT_DT1, id, viewAttr, false)); Map apiDatas = new HashMap<>(); apiDatas.put("result", resultMap); diff --git a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java index 71f97b2c..e5607405 100644 --- a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java +++ b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java @@ -307,7 +307,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService // 拓展页面分组 resultMap.put("tabInfo", getExtService(user).getTabInfo(EXTEND_TYPE, JCL_ORG_DEPTEXT)); // 处理明细表 - resultMap.put("tables", getExtService(user).getExtendTables(user, EXTEND_TYPE, JCL_ORG_DEPTEXT_DT1, id, viewAttr, false)); + resultMap.put("tables", getExtService(user).getExtendTables(user, EXTEND_TYPE, Long.parseLong(groupId), JCL_ORG_DEPTEXT_DT1, id, viewAttr, false)); Map apiDatas = new HashMap<>(); apiDatas.put("result", resultMap); diff --git a/src/com/engine/organization/service/impl/ExtServiceImpl.java b/src/com/engine/organization/service/impl/ExtServiceImpl.java index 904a9021..92070e07 100644 --- a/src/com/engine/organization/service/impl/ExtServiceImpl.java +++ b/src/com/engine/organization/service/impl/ExtServiceImpl.java @@ -6,6 +6,7 @@ import com.engine.organization.entity.TopTab; import com.engine.organization.entity.codesetting.po.CodeRulePO; import com.engine.organization.entity.extend.ExtendInfoOperateType; import com.engine.organization.entity.extend.bo.ExtendInfoBO; +import com.engine.organization.entity.extend.po.ExtendGroupPO; import com.engine.organization.entity.extend.po.ExtendInfoPO; import com.engine.organization.entity.extend.po.ExtendTitlePO; import com.engine.organization.mapper.codesetting.CodeRuleMapper; @@ -116,10 +117,15 @@ public class ExtServiceImpl extends Service implements ExtService { } @Override - public List> getExtendTables(User user, String extendType, String tableName, long id, int viewAttr, boolean showLabel) { + public List> getExtendTables(User user, String extendType, Long groupId, String tableName, long id, int viewAttr, boolean showLabel) { List> tables = new ArrayList<>(); + List infoPOList = new ArrayList<>(); + // 查询明细表 + List extendGroupList = getExtendGroupMapper().listGroupByPid(groupId); + for (ExtendGroupPO extendGroup : extendGroupList) { + infoPOList.addAll(getExtendInfoMapper().listFields(extendType, extendGroup.getId() + "", tableName, "")); + } // 查询所有分布模块，拓展明细表信息 - List infoPOList = getExtendInfoMapper().listFields(extendType, "", tableName, ""); Map> groupMap = infoPOList.stream().collect(Collectors.groupingBy(ExtendInfoPO::getExtendGroupId)); // 遍历Map,组装数据 for (Map.Entry> entry : groupMap.entrySet()) { @@ -132,7 +138,7 @@ public class ExtServiceImpl extends Service implements ExtService { // 浏览按钮添加filespan字段 String fields = entry.getValue().stream().map(item -> { - if (BROWSER_TYPE == item.getControlType()) { + if (BROWSER_TYPE.equals(item.getControlType())) { return item.getFieldName() + "," + item.getFieldName() + "span"; } return item.getFieldName(); @@ -160,12 +166,15 @@ public class ExtServiceImpl extends Service implements ExtService { infoPOList.addAll(infoPOList1); List ids = infoPOList.stream().map(ExtendInfoPO::getExtendGroupId).collect(Collectors.toList()); List extendTitles = getExtendTitleMapper().getTitlesByIds(ids); - Set extendGroups = extendTitles.stream().map(ExtendTitlePO::getGroupId).collect(Collectors.toSet()); + Set groupIds = extendTitles.stream().map(ExtendTitlePO::getGroupId).collect(Collectors.toSet()); + List extendGroupList = getExtendGroupMapper().listByType(extendType); // 拓展信息 - if (CollectionUtils.isNotEmpty(extendGroups)) { - for (Long groupId : extendGroups) { - topTabs.add(TopTab.builder().color("#000000").groupId(groupId + "").showcount(false).title(getExtendGroupMapper().getGroupNameById(groupId + "")).viewCondition(groupId + "").build()); + if (CollectionUtils.isNotEmpty(extendGroupList) && CollectionUtils.isNotEmpty(groupIds)) { + for (ExtendGroupPO extendGroup : extendGroupList) { + if (groupIds.contains(extendGroup.getId())) { + topTabs.add(TopTab.builder().color("#000000").groupId(extendGroup.getId().toString()).showcount(false).title(extendGroup.getGroupName()).viewCondition(extendGroup.getId().toString()).build()); + } } } return topTabs; diff --git a/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java b/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java index 6be33e5d..721926aa 100644 --- a/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java +++ b/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java @@ -1,5 +1,7 @@ package com.engine.organization.service.impl; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.engine.core.impl.Service; import com.engine.organization.entity.extend.po.ExtendTitlePO; import com.engine.organization.entity.fieldset.TypeTreeDTO; @@ -8,6 +10,8 @@ import com.engine.organization.mapper.extend.ExtendTitleMapper; import com.engine.organization.service.FieldDefinedService; import com.engine.organization.util.OrganizationAssert; import com.engine.organization.util.db.MapperProxyFactory; +import org.apache.commons.lang3.StringUtils; +import weaver.general.Util; import java.util.ArrayList; import java.util.HashMap; @@ -59,6 +63,17 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ return datas; } + @Override + public int saveFields(String data) { + if (StringUtils.isEmpty(data)) { + return 0; + } + JSONObject jsonObject = JSON.parseObject(data); + String groupType = Util.null2String(jsonObject.get("groupType")); + String groupId = Util.null2String(jsonObject.get("groupId")); + return 0; + } + /** * 判断该分组下是否有字段 * diff --git a/src/com/engine/organization/service/impl/JobServiceImpl.java b/src/com/engine/organization/service/impl/JobServiceImpl.java index f38a2abd..b52f7c2f 100644 --- a/src/com/engine/organization/service/impl/JobServiceImpl.java +++ b/src/com/engine/organization/service/impl/JobServiceImpl.java @@ -291,7 +291,7 @@ public class JobServiceImpl extends Service implements JobService { // 拓展页面分组 resultMap.put("tabInfo", getExtService(user).getTabInfo(EXTEND_TYPE, JCL_ORG_JOBEXT)); // 处理明细表 - List> extendTables = getExtService(user).getExtendTables(user, EXTEND_TYPE, JCL_ORG_JOBEXT_DT1, id, viewAttr, false); + List> extendTables = getExtService(user).getExtendTables(user, EXTEND_TYPE, Long.parseLong(groupId),JCL_ORG_JOBEXT_DT1, id, viewAttr, false); Map tableMap = new HashMap<>(); tableMap.put("hide", false); From 568c9411da5de77455dbad941c2e38dd1bc56d61 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Tue, 14 Jun 2022 17:57:41 +0800 Subject: [PATCH 46/77] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../engine/organization/enums/ModuleTypeEnum.java | 1 - .../service/impl/FieldDefinedServiceImpl.java | 15 +++++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/com/engine/organization/enums/ModuleTypeEnum.java b/src/com/engine/organization/enums/ModuleTypeEnum.java index 15ee1269..404fa62b 100644 --- a/src/com/engine/organization/enums/ModuleTypeEnum.java +++ b/src/com/engine/organization/enums/ModuleTypeEnum.java @@ -1,6 +1,5 @@ package com.engine.organization.enums; -import com.engine.salary.enums.BaseEnum; /** * @Author weaver_cl diff --git a/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java b/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java index b40d3223..74d48918 100644 --- a/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java +++ b/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java @@ -1,15 +1,26 @@ package com.engine.organization.service.impl; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.engine.core.impl.Service; import com.engine.organization.entity.extend.bo.ExtendGroupBO; import com.engine.organization.entity.extend.po.ExtendGroupPO; +import com.engine.organization.entity.extend.po.ExtendTitlePO; import com.engine.organization.entity.fieldset.vo.TypeTreeVO; import com.engine.organization.enums.ModuleTypeEnum; import com.engine.organization.mapper.extend.ExtendGroupMapper; +import com.engine.organization.mapper.extend.ExtendInfoMapper; +import com.engine.organization.mapper.extend.ExtendTitleMapper; import com.engine.organization.service.FieldDefinedService; +import com.engine.organization.util.OrganizationAssert; import com.engine.organization.util.db.MapperProxyFactory; +import com.weaver.general.Util; +import org.apache.commons.lang.StringUtils; +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** * @Author weaver_cl @@ -62,8 +73,8 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ return 0; } JSONObject jsonObject = JSON.parseObject(data); - String groupType = Util.null2String(jsonObject.get("groupType")); - String groupId = Util.null2String(jsonObject.get("groupId")); + String groupType = Util.null2String(jsonObject.getString("groupType")); + String groupId = Util.null2String(jsonObject.getString("groupId")); return 0; } From cde0608e025c5a577a6584f1c93e3cf2ac8bd0b0 Mon Sep 17 00:00:00 2001 From: Chengliang <1546584672@qq.com> Date: Tue, 14 Jun 2022 18:00:51 +0800 Subject: [PATCH 47/77] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E6=A0=91?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BF=AE=E5=A5=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/extend/bo/ExtendGroupBO.java | 18 +++++++----------- .../entity/fieldset/vo/TypeTreeVO.java | 5 ++++- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/com/engine/organization/entity/extend/bo/ExtendGroupBO.java b/src/com/engine/organization/entity/extend/bo/ExtendGroupBO.java index b2976b53..cf4f9b6a 100644 --- a/src/com/engine/organization/entity/extend/bo/ExtendGroupBO.java +++ b/src/com/engine/organization/entity/extend/bo/ExtendGroupBO.java @@ -1,7 +1,10 @@ package com.engine.organization.entity.extend.bo; import com.engine.organization.entity.extend.po.ExtendGroupPO; +import com.engine.organization.entity.extend.po.ExtendTitlePO; import com.engine.organization.entity.fieldset.vo.TypeTreeVO; +import com.engine.organization.mapper.extend.ExtendTitleMapper; +import com.engine.organization.util.db.MapperProxyFactory; import org.apache.commons.collections.CollectionUtils; import java.util.Collections; @@ -29,7 +32,6 @@ public class ExtendGroupBO { .canClick(true) .domid(String.valueOf(e.getId())) .hasGroup(isHasGroup(e.getId())) - .haschild(getHasChild(e.getId())) .isShow(e.getIsShow()) .key(e.getId()) .name(e.getGroupName()) @@ -38,20 +40,14 @@ public class ExtendGroupBO { .build()).collect(Collectors.toList()); //获取非一级 - Map> collects = typeTreeVOS.stream().filter(item -> item.getPid() != null).collect(Collectors.groupingBy(TypeTreeVO ::getPid)); + Map> collects = typeTreeVOS.stream().filter(item -> item.getPid() != null).collect(Collectors.groupingBy(TypeTreeVO :: getPid)); - return typeTreeVOS.stream().peek(e -> e.setSubs(collects.get(e.getKey()))).filter(item -> item.getPid() == null).collect(Collectors.toList()); - - } - - - - private static boolean getHasChild(Long id) { - return true; + return typeTreeVOS.stream().peek(e -> {e.setChilds(collects.get(e.getKey())); e.setHaschild(collects.get(e.getKey()) != null && collects.get(e.getKey()).size() > 0);}).filter(item -> item.getPid() == null).collect(Collectors.toList()); } private static boolean isHasGroup(Long id) { - return true; + List titlesByGroupID = MapperProxyFactory.getProxy(ExtendTitleMapper.class).getTitlesByGroupID(id); + return titlesByGroupID.size() > 0; } } diff --git a/src/com/engine/organization/entity/fieldset/vo/TypeTreeVO.java b/src/com/engine/organization/entity/fieldset/vo/TypeTreeVO.java index 7f8cf125..32c09f11 100644 --- a/src/com/engine/organization/entity/fieldset/vo/TypeTreeVO.java +++ b/src/com/engine/organization/entity/fieldset/vo/TypeTreeVO.java @@ -5,6 +5,7 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.util.ArrayList; import java.util.List; /** @@ -58,11 +59,13 @@ public class TypeTreeVO { private String name; //子节点 - private List subs; + private List childs; // private int viewAttr; + private ArrayList subs; + //父节点id private Long pid; From d809107c48e8388efce37624f2a4c01b2725686f Mon Sep 17 00:00:00 2001 From: dxfeng Date: Tue, 14 Jun 2022 18:03:35 +0800 Subject: [PATCH 48/77] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/organization/service/impl/ExtServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/engine/organization/service/impl/ExtServiceImpl.java b/src/com/engine/organization/service/impl/ExtServiceImpl.java index 92070e07..c6e0e7d8 100644 --- a/src/com/engine/organization/service/impl/ExtServiceImpl.java +++ b/src/com/engine/organization/service/impl/ExtServiceImpl.java @@ -167,7 +167,7 @@ public class ExtServiceImpl extends Service implements ExtService { List ids = infoPOList.stream().map(ExtendInfoPO::getExtendGroupId).collect(Collectors.toList()); List extendTitles = getExtendTitleMapper().getTitlesByIds(ids); Set groupIds = extendTitles.stream().map(ExtendTitlePO::getGroupId).collect(Collectors.toSet()); - List extendGroupList = getExtendGroupMapper().listByType(extendType); + List extendGroupList = getExtendGroupMapper().listByType(Integer.parseInt(extendType)); // 拓展信息 if (CollectionUtils.isNotEmpty(extendGroupList) && CollectionUtils.isNotEmpty(groupIds)) { From b4b54fa1e15ef33208942d8f16959f545d52015c Mon Sep 17 00:00:00 2001 From: dxfeng Date: Wed, 15 Jun 2022 11:25:23 +0800 Subject: [PATCH 49/77] =?UTF-8?q?=E5=88=86=E7=BB=84=E7=BB=B4=E6=8A=A4=20?= =?UTF-8?q?=E6=96=B0=E5=BB=BA=E5=88=86=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../extend/param/ExtendTitleSaveParam.java | 24 ++++++ .../mapper/extend/ExtendTitleMapper.java | 30 +++++++ .../mapper/extend/ExtendTitleMapper.xml | 83 +++++++++++++++++- .../service/FieldDefinedService.java | 17 ++++ .../service/impl/ExtServiceImpl.java | 3 + .../service/impl/FieldDefinedServiceImpl.java | 85 ++++++++++++++++--- .../web/FieldDefinedController.java | 47 +++++++++- .../wrapper/FieldDefinedWrapper.java | 21 +++++ 8 files changed, 290 insertions(+), 20 deletions(-) create mode 100644 src/com/engine/organization/entity/extend/param/ExtendTitleSaveParam.java diff --git a/src/com/engine/organization/entity/extend/param/ExtendTitleSaveParam.java b/src/com/engine/organization/entity/extend/param/ExtendTitleSaveParam.java new file mode 100644 index 00000000..802a425d --- /dev/null +++ b/src/com/engine/organization/entity/extend/param/ExtendTitleSaveParam.java @@ -0,0 +1,24 @@ +package com.engine.organization.entity.extend.param; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @author:dxfeng + * @createTime: 2022/06/15 + * @version: 1.0 + */ +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class ExtendTitleSaveParam { + private String data; + private Long groupType; + + private String groupName; + private String isShow; + +} diff --git a/src/com/engine/organization/mapper/extend/ExtendTitleMapper.java b/src/com/engine/organization/mapper/extend/ExtendTitleMapper.java index c825c5ad..2408ad34 100644 --- a/src/com/engine/organization/mapper/extend/ExtendTitleMapper.java +++ b/src/com/engine/organization/mapper/extend/ExtendTitleMapper.java @@ -20,5 +20,35 @@ public interface ExtendTitleMapper { */ List getTitlesByGroupID(@Param("groupId") Long groupId); + /** + * 根据ID查询数据 + * + * @param ids + * @return + */ List getTitlesByIds(@Param("ids") Collection ids); + + /** + * 新增 + * + * @param extendTitle + * @return + */ + int insertIgnoreNull(ExtendTitlePO extendTitle); + + /** + * 更新 + * + * @param extendTitle + * @return + */ + int updateExtendTitle(ExtendTitlePO extendTitle); + + /** + * 根据ID批量删除数据 + * + * @param ids + * @return + */ + int deleteExtendTitleByIds(@Param("ids") Collection ids); } diff --git a/src/com/engine/organization/mapper/extend/ExtendTitleMapper.xml b/src/com/engine/organization/mapper/extend/ExtendTitleMapper.xml index fff58b22..3b01efe0 100644 --- a/src/com/engine/organization/mapper/extend/ExtendTitleMapper.xml +++ b/src/com/engine/organization/mapper/extend/ExtendTitleMapper.xml @@ -20,13 +20,92 @@ id , t.group_id , t.title - , show_order - , is_show + , t.show_order + , t.is_show , t.creator , t.delete_type , t.create_time , t.update_time + + INSERT INTO jcl_field_extendtitle + + + creator, + + + delete_type, + + + create_time, + + + update_time, + + + + group_id, + + + title, + + + show_order, + + + is_show, + + + + + #{creator}, + + + #{deleteType}, + + + #{createTime}, + + + #{updateTime}, + + + #{groupId}, + + + #{title}, + + + + #{showOrder}, + + + #{isShow}, + + + + + update jcl_field_extendtitle + + update_time=#{updateTime}, + group_id=#{groupId}, + title=#{title}, + show_order=#{showOrder}, + is_show=#{isShow}, + + WHERE id = #{id} AND delete_type = 0 + + + UPDATE jcl_field_extendtitle + SET delete_type = 1 + WHERE delete_type = 0 + AND id IN + + #{id} + + + + INSERT INTO jcl_field_extendgroup + + + creator, + + + delete_type, + + + create_time, + + + update_time, + + + + extend_type, + + + group_name, + + + pid, + + + is_show, + + + + + #{creator}, + + + #{deleteType}, + + + #{createTime}, + + + #{updateTime}, + + + #{extendType}, + + + #{groupName}, + + + #{pid}, + + + #{isShow}, + + + + + + update jcl_field_extendgroup + + group_name=#{name}, + + WHERE id = #{id} AND delete_type = 0 + \ No newline at end of file diff --git a/src/com/engine/organization/mapper/extend/ExtendInfoMapper.java b/src/com/engine/organization/mapper/extend/ExtendInfoMapper.java index fba88e97..16e5d2fe 100644 --- a/src/com/engine/organization/mapper/extend/ExtendInfoMapper.java +++ b/src/com/engine/organization/mapper/extend/ExtendInfoMapper.java @@ -1,5 +1,6 @@ package com.engine.organization.mapper.extend; +import com.engine.organization.entity.extend.po.ExtendGroupPO; import com.engine.organization.entity.extend.po.ExtendInfoPO; import org.apache.ibatis.annotations.Param; @@ -12,15 +13,10 @@ import java.util.List; * @version: 1.0 */ public interface ExtendInfoMapper { - /** - * 列表查询 - * - * @param extendType - * @param extendGroupId - * @param tableName - * @return - */ + List listFields(@Param("extendType") String extendType, @Param("extendGroupId") String extendGroupId, @Param("tableName") String tableName,@Param("operateType")String operateType); int countFieldsByGroupId(@Param("groupId") Long groupId); + + } diff --git a/src/com/engine/organization/service/FieldDefinedService.java b/src/com/engine/organization/service/FieldDefinedService.java index 6a5cdd02..82f386ee 100644 --- a/src/com/engine/organization/service/FieldDefinedService.java +++ b/src/com/engine/organization/service/FieldDefinedService.java @@ -59,11 +59,12 @@ public interface FieldDefinedService { /** - * 新增类型树 + * 新增或编辑类型树 * @param moduleTypeEnum * @param fieldTypeTreeParam * @return */ - void addTree(ModuleTypeEnum moduleTypeEnum, FieldTypeTreeParam fieldTypeTreeParam); + void changeTree(ModuleTypeEnum moduleTypeEnum, FieldTypeTreeParam fieldTypeTreeParam); + } diff --git a/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java b/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java index 10a95554..dfb267aa 100644 --- a/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java +++ b/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java @@ -10,6 +10,7 @@ import com.engine.organization.entity.extend.po.ExtendGroupPO; import com.engine.organization.entity.extend.po.ExtendTitlePO; import com.engine.organization.entity.fieldset.param.FieldTypeTreeParam; import com.engine.organization.entity.fieldset.vo.TypeTreeVO; +import com.engine.organization.enums.DeleteTypeEnum; import com.engine.organization.enums.ModuleTypeEnum; import com.engine.organization.mapper.extend.ExtendGroupMapper; import com.engine.organization.mapper.extend.ExtendInfoMapper; @@ -147,12 +148,28 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ return datas; } - public void addTree(ModuleTypeEnum moduleTypeEnum, FieldTypeTreeParam fieldTypeTreeParam) { - buildExtentGroup(moduleTypeEnum,fieldTypeTreeParam); + public void changeTree(ModuleTypeEnum moduleTypeEnum, FieldTypeTreeParam fieldTypeTreeParam) { + if (fieldTypeTreeParam.getId() == null) { + ExtendGroupPO extendGroupPO = buildExtentGroupType(moduleTypeEnum, fieldTypeTreeParam); + MapperProxyFactory.getProxy(ExtendGroupMapper.class).insertIgnoreNull(extendGroupPO); + }else { + MapperProxyFactory.getProxy(ExtendGroupMapper.class).update(fieldTypeTreeParam.getId(),fieldTypeTreeParam.getName()); + } + } - private void buildExtentGroup(ModuleTypeEnum moduleTypeEnum, FieldTypeTreeParam fieldTypeTreeParam) { - + + private ExtendGroupPO buildExtentGroupType(ModuleTypeEnum moduleTypeEnum, FieldTypeTreeParam fieldTypeTreeParam) { + return ExtendGroupPO.builder() + .extendType(moduleTypeEnum.getValue()) + .groupName(fieldTypeTreeParam.getName()) + .creator((long) user.getUID()) + .deleteType(DeleteTypeEnum.NOT_DELETED.getValue()) + .createTime(new Date()) + .updateTime(new Date()) + .pid(fieldTypeTreeParam.getParentid()) + .isShow(fieldTypeTreeParam.getIsShow() == null ? "1" : fieldTypeTreeParam.getIsShow()).build(); + } diff --git a/src/com/engine/organization/web/FieldDefinedController.java b/src/com/engine/organization/web/FieldDefinedController.java index 552a6717..8ac9d72d 100644 --- a/src/com/engine/organization/web/FieldDefinedController.java +++ b/src/com/engine/organization/web/FieldDefinedController.java @@ -57,30 +57,19 @@ public class FieldDefinedController { } @POST - @Path("/{moduleTypeEnum}/addTree") + @Path("/{moduleTypeEnum}/changeTree") @Produces(MediaType.APPLICATION_JSON) - public ReturnResult addTree(@Context HttpServletRequest request, @Context HttpServletResponse response, + public ReturnResult changeTree(@Context HttpServletRequest request, @Context HttpServletResponse response, @PathParam("moduleTypeEnum") ModuleTypeEnum moduleTypeEnum, @RequestBody FieldTypeTreeParam fieldTypeTreeParam) { try { User user = HrmUserVarify.getUser(request, response); - return getFieldDefinedWrapper(user).addTree(moduleTypeEnum,fieldTypeTreeParam); + return getFieldDefinedWrapper(user).changeTree(moduleTypeEnum,fieldTypeTreeParam); } catch (Exception e) { return ReturnResult.exceptionHandle(e.getMessage()); } } - @POST - @Path("/{moduleTypeEnum}/editTree") - @Produces(MediaType.APPLICATION_JSON) - public ReturnResult editTree(@Context HttpServletRequest request, @Context HttpServletResponse response, - @PathParam("moduleTypeEnum") ModuleTypeEnum moduleTypeEnum,@RequestBody FieldTypeTreeParam fieldTypeTreeParam) { - try { - User user = HrmUserVarify.getUser(request, response); - return getFieldDefinedWrapper(user).getTree(moduleTypeEnum); - } catch (Exception e) { - return ReturnResult.exceptionHandle(e.getMessage()); - } - } + @GET @Path("/getTabInfo") diff --git a/src/com/engine/organization/wrapper/FieldDefinedWrapper.java b/src/com/engine/organization/wrapper/FieldDefinedWrapper.java index 0aa5b93e..02622852 100644 --- a/src/com/engine/organization/wrapper/FieldDefinedWrapper.java +++ b/src/com/engine/organization/wrapper/FieldDefinedWrapper.java @@ -61,8 +61,10 @@ public class FieldDefinedWrapper extends Service { } - public ReturnResult addTree(ModuleTypeEnum moduleTypeEnum, FieldTypeTreeParam fieldTypeTreeParam) { - getFieldDefinedService(user).addTree(moduleTypeEnum,fieldTypeTreeParam); + public ReturnResult changeTree(ModuleTypeEnum moduleTypeEnum, FieldTypeTreeParam fieldTypeTreeParam) { + getFieldDefinedService(user).changeTree(moduleTypeEnum,fieldTypeTreeParam); return ReturnResult.successed(); } + + } From 8564d29bf15007af41231ec663bc30807d562fd2 Mon Sep 17 00:00:00 2001 From: Chengliang <1546584672@qq.com> Date: Wed, 15 Jun 2022 17:56:29 +0800 Subject: [PATCH 53/77] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E9=BB=98=E8=AE=A4title?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/extend/po/ExtendTitlePO.java | 2 +- .../service/impl/FieldDefinedServiceImpl.java | 24 +++++++++++++++---- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/src/com/engine/organization/entity/extend/po/ExtendTitlePO.java b/src/com/engine/organization/entity/extend/po/ExtendTitlePO.java index 7aa2c96f..fee7e4ef 100644 --- a/src/com/engine/organization/entity/extend/po/ExtendTitlePO.java +++ b/src/com/engine/organization/entity/extend/po/ExtendTitlePO.java @@ -42,7 +42,7 @@ public class ExtendTitlePO { private String isShow; - private Integer creator; + private Long creator; private Integer deleteType; private Date createTime; private Date updateTime; diff --git a/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java b/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java index dfb267aa..ab4e7471 100644 --- a/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java +++ b/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java @@ -107,7 +107,7 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ } if (null == extendTitle.getId()) { - extendTitle.setCreator(user.getUID()); + extendTitle.setCreator((long)user.getUID()); extendTitle.setCreateTime(new Date()); extendTitle.setDeleteType(0); getExtendTitleMapper().insertIgnoreNull(extendTitle); @@ -137,7 +137,7 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ extendTitle.setIsShow(param.getIsShow()); extendTitle.setTitle(param.getGroupName()); extendTitle.setShowOrder(null == extendTitlePO ? 0 : extendTitlePO.getShowOrder() + 1); - extendTitle.setCreator(user.getUID()); + extendTitle.setCreator((long)user.getUID()); extendTitle.setCreateTime(new Date()); extendTitle.setDeleteType(0); getExtendTitleMapper().insertIgnoreNull(extendTitle); @@ -150,16 +150,31 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ public void changeTree(ModuleTypeEnum moduleTypeEnum, FieldTypeTreeParam fieldTypeTreeParam) { if (fieldTypeTreeParam.getId() == null) { - ExtendGroupPO extendGroupPO = buildExtentGroupType(moduleTypeEnum, fieldTypeTreeParam); + ExtendGroupPO extendGroupPO = buildExtendGroupType(moduleTypeEnum, fieldTypeTreeParam); MapperProxyFactory.getProxy(ExtendGroupMapper.class).insertIgnoreNull(extendGroupPO); + //默认新增title + ExtendTitlePO extendTitlePO = buildExtendTitleType(extendGroupPO); + MapperProxyFactory.getProxy(ExtendTitleMapper.class).insertIgnoreNull(extendTitlePO); }else { MapperProxyFactory.getProxy(ExtendGroupMapper.class).update(fieldTypeTreeParam.getId(),fieldTypeTreeParam.getName()); } } + private ExtendTitlePO buildExtendTitleType(ExtendGroupPO extendGroupPO) { + return ExtendTitlePO.builder() + .groupId(extendGroupPO.getId()) + .title(extendGroupPO.getGroupName()) + .showOrder(1) + .isShow("1") + .creator((long) user.getUID()) + .deleteType(DeleteTypeEnum.NOT_DELETED.getValue()) + .createTime(new Date()) + .updateTime(new Date()).build(); + } + - private ExtendGroupPO buildExtentGroupType(ModuleTypeEnum moduleTypeEnum, FieldTypeTreeParam fieldTypeTreeParam) { + private ExtendGroupPO buildExtendGroupType(ModuleTypeEnum moduleTypeEnum, FieldTypeTreeParam fieldTypeTreeParam) { return ExtendGroupPO.builder() .extendType(moduleTypeEnum.getValue()) .groupName(fieldTypeTreeParam.getName()) @@ -169,7 +184,6 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ .updateTime(new Date()) .pid(fieldTypeTreeParam.getParentid()) .isShow(fieldTypeTreeParam.getIsShow() == null ? "1" : fieldTypeTreeParam.getIsShow()).build(); - } From 7c02e9bc61b33b780754b5d69a26d2a4b6d8c910 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Wed, 15 Jun 2022 18:03:01 +0800 Subject: [PATCH 54/77] =?UTF-8?q?=E5=88=86=E7=BB=84=E5=88=A0=E9=99=A4=20?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=87=AA=E5=AE=9A=E4=B9=89=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/extend/bo/ExtendGroupBO.java | 41 ++++++++- .../entity/extend/bo/ExtendInfoBO.java | 12 ++- .../extend/param/ExtendInfoFieldParam.java | 92 +++++++++++++++++++ .../extend/param/ExtendInfoTypeParam.java | 26 ++++++ .../extend/param/ExtendTitleSaveParam.java | 2 +- .../mapper/extend/ExtendGroupMapper.java | 2 + .../mapper/extend/ExtendGroupMapper.xml | 7 ++ .../service/FieldDefinedService.java | 18 ++++ .../service/impl/FieldDefinedServiceImpl.java | 40 ++++++-- .../web/FieldDefinedController.java | 16 +++- .../wrapper/FieldDefinedWrapper.java | 8 +- 11 files changed, 249 insertions(+), 15 deletions(-) create mode 100644 src/com/engine/organization/entity/extend/param/ExtendInfoFieldParam.java create mode 100644 src/com/engine/organization/entity/extend/param/ExtendInfoTypeParam.java diff --git a/src/com/engine/organization/entity/extend/bo/ExtendGroupBO.java b/src/com/engine/organization/entity/extend/bo/ExtendGroupBO.java index cf4f9b6a..2b49bf14 100644 --- a/src/com/engine/organization/entity/extend/bo/ExtendGroupBO.java +++ b/src/com/engine/organization/entity/extend/bo/ExtendGroupBO.java @@ -22,7 +22,7 @@ public class ExtendGroupBO { public static List buildTypeTree(List extendGroupPOS) { - if(CollectionUtils.isEmpty(extendGroupPOS)){ + if (CollectionUtils.isEmpty(extendGroupPOS)) { return Collections.emptyList(); } @@ -40,9 +40,12 @@ public class ExtendGroupBO { .build()).collect(Collectors.toList()); //获取非一级 - Map> collects = typeTreeVOS.stream().filter(item -> item.getPid() != null).collect(Collectors.groupingBy(TypeTreeVO :: getPid)); + Map> collects = typeTreeVOS.stream().filter(item -> item.getPid() != null).collect(Collectors.groupingBy(TypeTreeVO::getPid)); - return typeTreeVOS.stream().peek(e -> {e.setChilds(collects.get(e.getKey())); e.setHaschild(collects.get(e.getKey()) != null && collects.get(e.getKey()).size() > 0);}).filter(item -> item.getPid() == null).collect(Collectors.toList()); + return typeTreeVOS.stream().peek(e -> { + e.setChilds(collects.get(e.getKey())); + e.setHaschild(collects.get(e.getKey()) != null && collects.get(e.getKey()).size() > 0); + }).filter(item -> item.getPid() == null).collect(Collectors.toList()); } @@ -50,4 +53,36 @@ public class ExtendGroupBO { List titlesByGroupID = MapperProxyFactory.getProxy(ExtendTitleMapper.class).getTitlesByGroupID(id); return titlesByGroupID.size() > 0; } + + /** + * 获取对应表名 + * + * @param extendGroupPO + * @return + */ + public static String getTableNameByGroupPO(ExtendGroupPO extendGroupPO) { + String tableName = ""; + switch (extendGroupPO.getExtendType()) { + case -1: + tableName = "JCL_ORG_COMP"; + break; + case -2: + tableName = "JCL_ORG_DEPT"; + break; + case -3: + tableName = "JCL_ORG_JOB"; + break; + default: + break; + } + + if (extendGroupPO.getId() < 0) { + + } else if (null == extendGroupPO.getPid()) { + tableName += "EXT"; + } else { + tableName += "EXT_DT1"; + } + return tableName; + } } diff --git a/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java b/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java index bd3a85c3..73a2f1c8 100644 --- a/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java +++ b/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java @@ -13,6 +13,7 @@ import com.api.hrm.util.FieldType; import com.api.hrm.util.ServiceUtil; import com.engine.kq.cmd.shiftmanagement.toolkit.ShiftManagementToolKit; import com.engine.organization.entity.SelectOptionParam; +import com.engine.organization.entity.extend.param.ExtendInfoFieldParam; import com.engine.organization.entity.extend.po.ExtendInfoPO; import com.engine.organization.util.OrganizationFormItemUtil; import com.engine.sensitive.biz.SensitiveWordTypeComInfo; @@ -65,6 +66,15 @@ public class ExtendInfoBO { } + public static ExtendInfoPO convertFieldParam2ExtendInfo(ExtendInfoFieldParam infoFieldParam) { + if (null == infoFieldParam) { + return null; + } + return ExtendInfoPO + .builder() + + .build(); + } /** * 明细表字段 @@ -311,7 +321,7 @@ public class ExtendInfoBO { detailtype = "1"; } searchConditionItem.setKey(Util.null2String(fieldvalue)); - searchConditionItem.setValue(fieldvalue+""); + searchConditionItem.setValue(fieldvalue + ""); searchConditionItem.setDetailtype(Util.getIntValue(detailtype, 3)); } else if (fieldhtmltype.equals("6")) {//附件 if (fieldname.equals("resourceimageid")) { diff --git a/src/com/engine/organization/entity/extend/param/ExtendInfoFieldParam.java b/src/com/engine/organization/entity/extend/param/ExtendInfoFieldParam.java new file mode 100644 index 00000000..783eefe9 --- /dev/null +++ b/src/com/engine/organization/entity/extend/param/ExtendInfoFieldParam.java @@ -0,0 +1,92 @@ +package com.engine.organization.entity.extend.param; + +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import weaver.general.Util; + +/** + * @description: TODO + * @author:dxfeng + * @createTime: 2022/06/15 + * @version: 1.0 + */ +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class ExtendInfoFieldParam { + private String id; + // field_name + private String fieldname; + // field_name_desc + private String fieldlabel; + + private Object fieldType; + + private ExtendInfoTypeParam infoTypeParam; + + private String enable; + + private String required; + + private String isModify; + + private String key; + + public String getControlType() { + JSONArray fieldType = (JSONArray) this.getFieldType(); + ExtendInfoTypeParam infoTypeParam = new ExtendInfoTypeParam(); + String fieldHtmlType = Util.null2String(fieldType.get(0)); + if (fieldHtmlType.equals("input")) { + fieldHtmlType = "1"; + } else if (fieldHtmlType.equals("textarea")) { + fieldHtmlType = "2"; + } else if (fieldHtmlType.equals("browser")) { + fieldHtmlType = "3"; + } else if (fieldHtmlType.equals("check")) { + fieldHtmlType = "4"; + } else if (fieldHtmlType.equals("select")) { + fieldHtmlType = "5"; + } else if (fieldHtmlType.equals("upload")) { + fieldHtmlType = "6"; + } + return fieldHtmlType; + } + + public String getBrowserType(String controlType) { + String browserType = "1"; + JSONArray fieldType = (JSONArray) this.getFieldType(); + if (fieldType.size() > 1) { + browserType = Util.null2String(fieldType.get(1)); + } + if (controlType.equals("1")) { + if (browserType.equals("text")) { + browserType = "1"; + } else if (browserType.equals("int")) { + browserType = "2"; + } else if (browserType.equals("float")) { + browserType = "3"; + } else if (browserType.equals("file")) { + browserType = "1"; + } + } + if (controlType.equals("2")) { + browserType = "1"; + } else if (controlType.equals("3")) { + browserType = Util.null2String(((JSONObject) fieldType.get(1)).get("value")); + } else if (controlType.equals("4")) { + browserType = "1"; + } else if (controlType.equals("5")) { + browserType = "1"; + } else if (controlType.equals("6")) { + if (browserType.equals("file")) { + browserType = "1"; + } + } + return browserType; + } +} \ No newline at end of file diff --git a/src/com/engine/organization/entity/extend/param/ExtendInfoTypeParam.java b/src/com/engine/organization/entity/extend/param/ExtendInfoTypeParam.java new file mode 100644 index 00000000..c87de8e2 --- /dev/null +++ b/src/com/engine/organization/entity/extend/param/ExtendInfoTypeParam.java @@ -0,0 +1,26 @@ +package com.engine.organization.entity.extend.param; + +import com.engine.hrm.entity.FieldSelectOptionBean; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +/** + * @description: TODO + * @author:dxfeng + * @createTime: 2022/06/15 + * @version: 1.0 + */ +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class ExtendInfoTypeParam { + private String fieldHtmlType; + private String fieldType; + private Object otherParam; + private List lsSelectOption; +} diff --git a/src/com/engine/organization/entity/extend/param/ExtendTitleSaveParam.java b/src/com/engine/organization/entity/extend/param/ExtendTitleSaveParam.java index 802a425d..60e54077 100644 --- a/src/com/engine/organization/entity/extend/param/ExtendTitleSaveParam.java +++ b/src/com/engine/organization/entity/extend/param/ExtendTitleSaveParam.java @@ -17,7 +17,7 @@ import lombok.NoArgsConstructor; public class ExtendTitleSaveParam { private String data; private Long groupType; - + private Long id; private String groupName; private String isShow; diff --git a/src/com/engine/organization/mapper/extend/ExtendGroupMapper.java b/src/com/engine/organization/mapper/extend/ExtendGroupMapper.java index 5e9f00fb..fc963a71 100644 --- a/src/com/engine/organization/mapper/extend/ExtendGroupMapper.java +++ b/src/com/engine/organization/mapper/extend/ExtendGroupMapper.java @@ -29,6 +29,8 @@ public interface ExtendGroupMapper { */ List listGroupByIds(@Param("ids") Collection ids); + ExtendGroupPO getGroupById(@Param("id") Long id); + /** * 根据ID 查询数据 * diff --git a/src/com/engine/organization/mapper/extend/ExtendGroupMapper.xml b/src/com/engine/organization/mapper/extend/ExtendGroupMapper.xml index 16fa249a..370e821c 100644 --- a/src/com/engine/organization/mapper/extend/ExtendGroupMapper.xml +++ b/src/com/engine/organization/mapper/extend/ExtendGroupMapper.xml @@ -59,6 +59,13 @@ WHERE t.delete_type = 0 and t.is_show = 1 and t.pid= #{pid} + \ No newline at end of file diff --git a/src/com/engine/organization/service/FieldDefinedService.java b/src/com/engine/organization/service/FieldDefinedService.java index 6a5cdd02..07215b80 100644 --- a/src/com/engine/organization/service/FieldDefinedService.java +++ b/src/com/engine/organization/service/FieldDefinedService.java @@ -20,6 +20,7 @@ public interface FieldDefinedService { /** * 获取左侧树 + * * @param moduleTypeEnum * @return */ @@ -60,10 +61,27 @@ public interface FieldDefinedService { /** * 新增类型树 + * * @param moduleTypeEnum * @param fieldTypeTreeParam * @return */ void addTree(ModuleTypeEnum moduleTypeEnum, FieldTypeTreeParam fieldTypeTreeParam); + /** + * 删除标题信息 + * + * @param param + * @return + */ + int deleteTitle(ExtendTitleSaveParam param); + + /** + * 获取自定义字段列表 + * + * @param param + * @return + */ + Map getFieldDefinedInfo(ExtendTitleSaveParam param); + } diff --git a/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java b/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java index 10a95554..6e237cc7 100644 --- a/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java +++ b/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.engine.core.impl.Service; +import com.engine.organization.entity.DeleteParam; import com.engine.organization.entity.extend.bo.ExtendGroupBO; import com.engine.organization.entity.extend.param.ExtendTitleSaveParam; import com.engine.organization.entity.extend.po.ExtendGroupPO; @@ -19,7 +20,6 @@ import com.engine.organization.util.OrganizationAssert; import com.engine.organization.util.db.MapperProxyFactory; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; -import weaver.general.Util; import java.util.*; import java.util.stream.Collectors; @@ -32,6 +32,10 @@ import java.util.stream.Collectors; **/ public class FieldDefinedServiceImpl extends Service implements FieldDefinedService { + private ExtendGroupMapper getExtendGroupMapper() { + return MapperProxyFactory.getProxy(ExtendGroupMapper.class); + } + private ExtendTitleMapper getExtendTitleMapper() { return MapperProxyFactory.getProxy(ExtendTitleMapper.class); } @@ -62,7 +66,7 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ tab.put("isShow", extendTitle.getIsShow()); tab.put("groupid", extendTitle.getGroupId()); tab.put("viewAttr", extendTitle.getGroupId() < 0 ? 1 : 2); - tab.put("editable", getExtendInfoMapper().countFieldsByGroupId(extendTitle.getId()) > 0); + tab.put("editable", !(getExtendInfoMapper().countFieldsByGroupId(extendTitle.getId()) > 0)); tabs.add(tab); } datas.put("status", "1"); @@ -76,8 +80,19 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ return 0; } JSONObject jsonObject = JSON.parseObject(data); - String groupType = Util.null2String(jsonObject.getString("groupType")); - String groupId = Util.null2String(jsonObject.getString("groupId")); + // extend_group主键 + Long groupType = jsonObject.getLong("groupType"); + ExtendGroupPO extendGroup = getExtendGroupMapper().getGroupById(groupType); + Integer extendType = extendGroup.getExtendType(); + String tableName = ExtendGroupBO.getTableNameByGroupPO(extendGroup); + + // 主表、主表拓展表为extend_title主键；明细表为extend_group主键 + Long extendGroupId = jsonObject.getLong("groupId"); + + JSONArray records = (JSONArray) jsonObject.get("records"); + for (int i = 0; i < records.size(); i++) { + + } return 0; } @@ -140,6 +155,7 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ extendTitle.setCreateTime(new Date()); extendTitle.setDeleteType(0); getExtendTitleMapper().insertIgnoreNull(extendTitle); + ids.add(extendTitle.getId()); datas.put("groupid", StringUtils.join(ids, ",")); @@ -147,16 +163,26 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ return datas; } + @Override public void addTree(ModuleTypeEnum moduleTypeEnum, FieldTypeTreeParam fieldTypeTreeParam) { - buildExtentGroup(moduleTypeEnum,fieldTypeTreeParam); + buildExtentGroup(moduleTypeEnum, fieldTypeTreeParam); } - private void buildExtentGroup(ModuleTypeEnum moduleTypeEnum, FieldTypeTreeParam fieldTypeTreeParam) { - + @Override + public int deleteTitle(ExtendTitleSaveParam param) { + int countFields = getExtendInfoMapper().countFieldsByGroupId(param.getGroupType()); + OrganizationAssert.isTrue(countFields == 0, "当前分组下仍有字段信息，请删除字段信息后删除分组"); + return getExtendTitleMapper().deleteExtendTitleByIds(DeleteParam.builder().ids(param.getId().toString()).build().getIds()); } + @Override + public Map getFieldDefinedInfo(ExtendTitleSaveParam param) { + return null; + } + private void buildExtentGroup(ModuleTypeEnum moduleTypeEnum, FieldTypeTreeParam fieldTypeTreeParam) { + } } diff --git a/src/com/engine/organization/web/FieldDefinedController.java b/src/com/engine/organization/web/FieldDefinedController.java index 552a6717..2ed51ae1 100644 --- a/src/com/engine/organization/web/FieldDefinedController.java +++ b/src/com/engine/organization/web/FieldDefinedController.java @@ -34,7 +34,7 @@ public class FieldDefinedController { @Path("/{moduleTypeEnum}/getTree") @Produces(MediaType.APPLICATION_JSON) public ReturnResult getTree(@Context HttpServletRequest request, @Context HttpServletResponse response, - @PathParam("moduleTypeEnum") ModuleTypeEnum moduleTypeEnum) { + @PathParam("moduleTypeEnum") ModuleTypeEnum moduleTypeEnum) { try { User user = HrmUserVarify.getUser(request, response); return getFieldDefinedWrapper(user).getTree(moduleTypeEnum); @@ -63,7 +63,7 @@ public class FieldDefinedController { @PathParam("moduleTypeEnum") ModuleTypeEnum moduleTypeEnum, @RequestBody FieldTypeTreeParam fieldTypeTreeParam) { try { User user = HrmUserVarify.getUser(request, response); - return getFieldDefinedWrapper(user).addTree(moduleTypeEnum,fieldTypeTreeParam); + return getFieldDefinedWrapper(user).addTree(moduleTypeEnum, fieldTypeTreeParam); } catch (Exception e) { return ReturnResult.exceptionHandle(e.getMessage()); } @@ -135,4 +135,16 @@ public class FieldDefinedController { return ReturnResult.exceptionHandle(e.getMessage()); } } + + @POST + @Path("/deleteTitle") + @Produces(MediaType.APPLICATION_JSON) + public ReturnResult deleteTitle(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody ExtendTitleSaveParam param) { + try { + User user = HrmUserVarify.getUser(request, response); + return ReturnResult.successed(getFieldDefinedWrapper(user).deleteTitle(param)); + } catch (Exception e) { + return ReturnResult.exceptionHandle(e.getMessage()); + } + } } diff --git a/src/com/engine/organization/wrapper/FieldDefinedWrapper.java b/src/com/engine/organization/wrapper/FieldDefinedWrapper.java index 0aa5b93e..31353d3c 100644 --- a/src/com/engine/organization/wrapper/FieldDefinedWrapper.java +++ b/src/com/engine/organization/wrapper/FieldDefinedWrapper.java @@ -34,6 +34,7 @@ public class FieldDefinedWrapper extends Service { /** * 获取标题分组 + * * @param groupType * @return */ @@ -53,6 +54,7 @@ public class FieldDefinedWrapper extends Service { /** * 新建分组 + * * @param param * @return */ @@ -62,7 +64,11 @@ public class FieldDefinedWrapper extends Service { public ReturnResult addTree(ModuleTypeEnum moduleTypeEnum, FieldTypeTreeParam fieldTypeTreeParam) { - getFieldDefinedService(user).addTree(moduleTypeEnum,fieldTypeTreeParam); + getFieldDefinedService(user).addTree(moduleTypeEnum, fieldTypeTreeParam); return ReturnResult.successed(); } + + public int deleteTitle(ExtendTitleSaveParam param) { + return getFieldDefinedService(user).deleteTitle(param); + } } From 70de6bbbd7ac12158afe2bd20d4f7456bdd68486 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Wed, 15 Jun 2022 18:12:53 +0800 Subject: [PATCH 55/77] =?UTF-8?q?=E5=A4=84=E7=90=86=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../organization/service/FieldDefinedService.java | 14 ++++++++++++++ .../service/impl/FieldDefinedServiceImpl.java | 13 ++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/src/com/engine/organization/service/FieldDefinedService.java b/src/com/engine/organization/service/FieldDefinedService.java index 82f386ee..958a4aa9 100644 --- a/src/com/engine/organization/service/FieldDefinedService.java +++ b/src/com/engine/organization/service/FieldDefinedService.java @@ -65,6 +65,20 @@ public interface FieldDefinedService { * @return */ void changeTree(ModuleTypeEnum moduleTypeEnum, FieldTypeTreeParam fieldTypeTreeParam); + /** + * 删除标题信息 + * + * @param param + * @return + */ + int deleteTitle(ExtendTitleSaveParam param); + /** + * 获取自定义字段列表 + * + * @param param + * @return + */ + Map getFieldDefinedInfo(ExtendTitleSaveParam param); } diff --git a/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java b/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java index 89d46f92..87a10e94 100644 --- a/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java +++ b/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java @@ -21,7 +21,6 @@ import com.engine.organization.util.OrganizationAssert; import com.engine.organization.util.db.MapperProxyFactory; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; -import weaver.general.Util; import java.util.*; import java.util.stream.Collectors; @@ -164,6 +163,7 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ return datas; } + @Override public void changeTree(ModuleTypeEnum moduleTypeEnum, FieldTypeTreeParam fieldTypeTreeParam) { if (fieldTypeTreeParam.getId() == null) { ExtendGroupPO extendGroupPO = buildExtendGroupType(moduleTypeEnum, fieldTypeTreeParam); @@ -176,6 +176,17 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ } } + @Override + public int deleteTitle(ExtendTitleSaveParam param) { + int countFields = getExtendInfoMapper().countFieldsByGroupId(param.getGroupType()); + OrganizationAssert.isTrue(countFields == 0, "当前分组下仍有字段信息，请删除字段信息后删除分组"); + return getExtendTitleMapper().deleteExtendTitleByIds(DeleteParam.builder().ids(param.getId().toString()).build().getIds()); + } + + @Override + public Map getFieldDefinedInfo(ExtendTitleSaveParam param) { + return null; + } private ExtendTitlePO buildExtendTitleType(ExtendGroupPO extendGroupPO) { return ExtendTitlePO.builder() From e588fb0c96802827f4bb36d8db55a0c6d869f9ab Mon Sep 17 00:00:00 2001 From: dxfeng Date: Thu, 16 Jun 2022 09:37:36 +0800 Subject: [PATCH 56/77] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/extend/bo/ExtendInfoBO.java | 43 ++++++++++++++++--- .../extend/param/ExtendInfoFieldParam.java | 29 +++++++++++-- .../extend/param/ExtendInfoTypeParam.java | 26 ----------- .../mapper/extend/ExtendInfoMapper.java | 3 +- .../mapper/extend/ExtendInfoMapper.xml | 3 ++ .../service/impl/FieldDefinedServiceImpl.java | 34 ++++++++++----- .../web/FieldDefinedController.java | 25 ++++++----- 7 files changed, 102 insertions(+), 61 deletions(-) delete mode 100644 src/com/engine/organization/entity/extend/param/ExtendInfoTypeParam.java diff --git a/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java b/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java index 73a2f1c8..1f7f18bf 100644 --- a/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java +++ b/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java @@ -14,6 +14,7 @@ import com.api.hrm.util.ServiceUtil; import com.engine.kq.cmd.shiftmanagement.toolkit.ShiftManagementToolKit; import com.engine.organization.entity.SelectOptionParam; import com.engine.organization.entity.extend.param.ExtendInfoFieldParam; +import com.engine.organization.entity.extend.po.ExtendGroupPO; import com.engine.organization.entity.extend.po.ExtendInfoPO; import com.engine.organization.util.OrganizationFormItemUtil; import com.engine.sensitive.biz.SensitiveWordTypeComInfo; @@ -23,10 +24,7 @@ import weaver.hrm.User; import weaver.hrm.definedfield.HrmFieldManager; import weaver.systeminfo.SystemEnv; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * @description: @@ -66,13 +64,46 @@ public class ExtendInfoBO { } - public static ExtendInfoPO convertFieldParam2ExtendInfo(ExtendInfoFieldParam infoFieldParam) { + /** + * 新增自定义字段时，对象转换 + * + * @param user + * @param infoFieldParam + * @param extendGroupPO + * @param extendGroupId + * @param showOrder + * @return + */ + public static ExtendInfoPO convertFieldParam2ExtendInfo(User user, ExtendInfoFieldParam infoFieldParam, ExtendGroupPO extendGroupPO, Long extendGroupId, Integer showOrder) { if (null == infoFieldParam) { return null; } + String controlType = infoFieldParam.getControlType(); + String browserType = infoFieldParam.getBrowserType(controlType); + String dbType = infoFieldParam.getDbType(controlType, browserType); return ExtendInfoPO .builder() - + .id(infoFieldParam.getId()) + .extendType(extendGroupPO.getExtendType()) + .tableName(ExtendGroupBO.getTableNameByGroupPO(extendGroupPO)) + .fieldName(infoFieldParam.getFieldname()) + .fieldNameDesc(infoFieldParam.getFieldlabel()) + // 数据库类型 + .fieldType(dbType) + .controlType(Integer.parseInt(controlType)) + .browserType(browserType) + .extendGroupId(extendGroupId) + .isenable(Integer.parseInt(infoFieldParam.getEnable())) + .isrequired(Integer.parseInt(infoFieldParam.getRequired())) + .listShow(1) + .editShow(1) + .addShow(1) + .browserShow(1) + .customValue(infoFieldParam.getFieldType().toString()) + .showOrder(showOrder) + .creator((long) user.getUID()) + .deleteType(0) + .createTime(new Date()) .build(); } diff --git a/src/com/engine/organization/entity/extend/param/ExtendInfoFieldParam.java b/src/com/engine/organization/entity/extend/param/ExtendInfoFieldParam.java index 783eefe9..7d0f42a3 100644 --- a/src/com/engine/organization/entity/extend/param/ExtendInfoFieldParam.java +++ b/src/com/engine/organization/entity/extend/param/ExtendInfoFieldParam.java @@ -2,6 +2,7 @@ package com.engine.organization.entity.extend.param; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.engine.hrm.biz.FieldParam; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -19,7 +20,7 @@ import weaver.general.Util; @AllArgsConstructor @NoArgsConstructor public class ExtendInfoFieldParam { - private String id; + private Long id; // field_name private String fieldname; // field_name_desc @@ -27,8 +28,6 @@ public class ExtendInfoFieldParam { private Object fieldType; - private ExtendInfoTypeParam infoTypeParam; - private String enable; private String required; @@ -39,7 +38,6 @@ public class ExtendInfoFieldParam { public String getControlType() { JSONArray fieldType = (JSONArray) this.getFieldType(); - ExtendInfoTypeParam infoTypeParam = new ExtendInfoTypeParam(); String fieldHtmlType = Util.null2String(fieldType.get(0)); if (fieldHtmlType.equals("input")) { fieldHtmlType = "1"; @@ -89,4 +87,27 @@ public class ExtendInfoFieldParam { } return browserType; } + + public String getDbType(String controlType, String browserType) { + FieldParam fp = new FieldParam(); + if (controlType.equals("1")) { + JSONArray fieldType = (JSONArray) this.getFieldType(); + String dbLength = "100"; + if (fieldType.size() > 2) { + dbLength = fieldType.get(2).toString(); + } + fp.setSimpleText(Util.getIntValue(browserType, -1), dbLength); + } else if (controlType.equals("2")) { + fp.setText(); + } else if (controlType.equals("3")) { + fp.setBrowser(Util.getIntValue(browserType, -1)); + } else if (controlType.equals("4")) { + fp.setCheck(); + } else if (controlType.equals("5")) { + fp.setSelect(); + } else if (controlType.equals("6")) { + fp.setAttach(); + } + return fp.getFielddbtype(); + } } \ No newline at end of file diff --git a/src/com/engine/organization/entity/extend/param/ExtendInfoTypeParam.java b/src/com/engine/organization/entity/extend/param/ExtendInfoTypeParam.java deleted file mode 100644 index c87de8e2..00000000 --- a/src/com/engine/organization/entity/extend/param/ExtendInfoTypeParam.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.engine.organization.entity.extend.param; - -import com.engine.hrm.entity.FieldSelectOptionBean; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.util.List; - -/** - * @description: TODO - * @author:dxfeng - * @createTime: 2022/06/15 - * @version: 1.0 - */ -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class ExtendInfoTypeParam { - private String fieldHtmlType; - private String fieldType; - private Object otherParam; - private List lsSelectOption; -} diff --git a/src/com/engine/organization/mapper/extend/ExtendInfoMapper.java b/src/com/engine/organization/mapper/extend/ExtendInfoMapper.java index 16e5d2fe..e298a331 100644 --- a/src/com/engine/organization/mapper/extend/ExtendInfoMapper.java +++ b/src/com/engine/organization/mapper/extend/ExtendInfoMapper.java @@ -1,6 +1,5 @@ package com.engine.organization.mapper.extend; -import com.engine.organization.entity.extend.po.ExtendGroupPO; import com.engine.organization.entity.extend.po.ExtendInfoPO; import org.apache.ibatis.annotations.Param; @@ -18,5 +17,7 @@ public interface ExtendInfoMapper { int countFieldsByGroupId(@Param("groupId") Long groupId); + int updateExtendInfo(ExtendInfoPO extendInfo); + } diff --git a/src/com/engine/organization/mapper/extend/ExtendInfoMapper.xml b/src/com/engine/organization/mapper/extend/ExtendInfoMapper.xml index b9a5d089..3835e399 100644 --- a/src/com/engine/organization/mapper/extend/ExtendInfoMapper.xml +++ b/src/com/engine/organization/mapper/extend/ExtendInfoMapper.xml @@ -53,6 +53,9 @@ , t.create_time , t.update_time + + + + \ No newline at end of file diff --git a/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java b/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java index c2cc48b8..a0c5586b 100644 --- a/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java +++ b/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java @@ -92,23 +92,32 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ Long extendGroupId = jsonObject.getLong("groupId"); JSONArray records = (JSONArray) jsonObject.get("records"); + int updateCount = 0; for (int i = 0; i < records.size(); i++) { // 存在ID则更新 ，不存在ID则增加 ExtendInfoFieldParam infoFieldParam = JSONObject.toJavaObject((JSONObject) records.get(i), ExtendInfoFieldParam.class); - // TODO ExtendInfoPO extendInfo = ExtendInfoBO.convertFieldParam2ExtendInfo(user, infoFieldParam, extendGroup, extendGroupId, i + 1); if (null != extendInfo.getId()) { // 更新 extend_title数据 - getExtendInfoMapper().updateExtendInfo(extendInfo); - + updateCount += getExtendInfoMapper().updateExtendInfo(extendInfo); } else { // 新增extend_title数据 - + // 获取操作表最大id,生成字段名 + Long maxId = getExtendInfoMapper().getMaxId(); + extendInfo.setFieldName("field" + (maxId + 1)); + updateCount += getExtendInfoMapper().insertExtendInfo(extendInfo); // 新增表结构 + getExtendInfoMapper().addTableColumn(extendInfo.getTableName(), extendInfo.getFieldName(), extendInfo.getFieldType()); + // 明细表且为浏览按钮字段，添加span字段 + if (null != extendGroup.getPid() && 3 == extendInfo.getControlType()) { + String dbType = infoFieldParam.getDbType("2", ""); + getExtendInfoMapper().addTableColumn(extendInfo.getTableName(), extendInfo.getFieldName() + "span", dbType); + } + } } - return 0; + return updateCount; } @Override diff --git a/src/com/engine/organization/service/impl/JobServiceImpl.java b/src/com/engine/organization/service/impl/JobServiceImpl.java index b52f7c2f..bbeb22c3 100644 --- a/src/com/engine/organization/service/impl/JobServiceImpl.java +++ b/src/com/engine/organization/service/impl/JobServiceImpl.java @@ -298,8 +298,8 @@ public class JobServiceImpl extends Service implements JobService { tableMap.put("tabname", "职等职级"); Map tabinfoMap = new HashMap<>(); List infoPOList = new ArrayList<>(); - infoPOList.add(ExtendInfoPO.builder().fieldName("gradeId").fieldNameDesc("职级").controlType(3).isrequired(1).browserType("161").customValue("gradeBrowser").build()); - infoPOList.add(ExtendInfoPO.builder().fieldName("levelId").fieldNameDesc("职等").controlType(3).isrequired(1).browserType("162").customValue("levelBrowser").build()); + infoPOList.add(ExtendInfoPO.builder().fieldName("gradeId").fieldNameDesc("职级").controlType(3).isrequired(1).browserType("161").customValue("[\"browser\",{\"value\":\"161\",\"valueSpan\":\"自定义单选\",\"replaceDatas\":[{\"id\":\"161\",\"name\":\"自定义单选\"}]},{\"value\":\"gradeBrowser\",\"valueSpan\":\"职级浏览按钮\",\"replaceDatas\":[{\"showname\":\"gradeBrowser\",\"shownamespan\":\"gradeBrowser\",\"namespan\":\"职级浏览按钮\",\"name\":\"职级浏览按钮\",\"showtypespan\":\"列表式\",\"randomFieldIdspan\":\"\",\"showtype\":\"1\",\"randomFieldId\":\"gradeBrowser\",\"id\":\"gradeBrowser\"}]}]").build()); + infoPOList.add(ExtendInfoPO.builder().fieldName("levelId").fieldNameDesc("职等").controlType(3).isrequired(1).browserType("162").customValue("[\"browser\",{\"value\":\"162\",\"valueSpan\":\"自定义多选\",\"replaceDatas\":[{\"id\":\"162\",\"name\":\"自定义多选\"}]},{\"value\":\"LevelBrowser\",\"valueSpan\":\"职等浏览按钮\",\"replaceDatas\":[{\"showname\":\"LevelBrowser\",\"shownamespan\":\"LevelBrowser\",\"namespan\":\"职等浏览按钮\",\"name\":\"职等浏览按钮\",\"showtypespan\":\"列表式\",\"randomFieldIdspan\":\"\",\"showtype\":\"1\",\"randomFieldId\":\"LevelBrowser\",\"id\":\"LevelBrowser\"}]}]").build()); tabinfoMap.put("columns", ExtendInfoBO.convertInfoListToTable(user, infoPOList, viewAttr, false)); tabinfoMap.put("rownum", "rownum"); // 去除null 元素 diff --git a/src/com/engine/organization/web/FieldDefinedController.java b/src/com/engine/organization/web/FieldDefinedController.java index dbefccf1..12778f7a 100644 --- a/src/com/engine/organization/web/FieldDefinedController.java +++ b/src/com/engine/organization/web/FieldDefinedController.java @@ -130,7 +130,19 @@ public class FieldDefinedController { public ReturnResult deleteTitle(@Context HttpServletRequest request, @Context HttpServletResponse response, @PathParam("moduleTypeEnum") ModuleTypeEnum moduleTypeEnum, @QueryParam("id") Long id) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getFieldDefinedWrapper(user).deleteTitle(id)); + return ReturnResult.successed(getFieldDefinedWrapper(user).deleteTitle(id)); + } catch (Exception e) { + return ReturnResult.exceptionHandle(e.getMessage()); + } + } + + @POST + @Path("/{moduleTypeEnum}/saveFields") + @Produces(MediaType.APPLICATION_JSON) + public ReturnResult saveFields(@Context HttpServletRequest request, @Context HttpServletResponse response, @PathParam("moduleTypeEnum") ModuleTypeEnum moduleTypeEnum, @RequestBody ExtendTitleSaveParam param) { + try { + User user = HrmUserVarify.getUser(request, response); + return ReturnResult.successed(getFieldDefinedWrapper(user).saveFields(param.getData())); } catch (Exception e) { return ReturnResult.exceptionHandle(e.getMessage()); } diff --git a/src/com/engine/organization/wrapper/FieldDefinedWrapper.java b/src/com/engine/organization/wrapper/FieldDefinedWrapper.java index 77876ce4..c3500489 100644 --- a/src/com/engine/organization/wrapper/FieldDefinedWrapper.java +++ b/src/com/engine/organization/wrapper/FieldDefinedWrapper.java @@ -34,6 +34,7 @@ public class FieldDefinedWrapper extends Service { /** * 获取标题分组 + * * @param groupType * @return */ @@ -53,6 +54,7 @@ public class FieldDefinedWrapper extends Service { /** * 新建分组 + * * @param param * @return */ @@ -62,13 +64,15 @@ public class FieldDefinedWrapper extends Service { public ReturnResult changeTree(ModuleTypeEnum moduleTypeEnum, FieldTypeTreeParam fieldTypeTreeParam) { - getFieldDefinedService(user).changeTree(moduleTypeEnum,fieldTypeTreeParam); + getFieldDefinedService(user).changeTree(moduleTypeEnum, fieldTypeTreeParam); return ReturnResult.successed(); } - - public int deleteTitle(Long id) { return getFieldDefinedService(user).deleteTitle(id); } + + public int saveFields(String data) { + return getFieldDefinedService(user).saveFields(data); + } } From 08ca2e0c5d0362852947ba0ac6b599f1361b3dc9 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Thu, 16 Jun 2022 16:10:33 +0800 Subject: [PATCH 59/77] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/SelectOptionParam.java | 30 +++ .../extend/param/ExtendFieldSearchParam.java | 21 ++ .../service/FieldDefinedService.java | 3 +- .../service/impl/FieldDefinedServiceImpl.java | 217 +++++++++++++++++- .../web/FieldDefinedController.java | 16 ++ .../wrapper/FieldDefinedWrapper.java | 5 + 6 files changed, 285 insertions(+), 7 deletions(-) create mode 100644 src/com/engine/organization/entity/extend/param/ExtendFieldSearchParam.java diff --git a/src/com/engine/organization/entity/SelectOptionParam.java b/src/com/engine/organization/entity/SelectOptionParam.java index 7db7f6df..5383f894 100644 --- a/src/com/engine/organization/entity/SelectOptionParam.java +++ b/src/com/engine/organization/entity/SelectOptionParam.java @@ -57,4 +57,34 @@ public class SelectOptionParam { } return customValue; } + + /** + * 获取自定义浏览按钮标识 + * + * @param customValue + * @return + */ + public static String getCustomBrowserValueSpan(String customValue) { + JSONArray objects = JSONObject.parseArray(customValue); + if (null != objects && objects.size() > 2) { + JSONObject object = (JSONObject) objects.get(2); + return object.getString("valueSpan"); + } + return customValue; + } + + /** + * 获取文本长度 + * + * @param customValue + * @return + */ + public static String getTextLength(String customValue) { + JSONArray objects = JSONObject.parseArray(customValue); + + if (null != objects && objects.size() > 2) { + return objects.get(2).toString(); + } + return customValue; + } } diff --git a/src/com/engine/organization/entity/extend/param/ExtendFieldSearchParam.java b/src/com/engine/organization/entity/extend/param/ExtendFieldSearchParam.java new file mode 100644 index 00000000..760b3d5a --- /dev/null +++ b/src/com/engine/organization/entity/extend/param/ExtendFieldSearchParam.java @@ -0,0 +1,21 @@ +package com.engine.organization.entity.extend.param; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @description: TODO + * @author:dxfeng + * @createTime: 2022/06/16 + * @version: 1.0 + */ +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class ExtendFieldSearchParam { + private String groupId; + private String groupType; +} diff --git a/src/com/engine/organization/service/FieldDefinedService.java b/src/com/engine/organization/service/FieldDefinedService.java index 113eeea9..e9a5208d 100644 --- a/src/com/engine/organization/service/FieldDefinedService.java +++ b/src/com/engine/organization/service/FieldDefinedService.java @@ -1,6 +1,7 @@ package com.engine.organization.service; +import com.engine.organization.entity.extend.param.ExtendFieldSearchParam; import com.engine.organization.entity.extend.param.ExtendTitleSaveParam; import com.engine.organization.entity.fieldset.param.FieldTypeTreeParam; import com.engine.organization.entity.fieldset.vo.TypeTreeVO; @@ -79,6 +80,6 @@ public interface FieldDefinedService { * @param param * @return */ - Map getFieldDefinedInfo(ExtendTitleSaveParam param); + Map getFieldDefinedInfo(ExtendFieldSearchParam param); } diff --git a/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java b/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java index a0c5586b..f6173160 100644 --- a/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java +++ b/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java @@ -5,8 +5,10 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.engine.core.impl.Service; import com.engine.organization.entity.DeleteParam; +import com.engine.organization.entity.SelectOptionParam; import com.engine.organization.entity.extend.bo.ExtendGroupBO; import com.engine.organization.entity.extend.bo.ExtendInfoBO; +import com.engine.organization.entity.extend.param.ExtendFieldSearchParam; import com.engine.organization.entity.extend.param.ExtendInfoFieldParam; import com.engine.organization.entity.extend.param.ExtendTitleSaveParam; import com.engine.organization.entity.extend.po.ExtendGroupPO; @@ -24,6 +26,9 @@ import com.engine.organization.util.OrganizationAssert; import com.engine.organization.util.db.MapperProxyFactory; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; +import weaver.general.Util; +import weaver.systeminfo.SystemEnv; +import weaver.workflow.field.BrowserComInfo; import java.util.*; import java.util.stream.Collectors; @@ -91,7 +96,7 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ // 主表、主表拓展表为extend_title主键；明细表为extend_group主键 Long extendGroupId = jsonObject.getLong("groupId"); - JSONArray records = (JSONArray) jsonObject.get("records"); + JSONArray records = jsonObject.getJSONArray("records"); int updateCount = 0; for (int i = 0; i < records.size(); i++) { // 存在ID则更新 ，不存在ID则增加 @@ -130,7 +135,7 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ String data = param.getData(); JSONObject jsonObject = JSON.parseObject(data); Set ids = new HashSet<>(); - JSONArray records = (JSONArray) jsonObject.get("records"); + JSONArray records = jsonObject.getJSONArray("records"); for (int i = 0; i < records.size(); i++) { ExtendTitlePO extendTitle = new ExtendTitlePO(); JSONObject object = (JSONObject) records.get(i); @@ -168,13 +173,13 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ Map datas = new HashMap<>(); List titlesByGroupID = getExtendTitleMapper().getTitlesByGroupID(param.getGroupType()); - ExtendTitlePO extendTitlePO = titlesByGroupID.stream().max(Comparator.comparing(ExtendTitlePO::getShowOrder)).get(); + ExtendTitlePO extendTitlePO = titlesByGroupID.stream().max(Comparator.comparing(ExtendTitlePO::getShowOrder)).orElse(ExtendTitlePO.builder().showOrder(1).build()); Set ids = titlesByGroupID.stream().map(ExtendTitlePO::getId).collect(Collectors.toSet()); ExtendTitlePO extendTitle = new ExtendTitlePO(); extendTitle.setGroupId(param.getGroupType()); extendTitle.setIsShow(param.getIsShow()); extendTitle.setTitle(param.getGroupName()); - extendTitle.setShowOrder(null == extendTitlePO ? 0 : extendTitlePO.getShowOrder() + 1); + extendTitle.setShowOrder(extendTitlePO.getShowOrder() + 1); extendTitle.setCreator((long) user.getUID()); extendTitle.setCreateTime(new Date()); extendTitle.setDeleteType(0); @@ -206,8 +211,208 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ } @Override - public Map getFieldDefinedInfo(ExtendTitleSaveParam param) { - return null; + public Map getFieldDefinedInfo(ExtendFieldSearchParam param) { + Map returnMap = new HashMap<>(); + List> lsFieldInfo = new ArrayList<>(); + Map fieldInfo; + Map recordInfo; + Map propsInfo; + Map comInfo; + List fieldTypeInfo; + List lsComDetialInfo; + Map comDetialInfo; + List infoPOList = getExtendInfoMapper().listFields("", param.getGroupId(), "", ""); + for (ExtendInfoPO extendInfoPO : infoPOList) { + Long fieldId = extendInfoPO.getId(); + String fieldName = extendInfoPO.getFieldName(); + String fieldLabel = extendInfoPO.getFieldNameDesc(); + String fieldHtmlType = extendInfoPO.getControlType().toString(); + String fieldtype = extendInfoPO.getBrowserType(); + String customValue = extendInfoPO.getCustomValue(); + String fielddmlurl = ""; + String fieldstrlength = SelectOptionParam.getTextLength(customValue); + //自定义字段排序 标识rowKey + String fieldidrowKey; + int dsporder = extendInfoPO.getShowOrder(); + boolean isUsed = false; + // 系统字段id<0 + boolean isSysField = extendInfoPO.getId() < 0; + if (isSysField) { + fieldidrowKey = fieldId + "_hrm"; + } else { + fieldidrowKey = fieldId + "_cus"; + } + // TODO 字段是否已使用 + // if (!isSysField) isUsed = hfm.fieldIsUsed("field" + hfm.getFieldid()); + boolean allowhide = extendInfoPO.getId() < 0; + boolean allowModify = extendInfoPO.getId() < 0; + + + BrowserComInfo BrowserComInfo = new BrowserComInfo(); + List fieldTypeObj = new ArrayList<>(); + String fieldType = ""; + switch (fieldHtmlType) { + case "1": + fieldTypeObj.add("input"); + fieldType = SystemEnv.getHtmlLabelName(688, user.getLanguage()); + + if (fieldtype.equals("1")) { + fieldTypeObj.add("text"); + fieldType += " " + SystemEnv.getHtmlLabelName(608, user.getLanguage()); + fieldType += " " + SystemEnv.getHtmlLabelName(608, user.getLanguage()) + ":" + fieldstrlength; + fieldTypeObj.add(fieldstrlength); + } else if (fieldtype.equals("2")) { + fieldTypeObj.add("int"); + fieldType += " " + SystemEnv.getHtmlLabelName(696, user.getLanguage()); + } else if (fieldtype.equals("3")) { + fieldTypeObj.add("float"); + fieldType += " " + SystemEnv.getHtmlLabelName(697, user.getLanguage()); + } + break; + case "2": + fieldTypeObj.add("textarea"); + fieldType = SystemEnv.getHtmlLabelName(689, user.getLanguage()); + break; + case "3": { + fieldTypeObj.add("browser"); + List replaceDatas = new ArrayList<>(); + Map tmp = new HashMap<>(); + tmp.put("value", fieldtype); + tmp.put("valueSpan", SystemEnv.getHtmlLabelName(Util.getIntValue(BrowserComInfo.getBrowserlabelid(fieldtype), 0), user.getLanguage())); + Map tmp1 = new HashMap<>(); + tmp1.put("id", fieldtype); + tmp1.put("name", SystemEnv.getHtmlLabelName(Util.getIntValue(BrowserComInfo.getBrowserlabelid(fieldtype), 0), user.getLanguage())); + replaceDatas.add(tmp1); + tmp.put("replaceDatas", replaceDatas); + fieldTypeObj.add(tmp); + if (fieldtype.equals("161") || fieldtype.equals("162") || fieldtype.equals("256") || fieldtype.equals("257")) { + tmp = new HashMap<>(); + tmp.put("value", SelectOptionParam.getCustomBrowserId(customValue)); + tmp.put("valueSpan", SelectOptionParam.getCustomBrowserValueSpan(customValue)); + fieldTypeObj.add(tmp); + } + fieldType = SystemEnv.getHtmlLabelName(695, user.getLanguage()); + fieldType += " " + SystemEnv.getHtmlLabelName(Util.getIntValue(BrowserComInfo.getBrowserlabelid(fieldtype), 0), user.getLanguage()); + // TODO + if ("emptyVal".equals(fielddmlurl) || "".equals(fielddmlurl)) { + } else { + fieldType += " " + SelectOptionParam.getCustomBrowserValueSpan(customValue); + } + break; + } + case "4": + fieldTypeObj.add("check"); + fieldType = SystemEnv.getHtmlLabelName(691, user.getLanguage()); + break; + case "5": { + fieldTypeObj.add("select"); + fieldTypeObj.add("select"); + Map tmp = new HashMap<>(); + tmp.put("datas", SelectOptionParam.convertJsonToListOption(customValue)); + tmp.put("sort", "horizontal"); + fieldTypeObj.add(tmp); + fieldType = SystemEnv.getHtmlLabelName(690, user.getLanguage()); + break; + } + case "6": + fieldTypeObj.add("upload"); + fieldTypeObj.add("file"); + fieldType = SystemEnv.getHtmlLabelName(17616, user.getLanguage()); + fieldType += " " + SystemEnv.getHtmlLabelName(20798, user.getLanguage()); + //fieldType += " " + (fieldtype.equals("1") ? SystemEnv.getHtmlLabelName(20798, user.getLanguage()) : SystemEnv.getHtmlLabelName(20001, user.getLanguage())); + break; + } + + fieldInfo = new HashMap<>(); + recordInfo = new HashMap<>(); + recordInfo.put("id", "" + fieldId); + recordInfo.put("fieldlabel", fieldLabel); + recordInfo.put("fieldname", fieldName); + recordInfo.put("fieldType", fieldType); + recordInfo.put("fieldTypeObj", fieldTypeObj); + recordInfo.put("enable", extendInfoPO.getIsenable()); + recordInfo.put("required", extendInfoPO.getIsrequired()); + recordInfo.put("isModify", extendInfoPO.getEditShow()); + recordInfo.put("viewAttr", isUsed || isSysField ? 1 : 2); + recordInfo.put("key", "" + dsporder); + recordInfo.put("fieldidrowKey", fieldidrowKey); + + fieldInfo.put("record", recordInfo); + + propsInfo = new HashMap<>(); + Map checkPropsInfo = new HashMap<>(); + Map checkPropsEnableInfo = new HashMap<>(); + Map checkPropsRequiredInfo = new HashMap<>(); + //允许个人修改字段check框属性 + Map checkPropsModifyInfo = new HashMap<>(); + checkPropsEnableInfo.put("viewAttr", allowhide ? 2 : 1); + checkPropsModifyInfo.put("viewAttr", allowModify ? 2 : 1); + checkPropsRequiredInfo.put("viewAttr", allowhide ? 2 : 1); + + checkPropsInfo.put("enable", checkPropsEnableInfo); + checkPropsInfo.put("required", checkPropsRequiredInfo); + checkPropsInfo.put("isModify", checkPropsModifyInfo); + propsInfo.put("checkProps", checkPropsInfo); + fieldInfo.put("props", propsInfo); + + comInfo = new HashMap<>(); + + lsComDetialInfo = new ArrayList<>(); + comDetialInfo = new HashMap<>(); + comDetialInfo.put("label", ""); + if (isSysField) { + comDetialInfo.put("type", "TEXT"); + } else { + comDetialInfo.put("type", "INPUT"); + } + comDetialInfo.put("width", "15%"); + comDetialInfo.put("key", "fieldlabel"); + comDetialInfo.put("viewAttr", "3"); + lsComDetialInfo.add(comDetialInfo); + comInfo.put("fieldlabel", lsComDetialInfo); + + lsComDetialInfo = new ArrayList<>(); + comDetialInfo = new HashMap<>(); + comDetialInfo.put("label", ""); + comDetialInfo.put("type", "TEXT"); + comDetialInfo.put("width", "15%"); + comDetialInfo.put("key", "fieldname"); + comDetialInfo.put("viewAttr", "3"); + lsComDetialInfo.add(comDetialInfo); + comInfo.put("fieldname", lsComDetialInfo); + + lsComDetialInfo = new ArrayList<>(); + comDetialInfo = new HashMap<>(); + comDetialInfo.put("label", ""); + comDetialInfo.put("type", fieldHtmlType.equals("5") ? "CUSTOMFIELD" : "TEXT"); + comDetialInfo.put("width", "60%"); + comDetialInfo.put("key", "fieldType"); + lsComDetialInfo.add(comDetialInfo); + comInfo.put("fieldType", lsComDetialInfo); + + fieldInfo.put("com", comInfo); + fieldInfo.put("isSysField", isSysField); + + fieldTypeInfo = new ArrayList<>(); + fieldTypeInfo.add("select"); + fieldTypeInfo.add("select"); + Map fieldTypeParamInfo = new HashMap<>(); + + if (fieldHtmlType.equals("5")) { + + fieldTypeParamInfo.put("datas", SelectOptionParam.convertJsonToListOption(customValue)); + fieldTypeParamInfo.put("sort", "horizontal"); + fieldTypeInfo.add(fieldTypeParamInfo); + fieldInfo.put("fieldType", fieldTypeInfo); + } + lsFieldInfo.add(fieldInfo); + + } + + + returnMap.put("data", lsFieldInfo); + returnMap.put("encryptEnable", false); + return returnMap; } private ExtendTitlePO buildExtendTitleType(ExtendGroupPO extendGroupPO) { diff --git a/src/com/engine/organization/web/FieldDefinedController.java b/src/com/engine/organization/web/FieldDefinedController.java index 12778f7a..5360eab0 100644 --- a/src/com/engine/organization/web/FieldDefinedController.java +++ b/src/com/engine/organization/web/FieldDefinedController.java @@ -2,6 +2,7 @@ package com.engine.organization.web; import com.engine.common.util.ParamUtil; import com.engine.common.util.ServiceUtil; +import com.engine.organization.entity.extend.param.ExtendFieldSearchParam; import com.engine.organization.entity.extend.param.ExtendTitleSaveParam; import com.engine.organization.entity.fieldset.param.FieldTypeTreeParam; import com.engine.organization.enums.ModuleTypeEnum; @@ -147,4 +148,19 @@ public class FieldDefinedController { return ReturnResult.exceptionHandle(e.getMessage()); } } + + @GET + @Path("/{moduleTypeEnum}/getFieldDefinedInfo") + @Produces(MediaType.APPLICATION_JSON) + public ReturnResult getFieldDefinedInfo(@Context HttpServletRequest request, @Context HttpServletResponse response, @PathParam("moduleTypeEnum") ModuleTypeEnum moduleTypeEnum) { + try { + User user = HrmUserVarify.getUser(request, response); + Map map = ParamUtil.request2Map(request); + String groupType = (String) map.get("groupType"); + String groupId = (String) map.get("groupId"); + return ReturnResult.successed(getFieldDefinedWrapper(user).getFieldDefinedInfo(ExtendFieldSearchParam.builder().groupType(groupType).groupId(groupId).build())); + } catch (Exception e) { + return ReturnResult.exceptionHandle(e.getMessage()); + } + } } diff --git a/src/com/engine/organization/wrapper/FieldDefinedWrapper.java b/src/com/engine/organization/wrapper/FieldDefinedWrapper.java index c3500489..353407da 100644 --- a/src/com/engine/organization/wrapper/FieldDefinedWrapper.java +++ b/src/com/engine/organization/wrapper/FieldDefinedWrapper.java @@ -2,6 +2,7 @@ package com.engine.organization.wrapper; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; +import com.engine.organization.entity.extend.param.ExtendFieldSearchParam; import com.engine.organization.entity.extend.param.ExtendTitleSaveParam; import com.engine.organization.entity.fieldset.param.FieldTypeTreeParam; import com.engine.organization.entity.fieldset.vo.TypeTreeVO; @@ -75,4 +76,8 @@ public class FieldDefinedWrapper extends Service { public int saveFields(String data) { return getFieldDefinedService(user).saveFields(data); } + + public Map getFieldDefinedInfo(ExtendFieldSearchParam param) { + return getFieldDefinedService(user).getFieldDefinedInfo(param); + } } From 5fd7eb34986b2b345722556bc02f2447bc15e743 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Thu, 16 Jun 2022 16:13:04 +0800 Subject: [PATCH 60/77] =?UTF-8?q?JCL=5FFIELD=5FEXTENDGROUP=20=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=20show=5Forder?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/表结构SQL/MySQL.sql | 1 + docs/表结构SQL/Oracle.sql | 1 + docs/表结构SQL/SqlServer.sql | 1 + 3 files changed, 3 insertions(+) diff --git a/docs/表结构SQL/MySQL.sql b/docs/表结构SQL/MySQL.sql index fe065481..3bc3bbe4 100644 --- a/docs/表结构SQL/MySQL.sql +++ b/docs/表结构SQL/MySQL.sql @@ -119,6 +119,7 @@ CREATE TABLE JCL_FIELD_EXTENDGROUP ( pid int null, extend_type int null, group_name varchar(100) NULL, + show_order int null, creator int null, delete_type int null, create_time date null, diff --git a/docs/表结构SQL/Oracle.sql b/docs/表结构SQL/Oracle.sql index cc122eac..ebc68141 100644 --- a/docs/表结构SQL/Oracle.sql +++ b/docs/表结构SQL/Oracle.sql @@ -121,6 +121,7 @@ CREATE TABLE JCL_FIELD_EXTENDGROUP ( PID NUMBER NULL, EXTEND_TYPE NUMBER NULL, GROUP_NAME NVARCHAR2(100) NULL, + SHOW_ORDER NUMBER null, CREATOR NUMBER NULL, DELETE_TYPE NUMBER NULL, CREATE_TIME DATE NULL, diff --git a/docs/表结构SQL/SqlServer.sql b/docs/表结构SQL/SqlServer.sql index f164c0cd..d6c4d2b6 100644 --- a/docs/表结构SQL/SqlServer.sql +++ b/docs/表结构SQL/SqlServer.sql @@ -119,6 +119,7 @@ CREATE TABLE JCL_FIELD_EXTENDGROUP ( pid int null, extend_type int null, group_name varchar(100) COLLATE Chinese_PRC_CI_AS NULL, + show_order int null, creator int null, delete_type int null, create_time datetime null, From 4d2a70ad5dd1b51321653896fd09cfa1e7299a07 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Thu, 16 Jun 2022 17:53:48 +0800 Subject: [PATCH 61/77] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/SelectOptionParam.java | 25 ++++++ .../entity/extend/bo/ExtendInfoBO.java | 21 ++++- .../extend/param/ExtendFieldSearchParam.java | 1 - .../mapper/extend/ExtendInfoMapper.java | 2 + .../mapper/extend/ExtendInfoMapper.xml | 4 + .../service/impl/FieldDefinedServiceImpl.java | 82 ++++++++++--------- .../web/FieldDefinedController.java | 15 ++-- 7 files changed, 102 insertions(+), 48 deletions(-) diff --git a/src/com/engine/organization/entity/SelectOptionParam.java b/src/com/engine/organization/entity/SelectOptionParam.java index 5383f894..70e04030 100644 --- a/src/com/engine/organization/entity/SelectOptionParam.java +++ b/src/com/engine/organization/entity/SelectOptionParam.java @@ -87,4 +87,29 @@ public class SelectOptionParam { } return customValue; } + + /** + * 获取下拉框信息 + * + * @param customValue + * @return + */ + public static List getSelectFields(String customValue) { + List selectFields = new ArrayList<>(); + JSONArray objects = JSONObject.parseArray(customValue); + if (objects.size() < 3) { + return selectFields; + } + JSONObject o = (JSONObject) objects.get(2); + JSONArray datas = o.getJSONArray("datas"); + if (!datas.isEmpty()) { + int size = datas.size(); + for (int i = 0; i < size; i++) { + selectFields.add(datas.get(i)); + } + } + return selectFields; + } + + } diff --git a/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java b/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java index 05e71f10..339d2fdb 100644 --- a/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java +++ b/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java @@ -16,9 +16,12 @@ import com.engine.organization.entity.SelectOptionParam; import com.engine.organization.entity.extend.param.ExtendInfoFieldParam; import com.engine.organization.entity.extend.po.ExtendGroupPO; import com.engine.organization.entity.extend.po.ExtendInfoPO; +import com.engine.organization.mapper.extend.ExtendInfoMapper; import com.engine.organization.util.OrganizationFormItemUtil; +import com.engine.organization.util.db.MapperProxyFactory; import com.engine.sensitive.biz.SensitiveWordTypeComInfo; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang3.StringUtils; import weaver.file.ImageFileManager; import weaver.general.Util; import weaver.hrm.User; @@ -111,6 +114,22 @@ public class ExtendInfoBO { .build(); } + /** + * 当前自定义字段是否已使用 + * + * @param tableName + * @param fieldName + * @return + */ + public static boolean fieldIsUsed(String tableName, String fieldName) { + if (StringUtils.isAnyEmpty(tableName, fieldName)) { + return true; + } + List objects = MapperProxyFactory.getProxy(ExtendInfoMapper.class).listFieldsByTableName(tableName, fieldName); + objects.removeIf(Objects::isNull); + return CollectionUtils.isNotEmpty(objects); + } + /** * 明细表字段 * diff --git a/src/com/engine/organization/entity/extend/param/ExtendFieldSearchParam.java b/src/com/engine/organization/entity/extend/param/ExtendFieldSearchParam.java index 760b3d5a..26181f1d 100644 --- a/src/com/engine/organization/entity/extend/param/ExtendFieldSearchParam.java +++ b/src/com/engine/organization/entity/extend/param/ExtendFieldSearchParam.java @@ -6,7 +6,6 @@ import lombok.Data; import lombok.NoArgsConstructor; /** - * @description: TODO * @author:dxfeng * @createTime: 2022/06/16 * @version: 1.0 diff --git a/src/com/engine/organization/mapper/extend/ExtendInfoMapper.java b/src/com/engine/organization/mapper/extend/ExtendInfoMapper.java index a6a84ca2..c6e4e082 100644 --- a/src/com/engine/organization/mapper/extend/ExtendInfoMapper.java +++ b/src/com/engine/organization/mapper/extend/ExtendInfoMapper.java @@ -26,5 +26,7 @@ public interface ExtendInfoMapper { Long getMaxId(); + List listFieldsByTableName(@Param("tableName") String tableName, @Param("fieldName") String fieldName); + } diff --git a/src/com/engine/organization/mapper/extend/ExtendInfoMapper.xml b/src/com/engine/organization/mapper/extend/ExtendInfoMapper.xml index 4c1d58f8..666e9c91 100644 --- a/src/com/engine/organization/mapper/extend/ExtendInfoMapper.xml +++ b/src/com/engine/organization/mapper/extend/ExtendInfoMapper.xml @@ -237,6 +237,10 @@ from jcl_field_extendinfo order by id desc + \ No newline at end of file diff --git a/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java b/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java index f6173160..c5f98399 100644 --- a/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java +++ b/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java @@ -227,26 +227,27 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ String fieldName = extendInfoPO.getFieldName(); String fieldLabel = extendInfoPO.getFieldNameDesc(); String fieldHtmlType = extendInfoPO.getControlType().toString(); - String fieldtype = extendInfoPO.getBrowserType(); + String browserType = extendInfoPO.getBrowserType(); String customValue = extendInfoPO.getCustomValue(); - String fielddmlurl = ""; - String fieldstrlength = SelectOptionParam.getTextLength(customValue); + String fieldStrLength = SelectOptionParam.getTextLength(customValue); //自定义字段排序 标识rowKey String fieldidrowKey; int dsporder = extendInfoPO.getShowOrder(); boolean isUsed = false; + // TODO 去除脏数据后调整为extendInfoPO.getId() > 0 // 系统字段id<0 - boolean isSysField = extendInfoPO.getId() < 0; + boolean isSysField = extendInfoPO.getExtendGroupId() < 0; if (isSysField) { fieldidrowKey = fieldId + "_hrm"; } else { fieldidrowKey = fieldId + "_cus"; } - // TODO 字段是否已使用 - // if (!isSysField) isUsed = hfm.fieldIsUsed("field" + hfm.getFieldid()); - boolean allowhide = extendInfoPO.getId() < 0; - boolean allowModify = extendInfoPO.getId() < 0; - + if (!isSysField) { + isUsed = ExtendInfoBO.fieldIsUsed(extendInfoPO.getTableName(), extendInfoPO.getFieldName()); + } + // TODO 去除脏数据后调整为extendInfoPO.getId() > 0 + boolean allowHide = extendInfoPO.getExtendGroupId() > 0; + boolean allowModify = extendInfoPO.getExtendGroupId() > 0; BrowserComInfo BrowserComInfo = new BrowserComInfo(); List fieldTypeObj = new ArrayList<>(); @@ -255,18 +256,21 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ case "1": fieldTypeObj.add("input"); fieldType = SystemEnv.getHtmlLabelName(688, user.getLanguage()); - - if (fieldtype.equals("1")) { - fieldTypeObj.add("text"); - fieldType += " " + SystemEnv.getHtmlLabelName(608, user.getLanguage()); - fieldType += " " + SystemEnv.getHtmlLabelName(608, user.getLanguage()) + ":" + fieldstrlength; - fieldTypeObj.add(fieldstrlength); - } else if (fieldtype.equals("2")) { - fieldTypeObj.add("int"); - fieldType += " " + SystemEnv.getHtmlLabelName(696, user.getLanguage()); - } else if (fieldtype.equals("3")) { - fieldTypeObj.add("float"); - fieldType += " " + SystemEnv.getHtmlLabelName(697, user.getLanguage()); + switch (browserType) { + case "1": + fieldTypeObj.add("text"); + fieldType += " " + SystemEnv.getHtmlLabelName(608, user.getLanguage()); + fieldType += " " + SystemEnv.getHtmlLabelName(608, user.getLanguage()) + ":" + fieldStrLength; + fieldTypeObj.add(fieldStrLength); + break; + case "2": + fieldTypeObj.add("int"); + fieldType += " " + SystemEnv.getHtmlLabelName(696, user.getLanguage()); + break; + case "3": + fieldTypeObj.add("float"); + fieldType += " " + SystemEnv.getHtmlLabelName(697, user.getLanguage()); + break; } break; case "2": @@ -277,25 +281,21 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ fieldTypeObj.add("browser"); List replaceDatas = new ArrayList<>(); Map tmp = new HashMap<>(); - tmp.put("value", fieldtype); - tmp.put("valueSpan", SystemEnv.getHtmlLabelName(Util.getIntValue(BrowserComInfo.getBrowserlabelid(fieldtype), 0), user.getLanguage())); + tmp.put("value", browserType); + tmp.put("valueSpan", SystemEnv.getHtmlLabelName(Util.getIntValue(BrowserComInfo.getBrowserlabelid(browserType), 0), user.getLanguage())); Map tmp1 = new HashMap<>(); - tmp1.put("id", fieldtype); - tmp1.put("name", SystemEnv.getHtmlLabelName(Util.getIntValue(BrowserComInfo.getBrowserlabelid(fieldtype), 0), user.getLanguage())); + tmp1.put("id", browserType); + tmp1.put("name", SystemEnv.getHtmlLabelName(Util.getIntValue(BrowserComInfo.getBrowserlabelid(browserType), 0), user.getLanguage())); replaceDatas.add(tmp1); tmp.put("replaceDatas", replaceDatas); fieldTypeObj.add(tmp); - if (fieldtype.equals("161") || fieldtype.equals("162") || fieldtype.equals("256") || fieldtype.equals("257")) { + fieldType = SystemEnv.getHtmlLabelName(695, user.getLanguage()); + fieldType += " " + SystemEnv.getHtmlLabelName(Util.getIntValue(BrowserComInfo.getBrowserlabelid(browserType), 0), user.getLanguage()); + if (browserType.equals("161") || browserType.equals("162") || browserType.equals("256") || browserType.equals("257")) { tmp = new HashMap<>(); tmp.put("value", SelectOptionParam.getCustomBrowserId(customValue)); tmp.put("valueSpan", SelectOptionParam.getCustomBrowserValueSpan(customValue)); fieldTypeObj.add(tmp); - } - fieldType = SystemEnv.getHtmlLabelName(695, user.getLanguage()); - fieldType += " " + SystemEnv.getHtmlLabelName(Util.getIntValue(BrowserComInfo.getBrowserlabelid(fieldtype), 0), user.getLanguage()); - // TODO - if ("emptyVal".equals(fielddmlurl) || "".equals(fielddmlurl)) { - } else { fieldType += " " + SelectOptionParam.getCustomBrowserValueSpan(customValue); } break; @@ -308,7 +308,7 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ fieldTypeObj.add("select"); fieldTypeObj.add("select"); Map tmp = new HashMap<>(); - tmp.put("datas", SelectOptionParam.convertJsonToListOption(customValue)); + tmp.put("datas", SelectOptionParam.getSelectFields(customValue)); tmp.put("sort", "horizontal"); fieldTypeObj.add(tmp); fieldType = SystemEnv.getHtmlLabelName(690, user.getLanguage()); @@ -319,7 +319,6 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ fieldTypeObj.add("file"); fieldType = SystemEnv.getHtmlLabelName(17616, user.getLanguage()); fieldType += " " + SystemEnv.getHtmlLabelName(20798, user.getLanguage()); - //fieldType += " " + (fieldtype.equals("1") ? SystemEnv.getHtmlLabelName(20798, user.getLanguage()) : SystemEnv.getHtmlLabelName(20001, user.getLanguage())); break; } @@ -330,9 +329,9 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ recordInfo.put("fieldname", fieldName); recordInfo.put("fieldType", fieldType); recordInfo.put("fieldTypeObj", fieldTypeObj); - recordInfo.put("enable", extendInfoPO.getIsenable()); - recordInfo.put("required", extendInfoPO.getIsrequired()); - recordInfo.put("isModify", extendInfoPO.getEditShow()); + recordInfo.put("enable", extendInfoPO.getIsenable() + ""); + recordInfo.put("required", extendInfoPO.getIsrequired() + ""); + recordInfo.put("isModify", extendInfoPO.getEditShow() + ""); recordInfo.put("viewAttr", isUsed || isSysField ? 1 : 2); recordInfo.put("key", "" + dsporder); recordInfo.put("fieldidrowKey", fieldidrowKey); @@ -343,11 +342,12 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ Map checkPropsInfo = new HashMap<>(); Map checkPropsEnableInfo = new HashMap<>(); Map checkPropsRequiredInfo = new HashMap<>(); + //允许个人修改字段check框属性 Map checkPropsModifyInfo = new HashMap<>(); - checkPropsEnableInfo.put("viewAttr", allowhide ? 2 : 1); + checkPropsEnableInfo.put("viewAttr", allowHide ? 2 : 1); checkPropsModifyInfo.put("viewAttr", allowModify ? 2 : 1); - checkPropsRequiredInfo.put("viewAttr", allowhide ? 2 : 1); + checkPropsRequiredInfo.put("viewAttr", allowHide ? 2 : 1); checkPropsInfo.put("enable", checkPropsEnableInfo); checkPropsInfo.put("required", checkPropsRequiredInfo); @@ -400,7 +400,7 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ if (fieldHtmlType.equals("5")) { - fieldTypeParamInfo.put("datas", SelectOptionParam.convertJsonToListOption(customValue)); + fieldTypeParamInfo.put("datas", SelectOptionParam.getSelectFields(customValue)); fieldTypeParamInfo.put("sort", "horizontal"); fieldTypeInfo.add(fieldTypeParamInfo); fieldInfo.put("fieldType", fieldTypeInfo); @@ -412,6 +412,8 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ returnMap.put("data", lsFieldInfo); returnMap.put("encryptEnable", false); + // TODO 后续去除 + returnMap.put("status", "1"); return returnMap; } diff --git a/src/com/engine/organization/web/FieldDefinedController.java b/src/com/engine/organization/web/FieldDefinedController.java index 5360eab0..24a85f8e 100644 --- a/src/com/engine/organization/web/FieldDefinedController.java +++ b/src/com/engine/organization/web/FieldDefinedController.java @@ -1,5 +1,6 @@ package com.engine.organization.web; +import com.alibaba.fastjson.JSON; import com.engine.common.util.ParamUtil; import com.engine.common.util.ServiceUtil; import com.engine.organization.entity.extend.param.ExtendFieldSearchParam; @@ -152,15 +153,17 @@ public class FieldDefinedController { @GET @Path("/{moduleTypeEnum}/getFieldDefinedInfo") @Produces(MediaType.APPLICATION_JSON) - public ReturnResult getFieldDefinedInfo(@Context HttpServletRequest request, @Context HttpServletResponse response, @PathParam("moduleTypeEnum") ModuleTypeEnum moduleTypeEnum) { - try { + public String getFieldDefinedInfo(@Context HttpServletRequest request, @Context HttpServletResponse response, @PathParam("moduleTypeEnum") ModuleTypeEnum moduleTypeEnum) { + // TODO + //try { User user = HrmUserVarify.getUser(request, response); Map map = ParamUtil.request2Map(request); String groupType = (String) map.get("groupType"); String groupId = (String) map.get("groupId"); - return ReturnResult.successed(getFieldDefinedWrapper(user).getFieldDefinedInfo(ExtendFieldSearchParam.builder().groupType(groupType).groupId(groupId).build())); - } catch (Exception e) { - return ReturnResult.exceptionHandle(e.getMessage()); - } + // return ReturnResult.successed(getFieldDefinedWrapper(user).getFieldDefinedInfo(ExtendFieldSearchParam.builder().groupType(groupType).groupId(groupId).build())); + return JSON.toJSONString(getFieldDefinedWrapper(user).getFieldDefinedInfo(ExtendFieldSearchParam.builder().groupType(groupType).groupId(groupId).build())); + //} catch (Exception e) { + // return ReturnResult.exceptionHandle(e.getMessage()); + //} } } From 6d4448ec51c98ec9f4a5bbece6d3710d80b7651b Mon Sep 17 00:00:00 2001 From: Chengliang <1546584672@qq.com> Date: Thu, 16 Jun 2022 17:57:03 +0800 Subject: [PATCH 62/77] =?UTF-8?q?=E5=AD=90=E4=BF=A1=E6=81=AF=E7=BB=B4?= =?UTF-8?q?=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/extend/bo/ExtendGroupBO.java | 5 +- .../entity/extend/po/ExtendGroupPO.java | 2 + .../fieldset/param/FieldTypeTreeParam.java | 4 +- .../mapper/extend/ExtendGroupMapper.java | 8 ++- .../mapper/extend/ExtendGroupMapper.xml | 27 ++++++++ .../service/FieldDefinedService.java | 12 ++++ .../service/impl/FieldDefinedServiceImpl.java | 63 +++++++++++++++++-- .../web/FieldDefinedController.java | 23 +++++-- .../wrapper/FieldDefinedWrapper.java | 13 +++- 9 files changed, 141 insertions(+), 16 deletions(-) diff --git a/src/com/engine/organization/entity/extend/bo/ExtendGroupBO.java b/src/com/engine/organization/entity/extend/bo/ExtendGroupBO.java index 9212661c..2ff9f23b 100644 --- a/src/com/engine/organization/entity/extend/bo/ExtendGroupBO.java +++ b/src/com/engine/organization/entity/extend/bo/ExtendGroupBO.java @@ -5,6 +5,7 @@ import com.engine.organization.entity.extend.po.ExtendTitlePO; import com.engine.organization.entity.fieldset.vo.TypeTreeVO; import com.engine.organization.mapper.extend.ExtendTitleMapper; import com.engine.organization.util.db.MapperProxyFactory; +import com.google.common.collect.Lists; import org.apache.commons.collections.CollectionUtils; import java.util.Collections; @@ -29,7 +30,9 @@ public class ExtendGroupBO { List typeTreeVOS = extendGroupPOS.stream().map(e -> TypeTreeVO.builder() .canClick(true) + .addChild(e.getPid() == null) .domid(String.valueOf(e.getId())) + .childs(Lists.newArrayList()) .hasGroup(isHasGroup(e.getId())) .isShow(e.getIsShow()) .key(e.getId()) @@ -42,7 +45,7 @@ public class ExtendGroupBO { Map> collects = typeTreeVOS.stream().filter(item -> item.getPid() != null).collect(Collectors.groupingBy(TypeTreeVO :: getPid)); return typeTreeVOS.stream().peek(e -> {e.setChilds(collects.get(e.getKey())); e.setHaschild(collects.get(e.getKey()) != null && collects.get(e.getKey()).size() > 0); - e.setAddChild(collects.get(e.getKey()) != null && collects.get(e.getKey()).size() > 0);}).filter(item -> item.getPid() == null).collect(Collectors.toList()); + }).filter(item -> item.getPid() == null).collect(Collectors.toList()); } diff --git a/src/com/engine/organization/entity/extend/po/ExtendGroupPO.java b/src/com/engine/organization/entity/extend/po/ExtendGroupPO.java index 1c9404d7..5e549ee3 100644 --- a/src/com/engine/organization/entity/extend/po/ExtendGroupPO.java +++ b/src/com/engine/organization/entity/extend/po/ExtendGroupPO.java @@ -40,6 +40,8 @@ public class ExtendGroupPO { private String isShow; + private Integer showOrder; + private Long creator; private int deleteType; private Date createTime; diff --git a/src/com/engine/organization/entity/fieldset/param/FieldTypeTreeParam.java b/src/com/engine/organization/entity/fieldset/param/FieldTypeTreeParam.java index 57e20c61..a9100ecc 100644 --- a/src/com/engine/organization/entity/fieldset/param/FieldTypeTreeParam.java +++ b/src/com/engine/organization/entity/fieldset/param/FieldTypeTreeParam.java @@ -20,9 +20,11 @@ import java.util.List; @AllArgsConstructor public class FieldTypeTreeParam { + private String data; //信息维护json数据 + private Long id; - private Long parentid; + private Long parentId; private String name; diff --git a/src/com/engine/organization/mapper/extend/ExtendGroupMapper.java b/src/com/engine/organization/mapper/extend/ExtendGroupMapper.java index 18ee6c5f..48aaae09 100644 --- a/src/com/engine/organization/mapper/extend/ExtendGroupMapper.java +++ b/src/com/engine/organization/mapper/extend/ExtendGroupMapper.java @@ -6,6 +6,7 @@ import org.apache.ibatis.annotations.Param; import java.util.Collection; import java.util.List; +import java.util.Set; /** * @description: @@ -48,10 +49,13 @@ public interface ExtendGroupMapper { */ String getGroupNameById(@Param("id") String id); + void insertIgnoreNull(ExtendGroupPO extendGroupPO); + void update(@Param("id")Long id, @Param("name")String name); - void insertIgnoreNull(ExtendGroupPO extendGroupPO); + void delete(@Param("id") Long id); + void updateNameAndOrder(@Param("id")Long id, @Param("groupName")String groupName, @Param("showOrder")Integer showOrder); - void update(@Param("id")Long id, @Param("name")String name); + void batchDelete(@Param("ids")Set removeSet); } diff --git a/src/com/engine/organization/mapper/extend/ExtendGroupMapper.xml b/src/com/engine/organization/mapper/extend/ExtendGroupMapper.xml index a2b11df7..d3b24e9d 100644 --- a/src/com/engine/organization/mapper/extend/ExtendGroupMapper.xml +++ b/src/com/engine/organization/mapper/extend/ExtendGroupMapper.xml @@ -134,4 +134,31 @@ WHERE id = #{id} AND delete_type = 0 + + update jcl_field_extendgroup + + delete_type=1, + + WHERE id = #{id} AND delete_type = 0 + + + + update jcl_field_extendgroup + + group_name=#{groupName}, + show_order=#{showOrder} + + WHERE id = #{id} AND delete_type = 0 + + + + UPDATE jcl_field_extendgroup + SET delete_type = 1 + WHERE delete_type = 0 + AND id IN + + #{id} + + + \ No newline at end of file diff --git a/src/com/engine/organization/service/FieldDefinedService.java b/src/com/engine/organization/service/FieldDefinedService.java index 113eeea9..3d7244ef 100644 --- a/src/com/engine/organization/service/FieldDefinedService.java +++ b/src/com/engine/organization/service/FieldDefinedService.java @@ -81,4 +81,16 @@ public interface FieldDefinedService { */ Map getFieldDefinedInfo(ExtendTitleSaveParam param); + /** + * 删除树类型 + * @param id + */ + void deleteTree(Long id); + + /** + * 子信息维护 + * @param moduleTypeEnum + * @param fieldTypeTreeParam + */ + void saveTree(ModuleTypeEnum moduleTypeEnum, FieldTypeTreeParam fieldTypeTreeParam); } diff --git a/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java b/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java index c2cc48b8..ad7a26e9 100644 --- a/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java +++ b/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java @@ -27,6 +27,7 @@ import org.apache.commons.lang.StringUtils; import java.util.*; import java.util.stream.Collectors; +import java.util.stream.Stream; /** * @Author weaver_cl @@ -180,10 +181,14 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ @Override public void changeTree(ModuleTypeEnum moduleTypeEnum, FieldTypeTreeParam fieldTypeTreeParam) { if (fieldTypeTreeParam.getId() == null) { - ExtendGroupPO extendGroupPO = buildExtendGroupType(moduleTypeEnum, fieldTypeTreeParam); + List extendGroupPOList = MapperProxyFactory.getProxy(ExtendGroupMapper.class).listGroupByPid(fieldTypeTreeParam.getParentId()); + ExtendGroupPO extendGroup = extendGroupPOList.stream().max(Comparator.comparing(ExtendGroupPO::getShowOrder)).get(); + ExtendGroupPO extendGroupPO = buildExtendGroupType(moduleTypeEnum, fieldTypeTreeParam,extendGroup.getShowOrder()); MapperProxyFactory.getProxy(ExtendGroupMapper.class).insertIgnoreNull(extendGroupPO); //默认新增title - ExtendTitlePO extendTitlePO = buildExtendTitleType(extendGroupPO); + List titlesByGroupID = getExtendTitleMapper().getTitlesByGroupID(extendGroup.getId()); + ExtendTitlePO extendTitle = titlesByGroupID.stream().max(Comparator.comparing(ExtendTitlePO::getShowOrder)).get(); + ExtendTitlePO extendTitlePO = buildExtendTitleType(extendGroupPO,extendTitle.getShowOrder()); MapperProxyFactory.getProxy(ExtendTitleMapper.class).insertIgnoreNull(extendTitlePO); } else { MapperProxyFactory.getProxy(ExtendGroupMapper.class).update(fieldTypeTreeParam.getId(), fieldTypeTreeParam.getName()); @@ -198,14 +203,59 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ @Override public Map getFieldDefinedInfo(ExtendTitleSaveParam param) { + return null; } - private ExtendTitlePO buildExtendTitleType(ExtendGroupPO extendGroupPO) { + @Override + public void deleteTree(Long id) { + MapperProxyFactory.getProxy(ExtendGroupMapper.class).delete(id); + } + + @Override + public void saveTree(ModuleTypeEnum moduleTypeEnum, FieldTypeTreeParam fieldTypeTreeParam) { + List collect = MapperProxyFactory.getProxy(ExtendGroupMapper.class) + .listGroupByPid(fieldTypeTreeParam.getParentId()).stream().map(ExtendGroupPO::getId).collect(Collectors.toList()); + Integer extendType = moduleTypeEnum.getValue(); + List extendGroupPOS = JSONArray.parseArray(fieldTypeTreeParam.getData(),ExtendGroupPO.class); + + List collect1 = extendGroupPOS.stream().map(ExtendGroupPO::getId).collect(Collectors.toList()); + Set removeSet = new HashSet<>(); + collect1.forEach(e->{ + if(!collect.contains(e)){ + removeSet.add(e); + } + }); + MapperProxyFactory.getProxy(ExtendGroupMapper.class).batchDelete(removeSet); + + int showOrder = 0; + extendGroupPOS.forEach(e -> { + e.setExtendType(extendType); + e.setPid(fieldTypeTreeParam.getParentId()); + e.setIsShow(fieldTypeTreeParam.getIsShow()); + e.setShowOrder(showOrder+1); + e.setCreator((long)user.getUID()); + e.setDeleteType(DeleteTypeEnum.NOT_DELETED.getValue()); + e.setCreateTime(new Date()); + e.setUpdateTime(new Date()); + + if (e.getId() == null){//新增 + MapperProxyFactory.getProxy(ExtendGroupMapper.class).insertIgnoreNull(e); + }else { //更新 + MapperProxyFactory.getProxy(ExtendGroupMapper.class).updateNameAndOrder(e.getId(),e.getGroupName(),e.getShowOrder()); + } + }); + + + + + } + + private ExtendTitlePO buildExtendTitleType(ExtendGroupPO extendGroupPO,Integer max) { return ExtendTitlePO.builder() .groupId(extendGroupPO.getId()) .title(extendGroupPO.getGroupName()) - .showOrder(1) + .showOrder(++max) .isShow("1") .creator((long) user.getUID()) .deleteType(DeleteTypeEnum.NOT_DELETED.getValue()) @@ -214,15 +264,16 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ } - private ExtendGroupPO buildExtendGroupType(ModuleTypeEnum moduleTypeEnum, FieldTypeTreeParam fieldTypeTreeParam) { + private ExtendGroupPO buildExtendGroupType(ModuleTypeEnum moduleTypeEnum, FieldTypeTreeParam fieldTypeTreeParam,Integer max) { return ExtendGroupPO.builder() .extendType(moduleTypeEnum.getValue()) .groupName(fieldTypeTreeParam.getName()) + .showOrder(++max) .creator((long) user.getUID()) .deleteType(DeleteTypeEnum.NOT_DELETED.getValue()) .createTime(new Date()) .updateTime(new Date()) - .pid(fieldTypeTreeParam.getParentid()) + .pid(fieldTypeTreeParam.getParentId()) .isShow(fieldTypeTreeParam.getIsShow() == null ? "1" : fieldTypeTreeParam.getIsShow()).build(); } diff --git a/src/com/engine/organization/web/FieldDefinedController.java b/src/com/engine/organization/web/FieldDefinedController.java index dbefccf1..d45ddaea 100644 --- a/src/com/engine/organization/web/FieldDefinedController.java +++ b/src/com/engine/organization/web/FieldDefinedController.java @@ -47,10 +47,10 @@ public class FieldDefinedController { @Path("/{moduleTypeEnum}/saveTree") @Produces(MediaType.APPLICATION_JSON) public ReturnResult saveTree(@Context HttpServletRequest request, @Context HttpServletResponse response, - @PathParam("moduleTypeEnum") ModuleTypeEnum moduleTypeEnum) { + @PathParam("moduleTypeEnum") ModuleTypeEnum moduleTypeEnum,@RequestBody FieldTypeTreeParam fieldTypeTreeParam) { try { User user = HrmUserVarify.getUser(request, response); - return getFieldDefinedWrapper(user).getTree(moduleTypeEnum); + return getFieldDefinedWrapper(user).saveTree(moduleTypeEnum,fieldTypeTreeParam); } catch (Exception e) { return ReturnResult.exceptionHandle(e.getMessage()); } @@ -69,6 +69,21 @@ public class FieldDefinedController { } } + @POST + @Path("/{moduleTypeEnum}/deleteTree") + @Produces(MediaType.APPLICATION_JSON) + public ReturnResult deleteTree(@Context HttpServletRequest request, @Context HttpServletResponse response, + @PathParam("moduleTypeEnum") ModuleTypeEnum moduleTypeEnum, @RequestBody FieldTypeTreeParam fieldTypeTreeParam) { + try { + User user = HrmUserVarify.getUser(request, response); + return getFieldDefinedWrapper(user).deleteTree(fieldTypeTreeParam.getId()); + } catch (Exception e) { + return ReturnResult.exceptionHandle(e.getMessage()); + } + } + + + @GET @Path("/{moduleTypeEnum}/getTabInfo") @@ -127,10 +142,10 @@ public class FieldDefinedController { @POST @Path("/{moduleTypeEnum}/deleteTitle") @Produces(MediaType.APPLICATION_JSON) - public ReturnResult deleteTitle(@Context HttpServletRequest request, @Context HttpServletResponse response, @PathParam("moduleTypeEnum") ModuleTypeEnum moduleTypeEnum, @QueryParam("id") Long id) { + public ReturnResult deleteTitle(@Context HttpServletRequest request, @Context HttpServletResponse response, @PathParam("moduleTypeEnum") ModuleTypeEnum moduleTypeEnum, @RequestBody ExtendTitleSaveParam param) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getFieldDefinedWrapper(user).deleteTitle(id)); + return ReturnResult.successed(getFieldDefinedWrapper(user).deleteTitle(param.getId())); } catch (Exception e) { return ReturnResult.exceptionHandle(e.getMessage()); } diff --git a/src/com/engine/organization/wrapper/FieldDefinedWrapper.java b/src/com/engine/organization/wrapper/FieldDefinedWrapper.java index 77876ce4..a6ff4abb 100644 --- a/src/com/engine/organization/wrapper/FieldDefinedWrapper.java +++ b/src/com/engine/organization/wrapper/FieldDefinedWrapper.java @@ -66,9 +66,18 @@ public class FieldDefinedWrapper extends Service { return ReturnResult.successed(); } - - public int deleteTitle(Long id) { return getFieldDefinedService(user).deleteTitle(id); } + + + public ReturnResult deleteTree(Long id) { + getFieldDefinedService(user).deleteTree(id); + return ReturnResult.successed(); + } + + public ReturnResult saveTree(ModuleTypeEnum moduleTypeEnum, FieldTypeTreeParam fieldTypeTreeParam) { + getFieldDefinedService(user).saveTree(moduleTypeEnum, fieldTypeTreeParam); + return ReturnResult.successed(); + } } From 3ba19c1b8df39c39476c7d1d2d86a3413f2daedf Mon Sep 17 00:00:00 2001 From: dxfeng Date: Thu, 16 Jun 2022 18:08:06 +0800 Subject: [PATCH 63/77] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/FieldDefinedServiceImpl.java | 39 +++++++++---------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java b/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java index f097bb65..1e843b77 100644 --- a/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java +++ b/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java @@ -32,7 +32,6 @@ import weaver.workflow.field.BrowserComInfo; import java.util.*; import java.util.stream.Collectors; -import java.util.stream.Stream; /** * @Author weaver_cl @@ -198,12 +197,12 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ if (fieldTypeTreeParam.getId() == null) { List extendGroupPOList = MapperProxyFactory.getProxy(ExtendGroupMapper.class).listGroupByPid(fieldTypeTreeParam.getParentId()); ExtendGroupPO extendGroup = extendGroupPOList.stream().max(Comparator.comparing(ExtendGroupPO::getShowOrder)).get(); - ExtendGroupPO extendGroupPO = buildExtendGroupType(moduleTypeEnum, fieldTypeTreeParam,extendGroup.getShowOrder()); + ExtendGroupPO extendGroupPO = buildExtendGroupType(moduleTypeEnum, fieldTypeTreeParam, extendGroup.getShowOrder()); MapperProxyFactory.getProxy(ExtendGroupMapper.class).insertIgnoreNull(extendGroupPO); //默认新增title List titlesByGroupID = getExtendTitleMapper().getTitlesByGroupID(extendGroup.getId()); ExtendTitlePO extendTitle = titlesByGroupID.stream().max(Comparator.comparing(ExtendTitlePO::getShowOrder)).get(); - ExtendTitlePO extendTitlePO = buildExtendTitleType(extendGroupPO,extendTitle.getShowOrder()); + ExtendTitlePO extendTitlePO = buildExtendTitleType(extendGroupPO, extendTitle.getShowOrder()); MapperProxyFactory.getProxy(ExtendTitleMapper.class).insertIgnoreNull(extendTitlePO); } else { MapperProxyFactory.getProxy(ExtendGroupMapper.class).update(fieldTypeTreeParam.getId(), fieldTypeTreeParam.getName()); @@ -237,16 +236,16 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ String customValue = extendInfoPO.getCustomValue(); String fieldStrLength = SelectOptionParam.getTextLength(customValue); //自定义字段排序 标识rowKey - String fieldidrowKey; - int dsporder = extendInfoPO.getShowOrder(); + String fieldIdRowKey; + int showOrder = extendInfoPO.getShowOrder(); boolean isUsed = false; // TODO 去除脏数据后调整为extendInfoPO.getId() > 0 // 系统字段id<0 boolean isSysField = extendInfoPO.getExtendGroupId() < 0; if (isSysField) { - fieldidrowKey = fieldId + "_hrm"; + fieldIdRowKey = fieldId + "_hrm"; } else { - fieldidrowKey = fieldId + "_cus"; + fieldIdRowKey = fieldId + "_cus"; } if (!isSysField) { isUsed = ExtendInfoBO.fieldIsUsed(extendInfoPO.getTableName(), extendInfoPO.getFieldName()); @@ -339,8 +338,8 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ recordInfo.put("required", extendInfoPO.getIsrequired() + ""); recordInfo.put("isModify", extendInfoPO.getEditShow() + ""); recordInfo.put("viewAttr", isUsed || isSysField ? 1 : 2); - recordInfo.put("key", "" + dsporder); - recordInfo.put("fieldidrowKey", fieldidrowKey); + recordInfo.put("key", "" + showOrder); + recordInfo.put("fieldidrowKey", fieldIdRowKey); fieldInfo.put("record", recordInfo); @@ -433,12 +432,12 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ List collect = MapperProxyFactory.getProxy(ExtendGroupMapper.class) .listGroupByPid(fieldTypeTreeParam.getParentId()).stream().map(ExtendGroupPO::getId).collect(Collectors.toList()); Integer extendType = moduleTypeEnum.getValue(); - List extendGroupPOS = JSONArray.parseArray(fieldTypeTreeParam.getData(),ExtendGroupPO.class); + List extendGroupPOS = JSONArray.parseArray(fieldTypeTreeParam.getData(), ExtendGroupPO.class); List collect1 = extendGroupPOS.stream().map(ExtendGroupPO::getId).collect(Collectors.toList()); Set removeSet = new HashSet<>(); - collect1.forEach(e->{ - if(!collect.contains(e)){ + collect1.forEach(e -> { + if (!collect.contains(e)) { removeSet.add(e); } }); @@ -449,25 +448,23 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ e.setExtendType(extendType); e.setPid(fieldTypeTreeParam.getParentId()); e.setIsShow(fieldTypeTreeParam.getIsShow()); - e.setShowOrder(showOrder+1); - e.setCreator((long)user.getUID()); + e.setShowOrder(showOrder + 1); + e.setCreator((long) user.getUID()); e.setDeleteType(DeleteTypeEnum.NOT_DELETED.getValue()); e.setCreateTime(new Date()); e.setUpdateTime(new Date()); - if (e.getId() == null){//新增 + if (e.getId() == null) {//新增 MapperProxyFactory.getProxy(ExtendGroupMapper.class).insertIgnoreNull(e); - }else { //更新 - MapperProxyFactory.getProxy(ExtendGroupMapper.class).updateNameAndOrder(e.getId(),e.getGroupName(),e.getShowOrder()); + } else { //更新 + MapperProxyFactory.getProxy(ExtendGroupMapper.class).updateNameAndOrder(e.getId(), e.getGroupName(), e.getShowOrder()); } }); - - } - private ExtendTitlePO buildExtendTitleType(ExtendGroupPO extendGroupPO,Integer max) { + private ExtendTitlePO buildExtendTitleType(ExtendGroupPO extendGroupPO, Integer max) { return ExtendTitlePO.builder() .groupId(extendGroupPO.getId()) .title(extendGroupPO.getGroupName()) @@ -480,7 +477,7 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ } - private ExtendGroupPO buildExtendGroupType(ModuleTypeEnum moduleTypeEnum, FieldTypeTreeParam fieldTypeTreeParam) { + private ExtendGroupPO buildExtendGroupType(ModuleTypeEnum moduleTypeEnum, FieldTypeTreeParam fieldTypeTreeParam, Integer max) { return ExtendGroupPO.builder() .extendType(moduleTypeEnum.getValue()) .groupName(fieldTypeTreeParam.getName()) From 9aebfbceccc16f95a35cf13019846b444e685ae7 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Thu, 16 Jun 2022 18:26:12 +0800 Subject: [PATCH 64/77] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=88=A0=E9=99=A4=20?= =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E5=88=86=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...chParam.java => ExtendFieldInfoParam.java} | 2 +- .../extend/param/ExtendInfoChangeParam.java | 23 ++++++++++++++++++ .../service/FieldDefinedService.java | 24 +++++++++++++++++-- .../service/impl/FieldDefinedServiceImpl.java | 15 ++++++++++-- .../web/FieldDefinedController.java | 4 ++-- .../wrapper/FieldDefinedWrapper.java | 4 ++-- 6 files changed, 63 insertions(+), 9 deletions(-) rename src/com/engine/organization/entity/extend/param/{ExtendFieldSearchParam.java => ExtendFieldInfoParam.java} (90%) create mode 100644 src/com/engine/organization/entity/extend/param/ExtendInfoChangeParam.java diff --git a/src/com/engine/organization/entity/extend/param/ExtendFieldSearchParam.java b/src/com/engine/organization/entity/extend/param/ExtendFieldInfoParam.java similarity index 90% rename from src/com/engine/organization/entity/extend/param/ExtendFieldSearchParam.java rename to src/com/engine/organization/entity/extend/param/ExtendFieldInfoParam.java index 26181f1d..902d4bbb 100644 --- a/src/com/engine/organization/entity/extend/param/ExtendFieldSearchParam.java +++ b/src/com/engine/organization/entity/extend/param/ExtendFieldInfoParam.java @@ -14,7 +14,7 @@ import lombok.NoArgsConstructor; @Builder @AllArgsConstructor @NoArgsConstructor -public class ExtendFieldSearchParam { +public class ExtendFieldInfoParam { private String groupId; private String groupType; } diff --git a/src/com/engine/organization/entity/extend/param/ExtendInfoChangeParam.java b/src/com/engine/organization/entity/extend/param/ExtendInfoChangeParam.java new file mode 100644 index 00000000..26c54672 --- /dev/null +++ b/src/com/engine/organization/entity/extend/param/ExtendInfoChangeParam.java @@ -0,0 +1,23 @@ +package com.engine.organization.entity.extend.param; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @description: TODO + * @author:dxfeng + * @createTime: 2022/06/16 + * @version: 1.0 + */ +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class ExtendInfoChangeParam { + private String fieldids; + private String fieldnames; + private Long groupid; + private Long scopeid; +} diff --git a/src/com/engine/organization/service/FieldDefinedService.java b/src/com/engine/organization/service/FieldDefinedService.java index f91cb020..23598c8f 100644 --- a/src/com/engine/organization/service/FieldDefinedService.java +++ b/src/com/engine/organization/service/FieldDefinedService.java @@ -1,7 +1,8 @@ package com.engine.organization.service; -import com.engine.organization.entity.extend.param.ExtendFieldSearchParam; +import com.engine.organization.entity.extend.param.ExtendFieldInfoParam; +import com.engine.organization.entity.extend.param.ExtendInfoChangeParam; import com.engine.organization.entity.extend.param.ExtendTitleSaveParam; import com.engine.organization.entity.fieldset.param.FieldTypeTreeParam; import com.engine.organization.entity.fieldset.vo.TypeTreeVO; @@ -21,6 +22,7 @@ public interface FieldDefinedService { /** * 获取左侧树 + * * @param moduleTypeEnum * @return */ @@ -61,11 +63,13 @@ public interface FieldDefinedService { /** * 新增或编辑类型树 + * * @param moduleTypeEnum * @param fieldTypeTreeParam * @return */ void changeTree(ModuleTypeEnum moduleTypeEnum, FieldTypeTreeParam fieldTypeTreeParam); + /** * 删除标题信息 * @@ -80,18 +84,34 @@ public interface FieldDefinedService { * @param param * @return */ - Map getFieldDefinedInfo(ExtendFieldSearchParam param); + Map getFieldDefinedInfo(ExtendFieldInfoParam param); /** * 删除树类型 + * * @param id */ void deleteTree(Long id); /** * 子信息维护 + * * @param moduleTypeEnum * @param fieldTypeTreeParam */ void saveTree(ModuleTypeEnum moduleTypeEnum, FieldTypeTreeParam fieldTypeTreeParam); + + /** + * 删除自定义字段 + * + * @param param + */ + void deleteFieldDefined(ExtendFieldInfoParam param); + + /** + * 移动分组 + * + * @param param + */ + void changeGroup(ExtendInfoChangeParam param); } diff --git a/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java b/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java index 1e843b77..3d34496f 100644 --- a/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java +++ b/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java @@ -8,7 +8,8 @@ import com.engine.organization.entity.DeleteParam; import com.engine.organization.entity.SelectOptionParam; import com.engine.organization.entity.extend.bo.ExtendGroupBO; import com.engine.organization.entity.extend.bo.ExtendInfoBO; -import com.engine.organization.entity.extend.param.ExtendFieldSearchParam; +import com.engine.organization.entity.extend.param.ExtendFieldInfoParam; +import com.engine.organization.entity.extend.param.ExtendInfoChangeParam; import com.engine.organization.entity.extend.param.ExtendInfoFieldParam; import com.engine.organization.entity.extend.param.ExtendTitleSaveParam; import com.engine.organization.entity.extend.po.ExtendGroupPO; @@ -216,7 +217,7 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ } @Override - public Map getFieldDefinedInfo(ExtendFieldSearchParam param) { + public Map getFieldDefinedInfo(ExtendFieldInfoParam param) { Map returnMap = new HashMap<>(); List> lsFieldInfo = new ArrayList<>(); Map fieldInfo; @@ -462,6 +463,16 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ }); + } + + @Override + public void deleteFieldDefined(ExtendFieldInfoParam param) { + + } + + @Override + public void changeGroup(ExtendInfoChangeParam param) { + } private ExtendTitlePO buildExtendTitleType(ExtendGroupPO extendGroupPO, Integer max) { diff --git a/src/com/engine/organization/web/FieldDefinedController.java b/src/com/engine/organization/web/FieldDefinedController.java index 71c35751..dde930a9 100644 --- a/src/com/engine/organization/web/FieldDefinedController.java +++ b/src/com/engine/organization/web/FieldDefinedController.java @@ -3,7 +3,7 @@ package com.engine.organization.web; import com.alibaba.fastjson.JSON; import com.engine.common.util.ParamUtil; import com.engine.common.util.ServiceUtil; -import com.engine.organization.entity.extend.param.ExtendFieldSearchParam; +import com.engine.organization.entity.extend.param.ExtendFieldInfoParam; import com.engine.organization.entity.extend.param.ExtendTitleSaveParam; import com.engine.organization.entity.fieldset.param.FieldTypeTreeParam; import com.engine.organization.enums.ModuleTypeEnum; @@ -176,7 +176,7 @@ public class FieldDefinedController { String groupType = (String) map.get("groupType"); String groupId = (String) map.get("groupId"); // return ReturnResult.successed(getFieldDefinedWrapper(user).getFieldDefinedInfo(ExtendFieldSearchParam.builder().groupType(groupType).groupId(groupId).build())); - return JSON.toJSONString(getFieldDefinedWrapper(user).getFieldDefinedInfo(ExtendFieldSearchParam.builder().groupType(groupType).groupId(groupId).build())); + return JSON.toJSONString(getFieldDefinedWrapper(user).getFieldDefinedInfo(ExtendFieldInfoParam.builder().groupType(groupType).groupId(groupId).build())); //} catch (Exception e) { // return ReturnResult.exceptionHandle(e.getMessage()); //} diff --git a/src/com/engine/organization/wrapper/FieldDefinedWrapper.java b/src/com/engine/organization/wrapper/FieldDefinedWrapper.java index 7d3cf7f4..f279f008 100644 --- a/src/com/engine/organization/wrapper/FieldDefinedWrapper.java +++ b/src/com/engine/organization/wrapper/FieldDefinedWrapper.java @@ -2,7 +2,7 @@ package com.engine.organization.wrapper; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; -import com.engine.organization.entity.extend.param.ExtendFieldSearchParam; +import com.engine.organization.entity.extend.param.ExtendFieldInfoParam; import com.engine.organization.entity.extend.param.ExtendTitleSaveParam; import com.engine.organization.entity.fieldset.param.FieldTypeTreeParam; import com.engine.organization.entity.fieldset.vo.TypeTreeVO; @@ -88,7 +88,7 @@ public class FieldDefinedWrapper extends Service { return getFieldDefinedService(user).saveFields(data); } - public Map getFieldDefinedInfo(ExtendFieldSearchParam param) { + public Map getFieldDefinedInfo(ExtendFieldInfoParam param) { return getFieldDefinedService(user).getFieldDefinedInfo(param); } } From c8604a8e40dc6376fd0c2407fa947ffe0eb2e0d7 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Fri, 17 Jun 2022 09:45:32 +0800 Subject: [PATCH 65/77] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../extend/param/ExtendFieldInfoParam.java | 20 ----------- .../extend/param/ExtendFieldSearchParam.java | 35 +++++++++++++++++++ .../extend/param/ExtendInfoChangeParam.java | 1 - .../service/FieldDefinedService.java | 6 ++-- .../service/impl/FieldDefinedServiceImpl.java | 17 ++++++--- .../web/FieldDefinedController.java | 29 +++++++-------- .../wrapper/FieldDefinedWrapper.java | 4 +-- 7 files changed, 65 insertions(+), 47 deletions(-) delete mode 100644 src/com/engine/organization/entity/extend/param/ExtendFieldInfoParam.java create mode 100644 src/com/engine/organization/entity/extend/param/ExtendFieldSearchParam.java diff --git a/src/com/engine/organization/entity/extend/param/ExtendFieldInfoParam.java b/src/com/engine/organization/entity/extend/param/ExtendFieldInfoParam.java deleted file mode 100644 index 902d4bbb..00000000 --- a/src/com/engine/organization/entity/extend/param/ExtendFieldInfoParam.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.engine.organization.entity.extend.param; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * @author:dxfeng - * @createTime: 2022/06/16 - * @version: 1.0 - */ -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class ExtendFieldInfoParam { - private String groupId; - private String groupType; -} diff --git a/src/com/engine/organization/entity/extend/param/ExtendFieldSearchParam.java b/src/com/engine/organization/entity/extend/param/ExtendFieldSearchParam.java new file mode 100644 index 00000000..5487d7c0 --- /dev/null +++ b/src/com/engine/organization/entity/extend/param/ExtendFieldSearchParam.java @@ -0,0 +1,35 @@ +package com.engine.organization.entity.extend.param; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import weaver.general.StringUtil; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.stream.Collectors; + +/** + * @author:dxfeng + * @createTime: 2022/06/16 + * @version: 1.0 + */ +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class ExtendFieldSearchParam { + private String id; + private Long groupId; + private Long groupType; + + + public Collection getId() { + if (StringUtil.isEmpty(id)) { + return new ArrayList<>(); + } + return Arrays.stream(id.split(",")).map(Long::parseLong).collect(Collectors.toList()); + } +} diff --git a/src/com/engine/organization/entity/extend/param/ExtendInfoChangeParam.java b/src/com/engine/organization/entity/extend/param/ExtendInfoChangeParam.java index 26c54672..139a5c26 100644 --- a/src/com/engine/organization/entity/extend/param/ExtendInfoChangeParam.java +++ b/src/com/engine/organization/entity/extend/param/ExtendInfoChangeParam.java @@ -6,7 +6,6 @@ import lombok.Data; import lombok.NoArgsConstructor; /** - * @description: TODO * @author:dxfeng * @createTime: 2022/06/16 * @version: 1.0 diff --git a/src/com/engine/organization/service/FieldDefinedService.java b/src/com/engine/organization/service/FieldDefinedService.java index 23598c8f..643207a9 100644 --- a/src/com/engine/organization/service/FieldDefinedService.java +++ b/src/com/engine/organization/service/FieldDefinedService.java @@ -1,7 +1,7 @@ package com.engine.organization.service; -import com.engine.organization.entity.extend.param.ExtendFieldInfoParam; +import com.engine.organization.entity.extend.param.ExtendFieldSearchParam; import com.engine.organization.entity.extend.param.ExtendInfoChangeParam; import com.engine.organization.entity.extend.param.ExtendTitleSaveParam; import com.engine.organization.entity.fieldset.param.FieldTypeTreeParam; @@ -84,7 +84,7 @@ public interface FieldDefinedService { * @param param * @return */ - Map getFieldDefinedInfo(ExtendFieldInfoParam param); + Map getFieldDefinedInfo(ExtendFieldSearchParam param); /** * 删除树类型 @@ -106,7 +106,7 @@ public interface FieldDefinedService { * * @param param */ - void deleteFieldDefined(ExtendFieldInfoParam param); + void deleteFieldDefined(ExtendFieldSearchParam param); /** * 移动分组 diff --git a/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java b/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java index 3d34496f..91b924c7 100644 --- a/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java +++ b/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java @@ -8,7 +8,7 @@ import com.engine.organization.entity.DeleteParam; import com.engine.organization.entity.SelectOptionParam; import com.engine.organization.entity.extend.bo.ExtendGroupBO; import com.engine.organization.entity.extend.bo.ExtendInfoBO; -import com.engine.organization.entity.extend.param.ExtendFieldInfoParam; +import com.engine.organization.entity.extend.param.ExtendFieldSearchParam; import com.engine.organization.entity.extend.param.ExtendInfoChangeParam; import com.engine.organization.entity.extend.param.ExtendInfoFieldParam; import com.engine.organization.entity.extend.param.ExtendTitleSaveParam; @@ -217,7 +217,7 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ } @Override - public Map getFieldDefinedInfo(ExtendFieldInfoParam param) { + public Map getFieldDefinedInfo(ExtendFieldSearchParam param) { Map returnMap = new HashMap<>(); List> lsFieldInfo = new ArrayList<>(); Map fieldInfo; @@ -227,7 +227,11 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ List fieldTypeInfo; List lsComDetialInfo; Map comDetialInfo; - List infoPOList = getExtendInfoMapper().listFields("", param.getGroupId(), "", ""); + // 区分主表明细表 + Long groupType = param.getGroupType(); + ExtendGroupPO extendGroupPO = getExtendGroupMapper().getGroupById(groupType); + String tableName = ExtendGroupBO.getTableNameByGroupPO(extendGroupPO); + List infoPOList = getExtendInfoMapper().listFields("", param.getGroupId().toString(), tableName, ""); for (ExtendInfoPO extendInfoPO : infoPOList) { Long fieldId = extendInfoPO.getId(); String fieldName = extendInfoPO.getFieldName(); @@ -466,7 +470,12 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ } @Override - public void deleteFieldDefined(ExtendFieldInfoParam param) { + public void deleteFieldDefined(ExtendFieldSearchParam param) { + Collection ids = param.getId(); + Long groupId = param.getGroupId(); + Long groupType = param.getGroupType(); + + } diff --git a/src/com/engine/organization/web/FieldDefinedController.java b/src/com/engine/organization/web/FieldDefinedController.java index dde930a9..f227411d 100644 --- a/src/com/engine/organization/web/FieldDefinedController.java +++ b/src/com/engine/organization/web/FieldDefinedController.java @@ -1,9 +1,8 @@ package com.engine.organization.web; -import com.alibaba.fastjson.JSON; import com.engine.common.util.ParamUtil; import com.engine.common.util.ServiceUtil; -import com.engine.organization.entity.extend.param.ExtendFieldInfoParam; +import com.engine.organization.entity.extend.param.ExtendFieldSearchParam; import com.engine.organization.entity.extend.param.ExtendTitleSaveParam; import com.engine.organization.entity.fieldset.param.FieldTypeTreeParam; import com.engine.organization.enums.ModuleTypeEnum; @@ -49,10 +48,10 @@ public class FieldDefinedController { @Path("/{moduleTypeEnum}/saveTree") @Produces(MediaType.APPLICATION_JSON) public ReturnResult saveTree(@Context HttpServletRequest request, @Context HttpServletResponse response, - @PathParam("moduleTypeEnum") ModuleTypeEnum moduleTypeEnum,@RequestBody FieldTypeTreeParam fieldTypeTreeParam) { + @PathParam("moduleTypeEnum") ModuleTypeEnum moduleTypeEnum, @RequestBody FieldTypeTreeParam fieldTypeTreeParam) { try { User user = HrmUserVarify.getUser(request, response); - return getFieldDefinedWrapper(user).saveTree(moduleTypeEnum,fieldTypeTreeParam); + return getFieldDefinedWrapper(user).saveTree(moduleTypeEnum, fieldTypeTreeParam); } catch (Exception e) { return ReturnResult.exceptionHandle(e.getMessage()); } @@ -85,8 +84,6 @@ public class FieldDefinedController { } - - @GET @Path("/{moduleTypeEnum}/getTabInfo") @Produces(MediaType.APPLICATION_JSON) @@ -147,7 +144,7 @@ public class FieldDefinedController { public ReturnResult deleteTitle(@Context HttpServletRequest request, @Context HttpServletResponse response, @PathParam("moduleTypeEnum") ModuleTypeEnum moduleTypeEnum, @RequestBody ExtendTitleSaveParam param) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getFieldDefinedWrapper(user).deleteTitle(param.getId())); + return ReturnResult.successed(getFieldDefinedWrapper(user).deleteTitle(param.getId())); } catch (Exception e) { return ReturnResult.exceptionHandle(e.getMessage()); } @@ -168,17 +165,15 @@ public class FieldDefinedController { @GET @Path("/{moduleTypeEnum}/getFieldDefinedInfo") @Produces(MediaType.APPLICATION_JSON) - public String getFieldDefinedInfo(@Context HttpServletRequest request, @Context HttpServletResponse response, @PathParam("moduleTypeEnum") ModuleTypeEnum moduleTypeEnum) { - // TODO - //try { + public ReturnResult getFieldDefinedInfo(@Context HttpServletRequest request, @Context HttpServletResponse response, @PathParam("moduleTypeEnum") ModuleTypeEnum moduleTypeEnum) { + try { User user = HrmUserVarify.getUser(request, response); Map map = ParamUtil.request2Map(request); - String groupType = (String) map.get("groupType"); - String groupId = (String) map.get("groupId"); - // return ReturnResult.successed(getFieldDefinedWrapper(user).getFieldDefinedInfo(ExtendFieldSearchParam.builder().groupType(groupType).groupId(groupId).build())); - return JSON.toJSONString(getFieldDefinedWrapper(user).getFieldDefinedInfo(ExtendFieldInfoParam.builder().groupType(groupType).groupId(groupId).build())); - //} catch (Exception e) { - // return ReturnResult.exceptionHandle(e.getMessage()); - //} + Long groupType = Long.parseLong((String) map.get("groupType")); + Long groupId = Long.parseLong((String) map.get("groupId")); + return ReturnResult.successed(getFieldDefinedWrapper(user).getFieldDefinedInfo(ExtendFieldSearchParam.builder().groupType(groupType).groupId(groupId).build())); + } catch (Exception e) { + return ReturnResult.exceptionHandle(e.getMessage()); + } } } diff --git a/src/com/engine/organization/wrapper/FieldDefinedWrapper.java b/src/com/engine/organization/wrapper/FieldDefinedWrapper.java index f279f008..7d3cf7f4 100644 --- a/src/com/engine/organization/wrapper/FieldDefinedWrapper.java +++ b/src/com/engine/organization/wrapper/FieldDefinedWrapper.java @@ -2,7 +2,7 @@ package com.engine.organization.wrapper; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; -import com.engine.organization.entity.extend.param.ExtendFieldInfoParam; +import com.engine.organization.entity.extend.param.ExtendFieldSearchParam; import com.engine.organization.entity.extend.param.ExtendTitleSaveParam; import com.engine.organization.entity.fieldset.param.FieldTypeTreeParam; import com.engine.organization.entity.fieldset.vo.TypeTreeVO; @@ -88,7 +88,7 @@ public class FieldDefinedWrapper extends Service { return getFieldDefinedService(user).saveFields(data); } - public Map getFieldDefinedInfo(ExtendFieldInfoParam param) { + public Map getFieldDefinedInfo(ExtendFieldSearchParam param) { return getFieldDefinedService(user).getFieldDefinedInfo(param); } } From b60a335a1c80b986cddc7d08486441a500c23973 Mon Sep 17 00:00:00 2001 From: Chengliang <1546584672@qq.com> Date: Fri, 17 Jun 2022 10:39:52 +0800 Subject: [PATCH 66/77] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../organization/mapper/extend/ExtendGroupMapper.xml | 7 +++++++ .../service/impl/FieldDefinedServiceImpl.java | 10 +++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/com/engine/organization/mapper/extend/ExtendGroupMapper.xml b/src/com/engine/organization/mapper/extend/ExtendGroupMapper.xml index d3b24e9d..98ac86a4 100644 --- a/src/com/engine/organization/mapper/extend/ExtendGroupMapper.xml +++ b/src/com/engine/organization/mapper/extend/ExtendGroupMapper.xml @@ -20,6 +20,7 @@ , t.extend_type , t.group_name , t.creator + , t.show_order , t.delete_type , t.create_time , t.update_time @@ -97,6 +98,9 @@ is_show, + + show_order, + @@ -123,6 +127,9 @@ #{isShow}, + + #{showOrder}, + diff --git a/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java b/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java index 3d34496f..b5fd87e9 100644 --- a/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java +++ b/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java @@ -196,14 +196,12 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ @Override public void changeTree(ModuleTypeEnum moduleTypeEnum, FieldTypeTreeParam fieldTypeTreeParam) { if (fieldTypeTreeParam.getId() == null) { - List extendGroupPOList = MapperProxyFactory.getProxy(ExtendGroupMapper.class).listGroupByPid(fieldTypeTreeParam.getParentId()); + List extendGroupPOList = MapperProxyFactory.getProxy(ExtendGroupMapper.class).listByType(moduleTypeEnum.getValue()); ExtendGroupPO extendGroup = extendGroupPOList.stream().max(Comparator.comparing(ExtendGroupPO::getShowOrder)).get(); ExtendGroupPO extendGroupPO = buildExtendGroupType(moduleTypeEnum, fieldTypeTreeParam, extendGroup.getShowOrder()); MapperProxyFactory.getProxy(ExtendGroupMapper.class).insertIgnoreNull(extendGroupPO); //默认新增title - List titlesByGroupID = getExtendTitleMapper().getTitlesByGroupID(extendGroup.getId()); - ExtendTitlePO extendTitle = titlesByGroupID.stream().max(Comparator.comparing(ExtendTitlePO::getShowOrder)).get(); - ExtendTitlePO extendTitlePO = buildExtendTitleType(extendGroupPO, extendTitle.getShowOrder()); + ExtendTitlePO extendTitlePO = buildExtendTitleType(extendGroupPO, 1); MapperProxyFactory.getProxy(ExtendTitleMapper.class).insertIgnoreNull(extendTitlePO); } else { MapperProxyFactory.getProxy(ExtendGroupMapper.class).update(fieldTypeTreeParam.getId(), fieldTypeTreeParam.getName()); @@ -426,6 +424,8 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ @Override public void deleteTree(Long id) { MapperProxyFactory.getProxy(ExtendGroupMapper.class).delete(id); + //明细表删除字段信息 todo + } @Override @@ -479,7 +479,7 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ return ExtendTitlePO.builder() .groupId(extendGroupPO.getId()) .title(extendGroupPO.getGroupName()) - .showOrder(++max) + .showOrder(max) .isShow("1") .creator((long) user.getUID()) .deleteType(DeleteTypeEnum.NOT_DELETED.getValue()) From 445507d10d71353c0e1a0e46699afab4e110812e Mon Sep 17 00:00:00 2001 From: dxfeng Date: Fri, 17 Jun 2022 10:54:59 +0800 Subject: [PATCH 67/77] =?UTF-8?q?=E8=A1=A8=E7=BB=93=E6=9E=84=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/extend/po/ExtendGroupPO.java | 2 ++ .../entity/extend/po/ExtendInfoPO.java | 2 ++ .../entity/extend/po/ExtendTitlePO.java | 1 + .../mapper/extend/ExtendInfoMapper.java | 9 ++++++- .../mapper/extend/ExtendInfoMapper.xml | 27 +++++++++++++++++++ .../service/impl/FieldDefinedServiceImpl.java | 19 ++++++++++--- .../web/FieldDefinedController.java | 13 +++++++++ .../wrapper/FieldDefinedWrapper.java | 9 +++++-- 8 files changed, 75 insertions(+), 7 deletions(-) diff --git a/src/com/engine/organization/entity/extend/po/ExtendGroupPO.java b/src/com/engine/organization/entity/extend/po/ExtendGroupPO.java index 5e549ee3..31ebeaf6 100644 --- a/src/com/engine/organization/entity/extend/po/ExtendGroupPO.java +++ b/src/com/engine/organization/entity/extend/po/ExtendGroupPO.java @@ -42,6 +42,8 @@ public class ExtendGroupPO { private Integer showOrder; + private Integer systemGroup; + private Long creator; private int deleteType; private Date createTime; diff --git a/src/com/engine/organization/entity/extend/po/ExtendInfoPO.java b/src/com/engine/organization/entity/extend/po/ExtendInfoPO.java index d58a7f8b..155e8693 100644 --- a/src/com/engine/organization/entity/extend/po/ExtendInfoPO.java +++ b/src/com/engine/organization/entity/extend/po/ExtendInfoPO.java @@ -109,6 +109,8 @@ public class ExtendInfoPO { */ private Integer showOrder; + private Integer systemColumn; + private Long creator; private int deleteType; private Date createTime; diff --git a/src/com/engine/organization/entity/extend/po/ExtendTitlePO.java b/src/com/engine/organization/entity/extend/po/ExtendTitlePO.java index fee7e4ef..232ae548 100644 --- a/src/com/engine/organization/entity/extend/po/ExtendTitlePO.java +++ b/src/com/engine/organization/entity/extend/po/ExtendTitlePO.java @@ -41,6 +41,7 @@ public class ExtendTitlePO { */ private String isShow; + private Integer systemDefault; private Long creator; private Integer deleteType; diff --git a/src/com/engine/organization/mapper/extend/ExtendInfoMapper.java b/src/com/engine/organization/mapper/extend/ExtendInfoMapper.java index c6e4e082..528c48f7 100644 --- a/src/com/engine/organization/mapper/extend/ExtendInfoMapper.java +++ b/src/com/engine/organization/mapper/extend/ExtendInfoMapper.java @@ -3,6 +3,7 @@ package com.engine.organization.mapper.extend; import com.engine.organization.entity.extend.po.ExtendInfoPO; import org.apache.ibatis.annotations.Param; +import java.util.Collection; import java.util.List; /** @@ -15,7 +16,7 @@ public interface ExtendInfoMapper { List listFields(@Param("extendType") String extendType, @Param("extendGroupId") String extendGroupId, @Param("tableName") String tableName, @Param("operateType") String operateType); - int countFieldsByGroupId(@Param("groupId") Long groupId); + int countFieldsByGroupId(@Param("tableName") String tableName, @Param("groupId") Long groupId); int updateExtendInfo(ExtendInfoPO extendInfo); @@ -28,5 +29,11 @@ public interface ExtendInfoMapper { List listFieldsByTableName(@Param("tableName") String tableName, @Param("fieldName") String fieldName); + int deleteExtendInfoByIds(@Param("ids") Collection ids); + + void deleteTableColumn(@Param("tableName") String tableName, @Param("fieldName") String fieldName); + + List getExtendInfosByIds(@Param("ids") Collection ids); + } diff --git a/src/com/engine/organization/mapper/extend/ExtendInfoMapper.xml b/src/com/engine/organization/mapper/extend/ExtendInfoMapper.xml index 666e9c91..745ccb88 100644 --- a/src/com/engine/organization/mapper/extend/ExtendInfoMapper.xml +++ b/src/com/engine/organization/mapper/extend/ExtendInfoMapper.xml @@ -205,6 +205,22 @@ WHERE id = #{id} AND delete_type = 0 + + UPDATE jcl_field_extendinfo + SET delete_type = 1 + WHERE delete_type = 0 + AND id IN + + #{id} + + + + ALTER TABLE ${tableName} + DROP + COLUMN + ${fieldName}; + + + \ No newline at end of file diff --git a/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java b/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java index 91b924c7..2b7b128b 100644 --- a/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java +++ b/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java @@ -66,6 +66,7 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ OrganizationAssert.notBlank(groupType, "分组信息有误，请确认"); Map datas = new HashMap<>(); Long groupId = Long.parseLong(groupType); + String tableName = ExtendGroupBO.getTableNameByGroupPO(getExtendGroupMapper().getGroupById(groupId)); List extendTitleList = getExtendTitleMapper().getTitlesByGroupID(groupId); List> tabs = new ArrayList<>(); int idx = 1; @@ -76,7 +77,7 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ tab.put("isShow", extendTitle.getIsShow()); tab.put("groupid", extendTitle.getId()); tab.put("viewAttr", extendTitle.getGroupId() < 0 ? 1 : 2); - tab.put("editable", getExtendInfoMapper().countFieldsByGroupId(extendTitle.getId()) == 0); + tab.put("editable", getExtendInfoMapper().countFieldsByGroupId(tableName, extendTitle.getId()) == 0); tabs.add(tab); } datas.put("status", "1"); @@ -102,7 +103,6 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ for (int i = 0; i < records.size(); i++) { // 存在ID则更新 ，不存在ID则增加 ExtendInfoFieldParam infoFieldParam = JSONObject.toJavaObject((JSONObject) records.get(i), ExtendInfoFieldParam.class); - // TODO ExtendInfoPO extendInfo = ExtendInfoBO.convertFieldParam2ExtendInfo(user, infoFieldParam, extendGroup, extendGroupId, i + 1); if (null != extendInfo.getId()) { @@ -472,10 +472,21 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ @Override public void deleteFieldDefined(ExtendFieldSearchParam param) { Collection ids = param.getId(); - Long groupId = param.getGroupId(); Long groupType = param.getGroupType(); + ExtendGroupPO groupById = getExtendGroupMapper().getGroupById(groupType); + + List extendInfoList = getExtendInfoMapper().getExtendInfosByIds(ids); + // 删除数据 + getExtendInfoMapper().deleteExtendInfoByIds(ids); + // 删除表结构 + for (ExtendInfoPO extendInfoPO : extendInfoList) { + getExtendInfoMapper().deleteTableColumn(extendInfoPO.getTableName(), extendInfoPO.getFieldName()); + // 明细表浏览按钮，额外删除span字段 + if (null != groupById.getPid() && 3 == extendInfoPO.getControlType()) { + getExtendInfoMapper().deleteTableColumn(extendInfoPO.getTableName(), extendInfoPO.getFieldName() + "span"); + } - + } } diff --git a/src/com/engine/organization/web/FieldDefinedController.java b/src/com/engine/organization/web/FieldDefinedController.java index f227411d..491e0111 100644 --- a/src/com/engine/organization/web/FieldDefinedController.java +++ b/src/com/engine/organization/web/FieldDefinedController.java @@ -176,4 +176,17 @@ public class FieldDefinedController { return ReturnResult.exceptionHandle(e.getMessage()); } } + + @POST + @Path("/{moduleTypeEnum}/del") + @Produces(MediaType.APPLICATION_JSON) + public ReturnResult deleteFieldDefined(@Context HttpServletRequest request, @Context HttpServletResponse response, @PathParam("moduleTypeEnum") ModuleTypeEnum moduleTypeEnum, @RequestBody ExtendFieldSearchParam param) { + try { + User user = HrmUserVarify.getUser(request, response); + getFieldDefinedWrapper(user).deleteFieldDefined(param); + return ReturnResult.successed(); + } catch (Exception e) { + return ReturnResult.exceptionHandle(e.getMessage()); + } + } } diff --git a/src/com/engine/organization/wrapper/FieldDefinedWrapper.java b/src/com/engine/organization/wrapper/FieldDefinedWrapper.java index 7d3cf7f4..ee0060a6 100644 --- a/src/com/engine/organization/wrapper/FieldDefinedWrapper.java +++ b/src/com/engine/organization/wrapper/FieldDefinedWrapper.java @@ -35,6 +35,7 @@ public class FieldDefinedWrapper extends Service { /** * 获取标题分组 + * * @param groupType * @return */ @@ -54,6 +55,7 @@ public class FieldDefinedWrapper extends Service { /** * 新建分组 + * * @param param * @return */ @@ -63,12 +65,11 @@ public class FieldDefinedWrapper extends Service { public ReturnResult changeTree(ModuleTypeEnum moduleTypeEnum, FieldTypeTreeParam fieldTypeTreeParam) { - getFieldDefinedService(user).changeTree(moduleTypeEnum,fieldTypeTreeParam); + getFieldDefinedService(user).changeTree(moduleTypeEnum, fieldTypeTreeParam); return ReturnResult.successed(); } - public int deleteTitle(Long id) { return getFieldDefinedService(user).deleteTitle(id); } @@ -91,4 +92,8 @@ public class FieldDefinedWrapper extends Service { public Map getFieldDefinedInfo(ExtendFieldSearchParam param) { return getFieldDefinedService(user).getFieldDefinedInfo(param); } + + public void deleteFieldDefined(ExtendFieldSearchParam param) { + getFieldDefinedService(user).deleteFieldDefined(param); + } } From e9aa68229d1f9fcc35ccd3dc7e458317da7691c4 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Fri, 17 Jun 2022 11:48:15 +0800 Subject: [PATCH 68/77] =?UTF-8?q?=E8=A1=A8=E7=BB=93=E6=9E=84=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/extend/bo/ExtendGroupBO.java | 12 +++++----- .../entity/extend/bo/ExtendInfoBO.java | 2 ++ .../entity/extend/po/ExtendGroupPO.java | 2 +- .../entity/extend/po/ExtendInfoPO.java | 2 +- .../entity/extend/po/ExtendTitlePO.java | 2 +- .../mapper/extend/ExtendGroupMapper.xml | 14 +++++++++--- .../mapper/extend/ExtendInfoMapper.xml | 8 +++++++ .../mapper/extend/ExtendTitleMapper.xml | 8 +++++++ .../service/impl/FieldDefinedServiceImpl.java | 22 ++++++++++--------- .../web/FieldDefinedController.java | 8 +++---- 10 files changed, 55 insertions(+), 25 deletions(-) diff --git a/src/com/engine/organization/entity/extend/bo/ExtendGroupBO.java b/src/com/engine/organization/entity/extend/bo/ExtendGroupBO.java index 5b64d25a..e890c1ba 100644 --- a/src/com/engine/organization/entity/extend/bo/ExtendGroupBO.java +++ b/src/com/engine/organization/entity/extend/bo/ExtendGroupBO.java @@ -23,7 +23,7 @@ public class ExtendGroupBO { public static List buildTypeTree(List extendGroupPOS) { - if(CollectionUtils.isEmpty(extendGroupPOS)){ + if (CollectionUtils.isEmpty(extendGroupPOS)) { return Collections.emptyList(); } @@ -42,10 +42,12 @@ public class ExtendGroupBO { .build()).collect(Collectors.toList()); //获取非一级 - Map> collects = typeTreeVOS.stream().filter(item -> item.getPid() != null).collect(Collectors.groupingBy(TypeTreeVO :: getPid)); + Map> collects = typeTreeVOS.stream().filter(item -> item.getPid() != null).collect(Collectors.groupingBy(TypeTreeVO::getPid)); - return typeTreeVOS.stream().peek(e -> {e.setChilds(collects.get(e.getKey())); e.setHaschild(collects.get(e.getKey()) != null && collects.get(e.getKey()).size() > 0); - }).filter(item -> item.getPid() == null).collect(Collectors.toList()); + return typeTreeVOS.stream().peek(e -> { + e.setChilds(collects.get(e.getKey())); + e.setHaschild(collects.get(e.getKey()) != null && collects.get(e.getKey()).size() > 0); + }).filter(item -> item.getPid() == null).collect(Collectors.toList()); } @@ -76,7 +78,7 @@ public class ExtendGroupBO { break; } - if (extendGroupPO.getId() < 0) { + if (extendGroupPO.getIsSystemDefault() == 0) { } else if (null == extendGroupPO.getPid()) { tableName += "EXT"; diff --git a/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java b/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java index 339d2fdb..2690a98b 100644 --- a/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java +++ b/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java @@ -108,6 +108,8 @@ public class ExtendInfoBO { .browserShow(1) .customValue(infoFieldParam.getFieldType().toString()) .showOrder(showOrder) + // 非系统初始化字段 + .isSystemDefault(1) .creator((long) user.getUID()) .deleteType(0) .createTime(new Date()) diff --git a/src/com/engine/organization/entity/extend/po/ExtendGroupPO.java b/src/com/engine/organization/entity/extend/po/ExtendGroupPO.java index 31ebeaf6..2bbffbd0 100644 --- a/src/com/engine/organization/entity/extend/po/ExtendGroupPO.java +++ b/src/com/engine/organization/entity/extend/po/ExtendGroupPO.java @@ -42,7 +42,7 @@ public class ExtendGroupPO { private Integer showOrder; - private Integer systemGroup; + private Integer isSystemDefault; private Long creator; private int deleteType; diff --git a/src/com/engine/organization/entity/extend/po/ExtendInfoPO.java b/src/com/engine/organization/entity/extend/po/ExtendInfoPO.java index 155e8693..74d5da3e 100644 --- a/src/com/engine/organization/entity/extend/po/ExtendInfoPO.java +++ b/src/com/engine/organization/entity/extend/po/ExtendInfoPO.java @@ -109,7 +109,7 @@ public class ExtendInfoPO { */ private Integer showOrder; - private Integer systemColumn; + private Integer isSystemDefault; private Long creator; private int deleteType; diff --git a/src/com/engine/organization/entity/extend/po/ExtendTitlePO.java b/src/com/engine/organization/entity/extend/po/ExtendTitlePO.java index 232ae548..884c355f 100644 --- a/src/com/engine/organization/entity/extend/po/ExtendTitlePO.java +++ b/src/com/engine/organization/entity/extend/po/ExtendTitlePO.java @@ -41,7 +41,7 @@ public class ExtendTitlePO { */ private String isShow; - private Integer systemDefault; + private Integer isSystemDefault; private Long creator; private Integer deleteType; diff --git a/src/com/engine/organization/mapper/extend/ExtendGroupMapper.xml b/src/com/engine/organization/mapper/extend/ExtendGroupMapper.xml index d3b24e9d..d7d533e0 100644 --- a/src/com/engine/organization/mapper/extend/ExtendGroupMapper.xml +++ b/src/com/engine/organization/mapper/extend/ExtendGroupMapper.xml @@ -5,6 +5,7 @@ + @@ -19,6 +20,7 @@ , t.pid , t.extend_type , t.group_name + , t.is_system_default , t.creator , t.delete_type , t.create_time @@ -97,6 +99,9 @@ is_show, + + is_system_default, + @@ -123,10 +128,13 @@ #{isShow}, + + #{isSystemDefault}, + - + update jcl_field_extendgroup group_name=#{name}, @@ -134,7 +142,7 @@ WHERE id = #{id} AND delete_type = 0 - + update jcl_field_extendgroup delete_type=1, @@ -142,7 +150,7 @@ WHERE id = #{id} AND delete_type = 0 - + update jcl_field_extendgroup group_name=#{groupName}, diff --git a/src/com/engine/organization/mapper/extend/ExtendInfoMapper.xml b/src/com/engine/organization/mapper/extend/ExtendInfoMapper.xml index 745ccb88..865d7841 100644 --- a/src/com/engine/organization/mapper/extend/ExtendInfoMapper.xml +++ b/src/com/engine/organization/mapper/extend/ExtendInfoMapper.xml @@ -20,6 +20,7 @@ + @@ -48,6 +49,7 @@ , t.browser_show , t.custom_value , t.show_order + , t.is_system_default , t.creator , t.delete_type , t.create_time @@ -121,6 +123,9 @@ show_order, + + is_system_default, + @@ -186,6 +191,9 @@ #{showOrder}, + + #{isSystemDefault}, + diff --git a/src/com/engine/organization/mapper/extend/ExtendTitleMapper.xml b/src/com/engine/organization/mapper/extend/ExtendTitleMapper.xml index 3b01efe0..2a72c9f0 100644 --- a/src/com/engine/organization/mapper/extend/ExtendTitleMapper.xml +++ b/src/com/engine/organization/mapper/extend/ExtendTitleMapper.xml @@ -7,6 +7,7 @@ + @@ -22,6 +23,7 @@ , t.title , t.show_order , t.is_show + , t.is_system_default , t.creator , t.delete_type , t.create_time @@ -57,6 +59,9 @@ is_show, + + is_system_default, + @@ -84,6 +89,9 @@ #{isShow}, + + #{isSystemDefault}, + diff --git a/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java b/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java index 2b7b128b..5cf8a778 100644 --- a/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java +++ b/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java @@ -76,7 +76,7 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ tab.put("title", extendTitle.getTitle()); tab.put("isShow", extendTitle.getIsShow()); tab.put("groupid", extendTitle.getId()); - tab.put("viewAttr", extendTitle.getGroupId() < 0 ? 1 : 2); + tab.put("viewAttr", extendTitle.getIsSystemDefault() == 0 ? 1 : 2); tab.put("editable", getExtendInfoMapper().countFieldsByGroupId(tableName, extendTitle.getId()) == 0); tabs.add(tab); } @@ -113,6 +113,7 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ // 获取操作表最大id,生成字段名 Long maxId = getExtendInfoMapper().getMaxId(); extendInfo.setFieldName("field" + (maxId + 1)); + extendInfo.setIsSystemDefault(1); updateCount += getExtendInfoMapper().insertExtendInfo(extendInfo); // 新增表结构 getExtendInfoMapper().addTableColumn(extendInfo.getTableName(), extendInfo.getFieldName(), extendInfo.getFieldType()); @@ -152,6 +153,7 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ } if (null == extendTitle.getId()) { + extendTitle.setIsSystemDefault(1); extendTitle.setCreator((long) user.getUID()); extendTitle.setCreateTime(new Date()); extendTitle.setDeleteType(0); @@ -185,6 +187,7 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ extendTitle.setCreator((long) user.getUID()); extendTitle.setCreateTime(new Date()); extendTitle.setDeleteType(0); + extendTitle.setIsSystemDefault(1); getExtendTitleMapper().insertIgnoreNull(extendTitle); ids.add(extendTitle.getId()); @@ -244,9 +247,8 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ String fieldIdRowKey; int showOrder = extendInfoPO.getShowOrder(); boolean isUsed = false; - // TODO 去除脏数据后调整为extendInfoPO.getId() > 0 - // 系统字段id<0 - boolean isSysField = extendInfoPO.getExtendGroupId() < 0; + // 是否为系统字段 + boolean isSysField = extendInfoPO.getIsSystemDefault() == 0; if (isSysField) { fieldIdRowKey = fieldId + "_hrm"; } else { @@ -255,9 +257,6 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ if (!isSysField) { isUsed = ExtendInfoBO.fieldIsUsed(extendInfoPO.getTableName(), extendInfoPO.getFieldName()); } - // TODO 去除脏数据后调整为extendInfoPO.getId() > 0 - boolean allowHide = extendInfoPO.getExtendGroupId() > 0; - boolean allowModify = extendInfoPO.getExtendGroupId() > 0; BrowserComInfo BrowserComInfo = new BrowserComInfo(); List fieldTypeObj = new ArrayList<>(); @@ -355,9 +354,9 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ //允许个人修改字段check框属性 Map checkPropsModifyInfo = new HashMap<>(); - checkPropsEnableInfo.put("viewAttr", allowHide ? 2 : 1); - checkPropsModifyInfo.put("viewAttr", allowModify ? 2 : 1); - checkPropsRequiredInfo.put("viewAttr", allowHide ? 2 : 1); + checkPropsEnableInfo.put("viewAttr", !isSysField ? 2 : 1); + checkPropsModifyInfo.put("viewAttr", !isSysField ? 2 : 1); + checkPropsRequiredInfo.put("viewAttr", !isSysField ? 2 : 1); checkPropsInfo.put("enable", checkPropsEnableInfo); checkPropsInfo.put("required", checkPropsRequiredInfo); @@ -454,6 +453,7 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ e.setPid(fieldTypeTreeParam.getParentId()); e.setIsShow(fieldTypeTreeParam.getIsShow()); e.setShowOrder(showOrder + 1); + e.setIsSystemDefault(1); e.setCreator((long) user.getUID()); e.setDeleteType(DeleteTypeEnum.NOT_DELETED.getValue()); e.setCreateTime(new Date()); @@ -501,6 +501,7 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ .title(extendGroupPO.getGroupName()) .showOrder(++max) .isShow("1") + .isSystemDefault(1) .creator((long) user.getUID()) .deleteType(DeleteTypeEnum.NOT_DELETED.getValue()) .createTime(new Date()) @@ -513,6 +514,7 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ .extendType(moduleTypeEnum.getValue()) .groupName(fieldTypeTreeParam.getName()) .showOrder(++max) + .isSystemDefault(1) .creator((long) user.getUID()) .deleteType(DeleteTypeEnum.NOT_DELETED.getValue()) .createTime(new Date()) diff --git a/src/com/engine/organization/web/FieldDefinedController.java b/src/com/engine/organization/web/FieldDefinedController.java index 491e0111..d684b58b 100644 --- a/src/com/engine/organization/web/FieldDefinedController.java +++ b/src/com/engine/organization/web/FieldDefinedController.java @@ -154,12 +154,12 @@ public class FieldDefinedController { @Path("/{moduleTypeEnum}/saveFields") @Produces(MediaType.APPLICATION_JSON) public ReturnResult saveFields(@Context HttpServletRequest request, @Context HttpServletResponse response, @PathParam("moduleTypeEnum") ModuleTypeEnum moduleTypeEnum, @RequestBody ExtendTitleSaveParam param) { - try { + //try { User user = HrmUserVarify.getUser(request, response); return ReturnResult.successed(getFieldDefinedWrapper(user).saveFields(param.getData())); - } catch (Exception e) { - return ReturnResult.exceptionHandle(e.getMessage()); - } + //} catch (Exception e) { + // return ReturnResult.exceptionHandle(e.getMessage()); + //} } @GET From 84adef05201935aa1a1cefa73921b7b350e88baf Mon Sep 17 00:00:00 2001 From: dxfeng Date: Fri, 17 Jun 2022 11:48:32 +0800 Subject: [PATCH 69/77] =?UTF-8?q?=E8=A1=A8=E7=BB=93=E6=9E=84=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../engine/organization/web/FieldDefinedController.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/com/engine/organization/web/FieldDefinedController.java b/src/com/engine/organization/web/FieldDefinedController.java index d684b58b..491e0111 100644 --- a/src/com/engine/organization/web/FieldDefinedController.java +++ b/src/com/engine/organization/web/FieldDefinedController.java @@ -154,12 +154,12 @@ public class FieldDefinedController { @Path("/{moduleTypeEnum}/saveFields") @Produces(MediaType.APPLICATION_JSON) public ReturnResult saveFields(@Context HttpServletRequest request, @Context HttpServletResponse response, @PathParam("moduleTypeEnum") ModuleTypeEnum moduleTypeEnum, @RequestBody ExtendTitleSaveParam param) { - //try { + try { User user = HrmUserVarify.getUser(request, response); return ReturnResult.successed(getFieldDefinedWrapper(user).saveFields(param.getData())); - //} catch (Exception e) { - // return ReturnResult.exceptionHandle(e.getMessage()); - //} + } catch (Exception e) { + return ReturnResult.exceptionHandle(e.getMessage()); + } } @GET From caff3332ceb324b6ab7fcf3e885a0b60a68b8f5f Mon Sep 17 00:00:00 2001 From: dxfeng Date: Fri, 17 Jun 2022 14:19:52 +0800 Subject: [PATCH 70/77] =?UTF-8?q?BUG=20=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../engine/organization/entity/extend/bo/ExtendInfoBO.java | 6 +++--- .../entity/extend/param/ExtendInfoFieldParam.java | 3 +-- .../organization/mapper/extend/ExtendGroupMapper.java | 7 +++---- .../organization/mapper/extend/ExtendGroupMapper.xml | 6 ++++-- .../organization/service/impl/FieldDefinedServiceImpl.java | 7 ++++--- 5 files changed, 15 insertions(+), 14 deletions(-) diff --git a/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java b/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java index 2690a98b..0adfead5 100644 --- a/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java +++ b/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java @@ -100,10 +100,10 @@ public class ExtendInfoBO { .controlType(Integer.parseInt(controlType)) .browserType(browserType) .extendGroupId(extendGroupId) - .isenable(null == infoFieldParam.getEnable() ? null : Integer.parseInt(infoFieldParam.getEnable())) - .isrequired(null == infoFieldParam.getRequired() ? null : Integer.parseInt(infoFieldParam.getRequired())) + .isenable("1".equals(infoFieldParam.getEnable()) ? 1 : 0) + .isrequired("1".equals(infoFieldParam.getRequired()) ? 1 : 0) .listShow(1) - .editShow(null == infoFieldParam.getIsModify() ? null : Integer.parseInt(infoFieldParam.getIsModify())) + .editShow("0".equals(infoFieldParam.getIsModify()) ? 0 : 1) .addShow(1) .browserShow(1) .customValue(infoFieldParam.getFieldType().toString()) diff --git a/src/com/engine/organization/entity/extend/param/ExtendInfoFieldParam.java b/src/com/engine/organization/entity/extend/param/ExtendInfoFieldParam.java index 7d0f42a3..ca44f358 100644 --- a/src/com/engine/organization/entity/extend/param/ExtendInfoFieldParam.java +++ b/src/com/engine/organization/entity/extend/param/ExtendInfoFieldParam.java @@ -10,7 +10,6 @@ import lombok.NoArgsConstructor; import weaver.general.Util; /** - * @description: TODO * @author:dxfeng * @createTime: 2022/06/15 * @version: 1.0 @@ -38,7 +37,7 @@ public class ExtendInfoFieldParam { public String getControlType() { JSONArray fieldType = (JSONArray) this.getFieldType(); - String fieldHtmlType = Util.null2String(fieldType.get(0)); + String fieldHtmlType = Util.null2String(fieldType.get(0)).trim(); if (fieldHtmlType.equals("input")) { fieldHtmlType = "1"; } else if (fieldHtmlType.equals("textarea")) { diff --git a/src/com/engine/organization/mapper/extend/ExtendGroupMapper.java b/src/com/engine/organization/mapper/extend/ExtendGroupMapper.java index 48aaae09..7f07081e 100644 --- a/src/com/engine/organization/mapper/extend/ExtendGroupMapper.java +++ b/src/com/engine/organization/mapper/extend/ExtendGroupMapper.java @@ -1,7 +1,6 @@ package com.engine.organization.mapper.extend; import com.engine.organization.entity.extend.po.ExtendGroupPO; -import com.engine.organization.entity.fieldset.param.FieldTypeTreeParam; import org.apache.ibatis.annotations.Param; import java.util.Collection; @@ -51,11 +50,11 @@ public interface ExtendGroupMapper { void insertIgnoreNull(ExtendGroupPO extendGroupPO); - void update(@Param("id")Long id, @Param("name")String name); + void update(@Param("id") Long id, @Param("name") String name); void delete(@Param("id") Long id); - void updateNameAndOrder(@Param("id")Long id, @Param("groupName")String groupName, @Param("showOrder")Integer showOrder); + void updateNameAndOrder(@Param("id") Long id, @Param("groupName") String groupName, @Param("showOrder") Integer showOrder, @Param("isShow") String isShow); - void batchDelete(@Param("ids")Set removeSet); + void batchDelete(@Param("ids") Set removeSet); } diff --git a/src/com/engine/organization/mapper/extend/ExtendGroupMapper.xml b/src/com/engine/organization/mapper/extend/ExtendGroupMapper.xml index f17809e6..7da508c4 100644 --- a/src/com/engine/organization/mapper/extend/ExtendGroupMapper.xml +++ b/src/com/engine/organization/mapper/extend/ExtendGroupMapper.xml @@ -23,6 +23,7 @@ , t.group_name , t.is_system_default , t.creator + , t.is_show , t.show_order , t.delete_type , t.create_time @@ -35,7 +36,7 @@ FROM jcl_field_extendgroup t - WHERE t.delete_type = 0 and t.is_show = 1 + WHERE t.delete_type = 0 and extend_type = #{extendType} @@ -162,7 +163,8 @@ update jcl_field_extendgroup group_name=#{groupName}, - show_order=#{showOrder} + show_order=#{showOrder}, + is_show = #{isShow} WHERE id = #{id} AND delete_type = 0 diff --git a/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java b/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java index 8a0f89b0..03f67704 100644 --- a/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java +++ b/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java @@ -445,13 +445,14 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ removeSet.add(e); } }); - MapperProxyFactory.getProxy(ExtendGroupMapper.class).batchDelete(removeSet); + if (CollectionUtils.isNotEmpty(removeSet)) { + MapperProxyFactory.getProxy(ExtendGroupMapper.class).batchDelete(removeSet); + } int showOrder = 0; extendGroupPOS.forEach(e -> { e.setExtendType(extendType); e.setPid(fieldTypeTreeParam.getParentId()); - e.setIsShow(fieldTypeTreeParam.getIsShow()); e.setShowOrder(showOrder + 1); e.setIsSystemDefault(1); e.setCreator((long) user.getUID()); @@ -462,7 +463,7 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ if (e.getId() == null) {//新增 MapperProxyFactory.getProxy(ExtendGroupMapper.class).insertIgnoreNull(e); } else { //更新 - MapperProxyFactory.getProxy(ExtendGroupMapper.class).updateNameAndOrder(e.getId(), e.getGroupName(), e.getShowOrder()); + MapperProxyFactory.getProxy(ExtendGroupMapper.class).updateNameAndOrder(e.getId(), e.getGroupName(), e.getShowOrder(), e.getIsShow()); } }); From 20bafffd2f82102953c6a021249392afab262f69 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Fri, 17 Jun 2022 16:00:05 +0800 Subject: [PATCH 71/77] =?UTF-8?q?BUG=20=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/extend/ExtendGroupMapper.xml | 15 ++++-- .../service/impl/CompServiceImpl.java | 4 +- .../service/impl/DepartmentServiceImpl.java | 4 +- .../service/impl/FieldDefinedServiceImpl.java | 54 ++++++++++++------- .../service/impl/JobServiceImpl.java | 4 +- 5 files changed, 51 insertions(+), 30 deletions(-) diff --git a/src/com/engine/organization/mapper/extend/ExtendGroupMapper.xml b/src/com/engine/organization/mapper/extend/ExtendGroupMapper.xml index 7da508c4..2aa5a5ad 100644 --- a/src/com/engine/organization/mapper/extend/ExtendGroupMapper.xml +++ b/src/com/engine/organization/mapper/extend/ExtendGroupMapper.xml @@ -40,12 +40,14 @@ and extend_type = #{extendType} + order by show_order - + update jcl_field_extendgroup group_name=#{name}, @@ -151,7 +156,7 @@ WHERE id = #{id} AND delete_type = 0 - + update jcl_field_extendgroup delete_type=1, @@ -159,7 +164,7 @@ WHERE id = #{id} AND delete_type = 0 - + update jcl_field_extendgroup group_name=#{groupName}, diff --git a/src/com/engine/organization/service/impl/CompServiceImpl.java b/src/com/engine/organization/service/impl/CompServiceImpl.java index 6410d187..28f232f8 100644 --- a/src/com/engine/organization/service/impl/CompServiceImpl.java +++ b/src/com/engine/organization/service/impl/CompServiceImpl.java @@ -69,7 +69,7 @@ public class CompServiceImpl extends Service implements CompService { /** * 公司/分部主表title指定ID */ - private static final Long GROUP_ID = -1L; + private static final Long GROUP_ID = 1L; private CompMapper getCompMapper() { return MapperProxyFactory.getProxy(CompMapper.class); @@ -243,7 +243,7 @@ public class CompServiceImpl extends Service implements CompService { if (CollectionUtils.isNotEmpty(extendTitles)) { for (ExtendTitlePO extendTitle : extendTitles) { - addGroups.add(new SearchConditionGroup(extendTitle.getTitle(), true, getExtService(user).getExtForm(user, EXTEND_TYPE + "", Integer.parseInt(groupId) >= 0 ? JCL_ORG_COMPEXT : JCL_ORG_COMP, viewAttr, id, extendTitle.getId() + "", "comp_no"))); + addGroups.add(new SearchConditionGroup(extendTitle.getTitle(), true, getExtService(user).getExtForm(user, EXTEND_TYPE + "", GROUP_ID.equals(Long.parseLong(groupId)) ? JCL_ORG_COMP : JCL_ORG_COMPEXT, viewAttr, id, extendTitle.getId() + "", "comp_no"))); } } diff --git a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java index e5607405..798f3350 100644 --- a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java +++ b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java @@ -80,7 +80,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService /** * 部门主表title指定ID */ - private static final Long GROUP_ID = -2L; + private static final Long GROUP_ID = 2L; private DepartmentMapper getDepartmentMapper() { @@ -296,7 +296,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService List extendTitles = getExtendTitleMapper().getTitlesByGroupID(Long.parseLong(groupId)); if (CollectionUtils.isNotEmpty(extendTitles)) { for (ExtendTitlePO extendTitle : extendTitles) { - addGroups.add(new SearchConditionGroup(extendTitle.getTitle(), true, getExtService(user).getExtForm(user, EXTEND_TYPE + "", Integer.parseInt(groupId) >= 0 ? JCL_ORG_DEPTEXT : JCL_ORG_DEPT, viewAttr, id, extendTitle.getId().toString(), "dept_no"))); + addGroups.add(new SearchConditionGroup(extendTitle.getTitle(), true, getExtService(user).getExtForm(user, EXTEND_TYPE + "", GROUP_ID.equals(Long.parseLong(groupId)) ? JCL_ORG_DEPT : JCL_ORG_DEPTEXT, viewAttr, id, extendTitle.getId().toString(), "dept_no"))); } } diff --git a/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java b/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java index 03f67704..605fd9c8 100644 --- a/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java +++ b/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java @@ -32,6 +32,7 @@ import weaver.systeminfo.SystemEnv; import weaver.workflow.field.BrowserComInfo; import java.util.*; +import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; /** @@ -427,33 +428,37 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ @Override public void deleteTree(Long id) { MapperProxyFactory.getProxy(ExtendGroupMapper.class).delete(id); - //明细表删除字段信息 todo - + //明细表删除字段信息、删除表结构 + ExtendGroupPO extendGroupPO = getExtendGroupMapper().getGroupById(id); + List extendInfoList = getExtendInfoMapper().listFields(extendGroupPO.getExtendType().toString(), extendGroupPO.getId().toString(), ExtendGroupBO.getTableNameByGroupPO(extendGroupPO), ""); + List ids = extendInfoList.stream().map(ExtendInfoPO::getId).collect(Collectors.toList()); + // 删除数据 + dropColumns(ids, extendGroupPO, extendInfoList); } @Override public void saveTree(ModuleTypeEnum moduleTypeEnum, FieldTypeTreeParam fieldTypeTreeParam) { - List collect = MapperProxyFactory.getProxy(ExtendGroupMapper.class) - .listGroupByPid(fieldTypeTreeParam.getParentId()).stream().map(ExtendGroupPO::getId).collect(Collectors.toList()); + Set collect = MapperProxyFactory.getProxy(ExtendGroupMapper.class) + .listGroupByPid(fieldTypeTreeParam.getParentId()).stream().map(ExtendGroupPO::getId).collect(Collectors.toSet()); Integer extendType = moduleTypeEnum.getValue(); List extendGroupPOS = JSONArray.parseArray(fieldTypeTreeParam.getData(), ExtendGroupPO.class); List collect1 = extendGroupPOS.stream().map(ExtendGroupPO::getId).collect(Collectors.toList()); - Set removeSet = new HashSet<>(); collect1.forEach(e -> { - if (!collect.contains(e)) { - removeSet.add(e); + if (collect.contains(e)) { + collect.remove(e); } }); - if (CollectionUtils.isNotEmpty(removeSet)) { - MapperProxyFactory.getProxy(ExtendGroupMapper.class).batchDelete(removeSet); + if (CollectionUtils.isNotEmpty(collect)) { + MapperProxyFactory.getProxy(ExtendGroupMapper.class).batchDelete(collect); } - int showOrder = 0; + AtomicInteger showOrder = new AtomicInteger(0); extendGroupPOS.forEach(e -> { + showOrder.getAndIncrement(); e.setExtendType(extendType); e.setPid(fieldTypeTreeParam.getParentId()); - e.setShowOrder(showOrder + 1); + e.setShowOrder(showOrder.get()); e.setIsSystemDefault(1); e.setCreator((long) user.getUID()); e.setDeleteType(DeleteTypeEnum.NOT_DELETED.getValue()); @@ -474,26 +479,37 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ public void deleteFieldDefined(ExtendFieldSearchParam param) { Collection ids = param.getId(); Long groupType = param.getGroupType(); - ExtendGroupPO groupById = getExtendGroupMapper().getGroupById(groupType); + ExtendGroupPO extendGroupPO = getExtendGroupMapper().getGroupById(groupType); List extendInfoList = getExtendInfoMapper().getExtendInfosByIds(ids); + dropColumns(ids, extendGroupPO, extendInfoList); + + } + + @Override + public void changeGroup(ExtendInfoChangeParam param) { + + } + + /** + * 删除数据及表结构 + * + * @param ids + * @param extendGroupPO + * @param extendInfoList + */ + private void dropColumns(Collection ids, ExtendGroupPO extendGroupPO, List extendInfoList) { // 删除数据 getExtendInfoMapper().deleteExtendInfoByIds(ids); // 删除表结构 for (ExtendInfoPO extendInfoPO : extendInfoList) { getExtendInfoMapper().deleteTableColumn(extendInfoPO.getTableName(), extendInfoPO.getFieldName()); // 明细表浏览按钮，额外删除span字段 - if (null != groupById.getPid() && 3 == extendInfoPO.getControlType()) { + if (null != extendGroupPO.getPid() && 3 == extendInfoPO.getControlType()) { getExtendInfoMapper().deleteTableColumn(extendInfoPO.getTableName(), extendInfoPO.getFieldName() + "span"); } } - - } - - @Override - public void changeGroup(ExtendInfoChangeParam param) { - } private ExtendTitlePO buildExtendTitleType(ExtendGroupPO extendGroupPO, Integer max) { diff --git a/src/com/engine/organization/service/impl/JobServiceImpl.java b/src/com/engine/organization/service/impl/JobServiceImpl.java index bbeb22c3..c6ce1991 100644 --- a/src/com/engine/organization/service/impl/JobServiceImpl.java +++ b/src/com/engine/organization/service/impl/JobServiceImpl.java @@ -97,7 +97,7 @@ public class JobServiceImpl extends Service implements JobService { /** * 岗位主表title指定ID */ - private static final Long GROUP_ID = -3L; + private static final Long GROUP_ID = 3L; private JobMapper getJobMapper() { return MapperProxyFactory.getProxy(JobMapper.class); @@ -281,7 +281,7 @@ public class JobServiceImpl extends Service implements JobService { List extendTitles = getExtendTitleMapper().getTitlesByGroupID(GROUP_ID); if (CollectionUtils.isNotEmpty(extendTitles)) { for (ExtendTitlePO extendTitle : extendTitles) { - addGroups.add(new SearchConditionGroup(extendTitle.getTitle(), true, getExtService(user).getExtForm(user, EXTEND_TYPE + "", Integer.parseInt(groupId) >= 0 ? JCL_ORG_JOBEXT : JCL_ORG_JOB, viewAttr, id, extendTitle.getId().toString(), "job_no"))); + addGroups.add(new SearchConditionGroup(extendTitle.getTitle(), true, getExtService(user).getExtForm(user, EXTEND_TYPE + "", GROUP_ID.equals(Long.parseLong(groupId)) ? JCL_ORG_JOB : JCL_ORG_JOBEXT, viewAttr, id, extendTitle.getId().toString(), "job_no"))); } } HashMap resultMap = new HashMap<>(); From f42ee2b8d12fdb8c67ec0fd3756fa760b1bdf5f7 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Fri, 17 Jun 2022 16:06:29 +0800 Subject: [PATCH 72/77] =?UTF-8?q?BUG=20=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/FieldDefinedServiceImpl.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java b/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java index 605fd9c8..158d3ed9 100644 --- a/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java +++ b/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java @@ -427,13 +427,15 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ @Override public void deleteTree(Long id) { - MapperProxyFactory.getProxy(ExtendGroupMapper.class).delete(id); //明细表删除字段信息、删除表结构 ExtendGroupPO extendGroupPO = getExtendGroupMapper().getGroupById(id); + MapperProxyFactory.getProxy(ExtendGroupMapper.class).delete(id); List extendInfoList = getExtendInfoMapper().listFields(extendGroupPO.getExtendType().toString(), extendGroupPO.getId().toString(), ExtendGroupBO.getTableNameByGroupPO(extendGroupPO), ""); List ids = extendInfoList.stream().map(ExtendInfoPO::getId).collect(Collectors.toList()); - // 删除数据 - dropColumns(ids, extendGroupPO, extendInfoList); + if(CollectionUtils.isNotEmpty(ids)) { + // 删除数据 + dropColumns(ids, extendGroupPO, extendInfoList); + } } @Override From 6df1accb9877d87421656e522c6938ab357f9601 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Fri, 17 Jun 2022 16:54:16 +0800 Subject: [PATCH 73/77] =?UTF-8?q?BUG=20=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../extend/param/ExtendInfoFieldParam.java | 20 ++++++++++++++++++- .../mapper/extend/ExtendTitleMapper.xml | 4 ++-- .../service/FieldDefinedService.java | 4 ++-- .../service/impl/FieldDefinedServiceImpl.java | 14 ++++++++++--- .../web/FieldDefinedController.java | 2 +- .../wrapper/FieldDefinedWrapper.java | 4 ++-- 6 files changed, 37 insertions(+), 11 deletions(-) diff --git a/src/com/engine/organization/entity/extend/param/ExtendInfoFieldParam.java b/src/com/engine/organization/entity/extend/param/ExtendInfoFieldParam.java index ca44f358..7e055d9c 100644 --- a/src/com/engine/organization/entity/extend/param/ExtendInfoFieldParam.java +++ b/src/com/engine/organization/entity/extend/param/ExtendInfoFieldParam.java @@ -7,6 +7,7 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.apache.commons.lang.StringUtils; import weaver.general.Util; /** @@ -37,7 +38,7 @@ public class ExtendInfoFieldParam { public String getControlType() { JSONArray fieldType = (JSONArray) this.getFieldType(); - String fieldHtmlType = Util.null2String(fieldType.get(0)).trim(); + String fieldHtmlType = Util.null2String(fieldType.get(0)); if (fieldHtmlType.equals("input")) { fieldHtmlType = "1"; } else if (fieldHtmlType.equals("textarea")) { @@ -109,4 +110,21 @@ public class ExtendInfoFieldParam { } return fp.getFielddbtype(); } + + public static String toDbc(String input) { + if (StringUtils.isBlank(input)) { + return ""; + } + char[] c = input.toCharArray(); + for (int i = 0; i < c.length; i++) { + if (c[i] == 12288) { + c[i] = (char) 32; + continue; + } + if (c[i] > 65280 && c[i] < 65375) { + c[i] = (char) (c[i] - 65248); + } + } + return new String(c); + } } \ No newline at end of file diff --git a/src/com/engine/organization/mapper/extend/ExtendTitleMapper.xml b/src/com/engine/organization/mapper/extend/ExtendTitleMapper.xml index 2a72c9f0..62cff4b5 100644 --- a/src/com/engine/organization/mapper/extend/ExtendTitleMapper.xml +++ b/src/com/engine/organization/mapper/extend/ExtendTitleMapper.xml @@ -120,7 +120,7 @@ FROM jcl_field_extendtitle t - WHERE t.delete_type = 0 and t.is_show = 1 + WHERE t.delete_type = 0 and group_id = #{groupId} @@ -132,7 +132,7 @@ FROM jcl_field_extendtitle t - WHERE t.delete_type = 0 and t.is_show = 1 + WHERE t.delete_type = 0 AND id IN #{id} diff --git a/src/com/engine/organization/service/FieldDefinedService.java b/src/com/engine/organization/service/FieldDefinedService.java index 643207a9..381e74f0 100644 --- a/src/com/engine/organization/service/FieldDefinedService.java +++ b/src/com/engine/organization/service/FieldDefinedService.java @@ -73,10 +73,10 @@ public interface FieldDefinedService { /** * 删除标题信息 * - * @param id + * @param param * @return */ - int deleteTitle(Long id); + int deleteTitle(ExtendTitleSaveParam param); /** * 获取自定义字段列表 diff --git a/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java b/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java index 158d3ed9..45f53f4c 100644 --- a/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java +++ b/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java @@ -214,8 +214,16 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ } @Override - public int deleteTitle(Long id) { - return getExtendTitleMapper().deleteExtendTitleByIds(DeleteParam.builder().ids(id.toString()).build().getIds()); + public int deleteTitle(ExtendTitleSaveParam param) { + getExtendTitleMapper().deleteExtendTitleByIds(DeleteParam.builder().ids(param.getId().toString()).build().getIds()); + List titlesByGroupID = getExtendTitleMapper().getTitlesByGroupID(param.getGroupType()); + + if (CollectionUtils.isEmpty(titlesByGroupID)) { + // 删除整个分组 + getExtendGroupMapper().delete(param.getGroupType()); + return 1; + } + return 0; } @Override @@ -432,7 +440,7 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ MapperProxyFactory.getProxy(ExtendGroupMapper.class).delete(id); List extendInfoList = getExtendInfoMapper().listFields(extendGroupPO.getExtendType().toString(), extendGroupPO.getId().toString(), ExtendGroupBO.getTableNameByGroupPO(extendGroupPO), ""); List ids = extendInfoList.stream().map(ExtendInfoPO::getId).collect(Collectors.toList()); - if(CollectionUtils.isNotEmpty(ids)) { + if (CollectionUtils.isNotEmpty(ids)) { // 删除数据 dropColumns(ids, extendGroupPO, extendInfoList); } diff --git a/src/com/engine/organization/web/FieldDefinedController.java b/src/com/engine/organization/web/FieldDefinedController.java index 491e0111..0593b217 100644 --- a/src/com/engine/organization/web/FieldDefinedController.java +++ b/src/com/engine/organization/web/FieldDefinedController.java @@ -144,7 +144,7 @@ public class FieldDefinedController { public ReturnResult deleteTitle(@Context HttpServletRequest request, @Context HttpServletResponse response, @PathParam("moduleTypeEnum") ModuleTypeEnum moduleTypeEnum, @RequestBody ExtendTitleSaveParam param) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getFieldDefinedWrapper(user).deleteTitle(param.getId())); + return ReturnResult.successed(getFieldDefinedWrapper(user).deleteTitle(param)); } catch (Exception e) { return ReturnResult.exceptionHandle(e.getMessage()); } diff --git a/src/com/engine/organization/wrapper/FieldDefinedWrapper.java b/src/com/engine/organization/wrapper/FieldDefinedWrapper.java index ee0060a6..cfa351f6 100644 --- a/src/com/engine/organization/wrapper/FieldDefinedWrapper.java +++ b/src/com/engine/organization/wrapper/FieldDefinedWrapper.java @@ -70,8 +70,8 @@ public class FieldDefinedWrapper extends Service { } - public int deleteTitle(Long id) { - return getFieldDefinedService(user).deleteTitle(id); + public int deleteTitle(ExtendTitleSaveParam param) { + return getFieldDefinedService(user).deleteTitle(param); } From 2a57f20693aaeafc74a2cdaa5ff17c12c793a3ba Mon Sep 17 00:00:00 2001 From: dxfeng Date: Fri, 17 Jun 2022 17:51:26 +0800 Subject: [PATCH 74/77] =?UTF-8?q?BUG=20=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/organization/entity/SelectOptionParam.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/com/engine/organization/entity/SelectOptionParam.java b/src/com/engine/organization/entity/SelectOptionParam.java index 70e04030..94f75911 100644 --- a/src/com/engine/organization/entity/SelectOptionParam.java +++ b/src/com/engine/organization/entity/SelectOptionParam.java @@ -3,6 +3,7 @@ package com.engine.organization.entity; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.api.browser.bean.SearchConditionOption; +import org.apache.commons.lang.StringUtils; import java.util.ArrayList; import java.util.List; @@ -32,7 +33,7 @@ public class SelectOptionParam { int size = datas.size(); for (int i = 0; i < size; i++) { JSONObject jsonObject = (JSONObject) datas.get(i); - SearchConditionOption option = new SearchConditionOption(jsonObject.getString("key"), jsonObject.getString("option")); + SearchConditionOption option = new SearchConditionOption(StringUtils.isEmpty(jsonObject.getString("key")) ? i + "" : jsonObject.getString("key"), jsonObject.getString("option")); selectOptions.add(option); } } From 2af1fb6336d3ba26bbc372e3fb6db504b85eb215 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Mon, 20 Jun 2022 09:09:14 +0800 Subject: [PATCH 75/77] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E5=88=B0=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/extend/ExtendInfoMapper.java | 2 ++ .../mapper/extend/ExtendInfoMapper.xml | 9 +++++++++ .../service/impl/FieldDefinedServiceImpl.java | 14 +++++++++++--- .../organization/web/FieldDefinedController.java | 14 ++++++++++++++ .../organization/wrapper/FieldDefinedWrapper.java | 5 +++++ 5 files changed, 41 insertions(+), 3 deletions(-) diff --git a/src/com/engine/organization/mapper/extend/ExtendInfoMapper.java b/src/com/engine/organization/mapper/extend/ExtendInfoMapper.java index 528c48f7..cca8368f 100644 --- a/src/com/engine/organization/mapper/extend/ExtendInfoMapper.java +++ b/src/com/engine/organization/mapper/extend/ExtendInfoMapper.java @@ -35,5 +35,7 @@ public interface ExtendInfoMapper { List getExtendInfosByIds(@Param("ids") Collection ids); + int updateExtendGroupId(@Param("groupId") Long groupId, @Param("ids") Collection ids); + } diff --git a/src/com/engine/organization/mapper/extend/ExtendInfoMapper.xml b/src/com/engine/organization/mapper/extend/ExtendInfoMapper.xml index 865d7841..725c17ac 100644 --- a/src/com/engine/organization/mapper/extend/ExtendInfoMapper.xml +++ b/src/com/engine/organization/mapper/extend/ExtendInfoMapper.xml @@ -228,6 +228,15 @@ COLUMN ${fieldName}; + + UPDATE jcl_field_extendinfo + SET extend_group_id = #{groupId} + WHERE delete_type = 0 + AND id IN + + #{id} + +