模块管理分权

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,
+  ec_manager text not null,
-  jcl_manger text not null,
+  jcl_manager text not null,
   ec_rolelevel text not null,
   jcl_rolelevel text not null,
   module text not null,

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,
+  ec_manager clob not null,
-  jcl_manger clob not null,
+  jcl_manager clob not null,
-  ec_rolelevel clob not null,
+  ec_rolelevel varchar(4000) not null,
-  jcl_rolelevel clob not null,
+  jcl_rolelevel varchar(4000) not null,
-  module clob not null,
+  module varchar(4000) not null,
   creator number null,
   delete_type number null,
   create_time date null,

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,
+  ec_manager text not null,
-  jcl_manger text not null,
+  jcl_manager text not null,
   ec_rolelevel text not null,
   jcl_rolelevel text not null,
   module text not null,

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;
+
 }

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 {
+
+}

src/com/engine/organization/mapper/detach/ManagerDetachMapper.xml

@@ -0,0 +1,231 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE  mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.engine.organization.mapper.scheme.SchemeMapper">
+    <resultMap id="BaseResultMap" type="com.engine.organization.entity.scheme.po.SchemePO">
+        <result column="id" property="id"/>
+        <result column="scheme_no" property="schemeNo"/>
+        <result column="scheme_name" property="schemeName"/>
+        <result column="scheme_description" property="schemeDescription"/>
+        <result column="forbidden_tag" property="forbiddenTag"/>
+        <result column="creator" property="creator"/>
+        <result column="delete_type" property="deleteType"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_time" property="updateTime"/>
+    </resultMap>
+
+    <resultMap id="TreeResultMap" type="com.engine.organization.entity.TreeData">
+        <result column="id" property="key"/>
+        <result column="scheme_name" property="title"/>
+        <result column="forbidden_tag" property="status"/>
+    </resultMap>
+
+    <!-- 表字段 -->
+    <sql id="baseColumns">
+        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
+    </sql>
+
+    <select id="listByNo" parameterType="com.engine.organization.entity.scheme.po.SchemePO" resultMap="BaseResultMap">
+        select
+        <include refid="baseColumns"/>
+        from jcl_org_scheme t where scheme_no = #{schemeNo} AND delete_type = 0
+    </select>
+
+    <select id="getSchemeByID" parameterType="com.engine.organization.entity.scheme.po.SchemePO"
+            resultMap="BaseResultMap">
+        select
+        <include refid="baseColumns"/>
+        from jcl_org_scheme t where id = #{id} AND delete_type = 0
+    </select>
+    <select id="listSchemesByIds" resultType="java.util.Map">
+        select
+        id as "id",
+        scheme_name as "name"
+        from jcl_org_scheme t
+        WHERE delete_type = 0
+        AND id IN
+        <foreach collection="ids" open="(" item="id" separator="," close=")">
+            #{id}
+        </foreach>
+    </select>
+    <select id="listUsedId" resultType="java.lang.String">
+        select scheme_id
+        from jcl_org_level
+        where delete_type = 0
+        union
+        select scheme_id
+        from jcl_org_grade
+        where delete_type = 0
+        union
+        select scheme_id
+        from JCL_ORG_SEQUENCE
+        where delete_type = 0
+        union
+        select scheme_id
+        from JCL_ORG_JOB
+        where delete_type = 0
+    </select>
+    <select id="getTreeData" resultMap="TreeResultMap">
+        select id, scheme_name,forbidden_tag
+        from jcl_org_scheme
+        where delete_type = '0' and forbidden_tag = 0 order by scheme_no
+    </select>
+    <select id="getSchemesByIds" resultMap="BaseResultMap">
+        select
+        <include refid="baseColumns"/>
+        from jcl_org_scheme t
+        WHERE delete_type = 0
+        AND id IN
+        <foreach collection="ids" open="(" item="id" separator="," close=")">
+            #{id}
+        </foreach>
+    </select>
+
+    <insert id="insertIgnoreNull" parameterType="com.engine.organization.entity.scheme.po.SchemePO" keyProperty="id"
+            keyColumn="id" useGeneratedKeys="true">
+        INSERT INTO jcl_org_scheme
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="creator != null">
+                creator,
+            </if>
+            <if test="deleteType != null">
+                delete_type,
+            </if>
+            <if test="createTime != null">
+                create_time,
+            </if>
+            <if test="updateTime != null">
+                update_time,
+            </if>
+            <if test="schemeNo != null ">
+                scheme_no,
+            </if>
+            <if test="schemeName != null ">
+                scheme_name,
+            </if>
+            <if test="schemeDescription != null ">
+                scheme_description,
+            </if>
+            forbidden_tag,
+        </trim>
+        <trim prefix="VALUES (" suffix=")" suffixOverrides=",">
+            <if test="creator != null">
+                #{creator},
+            </if>
+            <if test="deleteType != null">
+                #{deleteType},
+            </if>
+            <if test="createTime != null">
+                #{createTime},
+            </if>
+            <if test="updateTime != null">
+                #{updateTime},
+            </if>
+            <if test="schemeNo != null ">
+                #{schemeNo},
+            </if>
+            <if test="schemeName != null ">
+                #{schemeName},
+            </if>
+            <if test="schemeDescription != null ">
+                #{schemeDescription},
+            </if>
+            0,
+        </trim>
+    </insert>
+
+    <insert id="insertIgnoreNull" parameterType="com.engine.organization.entity.scheme.po.SchemePO" databaseId="oracle">
+        <selectKey  keyProperty="id" resultType="long" order="AFTER">
+            select JCL_ORG_SCHEME_ID.currval from dual
+        </selectKey>
+        INSERT INTO jcl_org_scheme
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="creator != null">
+                creator,
+            </if>
+            <if test="deleteType != null">
+                delete_type,
+            </if>
+            <if test="createTime != null">
+                create_time,
+            </if>
+            <if test="updateTime != null">
+                update_time,
+            </if>
+            <if test="schemeNo != null ">
+                scheme_no,
+            </if>
+            <if test="schemeName != null ">
+                scheme_name,
+            </if>
+            <if test="schemeDescription != null ">
+                scheme_description,
+            </if>
+            forbidden_tag,
+        </trim>
+        <trim prefix="VALUES (" suffix=")" suffixOverrides=",">
+            <if test="creator != null">
+                #{creator},
+            </if>
+            <if test="deleteType != null">
+                #{deleteType},
+            </if>
+            <if test="createTime != null">
+                #{createTime},
+            </if>
+            <if test="updateTime != null">
+                #{updateTime},
+            </if>
+            <if test="schemeNo != null ">
+                #{schemeNo},
+            </if>
+            <if test="schemeName != null ">
+                #{schemeName},
+            </if>
+            <if test="schemeDescription != null ">
+                #{schemeDescription},
+            </if>
+            0,
+        </trim>
+    </insert>
+
+    <update id="updateScheme" parameterType="com.engine.organization.entity.scheme.po.SchemePO">
+        update jcl_org_scheme
+        <set>
+            creator=#{creator},
+            update_time=#{updateTime},
+            scheme_no=#{schemeNo},
+            scheme_name=#{schemeName},
+            scheme_description=#{schemeDescription},
+        </set>
+        WHERE id = #{id} AND delete_type = 0
+    </update>
+
+    <update id="updateForbiddenTagById" parameterType="com.engine.organization.entity.scheme.po.SchemePO">
+        update jcl_org_scheme
+        <set>
+            forbidden_tag=#{forbiddenTag},
+        </set>
+        WHERE id = #{id} AND delete_type = 0
+    </update>
+
+    <update id="deleteByIds">
+        UPDATE jcl_org_scheme
+        SET delete_type = 1
+        WHERE delete_type = 0
+        AND id IN
+        <foreach collection="ids" open="(" item="id" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
+</mapper>

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<Long> getResourceIds(@Param("lastName") String lastName);
 }

