From 2b975e6636eaf62c069f312acf48c2310a9bce48 Mon Sep 17 00:00:00 2001 From: Chengliang <1546584672@qq.com> Date: Fri, 21 Oct 2022 17:53:15 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E6=A8=A1=E5=9D=97=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=88=86=E6=9D=83=E4=B8=AD=E5=BF=83=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/表结构SQL/MySQL.sql | 6 +- docs/表结构SQL/Oracle.sql | 6 +- docs/表结构SQL/SqlServer.sql | 6 +- .../web/ManagerDetachController.java | 13 ++++ .../entity/detach/po/ManagerDetachPO.java | 66 +++++++++++++++++++ .../entity/detach/vo/ManagerDetachVO.java | 11 ++++ .../entity/scheme/po/SchemePO.java | 8 +-- .../service/ManagerDetachService.java | 10 +++ .../impl/ManagerDetachServiceImpl.java | 13 ++++ .../web/ManagerDetachController.java | 45 +++++++++++++ .../wrapper/ManagerDetachWrapper.java | 26 ++++++++ 11 files changed, 200 insertions(+), 10 deletions(-) create mode 100644 src/com/api/organization/web/ManagerDetachController.java create mode 100644 src/com/engine/organization/entity/detach/po/ManagerDetachPO.java create mode 100644 src/com/engine/organization/entity/detach/vo/ManagerDetachVO.java create mode 100644 src/com/engine/organization/service/ManagerDetachService.java create mode 100644 src/com/engine/organization/service/impl/ManagerDetachServiceImpl.java create mode 100644 src/com/engine/organization/web/ManagerDetachController.java create mode 100644 src/com/engine/organization/wrapper/ManagerDetachWrapper.java diff --git a/docs/表结构SQL/MySQL.sql b/docs/表结构SQL/MySQL.sql index ca8be925..a4da50a8 100644 --- a/docs/表结构SQL/MySQL.sql +++ b/docs/表结构SQL/MySQL.sql @@ -549,8 +549,10 @@ create table JCL_ORG_ITEM ( create table JCL_ORG_DETACH ( id int auto_increment not null, type int null, - manger text not null, - rolelevel text not null, + ec_manger text not null, + jcl_manger text not null, + ec_rolelevel text not null, + jcl_rolelevel text not null, module text not null, creator int null, delete_type int null, diff --git a/docs/表结构SQL/Oracle.sql b/docs/表结构SQL/Oracle.sql index fd026eb8..187d01f6 100644 --- a/docs/表结构SQL/Oracle.sql +++ b/docs/表结构SQL/Oracle.sql @@ -491,8 +491,10 @@ CREATE TABLE JCL_ORG_HRMRELATION ( create table JCL_ORG_DETACH ( id number not null, type number null, - manger clob not null, - rolelevel clob not null, + ec_manger clob not null, + jcl_manger clob not null, + ec_rolelevel clob not null, + jcl_rolelevel clob not null, module clob not null, creator number null, delete_type number null, diff --git a/docs/表结构SQL/SqlServer.sql b/docs/表结构SQL/SqlServer.sql index 0cddf6f5..d397a3bc 100644 --- a/docs/表结构SQL/SqlServer.sql +++ b/docs/表结构SQL/SqlServer.sql @@ -522,8 +522,10 @@ CREATE TABLE JCL_ORG_MAP ( create table JCL_ORG_DETACH ( id int IDENTITY(1,1) not null, type int null, - manger text not null, - rolelevel text not null, + ec_manger text not null, + jcl_manger text not null, + ec_rolelevel text not null, + jcl_rolelevel text not null, module text not null, creator int null, delete_type int null, diff --git a/src/com/api/organization/web/ManagerDetachController.java b/src/com/api/organization/web/ManagerDetachController.java new file mode 100644 index 00000000..9a985c6c --- /dev/null +++ b/src/com/api/organization/web/ManagerDetachController.java @@ -0,0 +1,13 @@ +package com.api.organization.web; + +import javax.ws.rs.Path; + +/** + * @Author weaver_cl + * @Description: + * @Date 2022/10/21 + * @Version V1.0 + **/ +@Path("/bs/hrmorganization/detach") +public class ManagerDetachController extends com.engine.organization.web.ManagerDetachController { +} diff --git a/src/com/engine/organization/entity/detach/po/ManagerDetachPO.java b/src/com/engine/organization/entity/detach/po/ManagerDetachPO.java new file mode 100644 index 00000000..40dd9e27 --- /dev/null +++ b/src/com/engine/organization/entity/detach/po/ManagerDetachPO.java @@ -0,0 +1,66 @@ +package com.engine.organization.entity.detach.po; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +/** + * @Author weaver_cl + * @Description: + * @Date 2022/10/21 + * @Version V1.0 + **/ + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class ManagerDetachPO { + /** + * 自增主键 + */ + private Integer id; + /** + * 管理员类型 + */ + private Integer type; + /** + * ec管理员 + */ + private String ec_manger; + /** + * jcl管理员 + */ + private String jcl_manger; + /** + * ec分部 + */ + private String ec_rolelevel; + /** + * jcl分部 + */ + private String jcl_rolelevel; + /** + * 模块 + */ + private String module; + /** + * 创建人 + */ + private Long creator; + /** + * 删除标记 + */ + private int deleteType; + /** + * 创建时间 + */ + private Date createTime; + /** + * 更新时间 + */ + private Date updateTime; +} diff --git a/src/com/engine/organization/entity/detach/vo/ManagerDetachVO.java b/src/com/engine/organization/entity/detach/vo/ManagerDetachVO.java new file mode 100644 index 00000000..c0006a92 --- /dev/null +++ b/src/com/engine/organization/entity/detach/vo/ManagerDetachVO.java @@ -0,0 +1,11 @@ +package com.engine.organization.entity.detach.vo; + +/** + * @Author weaver_cl + * @Description: + * @Date 2022/10/21 + * @Version V1.0 + **/ +public class ManagerDetachVO { + +} diff --git a/src/com/engine/organization/entity/scheme/po/SchemePO.java b/src/com/engine/organization/entity/scheme/po/SchemePO.java index 1cf7918b..f1986ead 100644 --- a/src/com/engine/organization/entity/scheme/po/SchemePO.java +++ b/src/com/engine/organization/entity/scheme/po/SchemePO.java @@ -37,19 +37,19 @@ public class SchemePO { */ private int isUsed; /** - * + * 创建人 */ private Long creator; /** - * + * 删除标记 */ private int deleteType; /** - * + * 创建时间 */ private Date createTime; /** - * + * 更新时间 */ private Date updateTime; diff --git a/src/com/engine/organization/service/ManagerDetachService.java b/src/com/engine/organization/service/ManagerDetachService.java new file mode 100644 index 00000000..42c6d4b0 --- /dev/null +++ b/src/com/engine/organization/service/ManagerDetachService.java @@ -0,0 +1,10 @@ +package com.engine.organization.service; + +/** + * @Author weaver_cl + * @Description: + * @Date 2022/10/21 + * @Version V1.0 + **/ +public interface ManagerDetachService { +} diff --git a/src/com/engine/organization/service/impl/ManagerDetachServiceImpl.java b/src/com/engine/organization/service/impl/ManagerDetachServiceImpl.java new file mode 100644 index 00000000..2d91fd7c --- /dev/null +++ b/src/com/engine/organization/service/impl/ManagerDetachServiceImpl.java @@ -0,0 +1,13 @@ +package com.engine.organization.service.impl; + +import com.engine.core.impl.Service; +import com.engine.organization.service.ManagerDetachService; + +/** + * @Author weaver_cl + * @Description: + * @Date 2022/10/21 + * @Version V1.0 + **/ +public class ManagerDetachServiceImpl extends Service implements ManagerDetachService { +} diff --git a/src/com/engine/organization/web/ManagerDetachController.java b/src/com/engine/organization/web/ManagerDetachController.java new file mode 100644 index 00000000..bb6731dc --- /dev/null +++ b/src/com/engine/organization/web/ManagerDetachController.java @@ -0,0 +1,45 @@ +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.ManagerDetachWrapper; +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.Produces; +import javax.ws.rs.core.Context; +import javax.ws.rs.core.MediaType; +import java.util.Map; + +/** + * @Author weaver_cl + * @Description: 模块管理分权 + * @Date 2022/10/21 + * @Version V1.0 + **/ +public class ManagerDetachController { + + public ManagerDetachWrapper getManagerDetachWrapper(User user) { + return ServiceUtil.getService(ManagerDetachWrapper.class,user); + } + + + + @GET + @Path("/getTable") + @Produces(MediaType.APPLICATION_JSON) + public ReturnResult listScheme(@Context HttpServletRequest request, @Context HttpServletResponse response) { + try { + User user = HrmUserVarify.getUser(request, response); + Map map = ParamUtil.request2Map(request); + return ReturnResult.successed(getManagerDetachWrapper(user).listPage(map)); + } catch (Exception e) { + return ReturnResult.exceptionHandle(e); + } + } +} diff --git a/src/com/engine/organization/wrapper/ManagerDetachWrapper.java b/src/com/engine/organization/wrapper/ManagerDetachWrapper.java new file mode 100644 index 00000000..8e43f772 --- /dev/null +++ b/src/com/engine/organization/wrapper/ManagerDetachWrapper.java @@ -0,0 +1,26 @@ +package com.engine.organization.wrapper; + +import com.engine.common.util.ServiceUtil; +import com.engine.core.impl.Service; +import com.engine.organization.service.ManagerDetachService; +import com.engine.organization.service.impl.ManagerDetachServiceImpl; +import weaver.hrm.User; + +import java.util.Map; + +/** + * @Author weaver_cl + * @Description: + * @Date 2022/10/21 + * @Version V1.0 + **/ +public class ManagerDetachWrapper extends Service { + + public ManagerDetachService getManagerDetachService(User user) { + return ServiceUtil.getService(ManagerDetachServiceImpl.class,user); + } + + public Map listPage(Map params) { + return null; + } +} From 4c74b583bf675cf50b631dbf805f3273a3b1aea6 Mon Sep 17 00:00:00 2001 From: Chengliang <1546584672@qq.com> Date: Mon, 24 Oct 2022 19:25:55 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E6=A8=A1=E5=9D=97=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=88=86=E6=9D=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/表结构SQL/MySQL.sql | 4 +- docs/表结构SQL/Oracle.sql | 10 +- docs/表结构SQL/SqlServer.sql | 4 +- .../entity/detach/vo/ManagerDetachVO.java | 48 ++++ .../mapper/detach/ManagerDetachMapper.java | 11 + .../mapper/detach/ManagerDetachMapper.xml | 231 ++++++++++++++++++ .../mapper/employee/EmployeeMapper.java | 4 + .../mapper/employee/EmployeeMapper.xml | 27 ++ .../service/ManagerDetachService.java | 16 ++ .../impl/ManagerDetachServiceImpl.java | 73 ++++++ .../web/ManagerDetachController.java | 58 ++++- .../wrapper/ManagerDetachWrapper.java | 37 ++- 12 files changed, 508 insertions(+), 15 deletions(-) create mode 100644 src/com/engine/organization/mapper/detach/ManagerDetachMapper.java create mode 100644 src/com/engine/organization/mapper/detach/ManagerDetachMapper.xml diff --git a/docs/表结构SQL/MySQL.sql b/docs/表结构SQL/MySQL.sql index a4da50a8..2b9a0909 100644 --- a/docs/表结构SQL/MySQL.sql +++ b/docs/表结构SQL/MySQL.sql @@ -549,8 +549,8 @@ create table JCL_ORG_ITEM ( create table JCL_ORG_DETACH ( id int auto_increment not null, type int null, - ec_manger text not null, - jcl_manger text not null, + ec_manager text not null, + jcl_manager text not null, ec_rolelevel text not null, jcl_rolelevel text not null, module text not null, diff --git a/docs/表结构SQL/Oracle.sql b/docs/表结构SQL/Oracle.sql index 187d01f6..74245544 100644 --- a/docs/表结构SQL/Oracle.sql +++ b/docs/表结构SQL/Oracle.sql @@ -491,11 +491,11 @@ CREATE TABLE JCL_ORG_HRMRELATION ( create table JCL_ORG_DETACH ( id number not null, type number null, - ec_manger clob not null, - jcl_manger clob not null, - ec_rolelevel clob not null, - jcl_rolelevel clob not null, - module clob not null, + ec_manager clob not null, + jcl_manager clob not null, + ec_rolelevel varchar(4000) not null, + jcl_rolelevel varchar(4000) not null, + module varchar(4000) not 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 d397a3bc..2db5c0cb 100644 --- a/docs/表结构SQL/SqlServer.sql +++ b/docs/表结构SQL/SqlServer.sql @@ -522,8 +522,8 @@ CREATE TABLE JCL_ORG_MAP ( create table JCL_ORG_DETACH ( id int IDENTITY(1,1) not null, type int null, - ec_manger text not null, - jcl_manger text not null, + ec_manager text not null, + jcl_manager text not null, ec_rolelevel text not null, jcl_rolelevel text not null, module text not null, diff --git a/src/com/engine/organization/entity/detach/vo/ManagerDetachVO.java b/src/com/engine/organization/entity/detach/vo/ManagerDetachVO.java index c0006a92..b87954dd 100644 --- a/src/com/engine/organization/entity/detach/vo/ManagerDetachVO.java +++ b/src/com/engine/organization/entity/detach/vo/ManagerDetachVO.java @@ -1,11 +1,59 @@ package com.engine.organization.entity.detach.vo; +import com.cloudstore.eccom.pc.table.WeaTableType; +import com.engine.organization.annotation.OrganizationTable; +import com.engine.organization.annotation.OrganizationTableColumn; +import com.engine.organization.annotation.OrganizationTableOperate; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + /** * @Author weaver_cl * @Description: * @Date 2022/10/21 * @Version V1.0 **/ + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@OrganizationTable(pageId = "0bf9b7bc-c8b0-4225-bf28-4cd015d96e98", + fields = "t.id," + + "t.ec_manager," + + "t.ec_rolelevel," + + "t.module," + + "t.creator," + + "t.delete_type," + + "t.create_time," + + "t.update_time", + fromSql = "FROM jcl_org_detach t ", + orderby = "id", + sortway = "asc", + primarykey = "id", + operates = { + @OrganizationTableOperate(index = "0", text = "编辑"), + @OrganizationTableOperate(index = "1", text = "删除") + }, + tableType = WeaTableType.CHECKBOX +) public class ManagerDetachVO { + + @OrganizationTableColumn(column = "id", display = false) + private Long id; + + + @OrganizationTableColumn(text = "管理员", width = "20%", column = "ec_manager" ) + private String ecManager; + + @OrganizationTableColumn(text = "可管理组织机构", width = "40%", column = "ec_rolelevel") + private String ecRolelevel; + + + @OrganizationTableColumn(text = "可管理模块", width = "40%", column = "module") + private String module; + } diff --git a/src/com/engine/organization/mapper/detach/ManagerDetachMapper.java b/src/com/engine/organization/mapper/detach/ManagerDetachMapper.java new file mode 100644 index 00000000..8d56eaaa --- /dev/null +++ b/src/com/engine/organization/mapper/detach/ManagerDetachMapper.java @@ -0,0 +1,11 @@ +package com.engine.organization.mapper.detach; + +/** + * @Author weaver_cl + * @Description: + * @Date 2022/10/24 + * @Version V1.0 + **/ +public interface ManagerDetachMapper { + +} diff --git a/src/com/engine/organization/mapper/detach/ManagerDetachMapper.xml b/src/com/engine/organization/mapper/detach/ManagerDetachMapper.xml new file mode 100644 index 00000000..55ca3517 --- /dev/null +++ b/src/com/engine/organization/mapper/detach/ManagerDetachMapper.xml @@ -0,0 +1,231 @@ + + + + + + + + + + + + + + + + + + + + + + + + t + . + id + , t.scheme_no + , t.scheme_name + , t.scheme_description + , t.forbidden_tag + , t.creator + , t.delete_type + , t.create_time + , t.update_time + + + + + + + + + + + + INSERT INTO jcl_org_scheme + + + creator, + + + delete_type, + + + create_time, + + + update_time, + + + scheme_no, + + + scheme_name, + + + scheme_description, + + forbidden_tag, + + + + #{creator}, + + + #{deleteType}, + + + #{createTime}, + + + #{updateTime}, + + + #{schemeNo}, + + + #{schemeName}, + + + #{schemeDescription}, + + 0, + + + + + + select JCL_ORG_SCHEME_ID.currval from dual + + INSERT INTO jcl_org_scheme + + + creator, + + + delete_type, + + + create_time, + + + update_time, + + + scheme_no, + + + scheme_name, + + + scheme_description, + + forbidden_tag, + + + + #{creator}, + + + #{deleteType}, + + + #{createTime}, + + + #{updateTime}, + + + #{schemeNo}, + + + #{schemeName}, + + + #{schemeDescription}, + + 0, + + + + + update jcl_org_scheme + + creator=#{creator}, + update_time=#{updateTime}, + scheme_no=#{schemeNo}, + scheme_name=#{schemeName}, + scheme_description=#{schemeDescription}, + + WHERE id = #{id} AND delete_type = 0 + + + + update jcl_org_scheme + + forbidden_tag=#{forbiddenTag}, + + WHERE id = #{id} AND delete_type = 0 + + + + UPDATE jcl_org_scheme + 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/mapper/employee/EmployeeMapper.java b/src/com/engine/organization/mapper/employee/EmployeeMapper.java index bac40ab8..62d67b67 100644 --- a/src/com/engine/organization/mapper/employee/EmployeeMapper.java +++ b/src/com/engine/organization/mapper/employee/EmployeeMapper.java @@ -2,6 +2,8 @@ package com.engine.organization.mapper.employee; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * @Author weaver_cl @@ -12,4 +14,6 @@ import org.apache.ibatis.annotations.Param; public interface EmployeeMapper { String getEmployeeNameById(@Param("employeeId") Long id); + + List getResourceIds(@Param("lastName") String lastName); } diff --git a/src/com/engine/organization/mapper/employee/EmployeeMapper.xml b/src/com/engine/organization/mapper/employee/EmployeeMapper.xml index e00791d6..bb06ca67 100644 --- a/src/com/engine/organization/mapper/employee/EmployeeMapper.xml +++ b/src/com/engine/organization/mapper/employee/EmployeeMapper.xml @@ -2,10 +2,37 @@ + + + AND t.lastname like CONCAT('%',#{lastName},'%') + + + + + AND t.lastname like '%'||#{lastName}||'%' + + + + + AND t.lastname like '%'+#{lastName}+'%' + + + + + + + + + \ No newline at end of file diff --git a/src/com/engine/organization/service/ManagerDetachService.java b/src/com/engine/organization/service/ManagerDetachService.java index 42c6d4b0..c3b6185e 100644 --- a/src/com/engine/organization/service/ManagerDetachService.java +++ b/src/com/engine/organization/service/ManagerDetachService.java @@ -1,5 +1,7 @@ package com.engine.organization.service; +import java.util.Map; + /** * @Author weaver_cl * @Description: @@ -7,4 +9,18 @@ package com.engine.organization.service; * @Version V1.0 **/ public interface ManagerDetachService { + + /** + * 获取table列表 + * @param params + * @return + */ + Map listPage(Map params); + + /** + * 新建编辑表单 + * @param id + * @return + */ + Map getForm(Integer id); } diff --git a/src/com/engine/organization/service/impl/ManagerDetachServiceImpl.java b/src/com/engine/organization/service/impl/ManagerDetachServiceImpl.java index 2d91fd7c..006731f9 100644 --- a/src/com/engine/organization/service/impl/ManagerDetachServiceImpl.java +++ b/src/com/engine/organization/service/impl/ManagerDetachServiceImpl.java @@ -1,7 +1,22 @@ package com.engine.organization.service.impl; +import com.api.browser.bean.SearchConditionGroup; +import com.api.browser.bean.SearchConditionItem; +import com.cloudstore.eccom.result.WeaResultMsg; import com.engine.core.impl.Service; +import com.engine.organization.component.OrganizationWeaTable; +import com.engine.organization.entity.detach.vo.ManagerDetachVO; +import com.engine.organization.mapper.employee.EmployeeMapper; import com.engine.organization.service.ManagerDetachService; +import com.engine.organization.util.HasRightUtil; +import com.engine.organization.util.OrganizationFormItemUtil; +import com.engine.organization.util.db.MapperProxyFactory; +import org.apache.commons.lang3.StringUtils; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * @Author weaver_cl @@ -10,4 +25,62 @@ import com.engine.organization.service.ManagerDetachService; * @Version V1.0 **/ public class ManagerDetachServiceImpl extends Service implements ManagerDetachService { + + + private static final String RIGHT_NAME = "MangerDeatch:All"; + + @Override + public Map listPage(Map params) { + Map resultMap = new HashMap<>(); + boolean hasRight = HasRightUtil.hasRight(user, RIGHT_NAME, true); + resultMap.put("hasRight", hasRight); + if (!hasRight) { + return resultMap; + } + OrganizationWeaTable table = new OrganizationWeaTable<>(user, ManagerDetachVO.class); + String sqlWhere = buildSqlWhere(params); + table.setSqlwhere(sqlWhere); + WeaResultMsg result = new WeaResultMsg(false); + result.putAll(table.makeDataResult()); + result.success(); + resultMap.putAll(result.getResultMap()); + + return resultMap; + } + + @Override + public Map getForm(Integer id) { + Map apiDatas = new HashMap<>(); + List selectItems = new ArrayList<>(); + List addGroups = new ArrayList<>(); + SearchConditionItem ecManager = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, "管理员", "1", "ecManager", ""); + ecManager.setRules("required|string"); + SearchConditionItem ecRolelevel = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "可维护机构", "194", "ecRolelevel", ""); + ecRolelevel.setRules("required|string"); + SearchConditionItem module = OrganizationFormItemUtil.checkboxItem(user, 2, 16, 1, false, "可管理模块", "module"); + if (id != null) { + //todo + } + selectItems.add(ecManager); + selectItems.add(ecRolelevel); + selectItems.add(module); + addGroups.add(new SearchConditionGroup("基本信息", true, selectItems)); + apiDatas.put("condition", addGroups); + return apiDatas; + } + + private String buildSqlWhere(Map params) { + String sqlWhere = " where 1 = 1"; + String lastName = (String) params.get("ecManager"); + List resourceIds = MapperProxyFactory.getProxy(EmployeeMapper.class).getResourceIds(lastName); + String ecManager = StringUtils.join(resourceIds,","); + if (StringUtils.isNotBlank(ecManager)) { + sqlWhere += " AND ec_manager in ("+ecManager+") "; + } + String ecRolelevel = (String) params.get("ecRolelevel"); + if (StringUtils.isNotBlank(ecRolelevel)) { + sqlWhere += " AND ec_rolelevel in ("+ecRolelevel+")"; + } + return sqlWhere; + } } diff --git a/src/com/engine/organization/web/ManagerDetachController.java b/src/com/engine/organization/web/ManagerDetachController.java index bb6731dc..915710a7 100644 --- a/src/com/engine/organization/web/ManagerDetachController.java +++ b/src/com/engine/organization/web/ManagerDetachController.java @@ -2,16 +2,16 @@ package com.engine.organization.web; import com.engine.common.util.ParamUtil; import com.engine.common.util.ServiceUtil; +import com.engine.organization.entity.DeleteParam; import com.engine.organization.util.response.ReturnResult; import com.engine.organization.wrapper.ManagerDetachWrapper; +import io.swagger.v3.oas.annotations.parameters.RequestBody; 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.Produces; +import javax.ws.rs.*; import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; import java.util.Map; @@ -29,7 +29,6 @@ public class ManagerDetachController { } - @GET @Path("/getTable") @Produces(MediaType.APPLICATION_JSON) @@ -42,4 +41,55 @@ public class ManagerDetachController { return ReturnResult.exceptionHandle(e); } } + + + @GET + @Path("/getTableBtn") + @Produces(MediaType.APPLICATION_JSON) + public ReturnResult getTableBtn(@Context HttpServletRequest request, @Context HttpServletResponse response) { + try { + User user = HrmUserVarify.getUser(request, response); + return ReturnResult.successed(getManagerDetachWrapper(user).getTableBtn()); + } catch (Exception e) { + return ReturnResult.exceptionHandle(e); + } + } + + + @GET + @Path("/getSearchCondition") + @Produces(MediaType.APPLICATION_JSON) + public ReturnResult getSearchCondition(@Context HttpServletRequest request, @Context HttpServletResponse response) { + try { + User user = HrmUserVarify.getUser(request, response); + return ReturnResult.successed(getManagerDetachWrapper(user).getSearchCondition()); + } catch (Exception e) { + return ReturnResult.exceptionHandle(e); + } + } + + @GET + @Path("/getForm") + @Produces(MediaType.APPLICATION_JSON) + public ReturnResult getForm(@Context HttpServletRequest request, @Context HttpServletResponse response, + @QueryParam("id") Integer id) { + try { + User user = HrmUserVarify.getUser(request, response); + return ReturnResult.successed(getManagerDetachWrapper(user).getForm(id)); + } catch (Exception e) { + return ReturnResult.exceptionHandle(e); + } + } + + @POST + @Path("/deleteByIds") + @Produces(MediaType.APPLICATION_JSON) + public ReturnResult deleteByIds(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody DeleteParam param) { + try { + User user = HrmUserVarify.getUser(request, response); + return ReturnResult.successed(getManagerDetachWrapper(user).deleteByIds(param.getIds())); + } catch (Exception e) { + return ReturnResult.exceptionHandle(e); + } + } } diff --git a/src/com/engine/organization/wrapper/ManagerDetachWrapper.java b/src/com/engine/organization/wrapper/ManagerDetachWrapper.java index 8e43f772..2deb5ef6 100644 --- a/src/com/engine/organization/wrapper/ManagerDetachWrapper.java +++ b/src/com/engine/organization/wrapper/ManagerDetachWrapper.java @@ -1,12 +1,19 @@ package com.engine.organization.wrapper; +import com.api.browser.bean.SearchConditionGroup; +import com.api.browser.bean.SearchConditionItem; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; +import com.engine.organization.annotation.Log; +import com.engine.organization.enums.LogModuleNameEnum; +import com.engine.organization.enums.OperateTypeEnum; import com.engine.organization.service.ManagerDetachService; import com.engine.organization.service.impl.ManagerDetachServiceImpl; +import com.engine.organization.util.MenuBtn; +import com.engine.organization.util.OrganizationFormItemUtil; import weaver.hrm.User; -import java.util.Map; +import java.util.*; /** * @Author weaver_cl @@ -21,6 +28,32 @@ public class ManagerDetachWrapper extends Service { } public Map listPage(Map params) { - return null; + return getManagerDetachService(user).listPage(params); + } + + public Map> getTableBtn() { + return MenuBtn.getCommonBtnDatas(); + } + + public Map getSearchCondition() { + Map apiDatas = new HashMap<>(); + List addGroups = new ArrayList<>(); + List conditionItems = new ArrayList<>(); + SearchConditionItem ecManager = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "管理员名称", "ecManager"); + SearchConditionItem ecRolelevel = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "可管理组织机构", "194", "ecRolelevel", ""); + conditionItems.add(ecManager); + conditionItems.add(ecRolelevel); + addGroups.add(new SearchConditionGroup("高级搜索条件", true, conditionItems)); + apiDatas.put("conditions", addGroups); + return apiDatas; + } + + public Map getForm(Integer id) { + return getManagerDetachService(user).getForm(id); + } + + @Log(operateType = OperateTypeEnum.DELETE,operateModule = LogModuleNameEnum.OTHER,operateDesc = "删除") + public int deleteByIds(Collection ids) { + return -1; } } From f6ea4425cf71119e37f0ee33207b6f9544ca191b Mon Sep 17 00:00:00 2001 From: Chengliang <1546584672@qq.com> Date: Tue, 25 Oct 2022 17:48:22 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E6=A8=A1=E5=9D=97=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=88=86=E6=9D=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/表结构SQL/MySQL.sql | 4 +- docs/表结构SQL/Oracle.sql | 4 +- docs/表结构SQL/SqlServer.sql | 4 +- .../detach/param/ManagerDetachParam.java | 34 +++ .../entity/detach/po/ManagerDetachPO.java | 14 +- .../entity/detach/vo/ManagerDetachVO.java | 6 +- .../mapper/detach/ManagerDetachMapper.java | 13 + .../mapper/detach/ManagerDetachMapper.xml | 238 ++++++++---------- .../service/ManagerDetachService.java | 17 ++ .../impl/ManagerDetachServiceImpl.java | 40 ++- .../web/ManagerDetachController.java | 26 ++ .../wrapper/ManagerDetachWrapper.java | 36 ++- 12 files changed, 283 insertions(+), 153 deletions(-) create mode 100644 src/com/engine/organization/entity/detach/param/ManagerDetachParam.java diff --git a/docs/表结构SQL/MySQL.sql b/docs/表结构SQL/MySQL.sql index 2b9a0909..5bb92ee6 100644 --- a/docs/表结构SQL/MySQL.sql +++ b/docs/表结构SQL/MySQL.sql @@ -548,12 +548,12 @@ create table JCL_ORG_ITEM ( -- JCL_ORG_DETACH create table JCL_ORG_DETACH ( id int auto_increment not null, - type int null, + manager_type int null, ec_manager text not null, jcl_manager text not null, ec_rolelevel text not null, jcl_rolelevel text not null, - module text not null, + manage_module text not 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 74245544..67b0c456 100644 --- a/docs/表结构SQL/Oracle.sql +++ b/docs/表结构SQL/Oracle.sql @@ -490,12 +490,12 @@ CREATE TABLE JCL_ORG_HRMRELATION ( -- JCL_ORG_DETACH create table JCL_ORG_DETACH ( id number not null, - type number null, + manager_type number null, ec_manager clob not null, jcl_manager clob not null, ec_rolelevel varchar(4000) not null, jcl_rolelevel varchar(4000) not null, - module varchar(4000) not null, + manage_module varchar(4000) not 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 2db5c0cb..b94299ae 100644 --- a/docs/表结构SQL/SqlServer.sql +++ b/docs/表结构SQL/SqlServer.sql @@ -521,12 +521,12 @@ CREATE TABLE JCL_ORG_MAP ( -- JCL_ORG_DETACH create table JCL_ORG_DETACH ( id int IDENTITY(1,1) not null, - type int null, + manager_type int null, ec_manager text not null, jcl_manager text not null, ec_rolelevel text not null, jcl_rolelevel text not null, - module text not null, + manage_module text not null, creator int null, delete_type int null, create_time date null, diff --git a/src/com/engine/organization/entity/detach/param/ManagerDetachParam.java b/src/com/engine/organization/entity/detach/param/ManagerDetachParam.java new file mode 100644 index 00000000..1944a089 --- /dev/null +++ b/src/com/engine/organization/entity/detach/param/ManagerDetachParam.java @@ -0,0 +1,34 @@ +package com.engine.organization.entity.detach.param; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Author weaver_cl + * @Description: + * @Date 2022/10/25 + * @Version V1.0 + **/ + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class ManagerDetachParam { + + private Integer id; + + private Integer managerType; + + private String ecManager; + + private String jclManager; + + private String ecRolelevel; + + private String jclRolelevel; + + private String manageModule; +} diff --git a/src/com/engine/organization/entity/detach/po/ManagerDetachPO.java b/src/com/engine/organization/entity/detach/po/ManagerDetachPO.java index 40dd9e27..a40e29d2 100644 --- a/src/com/engine/organization/entity/detach/po/ManagerDetachPO.java +++ b/src/com/engine/organization/entity/detach/po/ManagerDetachPO.java @@ -26,27 +26,27 @@ public class ManagerDetachPO { /** * 管理员类型 */ - private Integer type; + private Integer managerType; /** * ec管理员 */ - private String ec_manger; + private String ecManager; /** * jcl管理员 */ - private String jcl_manger; + private String jclManager; /** * ec分部 */ - private String ec_rolelevel; + private String ecRolelevel; /** * jcl分部 */ - private String jcl_rolelevel; + private String jclRolelevel; /** - * 模块 + * 可管理模块 */ - private String module; + private String manageModule; /** * 创建人 */ diff --git a/src/com/engine/organization/entity/detach/vo/ManagerDetachVO.java b/src/com/engine/organization/entity/detach/vo/ManagerDetachVO.java index b87954dd..6a1fdea0 100644 --- a/src/com/engine/organization/entity/detach/vo/ManagerDetachVO.java +++ b/src/com/engine/organization/entity/detach/vo/ManagerDetachVO.java @@ -24,7 +24,7 @@ import lombok.NoArgsConstructor; fields = "t.id," + "t.ec_manager," + "t.ec_rolelevel," + - "t.module," + + "t.manage_module," + "t.creator," + "t.delete_type," + "t.create_time," + @@ -53,7 +53,7 @@ public class ManagerDetachVO { private String ecRolelevel; - @OrganizationTableColumn(text = "可管理模块", width = "40%", column = "module") - private String module; + @OrganizationTableColumn(text = "可管理模块", width = "40%", column = "manage_module") + private String manageModule; } diff --git a/src/com/engine/organization/mapper/detach/ManagerDetachMapper.java b/src/com/engine/organization/mapper/detach/ManagerDetachMapper.java index 8d56eaaa..3b057aa3 100644 --- a/src/com/engine/organization/mapper/detach/ManagerDetachMapper.java +++ b/src/com/engine/organization/mapper/detach/ManagerDetachMapper.java @@ -1,5 +1,11 @@ package com.engine.organization.mapper.detach; +import com.engine.organization.entity.detach.po.ManagerDetachPO; +import org.apache.ibatis.annotations.Param; + +import java.util.Collection; +import java.util.List; + /** * @Author weaver_cl * @Description: @@ -8,4 +14,11 @@ package com.engine.organization.mapper.detach; **/ public interface ManagerDetachMapper { + int insertIgnoreNull(ManagerDetachPO managerDetachPO); + + int updateDetach(ManagerDetachPO managerDetachPO); + + int deleteByIds(@Param("ids") Collection ids); + + List selectByIds(@Param("ids")Collection ids); } diff --git a/src/com/engine/organization/mapper/detach/ManagerDetachMapper.xml b/src/com/engine/organization/mapper/detach/ManagerDetachMapper.xml index 55ca3517..3c56ea21 100644 --- a/src/com/engine/organization/mapper/detach/ManagerDetachMapper.xml +++ b/src/com/engine/organization/mapper/detach/ManagerDetachMapper.xml @@ -1,99 +1,60 @@ - - + + - - - - + + + + + + - - - - - - t - . - id - , t.scheme_no - , t.scheme_name - , t.scheme_description - , t.forbidden_tag + t.id + , t.manager_type + , t.ec_manager + , t.jcl_manager + , t.ec_rolelevel + , t.jcl_rolelevel + , t.manage_module , t.creator , t.delete_type , t.create_time , t.update_time - - - - - - - - INSERT INTO jcl_org_scheme + INSERT INTO jcl_org_detach + + manager_type, + + + ec_manager, + + + jcl_manager, + + + ec_rolelevel, + + + jcl_rolelevel, + + + manage_module, + creator, @@ -106,18 +67,26 @@ update_time, - - scheme_no, + + + + #{managerType}, + + + #{ecManager}, - - scheme_name, + + #{jclManager}, - - scheme_description, + + #{ecRolelevel}, + + + #{jclRolelevel}, + + + #{manageModule}, - forbidden_tag, - - #{creator}, @@ -130,25 +99,33 @@ #{updateTime}, - - #{schemeNo}, - - - #{schemeName}, - - - #{schemeDescription}, - - 0, - + - select JCL_ORG_SCHEME_ID.currval from dual + select JCL_ORG_DETACH_ID.currval from dual - INSERT INTO jcl_org_scheme + INSERT INTO jcl_org_detach + + manager_type, + + + ec_manager, + + + jcl_manager, + + + ec_rolelevel, + + + jcl_rolelevel, + + + manage_module, + creator, @@ -161,18 +138,26 @@ update_time, - - scheme_no, + + + + #{managerType}, + + + #{ecManager}, - - scheme_name, + + #{jclManager}, - - scheme_description, + + #{ecRolelevel}, + + + #{jclRolelevel}, + + + #{manageModule}, - forbidden_tag, - - #{creator}, @@ -185,41 +170,23 @@ #{updateTime}, - - #{schemeNo}, - - - #{schemeName}, - - - #{schemeDescription}, - - 0, - - update jcl_org_scheme + + update jcl_org_detach - creator=#{creator}, - update_time=#{updateTime}, - scheme_no=#{schemeNo}, - scheme_name=#{schemeName}, - scheme_description=#{schemeDescription}, + ecManager=#{ecManager}, + jclManager=#{jclManager}, + ecRolelevel=#{ecRolelevel}, + jclRolelevel=#{jclRolelevel} WHERE id = #{id} AND delete_type = 0 - - update jcl_org_scheme - - forbidden_tag=#{forbiddenTag}, - - WHERE id = #{id} AND delete_type = 0 - - UPDATE jcl_org_scheme + UPDATE jcl_org_detach SET delete_type = 1 WHERE delete_type = 0 AND id IN @@ -228,4 +195,15 @@ + + \ No newline at end of file diff --git a/src/com/engine/organization/service/ManagerDetachService.java b/src/com/engine/organization/service/ManagerDetachService.java index c3b6185e..4c0e0c2f 100644 --- a/src/com/engine/organization/service/ManagerDetachService.java +++ b/src/com/engine/organization/service/ManagerDetachService.java @@ -1,5 +1,8 @@ package com.engine.organization.service; +import com.engine.organization.entity.detach.param.ManagerDetachParam; + +import java.util.Collection; import java.util.Map; /** @@ -23,4 +26,18 @@ public interface ManagerDetachService { * @return */ Map getForm(Integer id); + + /** + * 批量删除 + * @param ids + * @return + */ + int deleteByIds(Collection ids); + + /** + * 新增 + * @param param + * @return + */ + int save(ManagerDetachParam param); } diff --git a/src/com/engine/organization/service/impl/ManagerDetachServiceImpl.java b/src/com/engine/organization/service/impl/ManagerDetachServiceImpl.java index 006731f9..50b2139d 100644 --- a/src/com/engine/organization/service/impl/ManagerDetachServiceImpl.java +++ b/src/com/engine/organization/service/impl/ManagerDetachServiceImpl.java @@ -5,18 +5,20 @@ import com.api.browser.bean.SearchConditionItem; import com.cloudstore.eccom.result.WeaResultMsg; import com.engine.core.impl.Service; import com.engine.organization.component.OrganizationWeaTable; +import com.engine.organization.entity.detach.param.ManagerDetachParam; +import com.engine.organization.entity.detach.po.ManagerDetachPO; import com.engine.organization.entity.detach.vo.ManagerDetachVO; +import com.engine.organization.mapper.detach.ManagerDetachMapper; import com.engine.organization.mapper.employee.EmployeeMapper; +import com.engine.organization.mapper.hrmresource.HrmResourceMapper; import com.engine.organization.service.ManagerDetachService; import com.engine.organization.util.HasRightUtil; import com.engine.organization.util.OrganizationFormItemUtil; import com.engine.organization.util.db.MapperProxyFactory; +import com.engine.organization.util.relation.EcHrmRelationUtil; import org.apache.commons.lang3.StringUtils; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * @Author weaver_cl @@ -29,6 +31,14 @@ public class ManagerDetachServiceImpl extends Service implements ManagerDetachSe private static final String RIGHT_NAME = "MangerDeatch:All"; + public ManagerDetachMapper getMangeDetachMapper() { + return MapperProxyFactory.getProxy(ManagerDetachMapper.class); + } + + public HrmResourceMapper getHrmResourceMapper() { + return MapperProxyFactory.getProxy(HrmResourceMapper.class); + } + @Override public Map listPage(Map params) { Map resultMap = new HashMap<>(); @@ -69,6 +79,28 @@ public class ManagerDetachServiceImpl extends Service implements ManagerDetachSe return apiDatas; } + @Override + public int deleteByIds(Collection ids) { + return getMangeDetachMapper().deleteByIds(ids); + } + + @Override + public int save(ManagerDetachParam param) { + ManagerDetachPO managerDetachPO = ManagerDetachPO.builder() + .managerType(0) + .ecManager(param.getEcManager()) + .jclManager(String.valueOf(getHrmResourceMapper().getJclResourceId(param.getEcManager()))) + .ecRolelevel(param.getEcRolelevel()) + .jclRolelevel(EcHrmRelationUtil.getJclCompanyId(param.getEcRolelevel()) != null ? String.valueOf(EcHrmRelationUtil.getJclCompanyId(param.getEcRolelevel()).getId()) : null) + .creator((long)user.getUID()) + .deleteType(0) + .createTime(new Date()) + .updateTime(new Date()) + .build(); + + return getMangeDetachMapper().insertIgnoreNull(managerDetachPO); + } + private String buildSqlWhere(Map params) { String sqlWhere = " where 1 = 1"; String lastName = (String) params.get("ecManager"); diff --git a/src/com/engine/organization/web/ManagerDetachController.java b/src/com/engine/organization/web/ManagerDetachController.java index 915710a7..ef5f721d 100644 --- a/src/com/engine/organization/web/ManagerDetachController.java +++ b/src/com/engine/organization/web/ManagerDetachController.java @@ -3,6 +3,7 @@ package com.engine.organization.web; import com.engine.common.util.ParamUtil; import com.engine.common.util.ServiceUtil; import com.engine.organization.entity.DeleteParam; +import com.engine.organization.entity.detach.param.ManagerDetachParam; import com.engine.organization.util.response.ReturnResult; import com.engine.organization.wrapper.ManagerDetachWrapper; import io.swagger.v3.oas.annotations.parameters.RequestBody; @@ -92,4 +93,29 @@ public class ManagerDetachController { return ReturnResult.exceptionHandle(e); } } + + + @POST + @Path("/save") + @Produces(MediaType.APPLICATION_JSON) + public ReturnResult saveScheme(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody ManagerDetachParam param) { + try { + User user = HrmUserVarify.getUser(request, response); + return ReturnResult.successed(getManagerDetachWrapper(user).save(param)); + } catch (Exception e) { + return ReturnResult.exceptionHandle(e); + } + } + + @POST + @Path("/updateScheme") + @Produces(MediaType.APPLICATION_JSON) + public ReturnResult updateScheme(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody ManagerDetachParam param) { + try { + User user = HrmUserVarify.getUser(request, response); + return ReturnResult.successed(getManagerDetachWrapper(user).updateDetach(param)); + } catch (Exception e) { + return ReturnResult.exceptionHandle(e); + } + } } diff --git a/src/com/engine/organization/wrapper/ManagerDetachWrapper.java b/src/com/engine/organization/wrapper/ManagerDetachWrapper.java index 2deb5ef6..8a6c23bb 100644 --- a/src/com/engine/organization/wrapper/ManagerDetachWrapper.java +++ b/src/com/engine/organization/wrapper/ManagerDetachWrapper.java @@ -1,16 +1,21 @@ package com.engine.organization.wrapper; +import com.alibaba.fastjson.JSON; import com.api.browser.bean.SearchConditionGroup; import com.api.browser.bean.SearchConditionItem; import com.engine.common.util.ServiceUtil; -import com.engine.core.impl.Service; import com.engine.organization.annotation.Log; +import com.engine.organization.entity.detach.param.ManagerDetachParam; +import com.engine.organization.entity.detach.po.ManagerDetachPO; import com.engine.organization.enums.LogModuleNameEnum; import com.engine.organization.enums.OperateTypeEnum; +import com.engine.organization.mapper.detach.ManagerDetachMapper; import com.engine.organization.service.ManagerDetachService; import com.engine.organization.service.impl.ManagerDetachServiceImpl; import com.engine.organization.util.MenuBtn; import com.engine.organization.util.OrganizationFormItemUtil; +import com.engine.organization.util.OrganizationWrapper; +import com.engine.organization.util.db.MapperProxyFactory; import weaver.hrm.User; import java.util.*; @@ -21,7 +26,7 @@ import java.util.*; * @Date 2022/10/21 * @Version V1.0 **/ -public class ManagerDetachWrapper extends Service { +public class ManagerDetachWrapper extends OrganizationWrapper { public ManagerDetachService getManagerDetachService(User user) { return ServiceUtil.getService(ManagerDetachServiceImpl.class,user); @@ -52,8 +57,33 @@ public class ManagerDetachWrapper extends Service { return getManagerDetachService(user).getForm(id); } - @Log(operateType = OperateTypeEnum.DELETE,operateModule = LogModuleNameEnum.OTHER,operateDesc = "删除") + @Log(operateType = OperateTypeEnum.DELETE,operateModule = LogModuleNameEnum.OTHER,operateDesc = "删除分权数据") public int deleteByIds(Collection ids) { + List managerDetachPOS = MapperProxyFactory.getProxy(ManagerDetachMapper.class).selectByIds(ids); + int deleteByIds = getManagerDetachService(user).deleteByIds(ids); + for (ManagerDetachPO managerDetachPO : managerDetachPOS) { + writeOperateLog(new Object() { + }.getClass(), managerDetachPO.getEcManager(), JSON.toJSONString(ids), "删除等级方案"); + } + return deleteByIds; + } + + + @Log(operateType = OperateTypeEnum.ADD,operateModule = LogModuleNameEnum.OTHER,operateDesc = "新增分权管理员") + public int save(ManagerDetachParam param) { + int save = getManagerDetachService(user).save(param); + writeOperateLog(new Object() { + }.getClass(), param.getEcManager(), JSON.toJSONString(param), "新增分权管理员"); + return save; + } + + @Log(operateType = OperateTypeEnum.UPDATE, operateModule = LogModuleNameEnum.OTHER, operateDesc = "分权数据更新") + public int updateDetach(ManagerDetachParam param) { +// SchemePO schemeByID = getSchemeMapper().getSchemeByID(param.getId()); +// int updateScheme = getManagerDetachService(user).updateDetach(param); +// writeOperateLog(new Object() { +// }.getClass(), schemeByID.getSchemeName(), JSON.toJSONString(param), schemeByID, getSchemeMapper().getSchemeByID(param.getId())); +// return updateScheme; return -1; } } From 96cefec8915491126ce58bbffd4153e3286a40e2 Mon Sep 17 00:00:00 2001 From: Chengliang <1546584672@qq.com> Date: Wed, 26 Oct 2022 17:11:23 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E6=A8=A1=E5=9D=97=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=88=86=E6=9D=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/detach/ManagerDetachMapper.java | 2 ++ .../mapper/detach/ManagerDetachMapper.xml | 10 +++++++- .../service/ManagerDetachService.java | 7 ++++++ .../impl/ManagerDetachServiceImpl.java | 24 +++++++++++++++++-- .../web/ManagerDetachController.java | 2 +- .../wrapper/ManagerDetachWrapper.java | 11 ++++----- 6 files changed, 46 insertions(+), 10 deletions(-) diff --git a/src/com/engine/organization/mapper/detach/ManagerDetachMapper.java b/src/com/engine/organization/mapper/detach/ManagerDetachMapper.java index 3b057aa3..5cd47c4c 100644 --- a/src/com/engine/organization/mapper/detach/ManagerDetachMapper.java +++ b/src/com/engine/organization/mapper/detach/ManagerDetachMapper.java @@ -21,4 +21,6 @@ public interface ManagerDetachMapper { int deleteByIds(@Param("ids") Collection ids); List selectByIds(@Param("ids")Collection ids); + + ManagerDetachPO getDetachById(@Param("id") Integer id); } diff --git a/src/com/engine/organization/mapper/detach/ManagerDetachMapper.xml b/src/com/engine/organization/mapper/detach/ManagerDetachMapper.xml index 3c56ea21..cfd02f55 100644 --- a/src/com/engine/organization/mapper/detach/ManagerDetachMapper.xml +++ b/src/com/engine/organization/mapper/detach/ManagerDetachMapper.xml @@ -198,7 +198,7 @@ + + \ No newline at end of file diff --git a/src/com/engine/organization/service/ManagerDetachService.java b/src/com/engine/organization/service/ManagerDetachService.java index 4c0e0c2f..c277693a 100644 --- a/src/com/engine/organization/service/ManagerDetachService.java +++ b/src/com/engine/organization/service/ManagerDetachService.java @@ -40,4 +40,11 @@ public interface ManagerDetachService { * @return */ int save(ManagerDetachParam param); + + /** + * 更新 + * @param param + * @return + */ + int updateDetach(ManagerDetachParam param); } diff --git a/src/com/engine/organization/service/impl/ManagerDetachServiceImpl.java b/src/com/engine/organization/service/impl/ManagerDetachServiceImpl.java index 50b2139d..b74a4b80 100644 --- a/src/com/engine/organization/service/impl/ManagerDetachServiceImpl.java +++ b/src/com/engine/organization/service/impl/ManagerDetachServiceImpl.java @@ -2,6 +2,7 @@ package com.engine.organization.service.impl; import com.api.browser.bean.SearchConditionGroup; import com.api.browser.bean.SearchConditionItem; +import com.api.browser.bean.SearchConditionOption; import com.cloudstore.eccom.result.WeaResultMsg; import com.engine.core.impl.Service; import com.engine.organization.component.OrganizationWeaTable; @@ -63,11 +64,18 @@ public class ManagerDetachServiceImpl extends Service implements ManagerDetachSe Map apiDatas = new HashMap<>(); List selectItems = new ArrayList<>(); List addGroups = new ArrayList<>(); + List selectOptions = new ArrayList<>(); + SearchConditionOption moduleOption = new SearchConditionOption("0", "组织管理",true); + selectOptions.add(moduleOption); + SearchConditionItem ecManager = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, "管理员", "1", "ecManager", ""); ecManager.setRules("required|string"); - SearchConditionItem ecRolelevel = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "可维护机构", "194", "ecRolelevel", ""); + SearchConditionItem ecRolelevel = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, "可维护机构", "194", "ecRolelevel", ""); ecRolelevel.setRules("required|string"); - SearchConditionItem module = OrganizationFormItemUtil.checkboxItem(user, 2, 16, 1, false, "可管理模块", "module"); + SearchConditionItem module = OrganizationFormItemUtil.selectItem(user, selectOptions, 2, 16, 6, false, "可管理模块", "module"); + module.setViewAttr(1); + module.setDetailtype(2); + module.setHasBorder(true); if (id != null) { //todo } @@ -92,6 +100,7 @@ public class ManagerDetachServiceImpl extends Service implements ManagerDetachSe .jclManager(String.valueOf(getHrmResourceMapper().getJclResourceId(param.getEcManager()))) .ecRolelevel(param.getEcRolelevel()) .jclRolelevel(EcHrmRelationUtil.getJclCompanyId(param.getEcRolelevel()) != null ? String.valueOf(EcHrmRelationUtil.getJclCompanyId(param.getEcRolelevel()).getId()) : null) + .manageModule("组织管理") .creator((long)user.getUID()) .deleteType(0) .createTime(new Date()) @@ -101,6 +110,17 @@ public class ManagerDetachServiceImpl extends Service implements ManagerDetachSe return getMangeDetachMapper().insertIgnoreNull(managerDetachPO); } + @Override + public int updateDetach(ManagerDetachParam param) { + ManagerDetachPO managerDetachPO = ManagerDetachPO.builder() + .ecManager(param.getEcManager()) + .jclManager(String.valueOf(getHrmResourceMapper().getJclResourceId(param.getEcManager()))) + .ecRolelevel(param.getEcRolelevel()) + .jclRolelevel(EcHrmRelationUtil.getJclCompanyId(param.getEcRolelevel()) != null ? String.valueOf(EcHrmRelationUtil.getJclCompanyId(param.getEcRolelevel()).getId()) : null) + .build(); + return getMangeDetachMapper().updateDetach(managerDetachPO); + } + private String buildSqlWhere(Map params) { String sqlWhere = " where 1 = 1"; String lastName = (String) params.get("ecManager"); diff --git a/src/com/engine/organization/web/ManagerDetachController.java b/src/com/engine/organization/web/ManagerDetachController.java index ef5f721d..b3e64274 100644 --- a/src/com/engine/organization/web/ManagerDetachController.java +++ b/src/com/engine/organization/web/ManagerDetachController.java @@ -108,7 +108,7 @@ public class ManagerDetachController { } @POST - @Path("/updateScheme") + @Path("/update") @Produces(MediaType.APPLICATION_JSON) public ReturnResult updateScheme(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody ManagerDetachParam param) { try { diff --git a/src/com/engine/organization/wrapper/ManagerDetachWrapper.java b/src/com/engine/organization/wrapper/ManagerDetachWrapper.java index 8a6c23bb..c1ddb9bb 100644 --- a/src/com/engine/organization/wrapper/ManagerDetachWrapper.java +++ b/src/com/engine/organization/wrapper/ManagerDetachWrapper.java @@ -79,11 +79,10 @@ public class ManagerDetachWrapper extends OrganizationWrapper { @Log(operateType = OperateTypeEnum.UPDATE, operateModule = LogModuleNameEnum.OTHER, operateDesc = "分权数据更新") public int updateDetach(ManagerDetachParam param) { -// SchemePO schemeByID = getSchemeMapper().getSchemeByID(param.getId()); -// int updateScheme = getManagerDetachService(user).updateDetach(param); -// writeOperateLog(new Object() { -// }.getClass(), schemeByID.getSchemeName(), JSON.toJSONString(param), schemeByID, getSchemeMapper().getSchemeByID(param.getId())); -// return updateScheme; - return -1; + ManagerDetachPO managerDetachPO = MapperProxyFactory.getProxy(ManagerDetachMapper.class).getDetachById(param.getId()); + int result = getManagerDetachService(user).updateDetach(param); + writeOperateLog(new Object() { + }.getClass(), managerDetachPO.getEcManager(), JSON.toJSONString(param), managerDetachPO, MapperProxyFactory.getProxy(ManagerDetachMapper.class).getDetachById(param.getId())); + return result; } } From 939e6c7607c3eab7f21e5dc24c07dc8f11c7815a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98ml=E2=80=99?= Date: Fri, 21 Oct 2022 15:53:15 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E5=88=86=E9=83=A8=E8=BD=AC=E7=A7=BB?= =?UTF-8?q?=E3=80=81=E9=83=A8=E9=97=A8=E8=BD=AC=E7=A7=BB=E3=80=81=E5=B2=97?= =?UTF-8?q?=E4=BD=8D=E5=90=88=E5=B9=B6=E4=BF=AE=E5=A4=8D1021?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../organization/mapper/staff/StaffMapper.xml | 10 +++ .../thread/DepartmentTriggerRunnable.java | 12 ++++ .../thread/JobTriggerRunnable.java | 61 +++++++++++++++++++ 3 files changed, 83 insertions(+) diff --git a/src/com/engine/organization/mapper/staff/StaffMapper.xml b/src/com/engine/organization/mapper/staff/StaffMapper.xml index f5131b54..c7e96731 100644 --- a/src/com/engine/organization/mapper/staff/StaffMapper.xml +++ b/src/com/engine/organization/mapper/staff/StaffMapper.xml @@ -341,6 +341,7 @@ inner join jcl_org_staffplan b on a.plan_id = b.id WHERE a.delete_type = 0 and b.control_dimension = #{ftype} +<<<<<<< HEAD and a.comp_id = #{compId} @@ -348,6 +349,15 @@ and a.job_id = #{jobId} +======= + and t.comp_id = #{compId} + + + and t.dept_id = #{deptId} + + + and t.job_id = #{jobId} +>>>>>>> 162e591 (分部转移、部门转移、岗位合并修复1021) \ No newline at end of file diff --git a/src/com/engine/organization/thread/DepartmentTriggerRunnable.java b/src/com/engine/organization/thread/DepartmentTriggerRunnable.java index 29f349b8..1e30e7b9 100644 --- a/src/com/engine/organization/thread/DepartmentTriggerRunnable.java +++ b/src/com/engine/organization/thread/DepartmentTriggerRunnable.java @@ -168,6 +168,7 @@ public class DepartmentTriggerRunnable implements Runnable { if (1 != newDepartment.getDeleteType() && 1 != newDepartment.getForbiddenTag()) { MapperProxyFactory.getProxy(JclOrgMapper.class).insertMap(jclMap); +<<<<<<< HEAD } if(null != jclOrgMapByObjID) { updateParentPlanAndJob(jclMap.getFDateBegin(), jclOrgMapByObjID.getFParentId().toString()); @@ -181,6 +182,17 @@ public class DepartmentTriggerRunnable implements Runnable { } if (null != oldFparentId) { updateParentPlanAndJob(jclMap.getFDateBegin(), oldFparentId); +======= + if(null != jclOrgMapByObjID) { + updateParentPlanAndJob(currentDate, jclOrgMapByObjID.getFParentId().toString()); + } + if(null != moveTarget){ + updateParentPlanAndJob(currentDate, moveTarget); + } + if (null != oldFparentId) { + updateParentPlanAndJob(currentDate, oldFparentId); + } +>>>>>>> 162e591 (分部转移、部门转移、岗位合并修复1021) } } } diff --git a/src/com/engine/organization/thread/JobTriggerRunnable.java b/src/com/engine/organization/thread/JobTriggerRunnable.java index 5be8d6e6..eb3dd2ae 100644 --- a/src/com/engine/organization/thread/JobTriggerRunnable.java +++ b/src/com/engine/organization/thread/JobTriggerRunnable.java @@ -14,6 +14,7 @@ import com.engine.organization.util.OrganizationDateUtil; import com.engine.organization.util.db.MapperProxyFactory; import org.apache.commons.collections.CollectionUtils; import weaver.common.DateUtil; +import weaver.general.Util; import java.sql.Date; import java.util.Calendar; @@ -73,6 +74,7 @@ public class JobTriggerRunnable implements Runnable { return; } // 判断 +<<<<<<< HEAD JclOrgMap jclMap = new JclOrgMap(); int st = 100000000; int sj = 200000000; @@ -115,6 +117,43 @@ public class JobTriggerRunnable implements Runnable { if (null != jclOrgMap) { jclMap.setFPlan((null != staffPO ? staffPO.getStaffNum() : 0) + jclOrgMap.getFPlan()); jclMap.setFOnJob(jclOrgMapByObjID.getFOnJob() + jclOrgMap.getFOnJob()); +======= + if (diffFields.contains("jobName") || diffFields.contains("parentDept") || diffFields.contains("parentJob") || diffFields.contains("forbiddenTag") || diffFields.contains("deleteType")) { + JclOrgMap jclMap = new JclOrgMap(); + int st = 100000000; + int sj = 200000000; + jclMap.setFType(3); + // 更新逻辑 + jclMap.setFObjId(newJob.getId().intValue()); + jclMap.setId(newJob.getId().intValue() + sj); + jclMap.setFNumber(newJob.getJobNo()); + jclMap.setFName(newJob.getJobName()); + jclMap.setFParentId(null == newJob.getParentJob() ? newJob.getParentDept().intValue() + st : newJob.getParentJob().intValue() + sj); + jclMap.setFObjParentId(null == newJob.getParentJob() ? newJob.getParentDept().intValue() : newJob.getParentJob().intValue()); + Integer parentdept = newJob.getParentDept().intValue(); + + jclMap.setFClass(0); + jclMap.setFClassName("行政维度"); + + String currentDate = OrganizationDateUtil.getFormatLocalDate(new java.util.Date()); + jclMap.setFDateBegin(new Date(OrganizationDateUtil.stringToDate(currentDate).getTime())); + jclMap.setFDateEnd(new Date(OrganizationDateUtil.stringToDate("2099-12-31").getTime())); + + JclOrgMap jclOrgMapByObjID = MapperProxyFactory.getProxy(JclOrgMapper.class).getJclOrgMapByObjID(currentDate, ModuleTypeEnum.jobfielddefined.getValue().toString(), jclMap.getFObjId().toString()); + + // 该岗位有下级岗位时,查询 + JclOrgMap jclOrgMap = MapperProxyFactory.getProxy(JclOrgMapper.class).getSumPlanAndJobByFParentId(currentDate, jclMap.getId().toString()); + + if (null != jclOrgMapByObjID) { + if (null != jclOrgMap) { + StaffPO staffPO = MapperProxyFactory.getProxy(StaffMapper.class).getStaffsByParamId(null,null, jclOrgMapByObjID.getFObjId().toString()); + jclMap.setFPlan((null != staffPO ? staffPO.getStaffNum() : 0) + jclOrgMap.getFPlan()); + jclMap.setFOnJob(jclOrgMapByObjID.getFOnJob() + jclOrgMap.getFOnJob()); + } else { + jclMap.setFPlan(jclOrgMapByObjID.getFPlan()); + jclMap.setFOnJob(jclOrgMapByObjID.getFOnJob()); + } +>>>>>>> 162e591 (分部转移、部门转移、岗位合并修复1021) } else { jclMap.setFPlan(null != staffPO ? staffPO.getStaffNum() : 0); jclMap.setFOnJob(jclOrgMapByObjID.getFOnJob()); @@ -125,6 +164,7 @@ public class JobTriggerRunnable implements Runnable { } jclMap.setFIsVitual(0); +<<<<<<< HEAD Calendar cal = Calendar.getInstance(); cal.setTime(jclMap.getFDateBegin()); Calendar calendar = DateUtil.addDay(cal, -1); @@ -147,6 +187,27 @@ public class JobTriggerRunnable implements Runnable { if (null != oldJob) { if (null != oldJob.getId()) { updateParentPlanAndJob(jclMap.getFDateBegin(), oldJob.getId().toString()); +======= + Calendar cal = Calendar.getInstance(); + cal.setTime(jclMap.getFDateBegin()); + Calendar calendar = DateUtil.addDay(cal, -1); + Date time = new Date(calendar.getTime().getTime()); + getCompTriggerMapper().deleteMap(jclMap.getFType(), jclMap.getFObjId(), jclMap.getFDateBegin()); + getCompTriggerMapper().updateMap(jclMap.getFType(), jclMap.getFObjId(), jclMap.getFDateBegin(), time); + + if (1 != newJob.getDeleteType() && 1 != newJob.getForbiddenTag()) { + MapperProxyFactory.getProxy(JclOrgMapper.class).insertMap(jclMap); + if (null != jclOrgMapByObjID) { + if(null != jclOrgMapByObjID.getFParentId()){ + updateParentPlanAndJob(currentDate, jclOrgMapByObjID.getFParentId().toString()); + } + } + if (null != oldJob) { + if (null != oldJob.getId()){ + updateParentPlanAndJob(currentDate, oldJob.getId().toString()); + } + } +>>>>>>> 162e591 (分部转移、部门转移、岗位合并修复1021) } } From 1be79b9698ff19d668673baa83ab16869728ca48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98ml=E2=80=99?= Date: Mon, 24 Oct 2022 16:00:00 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E5=88=86=E9=83=A8=E3=80=81=E9=83=A8?= =?UTF-8?q?=E9=97=A8=E3=80=81=E5=B2=97=E4=BD=8D=E7=A6=81=E7=94=A8=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D1024?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/organization/wrapper/JobWrapper.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/com/engine/organization/wrapper/JobWrapper.java b/src/com/engine/organization/wrapper/JobWrapper.java index 2e447fe1..951e4ae0 100644 --- a/src/com/engine/organization/wrapper/JobWrapper.java +++ b/src/com/engine/organization/wrapper/JobWrapper.java @@ -11,9 +11,11 @@ import com.engine.organization.entity.job.param.JobMergeParam; import com.engine.organization.entity.job.param.JobSearchParam; import com.engine.organization.entity.job.po.JobPO; import com.engine.organization.entity.searchtree.SearchTreeParams; +import com.engine.organization.entity.staff.po.StaffPO; import com.engine.organization.enums.LogModuleNameEnum; import com.engine.organization.enums.OperateTypeEnum; import com.engine.organization.mapper.job.JobMapper; +import com.engine.organization.mapper.staff.StaffMapper; import com.engine.organization.service.JobService; import com.engine.organization.service.impl.JobServiceImpl; import com.engine.organization.thread.JobTriggerRunnable; From ef392f4d0a2c8e61379efc258688379fd8cfa544 Mon Sep 17 00:00:00 2001 From: Chengliang <1546584672@qq.com> Date: Thu, 27 Oct 2022 14:38:06 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E6=A8=A1=E5=9D=97=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=88=86=E6=9D=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/表结构SQL/MySQL.sql | 4 +-- docs/表结构SQL/Oracle.sql | 4 +-- docs/表结构SQL/SqlServer.sql | 4 +-- .../detach/param/ManagerDetachParam.java | 4 +-- .../entity/detach/po/ManagerDetachPO.java | 4 +-- .../entity/detach/vo/ManagerDetachVO.java | 6 ++-- .../organization/enums/LogModuleNameEnum.java | 1 + .../mapper/detach/ManagerDetachMapper.xml | 12 +++---- .../mapper/employee/EmployeeMapper.java | 4 +++ .../mapper/employee/EmployeeMapper.xml | 11 +++++- .../mapper/hrmresource/SystemDataMapper.java | 3 ++ .../mapper/hrmresource/SystemDataMapper.xml | 13 +++++++ .../impl/ManagerDetachServiceImpl.java | 35 +++++++++++++++---- .../transmethod/ManagerDetachTransMethod.java | 33 +++++++++++++++++ .../wrapper/ManagerDetachWrapper.java | 14 ++++---- 15 files changed, 118 insertions(+), 34 deletions(-) create mode 100644 src/com/engine/organization/transmethod/ManagerDetachTransMethod.java diff --git a/docs/表结构SQL/MySQL.sql b/docs/表结构SQL/MySQL.sql index 5bb92ee6..6cffd642 100644 --- a/docs/表结构SQL/MySQL.sql +++ b/docs/表结构SQL/MySQL.sql @@ -549,8 +549,8 @@ create table JCL_ORG_ITEM ( create table JCL_ORG_DETACH ( id int auto_increment not null, manager_type int null, - ec_manager text not null, - jcl_manager text not null, + ec_manager int not null, + jcl_manager int not null, ec_rolelevel text not null, jcl_rolelevel text not null, manage_module text not null, diff --git a/docs/表结构SQL/Oracle.sql b/docs/表结构SQL/Oracle.sql index 67b0c456..a142b274 100644 --- a/docs/表结构SQL/Oracle.sql +++ b/docs/表结构SQL/Oracle.sql @@ -491,8 +491,8 @@ CREATE TABLE JCL_ORG_HRMRELATION ( create table JCL_ORG_DETACH ( id number not null, manager_type number null, - ec_manager clob not null, - jcl_manager clob not null, + ec_manager NUMBER not null, + jcl_manager NUMBER not null, ec_rolelevel varchar(4000) not null, jcl_rolelevel varchar(4000) not null, manage_module varchar(4000) not null, diff --git a/docs/表结构SQL/SqlServer.sql b/docs/表结构SQL/SqlServer.sql index b94299ae..93a84834 100644 --- a/docs/表结构SQL/SqlServer.sql +++ b/docs/表结构SQL/SqlServer.sql @@ -522,8 +522,8 @@ CREATE TABLE JCL_ORG_MAP ( create table JCL_ORG_DETACH ( id int IDENTITY(1,1) not null, manager_type int null, - ec_manager text not null, - jcl_manager text not null, + ec_manager int not null, + jcl_manager int not null, ec_rolelevel text not null, jcl_rolelevel text not null, manage_module text not null, diff --git a/src/com/engine/organization/entity/detach/param/ManagerDetachParam.java b/src/com/engine/organization/entity/detach/param/ManagerDetachParam.java index 1944a089..ea79ddf8 100644 --- a/src/com/engine/organization/entity/detach/param/ManagerDetachParam.java +++ b/src/com/engine/organization/entity/detach/param/ManagerDetachParam.java @@ -22,9 +22,9 @@ public class ManagerDetachParam { private Integer managerType; - private String ecManager; + private Integer ecManager; - private String jclManager; + private Integer jclManager; private String ecRolelevel; diff --git a/src/com/engine/organization/entity/detach/po/ManagerDetachPO.java b/src/com/engine/organization/entity/detach/po/ManagerDetachPO.java index a40e29d2..8ac75ee0 100644 --- a/src/com/engine/organization/entity/detach/po/ManagerDetachPO.java +++ b/src/com/engine/organization/entity/detach/po/ManagerDetachPO.java @@ -30,11 +30,11 @@ public class ManagerDetachPO { /** * ec管理员 */ - private String ecManager; + private Integer ecManager; /** * jcl管理员 */ - private String jclManager; + private Integer jclManager; /** * ec分部 */ diff --git a/src/com/engine/organization/entity/detach/vo/ManagerDetachVO.java b/src/com/engine/organization/entity/detach/vo/ManagerDetachVO.java index 6a1fdea0..09eb15f4 100644 --- a/src/com/engine/organization/entity/detach/vo/ManagerDetachVO.java +++ b/src/com/engine/organization/entity/detach/vo/ManagerDetachVO.java @@ -46,10 +46,10 @@ public class ManagerDetachVO { private Long id; - @OrganizationTableColumn(text = "管理员", width = "20%", column = "ec_manager" ) - private String ecManager; + @OrganizationTableColumn(text = "管理员", width = "20%", column = "ec_manager", transmethod = "com.engine.organization.transmethod.ManagerDetachTransMethod.getManagerName") + private Integer ecManager; - @OrganizationTableColumn(text = "可管理组织机构", width = "40%", column = "ec_rolelevel") + @OrganizationTableColumn(text = "可管理组织机构", width = "40%", column = "ec_rolelevel",transmethod = "com.engine.organization.transmethod.ManagerDetachTransMethod.getRoleLevel") private String ecRolelevel; diff --git a/src/com/engine/organization/enums/LogModuleNameEnum.java b/src/com/engine/organization/enums/LogModuleNameEnum.java index 7779b220..c0115316 100644 --- a/src/com/engine/organization/enums/LogModuleNameEnum.java +++ b/src/com/engine/organization/enums/LogModuleNameEnum.java @@ -18,6 +18,7 @@ public enum LogModuleNameEnum { RESOURCE("人员管理", 11), STAFFPLAN("编制方案", 12), STAFF("编制上报", 13), + DETACH("模块管理分权", 14), OTHER("其他模块", 99); private String name; diff --git a/src/com/engine/organization/mapper/detach/ManagerDetachMapper.xml b/src/com/engine/organization/mapper/detach/ManagerDetachMapper.xml index cfd02f55..d1ddc927 100644 --- a/src/com/engine/organization/mapper/detach/ManagerDetachMapper.xml +++ b/src/com/engine/organization/mapper/detach/ManagerDetachMapper.xml @@ -176,10 +176,10 @@ update jcl_org_detach - ecManager=#{ecManager}, - jclManager=#{jclManager}, - ecRolelevel=#{ecRolelevel}, - jclRolelevel=#{jclRolelevel} + ec_manager=#{ecManager}, + jcl_Manager=#{jclManager}, + ec_rolelevel=#{ecRolelevel}, + jcl_rolelevel=#{jclRolelevel} WHERE id = #{id} AND delete_type = 0 @@ -198,7 +198,7 @@ select - from jcl_org_detach + from jcl_org_detach t WHERE delete_type = 0 AND id = #{id} diff --git a/src/com/engine/organization/mapper/employee/EmployeeMapper.java b/src/com/engine/organization/mapper/employee/EmployeeMapper.java index 62d67b67..0419a3cf 100644 --- a/src/com/engine/organization/mapper/employee/EmployeeMapper.java +++ b/src/com/engine/organization/mapper/employee/EmployeeMapper.java @@ -2,7 +2,9 @@ package com.engine.organization.mapper.employee; import org.apache.ibatis.annotations.Param; +import java.util.Collection; import java.util.List; +import java.util.Map; /** @@ -16,4 +18,6 @@ public interface EmployeeMapper { String getEmployeeNameById(@Param("employeeId") Long id); List getResourceIds(@Param("lastName") String lastName); + + List> getBrowserDatas(@Param("ids") Collection ids); } diff --git a/src/com/engine/organization/mapper/employee/EmployeeMapper.xml b/src/com/engine/organization/mapper/employee/EmployeeMapper.xml index bb06ca67..8419c565 100644 --- a/src/com/engine/organization/mapper/employee/EmployeeMapper.xml +++ b/src/com/engine/organization/mapper/employee/EmployeeMapper.xml @@ -33,6 +33,15 @@ - + \ No newline at end of file diff --git a/src/com/engine/organization/mapper/hrmresource/SystemDataMapper.java b/src/com/engine/organization/mapper/hrmresource/SystemDataMapper.java index 19365ba4..25f5cc8e 100644 --- a/src/com/engine/organization/mapper/hrmresource/SystemDataMapper.java +++ b/src/com/engine/organization/mapper/hrmresource/SystemDataMapper.java @@ -8,6 +8,7 @@ import org.apache.ibatis.annotations.Param; import java.util.Collection; import java.util.List; +import java.util.Map; /** * @author:dxfeng @@ -18,6 +19,8 @@ public interface SystemDataMapper { String getScCompanyNameById(@Param("companyId") String companyId); + List> getBrowserDatas(@Param("ids") Collection ids); + String getScDepartmentNameById(@Param("departmentId") String departmentId); String getScHrmResourceNameById(@Param("managerId") String managerId); diff --git a/src/com/engine/organization/mapper/hrmresource/SystemDataMapper.xml b/src/com/engine/organization/mapper/hrmresource/SystemDataMapper.xml index 18c55956..906461df 100644 --- a/src/com/engine/organization/mapper/hrmresource/SystemDataMapper.xml +++ b/src/com/engine/organization/mapper/hrmresource/SystemDataMapper.xml @@ -40,6 +40,19 @@ from hrmsubcompany where id = #{companyId} + + + +