组织人事测试、优化

src/com/engine/organization/entity/postion/dto/PostDTO.java

@@ -17,7 +17,6 @@ public class PostDTO {
         }
         return PostPO.builder()
                 .id(postPO.getId() == null ? 0 : postPO.getId())
-                .postNo(postPO.getPostNo() == null ? null : postPO.getPostNo())
                 .postName(postPO.getPostName() == null ? null : postPO.getPostName())
                 .description(postPO.getDescription() == null ? null : postPO.getDescription())
                 .deleteType(0)

src/com/engine/organization/entity/postion/po/PostPO.java

@@ -22,10 +22,6 @@ public class PostPO {
      * 主键
      */
     private Long id;
-    /**
-     * 编号
-     */
-    private String postNo;
     /**
      * 名称
      */

src/com/engine/organization/entity/scheme/vo/GradeTableVO.java

@@ -27,7 +27,8 @@ import lombok.NoArgsConstructor;
                 " t.forbidden_tag," +
                 "t.is_used",
         fromSql = "from jcl_org_grade t inner join jcl_org_scheme a on t.scheme_id = a.id ",
-        orderby = "id desc",
+        orderby = "grade_no",
+        sortway = "asc",
         primarykey = "id",
         operates = {
                 @OrganizationTableOperate(text = "编辑"),
@@ -52,7 +53,7 @@ public class GradeTableVO {
     /**
      * 编号
      */
-    @OrganizationTableColumn(text = "编号", width = "20%", column = "grade_no")
+    @OrganizationTableColumn(text = "编号", width = "20%", column = "grade_no", orderkey = "grade_no")
     private String gradeNo;
     /**
      * 名称

src/com/engine/organization/entity/sequence/vo/SequenceTableVO.java

@@ -30,7 +30,8 @@ import lombok.NoArgsConstructor;
                 "t.create_time," +
                 "t.update_time",
         fromSql = "FROM jcl_org_sequence t inner join jcl_org_scheme s on t.scheme_id = s.id ",
-        orderby = "id desc",
+        orderby = "sequence_no",
+        sortway = "asc",
         primarykey = "id",
         operates = {
                 @OrganizationTableOperate(text = "编辑"),
@@ -56,7 +57,7 @@ public class SequenceTableVO {
     /**
      * 编号
      */
-        @OrganizationTableColumn(text = "编号", width = "20%", column = "sequence_no")
+    @OrganizationTableColumn(text = "编号", width = "20%", column = "sequence_no", orderkey = "sequence_no")
     private String sequenceNo;
     /**
      * 名称

src/com/engine/organization/mapper/post/PostMapper.java

@@ -18,15 +18,6 @@ import java.util.Map;
  * @Version V1.0
  **/
 public interface PostMapper {
-
-    /**
-     * 根据No查询职务分类
-     *
-     * @param postNo
-     * @return
-     */
-    List<PostPO> listByNo(@Param("postNo") String postNo);
-
     /**
      * 获取职务分类根据ID
      *

src/com/engine/organization/mapper/post/PostMapper.xml

@@ -3,7 +3,6 @@
 <mapper namespace="com.engine.organization.mapper.post.PostMapper">
     <resultMap id="BaseResultMap" type="com.engine.organization.entity.postion.po.PostPO">
         <result column="id" property="id"/>
-        <result column="post_no" property="postNo"/>
         <result column="post_name" property="postName"/>
         <result column="description" property="description"/>
         <result column="creator" property="creator"/>
@@ -22,7 +21,6 @@
         t
         .
         id
-        , t.post_no
         , t.post_name
         , t.description
         , t.creator
@@ -37,13 +35,6 @@
         from jcl_org_post t where id = #{id} AND delete_type = 0
     </select>
 
-    <select id="listByNo" parameterType="com.engine.organization.entity.postion.po.PostPO" resultMap="BaseResultMap">
-        select
-        <include refid="baseColumns"/>
-        from jcl_org_post t where post_no = #{postNo} AND delete_type = 0
-    </select>
-
-
     <!-- 浏览按钮赋值、展示用 -->
     <select id="listPostsByIds" resultType="java.util.Map">
         select
@@ -66,7 +57,6 @@
         <set>
             creator=#{creator},
             update_time=#{updateTime},
-            post_no=#{postNo},
             post_name=#{postName},
             description=#{description},
         </set>
@@ -89,9 +79,6 @@
             <if test="updateTime != null">
                 update_time,
             </if>
-            <if test="postNo != null ">
-                post_no,
-            </if>
             <if test="postName != null ">
                 post_name,
             </if>
@@ -112,9 +99,6 @@
             <if test="updateTime != null">
                 #{updateTime},
             </if>
-            <if test="postNo != null ">
-                #{postNo},
-            </if>
             <if test="postName != null ">
                 #{postName},
             </if>

src/com/engine/organization/mapper/scheme/LevelMapper.java

@@ -1,10 +1,12 @@
 package com.engine.organization.mapper.scheme;
 
 
+import com.engine.organization.entity.TreeData;
 import com.engine.organization.entity.scheme.po.LevelPO;
 import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -34,6 +36,7 @@ public interface LevelMapper {
 
     /**
      * 获取职等根据ID
+     *
      * @param id
      * @return
      */
@@ -46,10 +49,11 @@ public interface LevelMapper {
      * @return
      */
     @MapKey("id")
-    List<Map<String,Object>> listLevelsByIds(@Param("ids") Collection<Long> ids);
+    List<Map<String, Object>> listLevelsByIds(@Param("ids") Collection<Long> ids);
 
     /**
      * 插入职等
+     *
      * @param levelPO
      * @return
      */
@@ -80,8 +84,16 @@ public interface LevelMapper {
 
     /**
      * 根据禁用标记统计
+     *
      * @param tag
      * @return
      */
     int getCountByTag(@Param("tag") int tag);
+
+    /**
+     * 获取左侧树
+     *
+     * @return
+     */
+    ArrayList<TreeData> getTreeData();
 }

src/com/engine/organization/mapper/scheme/LevelMapper.xml

@@ -14,6 +14,11 @@
         <result column="update_time" property="updateTime"/>
     </resultMap>
 
+    <resultMap id="TreeResultMap" type="com.engine.organization.entity.TreeData">
+        <result column="id" property="key"/>
+        <result column="level_name" property="title"/>
+    </resultMap>
+
     <!-- 表字段 -->
     <sql id="baseColumns">
         t
@@ -29,6 +34,8 @@
         , t.create_time
         , t.update_time
     </sql>
+
+
     <select id="getLevelByID" parameterType="com.engine.organization.entity.scheme.po.LevelPO"
             resultMap="BaseResultMap">
         select
@@ -68,6 +75,11 @@
         from JCL_ORG_JOBDT
         where delete_type = 0
     </select>
+    <select id="getTreeData" resultMap="TreeResultMap">
+        select id, level_name
+        from jcl_org_level
+        where delete_type = '0'
+    </select>
 
     <update id="updateLevel" parameterType="com.engine.organization.entity.scheme.po.LevelPO">
         update jcl_org_level

src/com/engine/organization/mapper/scheme/SchemeMapper.java

@@ -1,10 +1,12 @@
 package com.engine.organization.mapper.scheme;
 
 
+import com.engine.organization.entity.TreeData;
 import com.engine.organization.entity.scheme.po.SchemePO;
 import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -79,4 +81,10 @@ public interface SchemeMapper {
      * @param ids
      */
     int deleteByIds(@Param("ids") Collection<Long> ids);
+
+    /**
+     * 获取左侧树
+     * @return
+     */
+    ArrayList<TreeData> getTreeData();
 }

src/com/engine/organization/mapper/scheme/SchemeMapper.xml

@@ -13,6 +13,11 @@
         <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"/>
+    </resultMap>
+
     <!-- 表字段 -->
     <sql id="baseColumns">
         t
@@ -68,6 +73,11 @@
         from JCL_ORG_JOB
         where delete_type = 0
     </select>
+    <select id="getTreeData" resultMap="TreeResultMap">
+        select id, scheme_name
+        from jcl_org_scheme
+        where delete_type = '0'
+    </select>
 
     <insert id="insertIgnoreNull" parameterType="com.engine.organization.entity.scheme.po.SchemePO" keyProperty="id"
             keyColumn="id" useGeneratedKeys="true">

src/com/engine/organization/service/LevelService.java

@@ -1,5 +1,6 @@
 package com.engine.organization.service;
 
+import com.engine.organization.entity.TreeData;
 import com.engine.organization.entity.scheme.param.LevelSearchParam;
 
 import java.util.Collection;
@@ -78,4 +79,11 @@ public interface LevelService {
      */
     Map<String, Object> getTabInfo();
 
+    /**
+     * 获取左侧树
+     *
+     * @return
+     */
+    TreeData getTreeData();
+
 }

src/com/engine/organization/service/SchemeService.java

@@ -1,8 +1,10 @@
 package com.engine.organization.service;
 
+import com.engine.organization.entity.fieldset.vo.TypeTreeVO;
 import com.engine.organization.entity.scheme.param.SchemeSearchParam;
 
 import java.util.Collection;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -70,8 +72,16 @@ public interface SchemeService {
 
     /**
      * 获取列表页面按钮信息
+     *
      * @return
      */
     Map<String, Object> getTableBtn();
 
+    /**
+     * 获取左侧树
+     *
+     * @return
+     */
+    List<TypeTreeVO> getTreeData();
+
 }

src/com/engine/organization/service/impl/GradeServiceImpl.java

@@ -210,7 +210,7 @@ public class GradeServiceImpl extends Service implements GradeService {
             sqlWhere += " AND t.grade_name " + dbType.like(gradeName);
         }
         String schemeId = (String) params.get("schemeId");
-        if (StringUtils.isNotBlank(schemeId)) {
+        if (StringUtils.isNotBlank(schemeId) && !"-1".equals(schemeId)) {
             sqlWhere += " AND t.scheme_id = '" + schemeId + "'";
         }
         String viewCondition = (String) params.get("viewCondition");

src/com/engine/organization/service/impl/LevelServiceImpl.java

@@ -8,6 +8,7 @@ import com.engine.core.impl.Service;
 import com.engine.organization.component.OrganizationWeaTable;
 import com.engine.organization.entity.DeleteParam;
 import com.engine.organization.entity.TopTab;
+import com.engine.organization.entity.TreeData;
 import com.engine.organization.entity.scheme.dto.LevelDTO;
 import com.engine.organization.entity.scheme.param.LevelSearchParam;
 import com.engine.organization.entity.scheme.po.LevelPO;
@@ -183,6 +184,12 @@ public class LevelServiceImpl extends Service implements LevelService {
         return apiDatas;
     }
 
+    @Override
+    public TreeData getTreeData() {
+        ArrayList<TreeData> treeDataList = getLevelMapper().getTreeData();
+        return TreeData.builder().children(treeDataList).title("职等").key("-1").build();
+    }
+
     /**
      * 查询条件
      *
@@ -197,7 +204,7 @@ public class LevelServiceImpl extends Service implements LevelService {
             sqlWhere += " AND t.level_name " + dbType.like(levelName);
         }
         String schemeId = (String) params.get("schemeId");
-        if (StringUtils.isNotBlank(schemeId)) {
+        if (StringUtils.isNotBlank(schemeId) && !"-1".equals(schemeId)) {
             sqlWhere += " AND t.scheme_id = '" + schemeId + "'";
         }
         String viewCondition = (String) params.get("viewCondition");

src/com/engine/organization/service/impl/PostInfoServiceImpl.java

@@ -125,11 +125,11 @@ public class PostInfoServiceImpl extends Service implements PostInfoService {
         SearchConditionItem nameItem = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, "名称", "postInfoName");
         nameItem.setRules("required|string");
         // 权限
-        SearchConditionItem authorityItem = OrganizationFormItemUtil.inputItem(user, 2, 17, 2, 50, "权限", "postInfoAuthority");
+        SearchConditionItem authorityItem = OrganizationFormItemUtil.textareaItem(user, 2, 17, true, 2, 50, "权限", "postInfoAuthority");
         // 责任
-        SearchConditionItem dutyItem = OrganizationFormItemUtil.inputItem(user, 2, 17, 2, 50, "责任", "postInfoDuty");
+        SearchConditionItem dutyItem = OrganizationFormItemUtil.textareaItem(user, 2, 17, true, 2, 50, "责任", "postInfoDuty");
         // 资格
-        SearchConditionItem qualificationItem = OrganizationFormItemUtil.inputItem(user, 2, 17, 2, 50, "资格", "postInfoQualification");
+        SearchConditionItem qualificationItem = OrganizationFormItemUtil.textareaItem(user, 2, 17, true, 2, 50, "资格", "postInfoQualification");
         // 职务分类
         SearchConditionItem postIdBrowser = OrganizationFormItemUtil.browserItem(user, 2, 17, 3, false, "职务分类", "161", "postId", "postBrowser");
         postIdBrowser.setRules("required|string");
@@ -172,7 +172,25 @@ public class PostInfoServiceImpl extends Service implements PostInfoService {
 
     @Override
     public Map<String, Object> getHasRight() {
-        return MenuBtn.getCommonBtnDatas();
+        Map<String, Object> btnDatas = new HashMap<>();
+        ArrayList<MenuBtn> topMenuList = new ArrayList<>();
+        ArrayList<MenuBtn> rightMenuList = new ArrayList<>();
+        // 新增
+        topMenuList.add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("addPlan").menuIcon("icon-coms-New-Flow").menuName("新增职务分类").type("BTN_AddPlan").build());
+        topMenuList.add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("editPlan").menuIcon("icon-coms-edit").menuName("修改职务分类").type("BTN_EditPlan").build());
+        topMenuList.add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("delPlan").menuIcon("icon-coms-Delete").menuName("删除职务分类").type("BTN_DelPlan").build());
+        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;
     }
 
 

src/com/engine/organization/service/impl/PostServiceImpl.java

@@ -34,8 +34,8 @@ public class PostServiceImpl extends Service implements PostService {
     @Override
     public int savePost(PostPO postPO) {
         HasRightUtil.hasRight(user, RIGHT_NAME, false);
-        List<PostPO> list = getPostMapper().listByNo(Util.null2String(postPO.getPostNo()));
-        OrganizationAssert.isEmpty(list, "编号不允许重复");
+        // List<PostPO> list = getPostMapper().listByNo(Util.null2String(postPO.getPostNo()));
+        // OrganizationAssert.isEmpty(list, "编号不允许重复");
         return getPostMapper().insertIgnoreNull(PostDTO.convertPO(postPO, user.getUID()));
     }
 
@@ -60,8 +60,6 @@ public class PostServiceImpl extends Service implements PostService {
         List<SearchConditionGroup> addGroups = new ArrayList<>();
         SearchConditionItem postNameItem = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, "名称", "postName");
         postNameItem.setRules("required|string");
-        SearchConditionItem postNoItem = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, "编号", "postNo");
-        postNoItem.setRules("required|string");
         SearchConditionItem descriptionItem = OrganizationFormItemUtil.textareaItem(user, 2, 17, true, 2, 60, "描述说明", "description");
 
         // 编辑状态下赋值操作
@@ -71,12 +69,10 @@ public class PostServiceImpl extends Service implements PostService {
             OrganizationAssert.notNull(postPO, "选择的数据不存在，或数据已删除");
 
             postNameItem.setValue(postPO.getPostName());
-            postNoItem.setValue(postPO.getPostNo());
             descriptionItem.setValue(postPO.getDescription());
 
         }
 
-        selectItems.add(postNoItem);
         selectItems.add(postNameItem);
         selectItems.add(descriptionItem);
         addGroups.add(new SearchConditionGroup("基本信息", true, selectItems));
@@ -87,7 +83,7 @@ public class PostServiceImpl extends Service implements PostService {
     @Override
     public TreeData getTreeData() {
         ArrayList<TreeData> treeDataList = getPostMapper().getTreeData();
-        return TreeData.builder().children(treeDataList).title("全部类型").key("-1").build();
+        return TreeData.builder().children(treeDataList).title("职务分类").key("-1").build();
     }
 
 

src/com/engine/organization/service/impl/SchemeServiceImpl.java

@@ -5,6 +5,8 @@ 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.TreeData;
+import com.engine.organization.entity.fieldset.vo.TypeTreeVO;
 import com.engine.organization.entity.scheme.dto.SchemeDTO;
 import com.engine.organization.entity.scheme.param.SchemeSearchParam;
 import com.engine.organization.entity.scheme.po.SchemePO;
@@ -20,6 +22,7 @@ import weaver.general.StringUtil;
 import weaver.general.Util;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @Author dxfeng
@@ -151,6 +154,26 @@ public class SchemeServiceImpl extends Service implements SchemeService {
         return MenuBtn.getCommonBtnDatas();
     }
 
+    @Override
+    public List<TypeTreeVO> getTreeData() {
+        ArrayList<TreeData> treeDataList = getSchemeMapper().getTreeData();
+        TypeTreeVO build = TypeTreeVO.builder()
+                .childs(treeDataList.stream().map(e ->
+                        TypeTreeVO.builder()
+                                .domid(e.getKey())
+                                .key(Long.parseLong(e.getKey()))
+                                .name(e.getTitle())
+                                .build()).collect(Collectors.toList()))
+                .haschild(true)
+                .domid("-1")
+                .key(-1L)
+                .name("全部方案").build();
+        List<TypeTreeVO> typeTreeVOS = new ArrayList<>();
+        typeTreeVOS.add(build);
+        return typeTreeVOS;
+    }
+
+
     /**
      * 查询条件
      *

src/com/engine/organization/service/impl/SequenceServiceImpl.java

@@ -78,6 +78,11 @@ public class SequenceServiceImpl extends Service implements SequenceService {
     public int updateSequence(SequenceSearchParam param) {
         HasRightUtil.hasRight(user, RIGHT_NAME, false);
         SequencePO sequencePO = SequenceDTO.convertParamToPO(param, (long) user.getUID());
+        String oldSequenceNo = getSequenceMapper().getSequenceByID(sequencePO.getId()).getSequenceNo();
+        if (!oldSequenceNo.equals(sequencePO.getSequenceNo())) {
+            List<SequencePO> list = getSequenceMapper().listByNo(Util.null2String(sequencePO.getSequenceNo()));
+            OrganizationAssert.isEmpty(list, "编号不允许重复");
+        }
         return getSequenceMapper().updateSequence(sequencePO);
     }
 
@@ -142,7 +147,7 @@ public class SequenceServiceImpl extends Service implements SequenceService {
             browserBean.setReplaceDatas(maps);
             browserItem.setBrowserConditionParam(browserBean);
             // 编辑状态下,编号只读
-            sequenceNoCondition.setViewAttr(1);
+            // sequenceNoCondition.setViewAttr(1);
         }
 
         selectItems.add(sequenceNoCondition);

src/com/engine/organization/web/LevelController.java

@@ -202,4 +202,16 @@ public class LevelController {
             return ReturnResult.exceptionHandle(e.getMessage());
         }
     }
+
+    @GET
+    @Path("/getTreeData")
+    @Produces(MediaType.APPLICATION_JSON)
+    public ReturnResult getTreeData(@Context HttpServletRequest request, @Context HttpServletResponse response) {
+        try {
+            User user = HrmUserVarify.getUser(request, response);
+            return ReturnResult.successed(getLevelWrapper(user).getTreeData());
+        } catch (Exception e) {
+            return ReturnResult.exceptionHandle(e.getMessage());
+        }
+    }
 }

src/com/engine/organization/web/SchemeController.java

@@ -177,5 +177,17 @@ public class SchemeController {
         }
     }
 
+    @GET
+    @Path("/getTreeData")
+    @Produces(MediaType.APPLICATION_JSON)
+    public ReturnResult getTreeData(@Context HttpServletRequest request, @Context HttpServletResponse response) {
+        try {
+            User user = HrmUserVarify.getUser(request, response);
+            return ReturnResult.successed(getSchemeWrapper(user).getTreeData());
+        } catch (Exception e) {
+            return ReturnResult.exceptionHandle(e.getMessage());
+        }
+    }
+
 
 }

src/com/engine/organization/wrapper/LevelWrapper.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.TreeData;
 import com.engine.organization.entity.scheme.param.LevelSearchParam;
 import com.engine.organization.service.LevelService;
 import com.engine.organization.service.impl.LevelServiceImpl;
@@ -108,4 +109,8 @@ public class LevelWrapper extends Service {
     public Map<String, Object> getTabInfo() {
         return getLevelService(user).getTabInfo();
     }
+
+    public TreeData getTreeData() {
+        return getLevelService(user).getTreeData();
+    }
 }

src/com/engine/organization/wrapper/SchemeWrapper.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.fieldset.vo.TypeTreeVO;
 import com.engine.organization.entity.scheme.param.SchemeSearchParam;
 import com.engine.organization.service.SchemeService;
 import com.engine.organization.service.impl.SchemeServiceImpl;
@@ -9,6 +10,7 @@ import org.apache.ibatis.annotations.Param;
 import weaver.hrm.User;
 
 import java.util.Collection;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -74,6 +76,7 @@ public class SchemeWrapper extends Service {
 
     /**
      * 获取搜索条件
+     *
      * @param params
      * @return
      */
@@ -84,6 +87,7 @@ public class SchemeWrapper extends Service {
 
     /**
      * 获取新增表单
+     *
      * @param params
      * @return
      */
@@ -93,9 +97,14 @@ public class SchemeWrapper extends Service {
 
     /**
      * 获取列表页面按钮信息
+     *
      * @return
      */
     public Map<String, Object> getTableBtn() {
         return getSchemeService(user).getTableBtn();
     }
+
+    public List<TypeTreeVO> getTreeData() {
+        return getSchemeService(user).getTreeData();
+    }
 }