src/com/engine/organization/mapper/employee/EmployeeMapper.xml

@@ -2,10 +2,37 @@
 <!DOCTYPE  mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.engine.organization.mapper.employee.EmployeeMapper">
 
+    <sql id="likeSql">
+        <if test="lastName != null and lastName != ''">
+            AND t.lastname like CONCAT('%',#{lastName},'%')
+        </if>
+    </sql>
+    <sql id="likeSql" databaseId="oracle">
+        <if test="lastName != null and lastName != ''">
+            AND t.lastname like '%'||#{lastName}||'%'
+        </if>
+    </sql>
+    <sql id="likeSql" databaseId="sqlserver">
+        <if test="lastName != null and lastName != ''">
+            AND t.lastname like '%'+#{lastName}+'%'
+        </if>
+    </sql>
+
     <select id="getEmployeeNameById" resultType="string">
         select t.lastname
         from hrmresource t
         where id = #{employeeId}
     </select>
 
+
+    <select id="getResourceIds" resultType="long">
+        select t.id
+        from hrmresource t
+        where 1 = 1
+        <include refid="likeSql"/>
+    </select>
+
+
+
+
 </mapper>

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<String, Object> listPage(Map<String, Object> params);
+
+    /**
+     * 新建编辑表单
+     * @param id
+     * @return
+     */
+    Map<String, Object> getForm(Integer id);
 }

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<String, Object> listPage(Map<String, Object> params) {
+        Map<String, Object> resultMap = new HashMap<>();
+        boolean hasRight = HasRightUtil.hasRight(user, RIGHT_NAME, true);
+        resultMap.put("hasRight", hasRight);
+        if (!hasRight) {
+            return resultMap;
+        }
+        OrganizationWeaTable<ManagerDetachVO> 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<String, Object> getForm(Integer id) {
+        Map<String, Object> apiDatas = new HashMap<>();
+        List<SearchConditionItem> selectItems = new ArrayList<>();
+        List<SearchConditionGroup> 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<String, Object> params) {
+        String sqlWhere = " where 1 = 1";
+        String lastName = (String) params.get("ecManager");
+        List<Long> 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;
+    }
 }

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.*;
-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;
@@ -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);
+        }
+    }
 }

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<String, Object> listPage(Map<String, Object> params) {
-        return null;
+        return getManagerDetachService(user).listPage(params);
+    }
+
+    public Map<String, List<MenuBtn>> getTableBtn() {
+        return MenuBtn.getCommonBtnDatas();
+    }
+
+    public Map<String, Object> getSearchCondition() {
+        Map<String, Object> apiDatas = new HashMap<>();
+        List<SearchConditionGroup> addGroups = new ArrayList<>();
+        List<SearchConditionItem> 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<String, Object> getForm(Integer id) {
+        return getManagerDetachService(user).getForm(id);
+    }
+
+    @Log(operateType = OperateTypeEnum.DELETE,operateModule = LogModuleNameEnum.OTHER,operateDesc = "删除")
+    public int deleteByIds(Collection<Long> ids) {
+        return -1;
     }
 }